From owner-freebsd-gecko@FreeBSD.ORG  Fri Jul 22 20:24:04 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 BC7AE1065670
	for <freebsd-gecko@freebsd.org>; Fri, 22 Jul 2011 20:24:04 +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 27EA68FC17
	for <freebsd-gecko@freebsd.org>; Fri, 22 Jul 2011 20:24:03 +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 p6MKO2Xu009573
	for <freebsd-gecko@freebsd.org>; Fri, 22 Jul 2011 20:24:02 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p6MKNv4x009222
	for freebsd-gecko@freebsd.org; Fri, 22 Jul 2011 20:23:57 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Fri, 22 Jul 2011 20:23:57 GMT
Message-Id: <201107222023.p6MKNv4x009222@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] r591 - 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 Jul 2011 20:24:04 -0000

Author: flo
Date: Fri Jul 22 20:23:57 2011
New Revision: 591

Log:
use tar instead of cpio to install mozilla ports. This is required for e.g.
firefox and thunderbird > 6, as the cpio way does not work anylonger now that
${PREFIX}/bin/${PORTNAME} is not a shell script anymore, see 
https://bugzilla.mozilla.org/show_bug.cgi?id=552864 for more information.

Submitted by:	Pan Tsu <inyaoo@gmail.com>

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

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Fri Jul 22 19:38:45 2011	(r590)
+++ branches/experimental/Mk/bsd.gecko.mk	Fri Jul 22 20:23:57 2011	(r591)
@@ -849,11 +849,10 @@
 .endfor
 	@${REINPLACE_CMD} -e 's|${MOZILLA}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}|; \
 		s|$${progbase}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}-bin|' \
-		${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*
+		-i '' $$(${REALPATH} ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*)
 .endif
 	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-		${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*
-	${RM} -f ${FAKEDIR}/bin/*.bak
+		-i '' $$(${REALPATH} ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*)
 .endif
 
 gecko-create-plist:
@@ -869,7 +868,7 @@
 	${MV} -f ${FAKEDIR}/lib/pkgconfig ${FAKEDIR}/libdata/ || ${TRUE}
 	${RM} -f ${FAKEDIR}/lib/pkgconfig
 .for dir in ${MOZILLA_PLIST_DIRS}
-	@cd ${FAKEDIR}/${dir} && ${FIND} -H -s * -type f | \
+	@cd ${FAKEDIR}/${dir} && ${FIND} -H -s * ! -type d | \
 		${SED} -e 's|^|${dir}/|' >> ${PLISTF} && \
 		${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLISTD}
@@ -894,10 +893,9 @@
 .for dir in ${MOZILLA_PLIST_DIRS}
 .if !exists(${PREFIX}/${dir})
 	${MKDIR} ${PREFIX}/${dir}
-	${CHMOD} 755 ${PREFIX}/${dir}
 .endif
-	cd ${FAKEDIR}/${dir} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${dir}
+	${TAR} cf - -C${FAKEDIR}/${dir} -s'|${FAKEDIR}|${PREFIX}|s' . | \
+		${TAR} xof - -C${PREFIX}/${dir}
 .endfor
 .for pcfile in ${MOZ_PKGCONFIG_FILES}
 	${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \