summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorwennmach <wennmach>2006-08-24 17:59:04 +0000
committerwennmach <wennmach>2006-08-24 17:59:04 +0000
commit81ec1a4c10722af60d780584dd7f83111f52dc39 (patch)
tree4bcdaffaef15b4364a0f9824e3c3f7a661c3ad39 /net
parentb8218118fe31ec39220f215cda2e53f3c813e4a8 (diff)
downloadpkgsrc-81ec1a4c10722af60d780584dd7f83111f52dc39.tar.gz
Make the X11 components of arla an option.
Submitted by david l goodrich in PR pkg/33400.
Diffstat (limited to 'net')
-rw-r--r--net/arla/Makefile7
-rw-r--r--net/arla/PLIST4
-rw-r--r--net/arla/options.mk16
3 files changed, 21 insertions, 6 deletions
diff --git a/net/arla/Makefile b/net/arla/Makefile
index a37ca4b438d..85c61c7cdbc 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -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 @@ INFO_FILES= # PLIST
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 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
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 --git a/net/arla/PLIST b/net/arla/PLIST
index be3b61fef96..9a20f3ae99e 100644
--- a/net/arla/PLIST
+++ b/net/arla/PLIST
@@ -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 --git a/net/arla/options.mk b/net/arla/options.mk
new file mode 100644
index 00000000000..630969ec7e2
--- /dev/null
+++ b/net/arla/options.mk
@@ -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