From 426c6f2957e524897e43e81fc98ae63b92e740db Mon Sep 17 00:00:00 2001 From: dillo Date: Thu, 21 Jul 2005 13:11:42 +0000 Subject: Replace GECKO_PROVIDER with option group. New options are firefox and mozilla. Backwards compatibilty is provided. Reviewed by wiz. --- misc/yelp/Makefile | 14 +++++--------- mk/defaults/mk.conf | 8 +------- mk/defaults/options.description | 2 ++ www/epiphany/Makefile | 14 ++++++-------- www/galeon/Makefile | 18 +++++++----------- www/mozilla/gecko-depends.mk | 7 +++++++ www/mozilla/gecko-options.mk | 16 ++++++++++++++++ 7 files changed, 44 insertions(+), 35 deletions(-) create mode 100644 www/mozilla/gecko-depends.mk create mode 100644 www/mozilla/gecko-options.mk 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" diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 2988dcc2df8..5fa7356d2d1 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.69 2005/07/21 12:28:30 wiz Exp $ +# $NetBSD: mk.conf,v 1.70 2005/07/21 13:11:42 dillo Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -831,12 +831,6 @@ GAMEOWN?= ${BINOWN} # Possible: any user name # Default: ${BINOWN} -GECKO_PROVIDER?= firefox -# Selects which mozilla incarnation to use by packages which embed -# the Gecko HTML renderer. -# Possible: firefox, mozilla -# Default: firefox - GNU_PROGRAM_PREFIX?= g # This is the prefix to add for GNU programs, like gls or gnutouch. # Possible: g, gnu, empty, ... diff --git a/mk/defaults/options.description b/mk/defaults/options.description index 7c4900ca1c9..3a5c1bc344d 100644 --- a/mk/defaults/options.description +++ b/mk/defaults/options.description @@ -67,6 +67,7 @@ faac faad fam ffmpeg +firefox Use firefox as gecko rendering engine. flac freetype frontend-fastcgi @@ -154,6 +155,7 @@ mjpegtools-cmov Enable CMOV support (i386 only). mlib Enable usage of medialib (SunOS only). mmx Enable MMX support (i386 only). modperl +mozilla Use mozilla as gecko rendering engine. mplayer-menu Enable support for user-defined menus. mplayer-real Enable usage of Real codecs. mplayer-runtime-cpudetection Enable CPU detection at run time. diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index b71ac027416..435b18c3b0a 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/07/20 19:05:33 kristerw Exp $ +# $NetBSD: Makefile,v 1.36 2005/07/21 13:11:42 dillo Exp $ # DISTNAME= epiphany-1.6.4 @@ -23,9 +23,11 @@ PKGCONFIG_OVERRIDE= data/epiphany-1.6.pc.in CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc -.include "../../mk/bsd.prefs.mk" +PKG_OPTIONS_VAR= PKG_OPTIONS.epiphany +.include "../../www/mozilla/gecko-options.mk" +.include "../../mk/bsd.options.mk" -.if ${GECKO_PROVIDER} == "firefox" +.if !empty(PKG_OPTIONS:Mfirefox) CPPFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/find CFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/find CPPFLAGS+= -I${BUILDLINK_PREFIX.firefox}/include/firefox/necko @@ -65,12 +67,8 @@ BUILDLINK_DEPENDS.pango+= pango>=1.8.0 .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" -.if ${GECKO_PROVIDER} == "firefox" -.include "../../www/firefox/buildlink3.mk" -.else -.include "../../www/mozilla-gtk2/buildlink3.mk" -.endif .include "../../x11/gnome-desktop/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" +.include "../../www/mozilla/gecko-depends.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 96b62c66b86..36898d724b5 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2005/06/03 14:41:19 wiz Exp $ +# $NetBSD: Makefile,v 1.81 2005/07/21 13:11:43 dillo Exp $ # DISTNAME= galeon-1.3.21 @@ -6,7 +6,7 @@ CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galeon/} EXTRACT_SUFX= .tar.bz2 -MAINTAINER= packages@NetBSD.org +MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://galeon.sourceforge.net/ COMMENT= GNOME2 Web browser based on gecko @@ -23,9 +23,11 @@ GNU_CONFIGURE= yes _MOZILLA_USE_GTK2= # defined MOZILLA_USE_XFT= YES -.include "../../mk/bsd.prefs.mk" +PKG_OPTIONS_VAR= PKG_OPTIONS.galeon +.include "../../www/mozilla/gecko-options.mk" +.include "../../mk/bsd.options.mk" -.if ${GECKO_PROVIDER} == "firefox" +.if !empty(PKG_OPTIONS:Mfirefox) CONFIGURE_ARGS+= --with-mozilla=firefox .else BUILDLINK_RPATHDIRS.mozilla-gtk2+= lib/mozilla-gtk2 @@ -45,13 +47,7 @@ CONF_FILES= ${EGDIR}/sound/events/galeon.soundlist \ .include "../../security/openssl/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.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 "../../x11/gnome-desktop/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../www/mozilla/gecko-depends.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/mozilla/gecko-depends.mk b/www/mozilla/gecko-depends.mk new file mode 100644 index 00000000000..af9eb4dc285 --- /dev/null +++ b/www/mozilla/gecko-depends.mk @@ -0,0 +1,7 @@ +.if !empty(PKG_OPTIONS:Mfirefox) +# 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 diff --git a/www/mozilla/gecko-options.mk b/www/mozilla/gecko-options.mk new file mode 100644 index 00000000000..0eeb2f809fe --- /dev/null +++ b/www/mozilla/gecko-options.mk @@ -0,0 +1,16 @@ +PKG_OPTIONS_REQUIRED_GROUPS+= gecko +PKG_OPTIONS_GROUP.gecko= firefox mozilla +PKG_SUGGESTED_OPTIONS+= firefox + +.include "../../mk/bsd.prefs.mk" + +# can be removed after 2005Q3 +.if defined(GECKO_PROVIDER) +. if ${GECKO_PROVIDER} == "firefox" +PKG_LEGACY_OPTIONS+=firefox +PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable GECKO_PROVIDER used, use PKG_DEFAULT_OPTIONS+=firefox instead." +. else +PKG_LEGACY_OPTIONS+=mozilla +PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable GECKO_PROVIDER used, use PKG_DEFAULT_OPTIONS+=mozilla instead." +. endif +.endif -- cgit v1.2.3