[Midnightbsd-cvs] mports [22349] trunk/Mk/extensions/pear.mk: this seems to fix some pear issues
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Feb 25 12:34:40 EST 2017
Revision: 22349
http://svnweb.midnightbsd.org/mports/?rev=22349
Author: laffer1
Date: 2017-02-25 12:34:40 -0500 (Sat, 25 Feb 2017)
Log Message:
-----------
this seems to fix some pear issues
Modified Paths:
--------------
trunk/Mk/extensions/pear.mk
Modified: trunk/Mk/extensions/pear.mk
===================================================================
--- trunk/Mk/extensions/pear.mk 2017-02-25 17:25:15 UTC (rev 22348)
+++ trunk/Mk/extensions/pear.mk 2017-02-25 17:34:40 UTC (rev 22349)
@@ -113,20 +113,20 @@
.if !defined(USE_PHPIZE)
do-autogenerate-plist: patch
@${ECHO_MSG} "===> Generating packing list with pear"
- @${LN} -sf ${WRKDIR}/package.xml ${WRKSRC}/package.xml
- @cd ${WRKSRC} && ${PEAR} install -n -f -P ${WRKDIR}/inst package.xml > /dev/null 2> /dev/null
+ ${LN} -sf ${WRKDIR}/package.xml ${WRKSRC}/package.xml
+ cd ${WRKSRC} && ${PEAR} install -n -f -P ${WRKDIR}/inst package.xml > /dev/null 2> /dev/null
.for R in .channels .depdb .depdblock .filemap .lock .registry
- @${RM} -rf ${WRKDIR}/inst/${PREFIX}/${LPEARDIR}/${R}
- @${RM} -rf ${WRKDIR}/inst/${R}
+ ${RM} -rf ${WRKDIR}/inst/${PREFIX}/${LPEARDIR}/${R}
+ ${RM} -rf ${WRKDIR}/inst/${R}
.endfor
- @FILES=`cd ${WRKDIR}/inst && ${FIND} . -type f | ${CUT} -c 2- | \
+ FILES=`cd ${WRKDIR}/inst && ${FIND} . -type f | ${CUT} -c 2- | \
${GREP} -v -E "^${PREFIX}/"` || exit 0; \
${ECHO_CMD} $${FILES}; if ${TEST} -n "$${FILES}"; then \
${ECHO_CMD} "Cannot generate packing list: package files outside PREFIX"; \
exit 1; fi;
- @${ECHO_CMD} "${LPKGREGDIR}/package.xml" > ${PLIST}
+ ${ECHO_CMD} "${LPKGREGDIR}/package.xml" > ${PLIST}
# pkg_install needs to escape $ in directory name while pkg does not
- @cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type f | ${SORT} \
+ cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type f | ${SORT} \
| ${CUT} -c 3- >> ${PLIST}
pre-install: pear-pre-install do-autogenerate-plist do-generate-deinstall-script
More information about the Midnightbsd-cvs
mailing list