pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/pear Get PEAR to install a system-wide configurat...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbadba9fc14c
branches:  trunk
changeset: 528791:cbadba9fc14c
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Wed May 16 12:00:07 2007 +0000

description:
Get PEAR to install a system-wide configuration file instead of one
 just for root.
Spotted by joerg@'s bulk builds
PKGREVISION++

diffstat:

 lang/pear/Makefile |  11 +++++++++--
 lang/pear/PLIST    |   4 +++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (58 lines):

diff -r abde1048b49a -r cbadba9fc14c lang/pear/Makefile
--- a/lang/pear/Makefile        Wed May 16 11:46:11 2007 +0000
+++ b/lang/pear/Makefile        Wed May 16 12:00:07 2007 +0000
@@ -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<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 @@
        ${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 -r abde1048b49a -r cbadba9fc14c lang/pear/PLIST
--- a/lang/pear/PLIST   Wed May 16 11:46:11 2007 +0000
+++ b/lang/pear/PLIST   Wed May 16 12:00:07 2007 +0000
@@ -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/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 @@
 @unexec ${RMDIR} %D/lib/php/.registry 2>/dev/null || ${TRUE}
 @dirrm lib/php/.channels/.alias
 @dirrm lib/php/.channels
+@dirrm share/examples/pear



Home | Main Index | Thread Index | Old Index