pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/net/libnids Allow glib to be disabled



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3e70bf2ca7e8
branches:  trunk
changeset: 392697:3e70bf2ca7e8
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Wed May 06 21:54:54 2009 +0000

description:
Allow glib to be disabled
It's still enabled by default so no PKGREVISION bump

diffstat:

 net/libnids/Makefile   |   3 +--
 net/libnids/options.mk |  17 +++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 2617aec68958 -r 3e70bf2ca7e8 net/libnids/Makefile
--- a/net/libnids/Makefile      Wed May 06 21:41:29 2009 +0000
+++ b/net/libnids/Makefile      Wed May 06 21:54:54 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/02/24 00:44:26 cube Exp $
+# $NetBSD: Makefile,v 1.24 2009/05/06 21:54:54 adrianp Exp $
 #
 
 DISTNAME=      libnids-1.23
@@ -28,5 +28,4 @@
 .include "options.mk"
 
 .include "../../net/libpcap/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2617aec68958 -r 3e70bf2ca7e8 net/libnids/options.mk
--- a/net/libnids/options.mk    Wed May 06 21:41:29 2009 +0000
+++ b/net/libnids/options.mk    Wed May 06 21:54:54 2009 +0000
@@ -1,9 +1,13 @@
-# $NetBSD: options.mk,v 1.6 2009/02/24 00:44:26 cube Exp $
+# $NetBSD: options.mk,v 1.7 2009/05/06 21:54:54 adrianp Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.libnids
+
 PKG_OPTIONS_REQUIRED_GROUPS=   libnet
 PKG_OPTIONS_GROUP.libnet=      libnet10 libnet11
-PKG_SUGGESTED_OPTIONS=         libnet10
+
+PKG_SUPPORTED_OPTIONS=         glib
+
+PKG_SUGGESTED_OPTIONS=         libnet10 glib
 
 .include "../../mk/bsd.options.mk"
 
@@ -24,3 +28,12 @@
 BUILDLINK_DEPMETHOD.libnet11+= build
 SUBST_SED.conf=        -e "s|libnet-config|libnet11-config|g"
 .endif
+
+###
+### glib support
+###
+.if !empty(PKG_OPTIONS:Mglib)
+.include "../../devel/glib2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-libglib
+.endif



Home | Main Index | Thread Index | Old Index