summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authordillo <dillo@pkgsrc.org>2005-07-21 13:11:42 +0000
committerdillo <dillo@pkgsrc.org>2005-07-21 13:11:42 +0000
commit426c6f2957e524897e43e81fc98ae63b92e740db (patch)
tree26d339017bd73653019cd2065d20c1708831aeaa /misc
parent3c1188f74f8a65c2d7ad09ca9cf89cfbaf5d2847 (diff)
downloadpkgsrc-426c6f2957e524897e43e81fc98ae63b92e740db.tar.gz
Replace GECKO_PROVIDER with option group. New options are firefox
and mozilla. Backwards compatibilty is provided. Reviewed by wiz.
Diffstat (limited to 'misc')
-rw-r--r--misc/yelp/Makefile14
1 files changed, 5 insertions, 9 deletions
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index b19853b11a2..0c78c3c8c5b 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:05 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/07/21 13:11:42 dillo Exp $
#
DISTNAME= yelp-2.10.0
@@ -23,7 +23,9 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-html-widget=gtkhtml2
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR= PKG_OPTIONS.yelp
+.include "../../www/mozilla/gecko-options.mk"
+.include "../../mk/bsd.options.mk"
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
@@ -42,12 +44,6 @@ CONFIGURE_ARGS+= --with-html-widget=gtkhtml2
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../www/libgtkhtml/buildlink3.mk"
-.if ${GECKO_PROVIDER} == "firefox"
-# firefox didn't have a pkgconfig file before 1.0.4
-BUILDLINK_DEPENDS.firefox+= firefox>=1.0.4
-.include "../../www/firefox/buildlink3.mk"
-.else
-.include "../../www/mozilla-gtk2/buildlink3.mk"
-.endif
+.include "../../www/mozilla/gecko-depends.mk"
.include "../../mk/bsd.pkg.mk"