From owner-freebsd-gecko@FreeBSD.ORG  Fri Jun 22 01:31:02 2012
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 201DA1065674
	for <freebsd-gecko@freebsd.org>; Fri, 22 Jun 2012 01:31:02 +0000 (UTC)
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
	[217.150.245.56])
	by mx1.freebsd.org (Postfix) with ESMTP id 8802A8FC18
	for <freebsd-gecko@freebsd.org>; Fri, 22 Jun 2012 01:31:01 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
	by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q5M1UxX8005599
	for <freebsd-gecko@freebsd.org>; Fri, 22 Jun 2012 01:30:59 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5M1UsKs005400
	for freebsd-gecko@freebsd.org; Fri, 22 Jun 2012 01:30:54 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Fri, 22 Jun 2012 01:30:54 GMT
Message-Id: <201206220130.q5M1UsKs005400@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
	svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [SVN-Commit] r789 - branches/experimental/Mk
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jun 2012 01:31:02 -0000

Author: jbeich
Date: Fri Jun 22 01:30:54 2012
New Revision: 789

Log:
followup to r783, lump together similar substitutions

Modified:
   branches/experimental/Mk/bsd.gecko.mk

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Thu Jun 21 12:13:27 2012	(r788)
+++ branches/experimental/Mk/bsd.gecko.mk	Fri Jun 22 01:30:54 2012	(r789)
@@ -782,26 +782,24 @@
 		${ECHO_CMD} "unwind.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
 	fi
 .endfor
-	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
-		${WRKSRC}/config/autoconf.mk.in
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; s|/usr/X11R6|${LOCALBASE}|g' \
-		${MOZSRC}/security/coreconf/FreeBSD.mk \
-		${MOZSRC}/js/src/Makefile.in
-	@if [ -d ${WRKSRC}/directory/c-sdk ]; then \
-		${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
+	@for f in \
 			${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
-			${WRKSRC}/directory/c-sdk/configure ; \
-	fi
-	@-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' \
+			${WRKSRC}/directory/c-sdk/configure \
+			${MOZSRC}/security/coreconf/FreeBSD.mk \
+			${MOZSRC}/js/src/Makefile.in \
 			${MOZSRC}/js/src/configure \
 			${MOZSRC}/configure \
-			${WRKSRC}/configure; \
-	fi
+			${WRKSRC}/configure; do \
+		if [ -f $$f ] ; then \
+			${REINPLACE_CMD} -Ee 's|-lc_r|${PTHREAD_LIBS}|g ; \
+				s|-l?pthread|${PTHREAD_LIBS}|g ; \
+				s|echo aout|echo elf|g ; \
+				s|/usr/X11R6|${LOCALBASE}|g' \
+				$$f; \
+		fi; \
+	done
+	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
+		${WRKSRC}/config/autoconf.mk.in
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 			${MOZSRC}/build/unix/run-mozilla.sh