Sat Apr 2 08:22:04 2016 UTC ()
Ensure destination directory is precreated.  Fixes some pax failures.


(jperkin)
diff -r1.28 -r1.29 pkgsrc/lang/php/pear.mk
cvs diff -r1.28 -r1.29 pkgsrc/lang/php/pear.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/pear.mk 2016/02/29 19:26:53 1.28
+++ pkgsrc/lang/php/pear.mk 2016/04/02 08:22:03 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: pear.mk,v 1.28 2016/02/29 19:26:53 jperkin Exp $ 1# $NetBSD: pear.mk,v 1.29 2016/04/02 08:22:03 jperkin Exp $
2# 2#
3# This Makefile fragment is intended to be included by packages that build 3# This Makefile fragment is intended to be included by packages that build
4# and install pear packages. 4# and install pear packages.
5# 5#
6# If you don't know what pear is, you can visit: http://pear.php.net/ 6# If you don't know what pear is, you can visit: http://pear.php.net/
7# 7#
8# === Package-settable variables === 8# === Package-settable variables ===
9# 9#
10# PEAR_PACKAGE_XML Use package.xml to build package with ${PEAR_CMD}. 10# PEAR_PACKAGE_XML Use package.xml to build package with ${PEAR_CMD}.
11# Default: yes 11# Default: yes
12#  12#
13# 13#
14# === Variables defined by this file === 14# === Variables defined by this file ===
@@ -76,21 +76,22 @@ CHECK_FILES_SKIP+= ${PEAR_FILES_SKIP} @@ -76,21 +76,22 @@ CHECK_FILES_SKIP+= ${PEAR_FILES_SKIP}
76post-extract: 76post-extract:
77 @cd ${WRKSRC} && ${LN} -s ${WRKDIR}/package.xml package.xml 77 @cd ${WRKSRC} && ${LN} -s ${WRKDIR}/package.xml package.xml
78 78
79do-install: 79do-install:
80 cd ${WRKSRC} && ${SETENV} TZ=UTC \ 80 cd ${WRKSRC} && ${SETENV} TZ=UTC \
81 ${PEAR_CMD} "install" ${PEAR_DESTDIR} -n -O package.xml || exit 1 81 ${PEAR_CMD} "install" ${PEAR_DESTDIR} -n -O package.xml || exit 1
82 ${RM} -f ${PEAR_FILES_SKIP:S/^/${DESTDIR}&/} 82 ${RM} -f ${PEAR_FILES_SKIP:S/^/${DESTDIR}&/}
83 83
84.else # PEAR_PACKAGE_XML == no 84.else # PEAR_PACKAGE_XML == no
85 85
86PLIST_SUBST+= PEAR_LIB=${PEAR_LIB:Q} 86PLIST_SUBST+= PEAR_LIB=${PEAR_LIB:Q}
87 87
88do-install: 88do-install:
 89 ${MKDIR} ${DESTDIR}${PREFIX}/${PEAR_LIB}
89 cd ${WRKSRC}/lib && ${PAX} -wr * ${DESTDIR}${PREFIX}/${PEAR_LIB}/ 90 cd ${WRKSRC}/lib && ${PAX} -wr * ${DESTDIR}${PREFIX}/${PEAR_LIB}/
90 91
91.endif 92.endif
92 93
93.include "../../lang/php/phpversion.mk" 94.include "../../lang/php/phpversion.mk"
94.include "${PHPPKGSRCDIR}/buildlink3.mk" 95.include "${PHPPKGSRCDIR}/buildlink3.mk"
95 96
96.endif # _PEAR_PACKAGE_MK 97.endif # _PEAR_PACKAGE_MK