diff options
| -rw-r--r-- | www/php4/Makefile.common | 4 | ||||
| -rw-r--r-- | www/php4/files/md5 | 4 | ||||
| -rw-r--r-- | www/php4/files/patch-sum | 9 | ||||
| -rw-r--r-- | www/php4/patches/patch-aa | 39 | ||||
| -rw-r--r-- | www/php4/patches/patch-ab | 47 | ||||
| -rw-r--r-- | www/php4/patches/patch-ac | 2 | ||||
| -rw-r--r-- | www/php4/patches/patch-ad | 6 | ||||
| -rw-r--r-- | www/php4/patches/patch-ae | 15 |
8 files changed, 71 insertions, 55 deletions
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common index 91f4521a5fb..b7e5c8d5628 100644 --- a/www/php4/Makefile.common +++ b/www/php4/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.2 2000/12/17 17:18:02 jlam Exp $ +# $NetBSD: Makefile.common,v 1.3 2000/12/25 21:03:47 jlam Exp $ DISTNAME= php-${PHP_VERS} -PHP_VERS= 4.0.3pl1 +PHP_VERS= 4.0.4 CATEGORIES+= www php4 # Note the http address is written this way by purpose, so that bsd.pkg.mk DTRT diff --git a/www/php4/files/md5 b/www/php4/files/md5 index d6f7d3a6e39..48437206bd0 100644 --- a/www/php4/files/md5 +++ b/www/php4/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/12/17 09:19:32 jlam Exp $ +$NetBSD: md5,v 1.2 2000/12/25 21:03:47 jlam Exp $ -MD5 (php-4.0.3pl1.tar.gz) = 6969bc69588400557f70a014ab1536c1 +MD5 (php-4.0.4.tar.gz) = 16e2022a4b05153b3914fc10ddd63d77 diff --git a/www/php4/files/patch-sum b/www/php4/files/patch-sum index 5b00fcc704a..25dfc0040f6 100644 --- a/www/php4/files/patch-sum +++ b/www/php4/files/patch-sum @@ -1,6 +1,7 @@ -$NetBSD: patch-sum,v 1.4 2000/12/17 21:33:55 jlam Exp $ +$NetBSD: patch-sum,v 1.5 2000/12/25 21:03:47 jlam Exp $ -MD5 (patch-aa) = 08bfae1d2a0b86ad501fd83023733f8a -MD5 (patch-ab) = 5f23b48e9a5a14d282b458831f6769f7 +MD5 (patch-aa) = 511e161c09ffe0d7935026e72d9ab4a7 +MD5 (patch-ab) = 3f7f236e77fbdc98a005d2b02100207d MD5 (patch-ac) = b33a7b6413fb5c850ebbb4c21f04b4d4 -MD5 (patch-ad) = 02ba8252507ae8ad10cbae33ce313142 +MD5 (patch-ad) = bef4f5e16a927892db85ba59aa860163 +MD5 (patch-ae) = 496c420d0067a985139375ee634cbbd4 diff --git a/www/php4/patches/patch-aa b/www/php4/patches/patch-aa index 8eadee87d05..7feb7e0330d 100644 --- a/www/php4/patches/patch-aa +++ b/www/php4/patches/patch-aa @@ -1,40 +1,15 @@ -$NetBSD: patch-aa,v 1.3 2000/12/17 21:33:55 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2000/12/25 21:03:47 jlam Exp $ ---- configure.orig Sun Oct 15 07:47:10 2000 -+++ configure -@@ -17706,7 +17706,7 @@ - ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 - fi - -- for lib in imap c-client4 c-client; do -+ for lib in imapuw imap c-client4 c-client; do - IMAP_LIB=$lib - - str="$IMAP_DIR/lib/lib$lib.*" -@@ -37830,6 +37830,7 @@ - fi - - -+if false; then - echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 - echo "configure:37835: checking for pam_start in -lpam" >&5 - ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` -@@ -37874,6 +37875,8 @@ - else - echo "$ac_t""no" 1>&6 - fi -+ -+fi # if false - - - for ac_func in getcwd getwd -@@ -44218,9 +44221,6 @@ - +--- configure.in.orig Mon Dec 18 23:32:10 2000 ++++ configure.in +@@ -837,10 +837,6 @@ + PHP_CONFIGURE_PART(Configuring shared libtool) $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool' - else - PHP_COMPILE='$(COMPILE) -c $< && touch $@' - CXX_PHP_COMPILE='$(CXX_COMPILE) -c $< && touch $@' - fi +- fi fi + CC="$old_CC" diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab index bb15397e19a..af9ca4c15ee 100644 --- a/www/php4/patches/patch-ab +++ b/www/php4/patches/patch-ab @@ -1,15 +1,40 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/12/17 09:19:32 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2000/12/25 21:03:47 jlam Exp $ ---- ext/standard/config.m4.orig Wed Nov 1 12:20:14 2000 -+++ ext/standard/config.m4 Wed Nov 1 12:20:36 2000 -@@ -120,10 +120,6 @@ main() { +--- configure.orig Wed Dec 20 02:44:27 2000 ++++ configure +@@ -18746,7 +18746,7 @@ + ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 + fi - AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL,1,[ ])]) +- for lib in imap c-client4 c-client; do ++ for lib in imapuw imap c-client4 c-client; do + IMAP_LIB=$lib + + str="$IMAP_DIR/lib/lib$lib.*" +@@ -40172,6 +40172,7 @@ + fi --AC_CHECK_LIB(pam, pam_start, [ -- EXTRA_LIBS="$EXTRA_LIBS -lpam" -- AC_DEFINE(HAVE_LIBPAM,1,[ ]) ], []) -- - AC_CHECK_FUNCS(getcwd getwd) - AC_CRYPT_CAP ++if false; then + echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 + echo "configure:40177: checking for pam_start in -lpam" >&5 + ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` +@@ -40216,6 +40217,8 @@ + else + echo "$ac_t""no" 1>&6 + fi ++ ++fi # if false + + + for ac_func in getcwd getwd +@@ -47326,9 +47329,6 @@ + + $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh + SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool' +- else +- PHP_COMPILE='$(COMPILE) -c $< && touch $@' +- CXX_PHP_COMPILE='$(CXX_COMPILE) -c $< && touch $@' + fi + fi + diff --git a/www/php4/patches/patch-ac b/www/php4/patches/patch-ac index 661e128d4de..c4f63bdda37 100644 --- a/www/php4/patches/patch-ac +++ b/www/php4/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 2000/12/17 17:18:49 jlam Exp $ +$NetBSD: patch-ac,v 1.2 2000/12/25 21:03:47 jlam Exp $ --- ext/imap/config.m4.orig Mon Oct 2 18:16:53 2000 +++ ext/imap/config.m4 diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad index 44d57859346..657d4799d73 100644 --- a/www/php4/patches/patch-ad +++ b/www/php4/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1 2000/12/17 18:59:44 jlam Exp $ +$NetBSD: patch-ad,v 1.2 2000/12/25 21:03:47 jlam Exp $ ---- ext/imap/php_imap.c.orig Sat Sep 9 16:26:15 2000 +--- ext/imap/php_imap.c.orig Wed Oct 25 13:43:52 2000 +++ ext/imap/php_imap.c -@@ -389,7 +389,11 @@ +@@ -392,7 +392,11 @@ ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL) diff --git a/www/php4/patches/patch-ae b/www/php4/patches/patch-ae new file mode 100644 index 00000000000..1cd1ab919e9 --- /dev/null +++ b/www/php4/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1 2000/12/25 21:03:47 jlam Exp $ + +--- ext/standard/config.m4.orig Wed Jul 19 12:19:40 2000 ++++ ext/standard/config.m4 +@@ -136,10 +136,6 @@ + + AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL,1,[ ])]) + +-AC_CHECK_LIB(pam, pam_start, [ +- EXTRA_LIBS="$EXTRA_LIBS -lpam" +- AC_DEFINE(HAVE_LIBPAM,1,[ ]) ], []) +- + AC_CHECK_FUNCS(getcwd getwd) + + AC_CRYPT_CAP |