From owner-freebsd-gecko@FreeBSD.ORG  Thu Apr 28 23:10:52 2011
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 199831065670
	for <freebsd-gecko@freebsd.org>; Thu, 28 Apr 2011 23:10:52 +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 AB4DD8FC18
	for <freebsd-gecko@freebsd.org>; Thu, 28 Apr 2011 23:10:51 +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 p3SNAo8f079081
	for <freebsd-gecko@freebsd.org>; Thu, 28 Apr 2011 23:10:50 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p3SNAjBH078657
	for freebsd-gecko@freebsd.org; Thu, 28 Apr 2011 23:10:45 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Thu, 28 Apr 2011 23:10:45 GMT
Message-Id: <201104282310.p3SNAjBH078657@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] r542 - 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: Thu, 28 Apr 2011 23:10:52 -0000

Author: flo
Date: Thu Apr 28 23:10:45 2011
New Revision: 542

Log:
- patch configure.in instead of configure, this is required for the soon to be 
  committed firefox-devel (Firefox 5, aurora channel)

Tested by:	Tinderbox run of all gecko ports

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

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Thu Apr 28 23:05:00 2011	(r541)
+++ branches/experimental/Mk/bsd.gecko.mk	Thu Apr 28 23:10:45 2011	(r542)
@@ -4,7 +4,7 @@
 # Date created:		12 Nov 2005
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.26 2010/12/18 11:15:33 beat Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.27 2011/03/22 15:26:35 beat Exp $
 #
 # 4 column tabs prevent hair loss and tooth decay!
 
@@ -760,7 +760,7 @@
 			${MOZSRC}/build/unix/mozilla-config.in
 .endif
 	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
-		${WRKSRC}/configure
+		${WRKSRC}/configure.in
 .for subdir in config/system_wrappers nsprpub/config/system_wrappers js/src/config/system_wrappers_js
 	@${MKDIR} ${MOZSRC}/${subdir}
 	@${ECHO_CMD} "#pragma GCC system_header" >> ${MOZSRC}/${subdir}/iconv.h
@@ -789,7 +789,7 @@
 		s|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|echo aout|echo elf|g ; \
 		s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/configure
+		${WRKSRC}/configure.in
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 			${MOZSRC}/build/unix/run-mozilla.sh