[Midnightbsd-cvs] mports [22354] trunk/Mk/extensions/pear.mk: fix some of the paths for pear

[laffer1 at midnightbsd.org]

Revision: 22354
          http://svnweb.midnightbsd.org/mports/?rev=22354
Author:   laffer1
Date:     2017-02-25 13:25:50 -0500 (Sat, 25 Feb 2017)
Log Message:
-----------
fix some of the paths for pear

Modified Paths:
--------------
    trunk/Mk/extensions/pear.mk

Modified: trunk/Mk/extensions/pear.mk
===================================================================
--- trunk/Mk/extensions/pear.mk	2017-02-25 18:04:24 UTC (rev 22353)
+++ trunk/Mk/extensions/pear.mk	2017-02-25 18:25:50 UTC (rev 22354)
@@ -17,15 +17,13 @@
 IGNORE+=	USES=pear takes not arguments
 .endif
 
-MASTER_SITES?=	http://pear.php.net/get/ \
-		http://us.pear.php.net/get/ \
-		http://de.pear.php.net/get/
+MASTER_SITES?=	http://pear.php.net/get/
 
 EXTRACT_SUFX?=	.tgz
 DIST_SUBDIR?=	PEAR
 
-BUILD_DEPENDS+=	pear:${PORTSDIR}/devel/pear
-RUN_DEPENDS+=	pear:${PORTSDIR}/devel/pear
+BUILD_DEPENDS+=	pear:devel/pear
+RUN_DEPENDS+=	pear:devel/pear
 
 .if !defined(USE_PHPIZE)
 NO_BUILD=	yes
@@ -113,20 +111,20 @@
 .if !defined(USE_PHPIZE)
 do-autogenerate-plist: patch
 	@${ECHO_MSG} "===>   Generating packing list with pear"
-	${LN} -sf ${WRKDIR}/package.xml ${WRKSRC}/package.xml
+	@${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/${TRUE_PREFIX}/${LPEARDIR}/${R}
 	${RM} -rf ${WRKDIR}/inst/${R}
 .endfor
 	FILES=`cd ${WRKDIR}/inst && ${FIND} . -type f | ${CUT} -c 2- | \
-	${GREP} -v -E "^${PREFIX}/"` || exit 0; \
+	${GREP} -v -E "^${TRUE_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}
 # pkg_install needs to escape $ in directory name while pkg does not
-	cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type f | ${SORT} \
+	cd ${WRKDIR}/inst/${TRUE_PREFIX} && ${FIND} . -type f | ${SORT} \
 	| ${CUT} -c 3- >> ${PLIST}
 
 pre-install:	pear-pre-install do-autogenerate-plist do-generate-deinstall-script
@@ -133,11 +131,11 @@
 do-install:	do-auto-install pear-post-install
 
 do-auto-install:
-	@cd ${WRKSRC} && ${PEAR} install -n -f -P ${STAGEDIR} package.xml
+	@cd ${WRKSRC} && ${PEAR} install -n -f -P ${FAKE_DESTDIR} package.xml
 # Clean up orphans re-generated by pear-install
 .for R in .channels .depdb .depdblock .filemap .lock .registry
-	@${RM} -rf ${STAGEDIR}${PREFIX}/${LPEARDIR}/${R}
-	@${RM} -rf ${STAGEDIR}/${R}
+	@${RM} -rf ${FAKE_DESTDIR}${TRUE_PREFIX}/${LPEARDIR}/${R}
+	@${RM} -rf ${FAKE_DESTDIR}/${R}
 .endfor
 .endif
 
@@ -145,8 +143,8 @@
 	@${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${PORTSDIR}/devel/pear/pear-deinstall.in > ${WRKDIR}/pear-deinstall
 
 pear-post-install:
-	@${MKDIR} ${STAGEDIR}${PKGREGDIR}
-	@${INSTALL_DATA} ${WRKDIR}/package.xml ${STAGEDIR}${PKGREGDIR}
+	@${MKDIR} ${FAKE_DESTDIR}${PKGREGDIR}
+	@${INSTALL_DATA} ${WRKDIR}/package.xml ${FAKE_DESTDIR}${PKGREGDIR}
 
 show-depends: patch
 	@${PEAR} package-dependencies ${WRKDIR}/package.xml