[SVN-Commit] r783 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-beta mail/thunderbird-esr mail/thunderbird3 www/firefox www/firefox-beta www/firefox-esr www/firefox-nightly www/firefox36 www/libxul www/libxul19 www/seamonkey www/seamonkey-beta

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Thu Jun 21 12:05:01 UTC 2012 

Author: jbeich
Date: Thu Jun 21 12:04:48 2012
New Revision: 783

Log:
reduce duplicate configure patching

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/mail/thunderbird-beta/Makefile
   branches/experimental/mail/thunderbird-esr/Makefile
   branches/experimental/mail/thunderbird/Makefile
   branches/experimental/mail/thunderbird3/Makefile
   branches/experimental/www/firefox-beta/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-beta/Makefile
   branches/experimental/www/seamonkey/Makefile

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/Mk/bsd.gecko.mk	Thu Jun 21 12:04:48 2012	(r783)
@@ -786,11 +786,13 @@
 			${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
 			${WRKSRC}/directory/c-sdk/configure ; \
 	fi
-	@if [ -f ${WRKSRC}/configure ] ; then \
+	@-if [ -f ${WRKSRC}/configure ] ; then \
 		${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
 			s|-lpthread|${PTHREAD_LIBS}|g ; \
 			s|echo aout|echo elf|g ; \
 			s|/usr/X11R6|${LOCALBASE}|g' \
+			${MOZSRC}/js/src/configure \
+			${MOZSRC}/configure \
 			${WRKSRC}/configure; \
 	fi
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \

Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/mail/thunderbird-beta/Makefile	Thu Jun 21 12:04:48 2012	(r783)
@@ -119,11 +119,6 @@
 		${MOZSRC}/security/manager/ssl/src/Makefile.in \
 		${MOZSRC}/js/src/config/mkdepend/Makefile.in \
 		${MOZSRC}/js/src/config/config.mk
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${MOZSRC}/js/src/configure
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/mail/thunderbird-esr/Makefile	Thu Jun 21 12:04:48 2012	(r783)
@@ -120,11 +120,6 @@
 		${MOZSRC}/security/manager/ssl/src/Makefile.in \
 		${MOZSRC}/js/src/config/mkdepend/Makefile.in \
 		${MOZSRC}/js/src/config/config.mk
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${MOZSRC}/js/src/configure
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/mail/thunderbird/Makefile	Thu Jun 21 12:04:48 2012	(r783)
@@ -123,11 +123,6 @@
 		${MOZSRC}/security/manager/ssl/src/Makefile.in \
 		${MOZSRC}/js/src/config/mkdepend/Makefile.in \
 		${MOZSRC}/js/src/config/config.mk
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${MOZSRC}/js/src/configure
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/mail/thunderbird3/Makefile	Thu Jun 21 12:04:48 2012	(r783)
@@ -89,11 +89,6 @@
 		${MOZSRC}/security/manager/ssl/src/Makefile.in \
 		${MOZSRC}/js/src/config/mkdepend/Makefile.in \
 		${MOZSRC}/js/src/config/config.mk
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${MOZSRC}/js/src/configure
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/www/firefox-beta/Makefile	Thu Jun 21 12:04:48 2012	(r783)
@@ -134,11 +134,6 @@
 		${WRKSRC}/config/mkdepend/Makefile.in \
 		${WRKSRC}/config/config.mk \
 		${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/js/src/configure.in
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/www/firefox-esr/Makefile	Thu Jun 21 12:04:48 2012	(r783)
@@ -135,11 +135,6 @@
 		${WRKSRC}/config/mkdepend/Makefile.in \
 		${WRKSRC}/config/config.mk \
 		${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/js/src/configure.in
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/www/firefox-nightly/Makefile	Thu Jun 21 12:04:48 2012	(r783)
@@ -140,11 +140,6 @@
 		${WRKSRC}/config/mkdepend/Makefile.in \
 		${WRKSRC}/config/config.mk \
 		${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/js/src/configure.in
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/www/firefox/Makefile	Thu Jun 21 12:04:48 2012	(r783)
@@ -134,11 +134,6 @@
 		${WRKSRC}/config/mkdepend/Makefile.in \
 		${WRKSRC}/config/config.mk \
 		${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/js/src/configure.in
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/www/firefox36/Makefile	Thu Jun 21 12:04:48 2012	(r783)
@@ -86,11 +86,6 @@
 		${WRKSRC}/security/manager/ssl/src/Makefile.in \
 		${WRKSRC}/js/src/config/mkdepend/Makefile.in \
 		${WRKSRC}/js/src/config/config.mk
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/js/src/configure
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/www/libxul/Makefile	Thu Jun 21 12:04:48 2012	(r783)
@@ -92,11 +92,6 @@
 		${WRKSRC}/browser/app/nsBrowserApp.cpp \
 		${WRKSRC}/js/src/config/mkdepend/Makefile.in \
 		${WRKSRC}/js/src/config/config.mk
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/js/src/configure.in
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Modified: branches/experimental/www/libxul19/Makefile
==============================================================================
--- branches/experimental/www/libxul19/Makefile	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/www/libxul19/Makefile	Thu Jun 21 12:04:48 2012	(r783)
@@ -87,11 +87,6 @@
 		${WRKSRC}/db/sqlite3/src/Makefile.in
 	${REINPLACE_CMD} -e 's|/usr/local/include|${LOCALBASE}/include|' \
 	    	${WRKSRC}/js/src/config/mkdepend/Makefile.in
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/js/src/configure
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})

Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/www/seamonkey-beta/Makefile	Thu Jun 21 12:04:48 2012	(r783)
@@ -138,13 +138,6 @@
 		${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp
 	@${REINPLACE_CMD} -e 's|libgnomevfs-2.so.0|libgnomevfs-2.so|' \
 		${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/mozilla/js/src/configure.in \
-		${WRKSRC}/mozilla/configure.in \
-		${WRKSRC}/configure.in
 	@${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 		< ${FILESDIR}/seamonkey.desktop.in > \
 		${WRKDIR}/${MOZILLA}.desktop

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile	Wed Jun 20 08:52:58 2012	(r782)
+++ branches/experimental/www/seamonkey/Makefile	Thu Jun 21 12:04:48 2012	(r783)
@@ -138,13 +138,6 @@
 		${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp
 	@${REINPLACE_CMD} -e 's|libgnomevfs-2.so.0|libgnomevfs-2.so|' \
 		${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/mozilla/js/src/configure.in \
-		${WRKSRC}/mozilla/configure.in \
-		${WRKSRC}/configure.in
 	@${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 		< ${FILESDIR}/seamonkey.desktop.in > \
 		${WRKDIR}/${MOZILLA}.desktop

More information about the freebsd-gecko mailing list