Date: Fri, 6 Jul 2012 16:33:11 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r843 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-esr mail/thunderbird3 www/firefox www/firefox-esr www/firefox-nightly www/libxul www/libxul19 www/seamonkey Message-ID: <201207061633.q66GXBg1076820@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Jul 6 16:33:11 2012
New Revision: 843
Log:
convert non-i18n ports to optionsNG
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird-esr/Makefile
branches/experimental/mail/thunderbird/Makefile
branches/experimental/mail/thunderbird3/Makefile
branches/experimental/www/firefox-esr/Makefile
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox/Makefile
branches/experimental/www/libxul/Makefile
branches/experimental/www/libxul19/Makefile
branches/experimental/www/seamonkey/Makefile
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Thu Jul 5 20:38:05 2012 (r842)
+++ branches/experimental/Mk/bsd.gecko.mk Fri Jul 6 16:33:11 2012 (r843)
@@ -554,7 +554,9 @@
_USE_GECKO_OPTIONS_DEFAULT= dbus debug logging optimized_cflags
+LIGHTNING_DESC?=Enable calendar extension
LOGGING_DESC?= Enable additional log messages
+PGO_DESC?= Enable Profile-Guided Optimization # move to bsd.options.desc.mk
SMB?= Enable smb:// URI support using gnomevfs
.for use in ${USE_GECKO_OPTIONS}
Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Thu Jul 5 20:38:05 2012 (r842)
+++ branches/experimental/mail/thunderbird-esr/Makefile Fri Jul 6 16:33:11 2012 (r843)
@@ -57,7 +57,7 @@
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
OPTIONS_DEFAULT=DBUS
-OPTIONS= LIGHTNING "Enable calendar extension" off
+OPTIONS_DEFINE= LIGHTNING
.include <bsd.port.pre.mk>
@@ -94,7 +94,7 @@
LIBS+= -lcxxrt
.endif
-.if defined(WITH_LIGHTNING)
+.if ${PORT_OPTIONS:MLIGHTNING}
MOZ_OPTIONS+= --enable-calendar
MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
LIGHTNING_DIR= share/lightning
@@ -134,7 +134,7 @@
${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON}
-.if defined(WITH_LIGHTNING)
+.if ${PORT_OPTIONS:MLIGHTNING}
@${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird
@(cd ${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE})
@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${XPI_ID}
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Thu Jul 5 20:38:05 2012 (r842)
+++ branches/experimental/mail/thunderbird/Makefile Fri Jul 6 16:33:11 2012 (r843)
@@ -57,7 +57,7 @@
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
OPTIONS_DEFAULT=DBUS
-OPTIONS= LIGHTNING "Enable calendar extension" off
+OPTIONS_DEFINE= LIGHTNING
.include <bsd.port.pre.mk>
@@ -94,7 +94,7 @@
LIBS+= -lcxxrt
.endif
-.if defined(WITH_LIGHTNING)
+.if ${PORT_OPTIONS:MLIGHTNING}
MOZ_OPTIONS+= --enable-calendar
MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
LIGHTNING_DIR= share/lightning
@@ -134,7 +134,7 @@
${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON}
-.if defined(WITH_LIGHTNING)
+.if ${PORT_OPTIONS:MLIGHTNING}
@${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird
@(cd ${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE})
@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${XPI_ID}
Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile Thu Jul 5 20:38:05 2012 (r842)
+++ branches/experimental/mail/thunderbird3/Makefile Fri Jul 6 16:33:11 2012 (r843)
@@ -53,7 +53,6 @@
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
OPTIONS_DEFAULT=DBUS
-OPTIONS=
.include <bsd.port.pre.mk>
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Thu Jul 5 20:38:05 2012 (r842)
+++ branches/experimental/www/firefox-esr/Makefile Fri Jul 6 16:33:11 2012 (r843)
@@ -54,7 +54,7 @@
--disable-necko-wifi
OPTIONS_DEFAULT=DBUS
-OPTIONS= PGO "Enable Profile-Guided Optimization" off
+OPTIONS_DEFINE= PGO
.include <bsd.port.pre.mk>
@@ -78,7 +78,7 @@
MOZ_OPTIONS+= --disable-gnomeui
.endif
-.if defined(WITH_PGO)
+.if ${PORT_OPTIONS:MPGO}
BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
USE_PYTHON_BUILD= yes
USE_DISPLAY= yes
@@ -105,7 +105,7 @@
.endif
pre-extract:
-.if defined(WITH_PGO)
+.if ${PORT_OPTIONS:MPGO}
@${ECHO} "*****************************************************************"
@${ECHO} "**************************** attention **************************"
@${ECHO} "*****************************************************************"
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Thu Jul 5 20:38:05 2012 (r842)
+++ branches/experimental/www/firefox-nightly/Makefile Fri Jul 6 16:33:11 2012 (r843)
@@ -60,7 +60,6 @@
OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO
OPTIONS_DEFINE= PGO
-PGO_DESC= Enable Profile-Guided Optimization
.if ${USE_MOZILLA:M-nss}
OBJDIR_BUILD= yes
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Thu Jul 5 20:38:05 2012 (r842)
+++ branches/experimental/www/firefox/Makefile Fri Jul 6 16:33:11 2012 (r843)
@@ -54,7 +54,7 @@
--disable-necko-wifi
OPTIONS_DEFAULT=DBUS
-OPTIONS= PGO "Enable Profile-Guided Optimization" off
+OPTIONS_DEFINE= PGO
.include <bsd.port.pre.mk>
@@ -78,7 +78,7 @@
MOZ_OPTIONS+= --disable-gnomeui
.endif
-.if defined(WITH_PGO)
+.if ${PORT_OPTIONS:MPGO}
BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
USE_PYTHON_BUILD= yes
USE_DISPLAY= yes
@@ -101,7 +101,7 @@
.endif
pre-extract:
-.if defined(WITH_PGO)
+.if ${PORT_OPTIONS:MPGO}
@${ECHO} "*****************************************************************"
@${ECHO} "**************************** attention **************************"
@${ECHO} "*****************************************************************"
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Thu Jul 5 20:38:05 2012 (r842)
+++ branches/experimental/www/libxul/Makefile Fri Jul 6 16:33:11 2012 (r843)
@@ -46,7 +46,6 @@
--disable-necko-wifi
MOZ_EXTENSIONS= default,cookie,permissions
OPTIONS_DEFAULT=DBUS
-OPTIONS= # Empty, used for generic gecko OPTIONS
USE_GECKO= gecko
MOZILLA_EXEC_NAME=xulrunner
USE_MOZILLA= # empty
Modified: branches/experimental/www/libxul19/Makefile
==============================================================================
--- branches/experimental/www/libxul19/Makefile Thu Jul 5 20:38:05 2012 (r842)
+++ branches/experimental/www/libxul19/Makefile Fri Jul 6 16:33:11 2012 (r843)
@@ -40,7 +40,6 @@
--disable-necko-wifi
MOZ_EXTENSIONS= default,cookie,permissions
OPTIONS_DEFAULT=DBUS
-OPTIONS= # Empty, used for generic gecko OPTIONS
USE_GECKO= gecko
MOZILLA_EXEC_NAME=xulrunner
USE_MOZILLA= -event -ffi -vpx
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Thu Jul 5 20:38:05 2012 (r842)
+++ branches/experimental/www/seamonkey/Makefile Fri Jul 6 16:33:11 2012 (r843)
@@ -53,12 +53,13 @@
NOT_FOR_ARCHS= ia64
-OPTIONS_DEFAULT=DBUS
-OPTIONS=MAILNEWS "Enable Mail and News modules" on \
- COMPOSER "Enable the HTML Composer module" on \
- LDAP "Enable LDAP support for Mailnews" on \
- CHATZILLA "Enable the Chatzilla IRC module" on \
- LIGHTNING "Enable calendar extension" off
+OPTIONS_DEFAULT=DBUS MAILNEWS COMPOSER LDAP CHATZILLA
+OPTIONS_DEFINE= CHATZILLA COMPOSER LDAP LIGHTNING MAILNEWS
+
+CHATZILLA_DESC?=Enable the Chatzilla IRC module
+COMPOSER_DESC?= Enable the HTML Composer module
+LDAP_DESC?= Enable LDAP support for Mailnews
+MAILNEWS_DESC?= Enable Mail and News modules
.include <bsd.port.pre.mk>
@@ -83,24 +84,24 @@
MOZ_OPTIONS+= --disable-gnomeui
.endif
-.if defined(WITHOUT_MAILNEWS)
+.if ! ${PORT_OPTIONS:MMAILNEWS}
EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \
${FILESDIR}/extra-patch-configure.in
MOZ_OPTIONS+= --disable-ldap --disable-mailnews
.else
# mail and news desired, but not LDAP
-.if defined(WITHOUT_LDAP)
+.if ! ${PORT_OPTIONS:MLDAP}
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bridge-bridge.mk
MOZ_OPTIONS+= --disable-ldap --enable-mailnews
.else
MOZ_OPTIONS+= --enable-ldap --enable-mailnews
.endif
.endif
-.if !defined(WITHOUT_CHATZILLA)
+.if ${PORT_OPTIONS:MCHATZILLA}
MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc
.endif
-.if defined(WITHOUT_COMPOSER)
+.if ! ${PORT_OPTIONS:MCOMPOSER}
MOZ_OPTIONS+= --disable-composer
.endif
@@ -116,7 +117,7 @@
LIBS+= -lcxxrt
.endif
-.if defined(WITH_LIGHTNING)
+.if ${PORT_OPTIONS:MLIGHTNING}
MOZ_OPTIONS+= --enable-calendar
MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
LIGHTNING_DIR= share/lightning
@@ -161,7 +162,7 @@
${PREFIX}/share/pixmaps/${MOZILLA}.png
post-install:
-.if defined(WITH_LIGHTNING)
+.if ${PORT_OPTIONS:MLIGHTNING}
@${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/seamonkey
@(cd ${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE})
@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${XPI_ID}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207061633.q66GXBg1076820>