[pkgsrc/trunk]: pkgsrc Replace GECKO_PROVIDER with option group. New options...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fb05bac90fd1
branches:  trunk
changeset: 497177:fb05bac90fd1
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Thu Jul 21 13:11:42 2005 +0000

description:
Replace GECKO_PROVIDER with option group.  New options are firefox
and mozilla.  Backwards compatibilty is provided.

Reviewed by wiz.

diffstat:

 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(-)

diffs (190 lines):

diff -r 5ba774329fd3 -r fb05bac90fd1 misc/yelp/Makefile
--- a/misc/yelp/Makefile        Thu Jul 21 12:55:39 2005 +0000
+++ b/misc/yelp/Makefile        Thu Jul 21 13:11:42 2005 +0000
@@ -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 @@
 
 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 @@
 .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 -r 5ba774329fd3 -r fb05bac90fd1 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Thu Jul 21 12:55:39 2005 +0000
+++ b/mk/defaults/mk.conf       Thu Jul 21 13:11:42 2005 +0000
@@ -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 @@
 # 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 -r 5ba774329fd3 -r fb05bac90fd1 mk/defaults/options.description
--- a/mk/defaults/options.description   Thu Jul 21 12:55:39 2005 +0000
+++ b/mk/defaults/options.description   Thu Jul 21 13:11:42 2005 +0000
@@ -67,6 +67,7 @@
 faad   
 fam    
 ffmpeg 
+firefox                        Use firefox as gecko rendering engine.
 flac   
 freetype       
 frontend-fastcgi       
@@ -154,6 +155,7 @@
 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 -r 5ba774329fd3 -r fb05bac90fd1 www/epiphany/Makefile
--- a/www/epiphany/Makefile     Thu Jul 21 12:55:39 2005 +0000
+++ b/www/epiphany/Makefile     Thu Jul 21 13:11:42 2005 +0000
@@ -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 @@
 
 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 @@
 .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 -r 5ba774329fd3 -r fb05bac90fd1 www/galeon/Makefile
--- a/www/galeon/Makefile       Thu Jul 21 12:55:39 2005 +0000
+++ b/www/galeon/Makefile       Thu Jul 21 13:11:42 2005 +0000
@@ -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 @@
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=galeon/}
 EXTRACT_SUFX=  .tar.bz2
 
-MAINTAINER=    packages%NetBSD.org@localhost
+MAINTAINER=    tech-pkg%NetBSD.org@localhost
 HOMEPAGE=      http://galeon.sourceforge.net/
 COMMENT=       GNOME2 Web browser based on gecko
 
@@ -23,9 +23,11 @@
 _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 @@
 .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 -r 5ba774329fd3 -r fb05bac90fd1 www/mozilla/gecko-depends.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla/gecko-depends.mk      Thu Jul 21 13:11:42 2005 +0000
@@ -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 -r 5ba774329fd3 -r fb05bac90fd1 www/mozilla/gecko-options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla/gecko-options.mk      Thu Jul 21 13:11:42 2005 +0000
@@ -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