Date: Sat, 30 Jun 2012 22:56:14 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r825 - in branches/experimental/www: firefox firefox-esr firefox-nightly kompozer Message-ID: <201206302256.q5UMuE5Q071666@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jun 30 22:56:14 2012
New Revision: 825
Log:
run configure only once with client.mk
Modified:
branches/experimental/www/firefox-esr/Makefile
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox/Makefile
branches/experimental/www/kompozer/Makefile
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Sat Jun 30 22:56:05 2012 (r824)
+++ branches/experimental/www/firefox-esr/Makefile Sat Jun 30 22:56:14 2012 (r825)
@@ -85,8 +85,8 @@
USE_DISPLAY= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
-MOZ_OPTIONS:= ${MOZ_OPTIONS} ${CONFIGURE_TARGET}
-CONFIGURE_TARGET= # .mozconfig
+.undef GNU_CONFIGURE
+MOZ_OPTIONS+= ${CONFIGURE_TARGET}
MAKEFILE= ${WRKSRC}/client.mk
ALL_TARGET= profiledbuild
MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT='"${PYTHON_CMD} \
@@ -135,11 +135,6 @@
(cd ${WRKSRC} && ${AUTOCONF})
(cd ${WRKSRC}/js/src/ && ${AUTOCONF})
-post-configure:
-.if defined(WITH_PGO)
- (cd ${BUILD_WRKSRC} && ${GMAKE} distclean)
-.endif
-
port-pre-install:
${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
${ECHO_CMD} "@exec mkdir -p %D/include/firefox/nss" >> ${PLISTD}
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Sat Jun 30 22:56:05 2012 (r824)
+++ branches/experimental/www/firefox-nightly/Makefile Sat Jun 30 22:56:14 2012 (r825)
@@ -108,8 +108,8 @@
USE_DISPLAY= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
-MOZ_OPTIONS:= ${MOZ_OPTIONS} ${CONFIGURE_TARGET}
-CONFIGURE_TARGET= # .mozconfig
+.undef GNU_CONFIGURE
+MOZ_OPTIONS+= ${CONFIGURE_TARGET}
MAKEFILE= ${WRKSRC}/client.mk
ALL_TARGET= profiledbuild
MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT='"${PYTHON_CMD} \
@@ -154,11 +154,6 @@
(cd ${WRKSRC} && ${AUTOCONF})
(cd ${WRKSRC}/js/src/ && ${AUTOCONF})
-post-configure:
-.if ${PORT_OPTIONS:MPGO}
- (cd ${BUILD_WRKSRC} && ${GMAKE} distclean)
-.endif
-
port-pre-install:
${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
${ECHO_CMD} "@exec mkdir -p %D/include/firefox/nss" >> ${PLISTD}
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Sat Jun 30 22:56:05 2012 (r824)
+++ branches/experimental/www/firefox/Makefile Sat Jun 30 22:56:14 2012 (r825)
@@ -85,8 +85,8 @@
USE_DISPLAY= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
-MOZ_OPTIONS:= ${MOZ_OPTIONS} ${CONFIGURE_TARGET}
-CONFIGURE_TARGET= # .mozconfig
+.undef GNU_CONFIGURE
+MOZ_OPTIONS+= ${CONFIGURE_TARGET}
MAKEFILE= ${WRKSRC}/client.mk
ALL_TARGET= profiledbuild
MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT='"${PYTHON_CMD} \
@@ -131,11 +131,6 @@
(cd ${WRKSRC} && ${AUTOCONF})
(cd ${WRKSRC}/js/src/ && ${AUTOCONF})
-post-configure:
-.if defined(WITH_PGO)
- (cd ${BUILD_WRKSRC} && ${GMAKE} distclean)
-.endif
-
port-pre-install:
${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
${ECHO_CMD} "@exec mkdir -p %D/include/firefox/nss" >> ${PLISTD}
Modified: branches/experimental/www/kompozer/Makefile
==============================================================================
--- branches/experimental/www/kompozer/Makefile Sat Jun 30 22:56:05 2012 (r824)
+++ branches/experimental/www/kompozer/Makefile Sat Jun 30 22:56:14 2012 (r825)
@@ -21,7 +21,6 @@
USE_BZIP2= yes
USE_GECKO= gecko
USE_GMAKE= yes
-GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/mozilla
MAKEFILE= client.mk
ALL_TARGET= build_all
@@ -31,6 +30,7 @@
USE_GECKO_OPTIONS=-dbus
MOZ_EXTENSIONS= wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck
MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
+ ${CONFIGURE_TARGET} \
--enable-xinerama \
--disable-xprint \
--enable-application=composer
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206302256.q5UMuE5Q071666>