summaryrefslogtreecommitdiff
path: root/net/mldonkey-gui
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-03-06 16:04:32 +0000
committerwiz <wiz@pkgsrc.org>2011-03-06 16:04:32 +0000
commit319cbd207da038fdf5c1f2153ca4ba88eaf2222b (patch)
tree7932e4d81f8c6f4753f6924d91737148ca0591da /net/mldonkey-gui
parent3b0faad4eed25929eb9466f79a86bd63833058b2 (diff)
downloadpkgsrc-319cbd207da038fdf5c1f2153ca4ba88eaf2222b.tar.gz
Remove options that use GTK1.
Diffstat (limited to 'net/mldonkey-gui')
-rw-r--r--net/mldonkey-gui/Makefile9
-rw-r--r--net/mldonkey-gui/options.mk22
2 files changed, 7 insertions, 24 deletions
diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile
index 6acd3681f94..cf086f546f0 100644
--- a/net/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2011/02/26 09:24:33 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2011/03/06 16:04:32 wiz Exp $
#
.include "../../net/mldonkey/Makefile.common"
@@ -13,7 +13,7 @@ USE_TOOLS+= pkg-config
INSTALLATION_DIRS= bin libexec/mldonkey
-.include "options.mk"
+CONFIGURE_ARGS+= --enable-gui=newgui2
do-install:
${RM} -f ${DESTDIR}${PREFIX}/bin/mlgui
@@ -24,4 +24,9 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui \
${DESTDIR}${PREFIX}/libexec/mldonkey
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+# 2.6.0 is the first ~stable version (for mldonkey)
+BUILDLINK_API_DEPENDS.lablgtk+= lablgtk>=2.6.0
+.include "../../x11/lablgtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/mldonkey-gui/options.mk b/net/mldonkey-gui/options.mk
deleted file mode 100644
index 09b6da85fff..00000000000
--- a/net/mldonkey-gui/options.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: options.mk,v 1.8 2007/09/21 13:04:13 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.mldonkey-gui
-PKG_OPTIONS_REQUIRED_GROUPS+= toolkit
-PKG_OPTIONS_GROUP.toolkit= lablgtk1 lablgtk
-PKG_SUGGESTED_OPTIONS= lablgtk
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mlablgtk1)
-CONFIGURE_ARGS+= --enable-gui=newgui1
-.include "../../x11/lablgtk1/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mlablgtk)
-CONFIGURE_ARGS+= --enable-gui=newgui2
-.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-# 2.6.0 is the first ~stable version (for mldonkey)
-BUILDLINK_API_DEPENDS.lablgtk+= lablgtk>=2.6.0
-.include "../../x11/lablgtk/buildlink3.mk"
-.endif