Date: Tue, 24 Jul 2012 09:15:42 -0400 (EDT) From: AN <andy@neu.net> To: freebsd-gecko@freebsd.org Cc: jbeich@tormail.org Subject: Re: [SVN-Commit] r890 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-esr mail/thunderbird3 www/firefox www/firefox-esr www/firefox-nightly www/firefox36 www/kompozer www/libxul www/libxul19 www/seamonkey Message-ID: <alpine.BSF.2.00.1207240908200.98858@mail.neu.net> In-Reply-To: <201207241255.q6OCtYD0023775@trillian.chruetertee.ch> References: <201207241255.q6OCtYD0023775@trillian.chruetertee.ch>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 24 Jul 2012, svn-freebsd-gecko@chruetertee.ch wrote:
> Author: jbeich
> Date: Tue Jul 24 12:55:33 2012
> New Revision: 890
>
> Log:
> /ports@300943 made it impossible to alter options after bsd.port.pre.mk
>
> Added:
> branches/experimental/www/firefox/Makefile.options
> 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/kompozer/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 Tue Jul 24 12:55:21 2012 (r889)
> +++ branches/experimental/Mk/bsd.gecko.mk Tue Jul 24 12:55:33 2012 (r890)
> @@ -550,28 +550,6 @@
> CFLAGS+= ${PTHREAD_CFLAGS}
> LIBS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv
>
> -OPTIONS_DEFINE+= DBUS DEBUG LIBPROXY LOGGING OPTIMIZED_CFLAGS
> -
> -.if 0 # broken since /ports@300943
> -OPTIONS_DEFINE+= GNOME
> -
> -OPTIONS_SINGLE+= AUDIO
> -OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO
> -
> -OPTIONS_SINGLE+= TOOLKIT
> -OPTIONS_SINGLE_TOOLKIT= GTK2 QT4
> -
> -OPTIONS_MULTI+= GNOME
> -OPTIONS_MULTI_GNOME= GCONF GIO GNOMEUI GNOMEVFS2
> -.endif
> -
> -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
> -LIBPROXY_DESC?= Proxy support via libproxy
> -
> # Standard depends
> _ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip
>
>
> Modified: branches/experimental/mail/thunderbird-esr/Makefile
> ==============================================================================
> --- branches/experimental/mail/thunderbird-esr/Makefile Tue Jul 24 12:55:21 2012 (r889)
> +++ branches/experimental/mail/thunderbird-esr/Makefile Tue Jul 24 12:55:33 2012 (r890)
> @@ -53,9 +53,9 @@
> SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
> MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
>
> -OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS
> OPTIONS_DEFINE= LIGHTNING
>
> +.include "${.CURDIR}/../../www/firefox/Makefile.options"
> .include <bsd.port.pre.mk>
>
> WRKSRC= ${WRKDIR}/comm-esr10
>
> Modified: branches/experimental/mail/thunderbird/Makefile
> ==============================================================================
> --- branches/experimental/mail/thunderbird/Makefile Tue Jul 24 12:55:21 2012 (r889)
> +++ branches/experimental/mail/thunderbird/Makefile Tue Jul 24 12:55:33 2012 (r890)
> @@ -53,9 +53,9 @@
> SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
> MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
>
> -OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS
> OPTIONS_DEFINE= GSTREAMER LIGHTNING
>
> +.include "${.CURDIR}/../../www/firefox/Makefile.options"
> .include <bsd.port.pre.mk>
>
> WRKSRC= ${WRKDIR}/comm-release
>
> Modified: branches/experimental/mail/thunderbird3/Makefile
> ==============================================================================
> --- branches/experimental/mail/thunderbird3/Makefile Tue Jul 24 12:55:21 2012 (r889)
> +++ branches/experimental/mail/thunderbird3/Makefile Tue Jul 24 12:55:33 2012 (r890)
> @@ -50,13 +50,13 @@
> SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
> MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
>
> -OPTIONS_DEFAULT=DBUS LOGGING OSS
> -
> -.include <bsd.port.pre.mk>
> +.include "${.CURDIR}/../../www/firefox/Makefile.options"
>
> OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
> OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT}
>
> +.include <bsd.port.pre.mk>
> +
> WRKSRC= ${WRKDIR}/comm-1.9.2
> MOZSRC:= ${WRKSRC}/mozilla
>
>
> Modified: branches/experimental/www/firefox-esr/Makefile
> ==============================================================================
> --- branches/experimental/www/firefox-esr/Makefile Tue Jul 24 12:55:21 2012 (r889)
> +++ branches/experimental/www/firefox-esr/Makefile Tue Jul 24 12:55:33 2012 (r890)
> @@ -49,9 +49,9 @@
> --enable-application=browser \
> --enable-official-branding
>
> -OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS
> OPTIONS_DEFINE= PGO
>
> +.include "${.CURDIR}/../../www/firefox/Makefile.options"
> .include <bsd.port.pre.mk>
>
> WRKSRC:= ${WRKDIR}/mozilla-esr10
>
> Modified: branches/experimental/www/firefox-nightly/Makefile
> ==============================================================================
> --- branches/experimental/www/firefox-nightly/Makefile Tue Jul 24 12:55:21 2012 (r889)
> +++ branches/experimental/www/firefox-nightly/Makefile Tue Jul 24 12:55:33 2012 (r890)
> @@ -51,13 +51,14 @@
> MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
> --enable-application=browser
>
> -OPTIONS_DEFAULT=DBUS GTK2 LOGGING GSTREAMER OSS
> +OPTIONS_DEFAULT=GSTREAMER
> OPTIONS_DEFINE= GSTREAMER PGO
>
> .if ${USE_MOZILLA:M-nss}
> OBJDIR_BUILD= yes
> .endif
>
> +.include "${.CURDIR}/../../www/firefox/Makefile.options"
> .include <bsd.port.pre.mk>
>
> WRKSRC:= ${WRKSRC}-central-${HGREV:C/.*://}
>
> Modified: branches/experimental/www/firefox/Makefile
> ==============================================================================
> --- branches/experimental/www/firefox/Makefile Tue Jul 24 12:55:21 2012 (r889)
> +++ branches/experimental/www/firefox/Makefile Tue Jul 24 12:55:33 2012 (r890)
> @@ -49,9 +49,9 @@
> --enable-application=browser \
> --enable-official-branding
>
> -OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS
> OPTIONS_DEFINE= GSTREAMER PGO
>
> +.include "${.CURDIR}/../../www/firefox/Makefile.options"
> .include <bsd.port.pre.mk>
>
> WRKSRC:= ${WRKDIR}/mozilla-release
>
> Added: branches/experimental/www/firefox/Makefile.options
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ branches/experimental/www/firefox/Makefile.options Tue Jul 24 12:55:33 2012 (r890)
> @@ -0,0 +1,20 @@
> +# -*- makefile-bsdmake -*-
> +
> +OPTIONS_DEFINE+= DBUS DEBUG GNOME LIBPROXY LOGGING OPTIMIZED_CFLAGS
> +OPTIONS_DEFAULT+= DBUS GTK2 LOGGING OSS
> +
> +OPTIONS_SINGLE+= AUDIO
> +OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO
> +
> +OPTIONS_SINGLE+= TOOLKIT
> +OPTIONS_SINGLE_TOOLKIT= GTK2 QT4
> +
> +OPTIONS_MULTI+= GNOME
> +OPTIONS_MULTI_GNOME= GCONF GIO GNOMEUI GNOMEVFS2
> +
> +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
> +LIBPROXY_DESC?= Proxy support via libproxy
>
> Modified: branches/experimental/www/firefox36/Makefile
> ==============================================================================
> --- branches/experimental/www/firefox36/Makefile Tue Jul 24 12:55:21 2012 (r889)
> +++ branches/experimental/www/firefox36/Makefile Tue Jul 24 12:55:33 2012 (r890)
> @@ -46,13 +46,13 @@
> --enable-libxul \
> --disable-ipc
>
> -OPTIONS_DEFAULT=DBUS LOGGING OSS
> -
> -.include <bsd.port.pre.mk>
> +.include "${.CURDIR}/../../www/firefox/Makefile.options"
>
> OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
> OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT}
>
> +.include <bsd.port.pre.mk>
> +
> .if ${ARCH} == amd64
> CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
> .elif ${ARCH} == powerpc64
>
> Modified: branches/experimental/www/kompozer/Makefile
> ==============================================================================
> --- branches/experimental/www/kompozer/Makefile Tue Jul 24 12:55:21 2012 (r889)
> +++ branches/experimental/www/kompozer/Makefile Tue Jul 24 12:55:33 2012 (r890)
> @@ -41,14 +41,14 @@
> NOT_FOR_ARCHS= ia64
> NOT_FOR_ARCHS_REASON_ia64= does not build
>
> -OPTIONS_DEFAULT=LOGGING
> -
> -.include <bsd.port.pre.mk>
> +.include "${.CURDIR}/../../www/firefox/Makefile.options"
>
> OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NGIO:NLIBPROXY}
> OPTIONS_SINGLE:=${OPTIONS_SINGLE:NAUDIO:NTOOLKIT}
> OPTIONS_MULTI_GNOME:=${OPTIONS_MULTI_GNOME:NGIO}
>
> +.include <bsd.port.pre.mk>
> +
> .if ${ARCH} == amd64
> CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
> .endif
>
> Modified: branches/experimental/www/libxul/Makefile
> ==============================================================================
> --- branches/experimental/www/libxul/Makefile Tue Jul 24 12:55:21 2012 (r889)
> +++ branches/experimental/www/libxul/Makefile Tue Jul 24 12:55:33 2012 (r890)
> @@ -41,13 +41,13 @@
>
> PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig
> MOZ_EXTENSIONS= default,cookie,permissions
> -OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS
> USE_GECKO= gecko
> MOZILLA_EXEC_NAME=xulrunner
> USE_MOZILLA= # empty
> MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js \
> mozilla-plugin
>
> +.include "${.CURDIR}/../../www/firefox/Makefile.options"
> .include <bsd.port.pre.mk>
>
> .if ${USE_MOZILLA:M-nss}
>
> Modified: branches/experimental/www/libxul19/Makefile
> ==============================================================================
> --- branches/experimental/www/libxul19/Makefile Tue Jul 24 12:55:21 2012 (r889)
> +++ branches/experimental/www/libxul19/Makefile Tue Jul 24 12:55:33 2012 (r890)
> @@ -36,7 +36,6 @@
> PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig
> MOZ_OPTIONS?= --disable-ipc
> MOZ_EXTENSIONS= default,cookie,permissions
> -OPTIONS_DEFAULT=DBUS LOGGING OSS
> USE_GECKO= gecko
> MOZILLA_EXEC_NAME=xulrunner
> USE_MOZILLA= -event -ffi -vpx
> @@ -47,11 +46,13 @@
> OPTIONS_DEFINE= JAVA
> JAVA_DESC?= JAVA xpcom
>
> -.include <bsd.port.pre.mk>
> +.include "${.CURDIR}/../../www/firefox/Makefile.options"
>
> OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
> OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT}
>
> +.include <bsd.port.pre.mk>
> +
> .if ${USE_MOZILLA:M-nss}
> MOZ_PKGCONFIG_FILES+= mozilla-nss
> .endif
>
> Modified: branches/experimental/www/seamonkey/Makefile
> ==============================================================================
> --- branches/experimental/www/seamonkey/Makefile Tue Jul 24 12:55:21 2012 (r889)
> +++ branches/experimental/www/seamonkey/Makefile Tue Jul 24 12:55:33 2012 (r890)
> @@ -46,14 +46,15 @@
>
> NOT_FOR_ARCHS= ia64
>
> -OPTIONS_DEFAULT=DBUS CHATZILLA COMPOSER GTK2 LDAP LOGGING MAILNEWS OSS
> OPTIONS_DEFINE= CHATZILLA COMPOSER GSTREAMER LDAP LIGHTNING MAILNEWS
> +OPTIONS_DEFAULT=CHATZILLA COMPOSER LDAP MAILNEWS
>
> CHATZILLA_DESC?=Chatzilla IRC module
> COMPOSER_DESC?= HTML Composer module
> LDAP_DESC?= LDAP support for Mailnews
> MAILNEWS_DESC?= Mail and News modules
>
> +.include "${.CURDIR}/../../www/firefox/Makefile.options"
> .include <bsd.port.pre.mk>
>
> WRKSRC= ${WRKDIR}/comm-release
> _______________________________________________
Seems broken for me now.
Checked out revision 890.
[root@FBSD10 /home/root/ff_nightly]# make config
"Makefile", line 62: Could not find
/home/root/ff_nightly/../../www/firefox/Makefile.options
make: fatal errors encountered -- cannot continue
Lines 62 63 in make file:
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
# make update && make makesum && make all deinstall install clean
"Makefile", line 62: Could not find
/home/root/ff_nightly/../../www/firefox/Makefile.options
make: fatal errors encountered -- cannot continue
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1207240908200.98858>