diff options
| author | wiz <wiz> | 2013-10-31 00:38:20 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2013-10-31 00:38:20 +0000 |
| commit | 726f4728fdcf1c0cacc9596749c3b901044dc01e (patch) | |
| tree | 9ce0210c2d6b097d2264cdb26de9ece48c4646d5 /net | |
| parent | c699d170b0f8342d289178d2ff8f6a23e8d7f113 (diff) | |
| download | pkgsrc-726f4728fdcf1c0cacc9596749c3b901044dc01e.tar.gz | |
Make glib2 optional, but leave it default-on to stay as before.
Based on patch by Jean-Yves Moulin <jym@baaz.fr> with slight changes.
Diffstat (limited to 'net')
| -rw-r--r-- | net/mtr/Makefile | 3 | ||||
| -rw-r--r-- | net/mtr/options.mk | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/net/mtr/Makefile b/net/mtr/Makefile index f64efa57bd0..4b56e684af4 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -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 @@ do-install: ${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 --git a/net/mtr/options.mk b/net/mtr/options.mk index af0b5df7fa4..df34067f03a 100644 --- a/net/mtr/options.mk +++ b/net/mtr/options.mk @@ -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 @@ PKG_SUPPORTED_OPTIONS= gtk .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 |