Date: Thu, 28 Apr 2011 23:10:45 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r542 - branches/experimental/Mk Message-ID: <201104282310.p3SNAjBH078657@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104282310.p3SNAjBH078657>