Author: jbeich
Date: Sun Jul 8 12:46:02 2012
New Revision: 854
Log:
make GNOMEUI into an option
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/firefox36/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 Sun Jul 8 12:45:51 2012
(r853)
+++ branches/experimental/Mk/bsd.gecko.mk Sun Jul 8 12:46:02 2012
(r854)
@@ -552,12 +552,13 @@
CFLAGS+= ${PTHREAD_CFLAGS}
LIBS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv
-OPTIONS_DEFINE+=DBUS DEBUG GCONF GIO GNOMEVFS2 LIBPROXY LOGGING
OPTIMIZED_CFLAGS
+OPTIONS_DEFINE+=DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 LIBPROXY LOGGING
OPTIMIZED_CFLAGS
OPTIONS_SINGLE+= AUDIO
OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO
GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk
+GNOMEUI_DESC?= libgnomeui support module
LIGHTNING_DESC?=Calendar extension
LOGGING_DESC?= Additional log messages
PGO_DESC?= Profile-Guided Optimization # move to
bsd.options.desc.mk
@@ -707,6 +708,13 @@
MOZ_OPTIONS+= --disable-gio
.endif
+.if ${PORT_OPTIONS:MGNOMEUI}
+USE_GNOME+= libgnomeui
+MOZ_OPTIONS+= --enable-gnomeui
+.else
+MOZ_OPTIONS+= --disable-gnomeui
+.endif
+
.if ${PORT_OPTIONS:MGNOMEVFS2}
USE_GNOME+= gnomevfs2
MOZ_OPTIONS+= --enable-gnomevfs
Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Sun Jul 8 12:45:51
2012 (r853)
+++ branches/experimental/mail/thunderbird-esr/Makefile Sun Jul 8 12:46:02
2012 (r854)
@@ -75,13 +75,6 @@
.endif
.endif
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+= libgnomeui
-MOZ_OPTIONS+= --enable-gnomeui
-.else
-MOZ_OPTIONS+= --disable-gnomeui
-.endif
-
.if ${ARCH} == amd64 || ${ARCH} == i386
BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
.endif
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:45:51
2012 (r853)
+++ branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:46:02
2012 (r854)
@@ -75,13 +75,6 @@
.endif
.endif
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+= libgnomeui
-MOZ_OPTIONS+= --enable-gnomeui
-.else
-MOZ_OPTIONS+= --disable-gnomeui
-.endif
-
.if ${ARCH} == amd64 || ${ARCH} == i386
BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
.endif
Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile Sun Jul 8 12:45:51
2012 (r853)
+++ branches/experimental/mail/thunderbird3/Makefile Sun Jul 8 12:46:02
2012 (r854)
@@ -72,13 +72,6 @@
.endif
.endif
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+= libgnomeui
-MOZ_OPTIONS+= --enable-gnomeui
-.else
-MOZ_OPTIONS+= --disable-gnomeui
-.endif
-
post-extract:
${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|'
\
<${FILESDIR}/thunderbird.desktop.in
>${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Sun Jul 8 12:45:51
2012 (r853)
+++ branches/experimental/www/firefox-esr/Makefile Sun Jul 8 12:46:02
2012 (r854)
@@ -71,13 +71,6 @@
.endif
.endif
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+= libgnomeui
-MOZ_OPTIONS+= --enable-gnomeui
-.else
-MOZ_OPTIONS+= --disable-gnomeui
-.endif
-
.if ${PORT_OPTIONS:MPGO}
BUILD_DEPENDS+=
${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
USE_PYTHON_BUILD= yes
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Sun Jul 8 12:45:51
2012 (r853)
+++ branches/experimental/www/firefox-nightly/Makefile Sun Jul 8 12:46:02
2012 (r854)
@@ -80,13 +80,6 @@
.endif
.endif
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+= libgnomeui
-MOZ_OPTIONS+= --enable-gnomeui
-.else
-MOZ_OPTIONS+= --disable-gnomeui
-.endif
-
.if ${PORT_OPTIONS:MPGO}
USE_DISPLAY= yes
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Sun Jul 8 12:45:51 2012
(r853)
+++ branches/experimental/www/firefox/Makefile Sun Jul 8 12:46:02 2012
(r854)
@@ -71,13 +71,6 @@
.endif
.endif
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+= libgnomeui
-MOZ_OPTIONS+= --enable-gnomeui
-.else
-MOZ_OPTIONS+= --disable-gnomeui
-.endif
-
.if ${PORT_OPTIONS:MPGO}
BUILD_DEPENDS+=
${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
USE_PYTHON_BUILD= yes
Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile Sun Jul 8 12:45:51
2012 (r853)
+++ branches/experimental/www/firefox36/Makefile Sun Jul 8 12:46:02
2012 (r854)
@@ -68,13 +68,6 @@
WRKSRC:= ${WRKSRC}-1.9.2
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+= libgnomeui
-MOZ_OPTIONS+= --enable-gnomeui
-.else
-MOZ_OPTIONS+= --disable-gnomeui
-.endif
-
post-extract:
@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e
's|@MOZILLA@|${MOZILLA}|' \
-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Sun Jul 8 12:45:51 2012
(r853)
+++ branches/experimental/www/libxul/Makefile Sun Jul 8 12:46:02 2012
(r854)
@@ -69,13 +69,6 @@
.endif
.endif
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+= libgnomeui
-MOZ_OPTIONS+= --enable-gnomeui
-.else
-MOZ_OPTIONS+= --disable-gnomeui
-.endif
-
.if ${ARCH} == amd64 || ${ARCH} == i386
BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
.endif
Modified: branches/experimental/www/libxul19/Makefile
==============================================================================
--- branches/experimental/www/libxul19/Makefile Sun Jul 8 12:45:51 2012
(r853)
+++ branches/experimental/www/libxul19/Makefile Sun Jul 8 12:46:02 2012
(r854)
@@ -69,13 +69,6 @@
.endif
.endif
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+= libgnomeui
-MOZ_OPTIONS+= --enable-gnomeui
-.else
-MOZ_OPTIONS+= --disable-gnomeui
-.endif
-
.if ${PORT_OPTIONS:MJAVA}
USE_JAVA= yes
JAVA_VERSION+= 1.5+
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:45:51
2012 (r853)
+++ branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:46:02
2012 (r854)
@@ -76,13 +76,6 @@
.endif
.endif
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+= libgnomeui
-MOZ_OPTIONS+= --enable-gnomeui
-.else
-MOZ_OPTIONS+= --disable-gnomeui
-.endif
-
.if ! ${PORT_OPTIONS:MMAILNEWS}
EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \
${FILESDIR}/extra-patch-configure.in
_______________________________________________
freebsd-gecko@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "freebsd-gecko-unsubscr...@freebsd.org"
