Tue Mar 9 07:48:39 2010 UTC ()
Remove wrong ${DESTDIR} addition.


(obache)
diff -r1.11 -r1.12 pkgsrc/lang/pear/Makefile
cvs diff -r1.11 -r1.12 pkgsrc/lang/pear/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/pear/Makefile 2009/10/29 08:29:03 1.11
+++ pkgsrc/lang/pear/Makefile 2010/03/09 07:48:38 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.11 2009/10/29 08:29:03 seb Exp $ 1# $NetBSD: Makefile,v 1.12 2010/03/09 07:48:38 obache Exp $
2# 2#
3 3
4DISTNAME= PEAR-1.9.0 4DISTNAME= PEAR-1.9.0
5#PKGREVISION= 1 5#PKGREVISION= 1
6PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/} 6PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/}
7CATEGORIES= lang 7CATEGORIES= lang
8MASTER_SITES= http://download.pear.php.net/package/ 8MASTER_SITES= http://download.pear.php.net/package/
9EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
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
14 14
@@ -79,27 +79,27 @@ do-build: @@ -79,27 +79,27 @@ do-build:
79 ${GZCAT} ${DISTDIR}/${ARCHIVE_SRCS} > \ 79 ${GZCAT} ${DISTDIR}/${ARCHIVE_SRCS} > \
80 ${BUNDLE}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}/.tar/} 80 ${BUNDLE}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}/.tar/}
81 ${GZCAT} ${DISTDIR}/${CONSOLE_SRCS} > \ 81 ${GZCAT} ${DISTDIR}/${CONSOLE_SRCS} > \
82 ${BUNDLE}/${CONSOLE_SRCS:S/${EXTRACT_SUFX}/.tar/} 82 ${BUNDLE}/${CONSOLE_SRCS:S/${EXTRACT_SUFX}/.tar/}
83 ${GZCAT} ${DISTDIR}/${PEAR_SRCS} > \ 83 ${GZCAT} ${DISTDIR}/${PEAR_SRCS} > \
84 ${BUNDLE}/${PEAR_SRCS:S/${EXTRACT_SUFX}/.tar/} 84 ${BUNDLE}/${PEAR_SRCS:S/${EXTRACT_SUFX}/.tar/}
85 ${GZCAT} ${DISTDIR}/${STRUCTURES_SRCS} > \ 85 ${GZCAT} ${DISTDIR}/${STRUCTURES_SRCS} > \
86 ${BUNDLE}/${STRUCTURES_SRCS:S/${EXTRACT_SUFX}/.tar/} 86 ${BUNDLE}/${STRUCTURES_SRCS:S/${EXTRACT_SUFX}/.tar/}
87 87
88 ${CP} ${ARCHIVE_WRKSRC}/Archive/Tar.php ${BUNDLE} 88 ${CP} ${ARCHIVE_WRKSRC}/Archive/Tar.php ${BUNDLE}
89 ${CP} ${CONSOLE_WRKSRC}/Console/Getopt.php ${BUNDLE} 89 ${CP} ${CONSOLE_WRKSRC}/Console/Getopt.php ${BUNDLE}
90 90
91do-install: 91do-install:
92 ${PREFIX}/bin/php ${DESTDIR}${WRKSRC}/install/go-pear.php local 92 ${PREFIX}/bin/php ${WRKSRC}/install/go-pear.php local
93 ${INSTALL_SCRIPT} ${WRKSRC}/pear.sh ${DESTDIR}${PREFIX}/bin/pear 93 ${INSTALL_SCRIPT} ${WRKSRC}/pear.sh ${DESTDIR}${PREFIX}/bin/pear
94 ${INSTALL_DATA} ${WRKSRC}/pear.conf \ 94 ${INSTALL_DATA} ${WRKSRC}/pear.conf \
95 ${DESTDIR}${PREFIX}/share/examples/pear/pear.conf 95 ${DESTDIR}${PREFIX}/share/examples/pear/pear.conf
96 96
97.include "${PHPPKGSRCDIR}/buildlink3.mk" 97.include "${PHPPKGSRCDIR}/buildlink3.mk"
98 98
99.if ${PKG_PHP_VERSION} == "4" 99.if ${PKG_PHP_VERSION} == "4"
100BUILDLINK_API_DEPENDS.php+= php>=4.4.6nb1 100BUILDLINK_API_DEPENDS.php+= php>=4.4.6nb1
101.elif ${PKG_PHP_VERSION} == "5" 101.elif ${PKG_PHP_VERSION} == "5"
102BUILDLINK_API_DEPENDS.php+= php>=5.2.1nb2 102BUILDLINK_API_DEPENDS.php+= php>=5.2.1nb2
103.endif 103.endif
104 104
105.include "../../mk/bsd.pkg.mk" 105.include "../../mk/bsd.pkg.mk"