Thu Dec 17 01:40:54 2015 UTC ()
Take care of DIST_SUBDIR when accessing DISTFILES.

Problem was noted by joerg@ and patch was suggested by Robert Elz.


(taca)
diff -r1.35 -r1.36 pkgsrc/lang/pear/Makefile
cvs diff -r1.35 -r1.36 pkgsrc/lang/pear/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/pear/Makefile 2015/12/15 15:09:01 1.35
+++ pkgsrc/lang/pear/Makefile 2015/12/17 01:40:54 1.36
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.35 2015/12/15 15:09:01 taca Exp $ 1# $NetBSD: Makefile,v 1.36 2015/12/17 01:40:54 taca Exp $
2# 2#
3 3
4DISTNAME= PEAR-1.10.1 4DISTNAME= PEAR-1.10.1
5PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/} 5PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/}
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://download.pear.php.net/package/ 7MASTER_SITES= http://download.pear.php.net/package/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9DIST_SUBDIR= pear20151210 9DIST_SUBDIR= pear20151210
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://pear.php.net/ 12HOMEPAGE= http://pear.php.net/
13COMMENT= PEAR Base System for PHP 13COMMENT= PEAR Base System for PHP
14LICENSE= 2-clause-bsd 14LICENSE= 2-clause-bsd
@@ -61,37 +61,30 @@ SUBST_MESSAGE.config= Fixing configurati @@ -61,37 +61,30 @@ SUBST_MESSAGE.config= Fixing configurati
61 61
62REPLACE_SH+= script/pear.sh 62REPLACE_SH+= script/pear.sh
63 63
64INSTALLATION_DIRS+= share/examples/pear 64INSTALLATION_DIRS+= share/examples/pear
65 65
66post-extract: 66post-extract:
67 ${RM} ${WRKSRC}/INSTALL 67 ${RM} ${WRKSRC}/INSTALL
68 ${MKDIR} ${WRKSRC}/install 68 ${MKDIR} ${WRKSRC}/install
69 ${MKDIR} ${BUNDLE} 69 ${MKDIR} ${BUNDLE}
70 ${CP} ${FILESDIR}/go-pear.php ${WRKSRC}/install 70 ${CP} ${FILESDIR}/go-pear.php ${WRKSRC}/install
71 ${CP} ${FILESDIR}/PEAR.php ${BUNDLE} 71 ${CP} ${FILESDIR}/PEAR.php ${BUNDLE}
72 72
73do-build: 73do-build:
74 ${GZCAT} ${DISTDIR}/${ARCHIVE_SRCS} > \ 74.for f in ${DISTFILES}
75 ${BUNDLE}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}/.tar/} 75 ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${f} > \
76 ${GZCAT} ${DISTDIR}/${CONSOLE_SRCS} > \ 76 ${BUNDLE}/${f:S/${EXTRACT_SUFX}/.tar/}
77 ${BUNDLE}/${CONSOLE_SRCS:S/${EXTRACT_SUFX}/.tar/} 77.endfor
78 ${GZCAT} ${DISTDIR}/${PEAR_SRCS} > \ 
79 ${BUNDLE}/${PEAR_SRCS:S/${EXTRACT_SUFX}/.tar/} 
80 ${GZCAT} ${DISTDIR}/${STRUCTURES_SRCS} > \ 
81 ${BUNDLE}/${STRUCTURES_SRCS:S/${EXTRACT_SUFX}/.tar/} 
82 ${GZCAT} ${DISTDIR}/${XMLUTIL_SRCS} > \ 
83 ${BUNDLE}/${XMLUTIL_SRCS:S/${EXTRACT_SUFX}/.tar/} 
84 
85 ${CP} ${ARCHIVE_WRKSRC}/Archive/Tar.php ${BUNDLE} 78 ${CP} ${ARCHIVE_WRKSRC}/Archive/Tar.php ${BUNDLE}
86 ${CP} ${CONSOLE_WRKSRC}/Console/Getopt.php ${BUNDLE} 79 ${CP} ${CONSOLE_WRKSRC}/Console/Getopt.php ${BUNDLE}
87 80
88do-install: 81do-install:
89 ${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/php ${WRKSRC}/install/go-pear.php local 82 ${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/php ${WRKSRC}/install/go-pear.php local
90 ${INSTALL_DATA} ${WRKSRC}/pear.conf \ 83 ${INSTALL_DATA} ${WRKSRC}/pear.conf \
91 ${DESTDIR}${PREFIX}/share/examples/pear/pear.conf 84 ${DESTDIR}${PREFIX}/share/examples/pear/pear.conf
92 85
93.include "${PHPPKGSRCDIR}/buildlink3.mk" 86.include "${PHPPKGSRCDIR}/buildlink3.mk"
94 87
95BUILDLINK_API_DEPENDS.php+= php>=5.2.1nb2 88BUILDLINK_API_DEPENDS.php+= php>=5.2.1nb2
96 89
97.include "../../mk/bsd.pkg.mk" 90.include "../../mk/bsd.pkg.mk"