diff options
| author | joerg <joerg@pkgsrc.org> | 2009-06-14 22:57:58 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-06-14 22:57:58 +0000 |
| commit | 9bb0d96ea93fe7d169bb22cd824d463449d51611 (patch) | |
| tree | 63741286465d08baa5292031d5f6b9ffd847c5b9 /lang/php | |
| parent | dc3a8c2312879451e787a3a002089e0123c0d646 (diff) | |
| download | pkgsrc-9bb0d96ea93fe7d169bb22cd824d463449d51611.tar.gz | |
Remove @dirrm related logic.
Diffstat (limited to 'lang/php')
| -rw-r--r-- | lang/php/pear.mk | 7 | ||||
| -rw-r--r-- | lang/php/pear_plist.php | 13 |
2 files changed, 2 insertions, 18 deletions
diff --git a/lang/php/pear.mk b/lang/php/pear.mk index e15d597b3b3..d7bb4e7f8c1 100644 --- a/lang/php/pear.mk +++ b/lang/php/pear.mk @@ -1,4 +1,4 @@ -# $NetBSD: pear.mk,v 1.12 2009/01/19 19:55:02 abs Exp $ +# $NetBSD: pear.mk,v 1.13 2009/06/14 22:58:02 joerg Exp $ # # This Makefile fragment is intended to be included by packages that build # and install pear packages. @@ -37,16 +37,11 @@ PEAR_LIB= lib/php PEAR_DESTDIR= -R ${DESTDIR} .endif -# whether @dirrm for baseinstalldir should be included in PLIST -PEAR_DIRRM_BASEDIR?= # empty - # Dynamic PLIST, generated via a helper PHP script, which parses the package # XML config file. PEAR_GENERATE_PLIST= \ ${ECHO} "@comment The following lines are automatically generated"; \ PEAR_LIB="${PEAR_LIB}" WRKSRC="${WRKSRC}" \ - PEAR_DIRRM_BASEDIR="${PEAR_DIRRM_BASEDIR}" \ - PEAR_DIRRM_EXCLUDE="${PEAR_DIRRM_EXCLUDE}" \ ${PREFIX}/bin/php -d include_path=".:${PREFIX}/lib/php" \ -C -n ${PKGDIR}/../../lang/php/pear_plist.php; GENERATE_PLIST+= ${PEAR_GENERATE_PLIST} diff --git a/lang/php/pear_plist.php b/lang/php/pear_plist.php index fc34f920d80..6f3244708e5 100644 --- a/lang/php/pear_plist.php +++ b/lang/php/pear_plist.php @@ -1,5 +1,5 @@ <?php -# $NetBSD: pear_plist.php,v 1.6 2009/01/19 19:55:02 abs Exp $ +# $NetBSD: pear_plist.php,v 1.7 2009/06/14 22:58:02 joerg Exp $ # Parses package XML file and outputs appropriate PLIST $PEAR_LIB = getenv('PEAR_LIB'); @@ -55,15 +55,4 @@ foreach($info['filelist'] as $f => $v) { while(($f = dirname($f)) && $f != '.') $dirrm["{$prefix}{$f}"] = true; } - -# output @dirrm directives, in reverse order so that deeper -# directories are removed first -$dirrm = array_keys($dirrm); -rsort($dirrm); -foreach($dirrm as $dir) { - $fulldir = "{$PEAR_LIB}/$dir"; - if ($PEAR_DIRRM_EXCLUDE && substr($fulldir, 0, strlen($PEAR_DIRRM_EXCLUDE)) == $PEAR_DIRRM_EXCLUDE) - continue; - echo "@dirrm $fulldir\n"; -} ?> |