diff options
| author | adrianp <adrianp> | 2007-05-16 12:00:07 +0000 |
|---|---|---|
| committer | adrianp <adrianp> | 2007-05-16 12:00:07 +0000 |
| commit | 0542bd822d34135b86a0ad68ad72fa81a5f7f48d (patch) | |
| tree | eb35566c73c34c6a3ecd2b95a4ec0dfd0ff3f42a | |
| parent | 1cc12eafcb8ffa5627de26f579536d7396a0d21e (diff) | |
| download | pkgsrc-0542bd822d34135b86a0ad68ad72fa81a5f7f48d.tar.gz | |
Get PEAR to install a system-wide configuration file instead of one
just for root.
Spotted by joerg@'s bulk builds
PKGREVISION++
| -rw-r--r-- | lang/pear/Makefile | 11 | ||||
| -rw-r--r-- | lang/pear/PLIST | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lang/pear/Makefile b/lang/pear/Makefile index 71bfa80662f..55c1ec4ba4f 100644 --- a/lang/pear/Makefile +++ b/lang/pear/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/05/05 21:21:45 adrianp Exp $ +# $NetBSD: Makefile,v 1.2 2007/05/16 12:00:07 adrianp Exp $ # DISTNAME= PEAR-1.5.2 +PKGREVISION= 1 PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/} CATEGORIES= lang MASTER_SITES= http://download.pear.php.net/package/ @@ -23,6 +24,9 @@ CONFLICTS+= php<4.4.6nb1 CONFLICTS+= php<5.2.1nb2 .endif +CONF_FILES= ${PREFIX}/share/examples/pear/pear.conf \ + ${PKG_SYSCONFDIR}/pear.conf + BUNDLE= ${WRKSRC}/install/go-pear-bundle # everything else that forms a part of the "base" PEAR install @@ -82,8 +86,11 @@ do-build: ${CP} ${WRKSRC}/PEAR.php ${BUNDLE} do-install: - ${PREFIX}/bin/php ${WRKSRC}/install/go-pear.php + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pear + ${PREFIX}/bin/php ${WRKSRC}/install/go-pear.php local ${INSTALL_SCRIPT} ${WRKSRC}/pear.sh ${PREFIX}/bin/pear + ${CP} ${PKG_SYSCONFDIR}/pear.conf ${PREFIX}/share/examples/pear + ${RM} ${PKG_SYSCONFDIR}/pear.conf .if ${PKG_PHP_VERSION} == "4" BUILDLINK_API_DEPENDS.php+= php>=4.4.6nb1 diff --git a/lang/pear/PLIST b/lang/pear/PLIST index 2509e667c25..1f14bb49d2f 100644 --- a/lang/pear/PLIST +++ b/lang/pear/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/05/05 21:21:45 adrianp Exp $ +@comment $NetBSD: PLIST,v 1.2 2007/05/16 12:00:08 adrianp Exp $ bin/pear bin/peardev bin/pecl @@ -145,6 +145,7 @@ lib/php/peclcmd.php lib/php/test/Structures_Graph/tests/README lib/php/test/Structures_Graph/tests/all-tests.php lib/php/test/Structures_Graph/tests/testCase/BasicGraph.php +share/examples/pear/pear.conf @dirrm lib/php/doc/Archive_Tar/docs @dirrm lib/php/doc/Archive_Tar @dirrm lib/php/doc/PEAR @@ -192,3 +193,4 @@ lib/php/test/Structures_Graph/tests/testCase/BasicGraph.php @unexec ${RMDIR} %D/lib/php/.registry 2>/dev/null || ${TRUE} @dirrm lib/php/.channels/.alias @dirrm lib/php/.channels +@dirrm share/examples/pear |