diff options
| author | jlam <jlam> | 2003-02-03 23:53:24 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-02-03 23:53:24 +0000 |
| commit | a124ea59a46cd432d55e9f89f64724e9555f90b0 (patch) | |
| tree | 46e1c7eaff0ed67d3c882643893fe4249e488e42 /www | |
| parent | 6398bcce94982bfaa57acec388021340105c2ab3 (diff) | |
| download | pkgsrc-a124ea59a46cd432d55e9f89f64724e9555f90b0.tar.gz | |
Bump PKGREVISION of www/php4 to 1. This fixes a problem reported on
tech-pkg@ where the incorrect libtoolize was being invoked. We now pass
in the path to libtoolize via the environment, much like how the other
GNU auto* tools are found in pkgsrc.
Diffstat (limited to 'www')
| -rw-r--r-- | www/php4/Makefile | 3 | ||||
| -rw-r--r-- | www/php4/Makefile.module | 3 | ||||
| -rw-r--r-- | www/php4/distinfo | 4 | ||||
| -rw-r--r-- | www/php4/patches/patch-ab | 10 |
4 files changed, 12 insertions, 8 deletions
diff --git a/www/php4/Makefile b/www/php4/Makefile index 6ab60f41be9..211a0d45497 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2003/01/28 22:04:31 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2003/02/03 23:53:24 jlam Exp $ PKGNAME= php-${PHP_BASE_VERS} +PKGREVISION= 1 CATEGORIES+= lang COMMENT= HTML-embedded scripting language diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module index ebd4020901a..00ad9b7c499 100644 --- a/www/php4/Makefile.module +++ b/www/php4/Makefile.module @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.module,v 1.21 2002/10/14 06:21:18 martti Exp $ +# $NetBSD: Makefile.module,v 1.22 2003/02/03 23:53:24 jlam Exp $ # # This Makefile is provided to ease creating PHP4 packages for the extension # modules distributed in the PHP4 sources. @@ -50,6 +50,7 @@ phpize-module: if [ ! -f $${cookie} ]; then \ ( cd ${WRKSRC} && ${SETENV} AUTOCONF=${AUTOCONF} \ AUTOHEADER=${AUTOHEADER} ACLOCAL=${ACLOCAL} \ + LIBTOOLIZE=${LOCALBASE}/bin/libtoolize \ ${PHPIZE} ); \ ${TOUCH} ${TOUCH_FLAGS} $${cookie}; \ fi diff --git a/www/php4/distinfo b/www/php4/distinfo index c7784609b04..fc2c7079b0d 100644 --- a/www/php4/distinfo +++ b/www/php4/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.17 2003/01/14 21:39:54 christos Exp $ +$NetBSD: distinfo,v 1.18 2003/02/03 23:53:24 jlam Exp $ SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc Size (php-4.2.3.tar.gz) = 3413829 bytes SHA1 (patch-aa) = 09fb15fde09bf866d9be016839f33c889d9cefb9 -SHA1 (patch-ab) = f385cce407fed6fc1ed705a4507015684bebb1b5 +SHA1 (patch-ab) = daac6888e758b39bc40abed41eba9e55a0fa30e5 SHA1 (patch-ac) = f3a3a4a5af6f03a6274aa4875a922b838f1bde1b SHA1 (patch-ad) = f1d129a8f0ef45f274a42033c5494e4a0a516f66 SHA1 (patch-ae) = e7acc06a63f47053c81ab442b53c68d89d122f78 diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab index f35e73b538d..815a3dd2772 100644 --- a/www/php4/patches/patch-ab +++ b/www/php4/patches/patch-ab @@ -1,19 +1,21 @@ -$NetBSD: patch-ab,v 1.10 2002/10/02 23:48:07 wiz Exp $ +$NetBSD: patch-ab,v 1.11 2003/02/03 23:53:25 jlam Exp $ ---- pear/scripts/phpize.in.orig Wed Jan 10 02:01:59 2001 +--- pear/scripts/phpize.in.orig Wed Apr 17 06:35:59 2002 +++ pear/scripts/phpize.in -@@ -25,7 +25,11 @@ sed \ +@@ -25,7 +25,12 @@ sed \ touch install-sh mkinstalldirs missing -aclocal -autoconf -autoheader +-libtoolize -f -c +if [ -z "$ACLOCAL" ]; then ACLOCAL=aclocal; fi +if [ -z "$AUTOCONF" ]; then AUTOCONF=autoconf; fi +if [ -z "$AUTOHEADER" ]; then AUTOHEADER=autoheader; fi ++if [ -z "$LIBTOOLIZE" ]; then LIBTOOLIZE=libtoolize; fi + +$ACLOCAL +$AUTOCONF +$AUTOHEADER - libtoolize -f -c ++$LIBTOOLIZE -f -c |