[pkgsrc/trunk]: pkgsrc/net/mtr Make glib2 optional, but leave it default-on t...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd723a4dc4e3
branches:  trunk
changeset: 626049:cd723a4dc4e3
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Oct 31 00:38:20 2013 +0000

description:
Make glib2 optional, but leave it default-on to stay as before.
Based on patch by Jean-Yves Moulin <jym%baaz.fr@localhost> with slight changes.

diffstat:

 net/mtr/Makefile   |   3 +--
 net/mtr/options.mk |  11 +++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r aec7ad276bd8 -r cd723a4dc4e3 net/mtr/Makefile
--- a/net/mtr/Makefile  Thu Oct 31 00:10:56 2013 +0000
+++ b/net/mtr/Makefile  Thu Oct 31 00:38:20 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2013/10/10 14:42:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.86 2013/10/31 00:38:20 wiz Exp $
 
 DISTNAME=      mtr-0.85
 PKGREVISION=   3
@@ -41,5 +41,4 @@
        ${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/mtr
 
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r aec7ad276bd8 -r cd723a4dc4e3 net/mtr/options.mk
--- a/net/mtr/options.mk        Thu Oct 31 00:10:56 2013 +0000
+++ b/net/mtr/options.mk        Thu Oct 31 00:38:20 2013 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2009/03/22 16:21:44 smb Exp $
+# $NetBSD: options.mk,v 1.4 2013/10/31 00:38:20 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mtr
-PKG_SUPPORTED_OPTIONS= gtk
+PKG_SUPPORTED_OPTIONS= gtk glib
+PKG_SUGGESTED_OPTIONS= glib
 
 .include "../../mk/bsd.options.mk"
 
@@ -10,3 +11,9 @@
 .else
 CONFIGURE_ARGS+=       --without-gtk
 .endif
+
+.if !empty(PKG_OPTIONS:Mglib) || !empty(PKG_OPTIONS:Mgtk)
+.include "../../devel/glib2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-glib
+.endif