pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/arla Make the X11 components of arla an option.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/379b7faa4709
branches:  trunk
changeset: 517901:379b7faa4709
user:      wennmach <wennmach%pkgsrc.org@localhost>
date:      Thu Aug 24 17:59:04 2006 +0000

description:
Make the X11 components of arla an option.
Submitted by david l goodrich in PR pkg/33400.

diffstat:

 net/arla/Makefile   |   7 +++----
 net/arla/PLIST      |   4 ++--
 net/arla/options.mk |  16 ++++++++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diffs (63 lines):

diff -r 0c1ff8ea0458 -r 379b7faa4709 net/arla/Makefile
--- a/net/arla/Makefile Thu Aug 24 17:50:13 2006 +0000
+++ b/net/arla/Makefile Thu Aug 24 17:59:04 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2006/08/24 13:25:41 wennmach Exp $
+# $NetBSD: Makefile,v 1.60 2006/08/24 17:59:04 wennmach Exp $
 
 DISTNAME=              arla-0.43
-#PKGREVISION=          1
+PKGREVISION=           1
 CATEGORIES=            net security
 MASTER_SITES=          ftp://ftp.stacken.kth.se/pub/arla/
 
@@ -21,6 +21,7 @@
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 
+.include "options.mk"
 .include "../../mk/bsd.prefs.mk"
 
 .if !exists(/usr/src/sys/lib/libkern/libkern.h)
@@ -62,8 +63,6 @@
 RCD_SCRIPTS=   arlad
 OWN_DIRS_PERMS=        ${ARLA_CACHE} ${ROOT_USER} ${ROOT_GROUP} 0700
 
-.include "../../mk/x11.buildlink3.mk"
-
 post-extract:
        ${CP} ${FILESDIR}/lkm.conf ${WRKDIR}/lkm.conf
 
diff -r 0c1ff8ea0458 -r 379b7faa4709 net/arla/PLIST
--- a/net/arla/PLIST    Thu Aug 24 17:50:13 2006 +0000
+++ b/net/arla/PLIST    Thu Aug 24 17:59:04 2006 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.20 2006/04/06 03:20:54 jlam Exp $
+@comment $NetBSD: PLIST,v 1.21 2006/08/24 17:59:04 wennmach Exp $
 bin/afsfsperf
 bin/afstool
-bin/amon
+${X11_SUPPORT}bin/amon
 bin/arla-send-pr
 bin/bos
 bin/fs
diff -r 0c1ff8ea0458 -r 379b7faa4709 net/arla/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/arla/options.mk       Thu Aug 24 17:59:04 2006 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2006/08/24 17:59:04 wennmach Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.arla
+PKG_SUPPORTED_OPTIONS= x11
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=       --with-x
+PLIST_SUBST+=          X11_SUPPORT=
+.include "../../mk/x11.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=        --without-x
+PLIST_SUBST+=           X11_SUPPORT='@comment '
+.endif



Home | Main Index | Thread Index | Old Index