[pkgsrc/trunk]: pkgsrc Use a package option to control the --enable-single-pr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/719eb88a1d22
branches:  trunk
changeset: 530113:719eb88a1d22
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Sat Jun 16 01:14:47 2007 +0000

description:
Use a package option to control the --enable-single-profile option for
mozilla browsers.  This is now useful again to those of use who require
multiple profiles.

diffstat:

 mk/defaults/options.description       |   1 +
 www/firefox/Makefile-firefox.common   |   3 +--
 www/firefox15/Makefile-firefox.common |   3 +--
 www/seamonkey/options.mk              |  10 +++++++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diffs (76 lines):

diff -r 9064eeb25191 -r 719eb88a1d22 mk/defaults/options.description
--- a/mk/defaults/options.description   Fri Jun 15 23:43:14 2007 +0000
+++ b/mk/defaults/options.description   Sat Jun 16 01:14:47 2007 +0000
@@ -220,6 +220,7 @@
 modperl2               Use modperl 2.x as the CGI manager (with Apache 2.x).
 motif                  Enable motif support.
 mozilla                        Use mozilla as gecko rendering engine.
+mozilla-single-profile Enable single profiles on mozilla browsers
 mpeg4ip                        Enable mpeg4ip support.
 mpg123-arm-fixed64     Enable 64-bit calculations to avoid glitches on ARM.
 mplayer-menu           Enable support for user-defined menus.
diff -r 9064eeb25191 -r 719eb88a1d22 www/firefox/Makefile-firefox.common
--- a/www/firefox/Makefile-firefox.common       Fri Jun 15 23:43:14 2007 +0000
+++ b/www/firefox/Makefile-firefox.common       Sat Jun 16 01:14:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-firefox.common,v 1.44 2007/05/31 07:25:07 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.45 2007/06/16 01:14:48 dmcmahill Exp $
 
 MOZILLA_BIN=           firefox-bin
 MOZ_VER=               2.0.0.4
@@ -19,7 +19,6 @@
 PATCHDIR=              ${.CURDIR}/../../www/firefox/patches
 
 CONFIGURE_ARGS+=       --enable-application=browser
-CONFIGURE_ARGS+=       --enable-single-profile
 CONFIGURE_ARGS+=       --without-gssapi
 
 CONFIGURE_ARGS+=       --enable-canvas
diff -r 9064eeb25191 -r 719eb88a1d22 www/firefox15/Makefile-firefox.common
--- a/www/firefox15/Makefile-firefox.common     Fri Jun 15 23:43:14 2007 +0000
+++ b/www/firefox15/Makefile-firefox.common     Sat Jun 16 01:14:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-firefox.common,v 1.2 2007/05/31 07:26:45 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.3 2007/06/16 01:14:48 dmcmahill Exp $
 
 MOZILLA_BIN=           firefox-bin
 MOZ_VER=               1.5.0.12
@@ -17,7 +17,6 @@
 PATCHDIR=              ${.CURDIR}/../../www/firefox15/patches
 
 CONFIGURE_ARGS+=       --enable-application=browser
-CONFIGURE_ARGS+=       --enable-single-profile
 CONFIGURE_ARGS+=       --without-gssapi
 
 CONFIGURE_ARGS+=       --enable-canvas
diff -r 9064eeb25191 -r 719eb88a1d22 www/seamonkey/options.mk
--- a/www/seamonkey/options.mk  Fri Jun 15 23:43:14 2007 +0000
+++ b/www/seamonkey/options.mk  Sat Jun 16 01:14:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2006/11/15 15:28:21 martin Exp $
+# $NetBSD: options.mk,v 1.5 2007/06/16 01:14:48 dmcmahill Exp $
 
 PKG_OPTIONS_VAR                = PKG_OPTIONS.gecko
 PKG_SUPPORTED_OPTIONS  = debug
@@ -7,6 +7,10 @@
 PKG_SUPPORTED_OPTIONS  += official-mozilla-branding
 .endif
 
+.if ( ${MOZILLA_BIN} == "firefox-bin" || ${MOZILLA_BIN} == "seamonkey-bin" )
+PKG_SUPPORTED_OPTIONS  += mozilla-single-profile
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 # this .if test looks backward, but the missing options disables debug,
@@ -17,6 +21,10 @@
 CONFIGURE_ARGS+=       --enable-debug
 .endif
 
+.if !empty(PKG_OPTIONS:Mmozilla-single-profile)
+CONFIGURE_ARGS+=       --enable-single-profile
+.endif
+
 # Enable Official mozilla.org Branding for Firefox or Thunderbird.
 # Note that you cannot distribute builds with Official Branding
 # without permission of the Mozilla Foundation.