Re: CVS commit: pkgsrc/lang/pear

[Robert Elz <kre%munnari.OZ.AU@localhost>]

    Date:        Wed, 16 Dec 2015 18:53:53 +0100
    From:        Joerg Sonnenberger <joerg%britannica.bec.de@localhost>
    Message-ID:  <20151216175353.GA18329%britannica.bec.de@localhost>

  | This doesn't match the file names it wants to extract, does it?

Yes, it needs ... (this should be safe even after DIST_SUBDIR is removed)

Index: Makefile
===================================================================
RCS file: /cvsroot/NetBSD/pkgsrc/lang/pear/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile    15 Dec 2015 15:09:01 -0000      1.35
+++ Makefile    16 Dec 2015 23:41:12 -0000
@@ -71,15 +71,15 @@
        ${CP} ${FILESDIR}/PEAR.php ${BUNDLE}
 
 do-build:
-       ${GZCAT} ${DISTDIR}/${ARCHIVE_SRCS} > \
+       ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${ARCHIVE_SRCS} > \
                ${BUNDLE}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}/.tar/}
-       ${GZCAT} ${DISTDIR}/${CONSOLE_SRCS} > \
+       ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${CONSOLE_SRCS} > \
                ${BUNDLE}/${CONSOLE_SRCS:S/${EXTRACT_SUFX}/.tar/}
-       ${GZCAT} ${DISTDIR}/${PEAR_SRCS} > \
+       ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${PEAR_SRCS} > \
                ${BUNDLE}/${PEAR_SRCS:S/${EXTRACT_SUFX}/.tar/}
-       ${GZCAT} ${DISTDIR}/${STRUCTURES_SRCS} > \
+       ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${STRUCTURES_SRCS} > \
                ${BUNDLE}/${STRUCTURES_SRCS:S/${EXTRACT_SUFX}/.tar/}
-       ${GZCAT} ${DISTDIR}/${XMLUTIL_SRCS} > \
+       ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${XMLUTIL_SRCS} > \
                ${BUNDLE}/${XMLUTIL_SRCS:S/${EXTRACT_SUFX}/.tar/}
 
        ${CP} ${ARCHIVE_WRKSRC}/Archive/Tar.php ${BUNDLE}