Date: Fri, 22 Jul 2011 20:23:57 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r591 - branches/experimental/Mk Message-ID: <201107222023.p6MKNv4x009222@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107222023.p6MKNv4x009222>