From 92ea477b4a264873accc647b17d0f35efcfc106a Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 15 Jan 2001 16:32:27 +0000 Subject: Update to version 4.0.4pl1. Changes from version 4.0.4: * Make NetBSD PHP extensions_dir equal the compiled-in default for PHP4. * Install the PEAR PHP4 script repository and tools. * Use the source's install target instead of homegrown one. - Fixed the various pdf_open_*() functions (Daniel) - Fixed a bug that could cause invalid INI entries to be used under certain circumstances (Zeev) - Fixed a bug in the Apache module that could cause invalid INI values to propogate to different virtual hosts, if one or more of the virtual hosts was configured with engine=Off (Zeev) - Fixed possible crash bugs in the session module (Sascha) - Fixed the ODBC module to build properly with Solid 3.0 and OpenLink (Dan Kalowsky) - Fixed possible corruption of line number information in PHP scripts (Zeev, Zend Engine) - Fixed a few possible crashes in functions that use user-defined callbacks (Zeev, Zend Engine) --- www/php4/Makefile | 17 ++-- www/php4/Makefile.common | 8 +- www/php4/files/md5 | 4 +- www/php4/files/patch-sum | 4 +- www/php4/patches/patch-ab | 14 +-- www/php4/pkg/MESSAGE.module | 6 +- www/php4/pkg/PLIST | 220 ++++++++++++++++++++++++++++++++++++++++++-- www/php4/pkg/PLIST.module | 3 +- 8 files changed, 240 insertions(+), 36 deletions(-) (limited to 'www/php4') diff --git a/www/php4/Makefile b/www/php4/Makefile index f2efb7abb32..db68fa4a609 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/12/17 21:33:55 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/01/15 16:32:27 jlam Exp $ .include "../../www/php4/Makefile.common" @@ -11,20 +11,15 @@ CONFLICTS+= ap-php-4.0.3pl1 MESSAGE_FILE= ${WRKDIR}/.MESSAGE -BINDIR= ${PREFIX}/bin -CGIDIR= ${PREFIX}/libexec/cgi-bin -LIBDIR= ${PREFIX}/lib - pre-install: ${SED} -e "s,@PREFIX@,${PREFIX},g" \ < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE} -do-install: - ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/php ${BINDIR} - ${INSTALL_DATA_DIR} ${CGIDIR} - ${RM} -f ${CGIDIR}/php - ${LN} -sf ../../bin/php ${CGIDIR}/php - ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libphp4.la ${LIBDIR} +post-install: + ${TOUCH} ${PREFIX}/${PHP_EXTENSION_DIR}/.directory + ${INSTALL_DATA_DIR} ${PREFIX}/libexec/cgi-bin + ${RM} -f ${PREFIX}/libexec/cgi-bin/php + ${LN} -sf ../../bin/php ${PREFIX}/libexec/cgi-bin/php ${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc ${INSTALL_DATA} ${WRKSRC}/php.ini-optimized ${PREFIX}/etc ${INSTALL_DATA_DIR} ${PREFIX}/share/php4 diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common index b7e5c8d5628..9453a63880d 100644 --- a/www/php4/Makefile.common +++ b/www/php4/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.3 2000/12/25 21:03:47 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4 2001/01/15 16:32:28 jlam Exp $ DISTNAME= php-${PHP_VERS} -PHP_VERS= 4.0.4 +PHP_VERS= 4.0.4pl1 CATEGORIES+= www php4 # Note the http address is written this way by purpose, so that bsd.pkg.mk DTRT @@ -18,7 +18,9 @@ FILESDIR= ${.CURDIR}/../../www/php4/files PATCHDIR= ${.CURDIR}/../../www/php4/patches # Location of installed PHP4 loadable modules under ${PREFIX}. -PHP_EXTENSION_DIR= lib/php4 +# This is derived from the value of `php-config --extension-dir`. +# +PHP_EXTENSION_DIR= lib/php/extensions/no-debug-non-zts-20001214 PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} USE_LIBTOOL= # defined diff --git a/www/php4/files/md5 b/www/php4/files/md5 index 48437206bd0..dd2747ce2d1 100644 --- a/www/php4/files/md5 +++ b/www/php4/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 2000/12/25 21:03:47 jlam Exp $ +$NetBSD: md5,v 1.3 2001/01/15 16:32:28 jlam Exp $ -MD5 (php-4.0.4.tar.gz) = 16e2022a4b05153b3914fc10ddd63d77 +MD5 (php-4.0.4pl1.tar.gz) = ae3ab0105154dddea1fa2ca18a902f85 diff --git a/www/php4/files/patch-sum b/www/php4/files/patch-sum index 25dfc0040f6..8abaf3323d7 100644 --- a/www/php4/files/patch-sum +++ b/www/php4/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.5 2000/12/25 21:03:47 jlam Exp $ +$NetBSD: patch-sum,v 1.6 2001/01/15 16:32:28 jlam Exp $ MD5 (patch-aa) = 511e161c09ffe0d7935026e72d9ab4a7 -MD5 (patch-ab) = 3f7f236e77fbdc98a005d2b02100207d +MD5 (patch-ab) = 890bb3a2222ae5295d5f4ea01d2cfd5d MD5 (patch-ac) = b33a7b6413fb5c850ebbb4c21f04b4d4 MD5 (patch-ad) = bef4f5e16a927892db85ba59aa860163 MD5 (patch-ae) = 496c420d0067a985139375ee634cbbd4 diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab index af9ca4c15ee..0b3439a7f57 100644 --- a/www/php4/patches/patch-ab +++ b/www/php4/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2000/12/25 21:03:47 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2001/01/15 16:32:28 jlam Exp $ ---- configure.orig Wed Dec 20 02:44:27 2000 +--- configure.orig Thu Jan 11 13:39:29 2001 +++ configure -@@ -18746,7 +18746,7 @@ +@@ -18750,7 +18750,7 @@ ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 fi @@ -11,15 +11,15 @@ $NetBSD: patch-ab,v 1.2 2000/12/25 21:03:47 jlam Exp $ IMAP_LIB=$lib str="$IMAP_DIR/lib/lib$lib.*" -@@ -40172,6 +40172,7 @@ +@@ -40176,6 +40176,7 @@ fi +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 + echo "configure:40181: checking for pam_start in -lpam" >&5 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` -@@ -40216,6 +40217,8 @@ +@@ -40220,6 +40221,8 @@ else echo "$ac_t""no" 1>&6 fi @@ -28,7 +28,7 @@ $NetBSD: patch-ab,v 1.2 2000/12/25 21:03:47 jlam Exp $ for ac_func in getcwd getwd -@@ -47326,9 +47329,6 @@ +@@ -47325,9 +47328,6 @@ $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool' diff --git a/www/php4/pkg/MESSAGE.module b/www/php4/pkg/MESSAGE.module index 37214817a55..3d7537a634c 100644 --- a/www/php4/pkg/MESSAGE.module +++ b/www/php4/pkg/MESSAGE.module @@ -1,10 +1,10 @@ =========================================================================== -$NetBSD: MESSAGE.module,v 1.1.1.1 2000/12/17 09:19:32 jlam Exp $ +$NetBSD: MESSAGE.module,v 1.2 2001/01/15 16:32:28 jlam Exp $ To enable this package, add the following lines to php.ini: - extension_dir=@PREFIX@/@PHP_EXTENSION_DIR@ - extension=@MODNAME@.so + extension_dir=@PREFIX@/@PHP_EXTENSION_DIR@ + extension=@MODNAME@.so and restart your PHP4-enabled HTTP server to load this module. =========================================================================== diff --git a/www/php4/pkg/PLIST b/www/php4/pkg/PLIST index 4e9a78f791a..51f3c71492e 100644 --- a/www/php4/pkg/PLIST +++ b/www/php4/pkg/PLIST @@ -1,13 +1,221 @@ -@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:58 agc Exp $ +@comment $NetBSD: PLIST,v 1.4 2001/01/15 16:32:29 jlam Exp $ +bin/pear bin/php +bin/php-config +bin/phpextdist +bin/phpize etc/php.ini-dist etc/php.ini-optimized -lib/libphp4.a -lib/libphp4.la -lib/libphp4.so -lib/libphp4.so.0 -lib/libphp4.so.0.0 +include/php/acconfig.h +include/php/php_version.h +include/php/TSRM/TSRM.h +include/php/TSRM/acconfig.h +include/php/TSRM/readdir.h +include/php/TSRM/tsrm_config.h +include/php/TSRM/tsrm_config.w32.h +include/php/TSRM/tsrm_config_common.h +include/php/TSRM/tsrm_strtok_r.h +include/php/TSRM/tsrm_virtual_cwd.h +include/php/Zend/FlexLexer.h +include/php/Zend/acconfig.h +include/php/Zend/modules.h +include/php/Zend/zend.h +include/php/Zend/zend_API.h +include/php/Zend/zend_alloc.h +include/php/Zend/zend_builtin_functions.h +include/php/Zend/zend_compile.h +include/php/Zend/zend_config.h +include/php/Zend/zend_config.w32.h +include/php/Zend/zend_constants.h +include/php/Zend/zend_dynamic_array.h +include/php/Zend/zend_errors.h +include/php/Zend/zend_execute.h +include/php/Zend/zend_execute_locks.h +include/php/Zend/zend_extensions.h +include/php/Zend/zend_fast_cache.h +include/php/Zend/zend_globals.h +include/php/Zend/zend_globals_macros.h +include/php/Zend/zend_hash.h +include/php/Zend/zend_highlight.h +include/php/Zend/zend_indent.h +include/php/Zend/zend_ini.h +include/php/Zend/zend_ini_parser.h +include/php/Zend/zend_ini_scanner.h +include/php/Zend/zend_language_parser.h +include/php/Zend/zend_language_scanner.h +include/php/Zend/zend_list.h +include/php/Zend/zend_llist.h +include/php/Zend/zend_operators.h +include/php/Zend/zend_ptr_stack.h +include/php/Zend/zend_stack.h +include/php/Zend/zend_static_allocator.h +include/php/Zend/zend_variables.h +include/php/ext/standard/base64.h +include/php/ext/standard/basic_functions.h +include/php/ext/standard/credits.h +include/php/ext/standard/credits_ext.h +include/php/ext/standard/credits_sapi.h +include/php/ext/standard/cyr_convert.h +include/php/ext/standard/datetime.h +include/php/ext/standard/dl.h +include/php/ext/standard/dns.h +include/php/ext/standard/exec.h +include/php/ext/standard/file.h +include/php/ext/standard/flock_compat.h +include/php/ext/standard/fsock.h +include/php/ext/standard/head.h +include/php/ext/standard/html.h +include/php/ext/standard/info.h +include/php/ext/standard/md5.h +include/php/ext/standard/microtime.h +include/php/ext/standard/pack.h +include/php/ext/standard/pageinfo.h +include/php/ext/standard/php_array.h +include/php/ext/standard/php_assert.h +include/php/ext/standard/php_browscap.h +include/php/ext/standard/php_crypt.h +include/php/ext/standard/php_dir.h +include/php/ext/standard/php_ext_syslog.h +include/php/ext/standard/php_filestat.h +include/php/ext/standard/php_fopen_wrappers.h +include/php/ext/standard/php_image.h +include/php/ext/standard/php_incomplete_class.h +include/php/ext/standard/php_iptc.h +include/php/ext/standard/php_lcg.h +include/php/ext/standard/php_link.h +include/php/ext/standard/php_mail.h +include/php/ext/standard/php_math.h +include/php/ext/standard/php_metaphone.h +include/php/ext/standard/php_output.h +include/php/ext/standard/php_parsedate.h +include/php/ext/standard/php_rand.h +include/php/ext/standard/php_smart_str.h +include/php/ext/standard/php_smart_str_public.h +include/php/ext/standard/php_standard.h +include/php/ext/standard/php_string.h +include/php/ext/standard/php_var.h +include/php/ext/standard/quot_print.h +include/php/ext/standard/reg.h +include/php/ext/standard/scanf.h +include/php/ext/standard/type.h +include/php/ext/standard/uniqid.h +include/php/ext/standard/url.h +include/php/ext/standard/url_scanner.h +include/php/ext/standard/url_scanner_ex.h +include/php/ext/xml/expat/xmlparse/expat_hashtable.h +include/php/ext/xml/expat/xmlparse/xmlparse.h +include/php/ext/xml/expat/xmltok/asciitab.h +include/php/ext/xml/expat/xmltok/iasciitab.h +include/php/ext/xml/expat/xmltok/latin1tab.h +include/php/ext/xml/expat/xmltok/nametab.h +include/php/ext/xml/expat/xmltok/utf8tab.h +include/php/ext/xml/expat/xmltok/xmldef.h +include/php/ext/xml/expat/xmltok/xmlrole.h +include/php/ext/xml/expat/xmltok/xmltok.h +include/php/ext/xml/expat/xmltok/xmltok_impl.h +include/php/ext/xml/php_xml.h +include/php/main/SAPI.h +include/php/main/build-defs.h +include/php/main/config.w32.h +include/php/main/fopen-wrappers.h +include/php/main/internal_functions_registry.h +include/php/main/logos.h +include/php/main/php.h +include/php/main/php3_compat.h +include/php/main/php_compat.h +include/php/main/php_config.h +include/php/main/php_content_types.h +include/php/main/php_globals.h +include/php/main/php_ini.h +include/php/main/php_logos.h +include/php/main/php_main.h +include/php/main/php_network.h +include/php/main/php_open_temporary_file.h +include/php/main/php_reentrancy.h +include/php/main/php_regex.h +include/php/main/php_syslog.h +include/php/main/php_ticks.h +include/php/main/php_variables.h +include/php/main/php_version.h +include/php/main/rfc1867.h +include/php/main/safe_mode.h +include/php/main/snprintf.h +include/php/main/win95nt.h +include/php/regex/cclass.h +include/php/regex/cname.h +include/php/regex/regex.h +include/php/regex/regex2.h +include/php/regex/regex_extra.h +include/php/regex/utils.h +lib/php/Benchmark/Iterate.php +lib/php/Benchmark/Timer.php +lib/php/Crypt/HCEMD5.php +lib/php/DB.php +lib/php/DB/common.php +lib/php/DB/ibase.php +lib/php/DB/msql.php +lib/php/DB/mssql.php +lib/php/DB/mysql.php +lib/php/DB/oci8.php +lib/php/DB/odbc.php +lib/php/DB/pgsql.php +lib/php/DB/storage.php +lib/php/DB/sybase.php +lib/php/Date/Calc.php +lib/php/File/Find.php +lib/php/File/SearchReplace.php +lib/php/HTML/Form.php +lib/php/HTTP.php +lib/php/Mail.php +lib/php/Mail/sendmail.php +lib/php/Mail/smtp.php +lib/php/Net/SMTP.php +lib/php/Net/Socket.php +lib/php/PEAR.php +lib/php/PEAR/Installer.php +lib/php/Payment/Verisign.php +lib/php/XML/Parser.php +lib/php/build/acinclude.m4 +lib/php/build/dynlib.m4 +lib/php/build/dynlib.mk +lib/php/build/fastgen.sh +lib/php/build/library.mk +lib/php/build/ltlib.mk +lib/php/build/mkdep.awk +lib/php/build/pear.m4 +lib/php/build/program.mk +lib/php/build/rules.mk +lib/php/build/rules_common.mk +lib/php/build/rules_pear.mk +lib/php/build/shtool +lib/php/extensions/no-debug-non-zts-20001214/.directory libexec/cgi-bin/php share/php4/php4.gif @dirrm share/php4 @unexec rmdir -p %D/libexec/cgi-bin 2>/dev/null || true +@dirrm lib/php/extensions/no-debug-non-zts-20001214 +@dirrm lib/php/extensions +@dirrm lib/php/build +@dirrm lib/php/XML +@dirrm lib/php/Payment +@dirrm lib/php/PEAR +@dirrm lib/php/Net +@dirrm lib/php/Mail +@dirrm lib/php/HTML +@dirrm lib/php/File +@dirrm lib/php/Date +@dirrm lib/php/DB +@dirrm lib/php/Crypt +@dirrm lib/php/Benchmark +@dirrm lib/php +@dirrm include/php/regex +@dirrm include/php/main +@dirrm include/php/ext/xml/expat/xmltok +@dirrm include/php/ext/xml/expat/xmlparse +@dirrm include/php/ext/xml/expat +@dirrm include/php/ext/xml +@dirrm include/php/ext/standard +@dirrm include/php/ext +@dirrm include/php/Zend +@dirrm include/php/TSRM +@dirrm include/php diff --git a/www/php4/pkg/PLIST.module b/www/php4/pkg/PLIST.module index 4a20fdb7199..9aabc6b91da 100644 --- a/www/php4/pkg/PLIST.module +++ b/www/php4/pkg/PLIST.module @@ -1,3 +1,2 @@ -@comment $NetBSD: PLIST.module,v 1.1.1.1 2000/12/17 09:19:32 jlam Exp $ +@comment $NetBSD: PLIST.module,v 1.2 2001/01/15 16:32:29 jlam Exp $ ${PHP_EXTENSION_DIR}/${MODNAME}.so -@unexec rmdir -p %D/${PHP_EXTENSION_DIR} 2>/dev/null || true -- cgit v1.2.3