Subject: php4 upgrade to 4.0.6
To: None <tech-pkg@netbsd.org>
From: SUNAGAWA Keiki <Keiki_SUNAGAWA@yokogawa.co.jp>
List: tech-pkg
Date: 08/17/2001 15:02:34
Hi,
It took several weeks from php 4.0.6 had been released and
this version supports multibyte encodings officially, so I
want to upgrade our pkgsrc version to 4.0.6.
Is the patch below ok? Comments are welcome.
note: there was some difficalty in php4-gd (even in php3-gd)
for --without-gd and --with-gd options, so I explicitly
removed --without-gd option when building php4-gd package.
Thank you.
--
SUNAGAWA Keiki <Keiki_SUNAGAWA@yokogawa.co.jp>
Index: php4/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- php4/Makefile 2001/07/13 07:09:26 1.13
+++ php4/Makefile 2001/08/17 05:51:39
@@ -31,6 +31,7 @@
post-install:
${INSTALL_DATA_DIR} ${CGIDIR}
${LN} -sf ../../bin/php ${CGIDIR}/php
+ ${INSTALL_DATA_DIR} ${PREFIX}/${PHP_EXTENSION_DIR}
${TOUCH} ${PREFIX}/${PHP_EXTENSION_DIR}/.directory
${INSTALL_DATA_DIR} ${EGDIR}
cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-optimized ${EGDIR}
Index: php4/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4/Makefile.common,v
retrieving revision 1.15
diff -u -r1.15 Makefile.common
--- php4/Makefile.common 2001/06/13 06:20:28 1.15
+++ php4/Makefile.common 2001/08/17 05:51:39
@@ -1,7 +1,7 @@
# $NetBSD: Makefile.common,v 1.15 2001/06/13 06:20:28 explorer Exp $
DISTNAME= php-${PHP_DIST_VERS}
-PHP_DIST_VERS= 4.0.5
+PHP_DIST_VERS= 4.0.6
PHP_BASE_VERS= ${PHP_DIST_VERS}
PHP_VERS= ${PHP_BASE_VERS}
CATEGORIES+= www php4
@@ -48,7 +48,9 @@
GETTEXTDIR= ${LOCALBASE}
.endif
+.if !defined(MODNAME) || ${MODNAME} != "gd"
CONFIGURE_ARGS+= --without-gd
+.endif
CONFIGURE_ARGS+= --without-mysql
CONFIGURE_ARGS+= --without-pcre-regex
CONFIGURE_ARGS+= --with-gdbm=${LOCALBASE}
@@ -66,6 +68,8 @@
CONFIGURE_ARGS+= --enable-sysvshm
CONFIGURE_ARGS+= --enable-wddx
CONFIGURE_ARGS+= --enable-sockets
+CONFIGURE_ARGS+= --enable-mbstring
+CONFIGURE_ARGS+= --enable-mbstr-enc-trans
# The following two modules are bogus to include, but we need it to maintain
# version/capability compatibility with older binary packages of ap-php4.
Index: php4/Makefile.module
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4/Makefile.module,v
retrieving revision 1.9
diff -u -r1.9 Makefile.module
--- php4/Makefile.module 2001/06/21 22:44:03 1.9
+++ php4/Makefile.module 2001/08/17 05:51:39
@@ -38,6 +38,5 @@
do-install: do-module-install
do-module-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/${PHP_EXTENSION_DIR}
${INSTALL_DATA} ${MODULESDIR}/${MODNAME:S/-/_/}.so \
${PREFIX}/${PHP_EXTENSION_DIR}
Index: php4/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- php4/distinfo 2001/05/14 14:12:28 1.4
+++ php4/distinfo 2001/08/17 05:51:39
@@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.4 2001/05/14 14:12:28 jlam Exp $
-SHA1 (php-4.0.5.tar.gz) = 91819cc92200b2839bfc94d55e0f14e4b0375f68
-Size (php-4.0.5.tar.gz) = 2684069 bytes
-SHA1 (patch-aa) = b616d54851cabb599a597f79d42a2265704e2fb1
-SHA1 (patch-ab) = 982630468096659c9e80b8aa69b5ef0f529ba480
-SHA1 (patch-ad) = 66d2f1b8bc557ffa4ff92d738527dd1f08ade8b0
+SHA1 (php-4.0.6.tar.gz) = 6544eb1085b916541af914a11074e9bb8a037a03
+Size (php-4.0.6.tar.gz) = 3157346 bytes
+SHA1 (patch-aa) = b9f3f3fd54bdc47e6aa6c8e7ffa8361932e2117c
+SHA1 (patch-ab) = d513fc069c8f733dbaa855618499a8b9dc4286b0
+SHA1 (patch-ad) = e9ed2afc50bbfaeca1e88b17801c5a356ccda683
SHA1 (patch-ae) = 02544646e87acea327b22d53956b5551c8a9a623
SHA1 (patch-af) = b1ab346ff1b71d9a68908af31c1f62475220f677
SHA1 (patch-ag) = c5f04ef52b9d44cd0a4251d3074e4dbc668987e7
Index: php4/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4/patches/patch-aa,v
retrieving revision 1.6
diff -u -r1.6 patch-aa
--- php4/patches/patch-aa 2001/05/14 14:12:28 1.6
+++ php4/patches/patch-aa 2001/08/17 05:51:39
@@ -1,18 +1,8 @@
$NetBSD: patch-aa,v 1.6 2001/05/14 14:12:28 jlam Exp $
---- configure.in.orig Mon Apr 30 09:37:22 2001
-+++ configure.in
-@@ -353,7 +353,8 @@
-
- dnl Check for IPv6 support
- AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support,
--[AC_TRY_COMPILE([#include <sys/socket.h>
-+[AC_TRY_COMPILE([#include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>], [struct sockaddr_in6 s; int i=AF_INET6; s],
- ac_cv_ipv6_support=yes, ac_cv_ipv6_support=no)])
- if test "$ac_cv_ipv6_support" = yes; then
-@@ -820,10 +821,6 @@
+--- configure.in.orig Thu Jun 21 05:12:59 2001
++++ configure.in Fri Jun 29 10:56:27 2001
+@@ -905,10 +905,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'
Index: php4/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4/patches/patch-ab,v
retrieving revision 1.7
diff -u -r1.7 patch-ab
--- php4/patches/patch-ab 2001/05/14 14:12:29 1.7
+++ php4/patches/patch-ab 2001/08/17 05:51:39
@@ -1,24 +1,25 @@
$NetBSD: patch-ab,v 1.7 2001/05/14 14:12:29 jlam Exp $
---- configure.orig Mon Apr 30 09:47:59 2001
-+++ configure
-@@ -6392,6 +6392,7 @@
- cat > conftest.$ac_ext <<EOF
- #line 6394 "configure"
- #include "confdefs.h"
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- int main() {
-@@ -43649,6 +43650,7 @@
+--- configure.orig Thu Jun 21 15:28:57 2001
++++ configure Mon Jul 2 14:19:44 2001
+@@ -493,7 +493,7 @@
+ Set DIR to "shared" to build as a dl, or
+ "shared,DIR" to build as a dl and still specify DIR."
+ ac_help="$ac_help
+- --enable-gd-native-ttf GD: Enable TrueType string function in gd"
++ --enable-gd-native-tt GD: Enable TrueType string function in gd"
+ ac_help="$ac_help
+ --with-jpeg-dir=DIR GD: Set the path to libjpeg install prefix."
+ ac_help="$ac_help
+@@ -47513,6 +47513,7 @@
fi
+if false; then
echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
- echo "configure:43654: checking for pam_start in -lpam" >&5
+ echo "configure:47518: checking for pam_start in -lpam" >&5
ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
-@@ -43693,6 +43695,8 @@
+@@ -47557,6 +47558,8 @@
else
echo "$ac_t""no" 1>&6
fi
@@ -27,7 +28,7 @@
for ac_func in getcwd getwd
-@@ -51503,9 +51507,6 @@
+@@ -55814,9 +55817,6 @@
$SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool'
Index: php4/patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4/patches/patch-ad,v
retrieving revision 1.4
diff -u -r1.4 patch-ad
--- php4/patches/patch-ad 2001/05/14 14:12:29 1.4
+++ php4/patches/patch-ad 2001/08/17 05:51:39
@@ -1,8 +1,8 @@
$NetBSD: patch-ad,v 1.4 2001/05/14 14:12:29 jlam Exp $
---- ext/imap/php_imap.c.orig Tue Apr 24 10:17:41 2001
-+++ ext/imap/php_imap.c
-@@ -427,7 +427,11 @@
+--- ext/imap/php_imap.c.orig Thu May 31 02:27:49 2001
++++ ext/imap/php_imap.c Fri Jun 29 11:04:58 2001
+@@ -432,7 +432,11 @@
ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
@@ -13,5 +13,5 @@
+ */
+#if 0
#ifndef PHP_WIN32
- mail_link(&unixdriver); /* link in the unix driver */
+ mail_link(&unixdriver); /* link in the unix driver */
#endif
Index: php4/pkg/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- php4/pkg/PLIST 2001/05/14 14:12:31 1.9
+++ php4/pkg/PLIST 2001/08/17 05:51:39
@@ -12,6 +12,7 @@
include/php/TSRM/tsrm_config_common.h
include/php/TSRM/tsrm_strtok_r.h
include/php/TSRM/tsrm_virtual_cwd.h
+include/php/TSRM/tsrm_win32.h
include/php/Zend/FlexLexer.h
include/php/Zend/acconfig.h
include/php/Zend/zend.h
@@ -131,6 +132,7 @@
include/php/main/php_open_temporary_file.h
include/php/main/php_reentrancy.h
include/php/main/php_regex.h
+include/php/main/php_streams.h
include/php/main/php_syslog.h
include/php/main/php_ticks.h
include/php/main/php_variables.h
@@ -151,18 +153,22 @@
lib/php/Cache.php
lib/php/Cache/Container.php
lib/php/Cache/Container/db.php
+lib/php/Cache/Container/dbx.php
lib/php/Cache/Container/file.php
lib/php/Cache/Container/phplib.php
lib/php/Cache/Container/shm.php
+lib/php/Cache/Error.php
lib/php/Cache/Function.php
lib/php/Cache/Graphics.php
lib/php/Cache/Output.php
+lib/php/Cache/OutputCompression.php
lib/php/Console/Getopt.php
lib/php/Crypt/CBC.php
lib/php/Crypt/HCEMD5.php
lib/php/DB.php
lib/php/DB/common.php
lib/php/DB/ibase.php
+lib/php/DB/ifx.php
lib/php/DB/msql.php
lib/php/DB/mssql.php
lib/php/DB/mysql.php
@@ -176,10 +182,14 @@
lib/php/File/Find.php
lib/php/File/Passwd.php
lib/php/File/SearchReplace.php
+lib/php/HTML/Common.php
lib/php/HTML/Form.php
lib/php/HTML/IT.php
lib/php/HTML/ITX.php
+lib/php/HTML/Page.php
lib/php/HTML/Processor.php
+lib/php/HTML/Select.php
+lib/php/HTML/Table.php
lib/php/HTTP.php
lib/php/HTTP/Compress.php
lib/php/Image/Remote.php
@@ -203,10 +213,14 @@
lib/php/Numbers/Roman.php
lib/php/PEAR.php
lib/php/PEAR/Installer.php
+lib/php/PEAR/Common.php
+lib/php/PEAR/Packager.php
+lib/php/PEAR/Uploader.php
lib/php/Payment/Verisign.php
lib/php/Schedule/At.php
lib/php/XML/Parser.php
lib/php/XML/RPC.php
+lib/php/XML/RPC/Server.php
lib/php/build/acinclude.m4
lib/php/build/dynlib.m4
lib/php/build/dynlib.mk
@@ -230,6 +244,7 @@
@dirrm lib/php/extensions/no-debug-non-zts-20001222
@dirrm lib/php/extensions
@dirrm lib/php/build
+@dirrm lib/php/XML/RPC
@dirrm lib/php/XML
@dirrm lib/php/Schedule
@dirrm lib/php/Payment
@@ -250,6 +265,7 @@
@dirrm lib/php/Cache/Container
@dirrm lib/php/Cache
@dirrm lib/php/Benchmark
+@dirrm lib/php/20001222
@dirrm lib/php
@dirrm include/php/regex
@dirrm include/php/main
Index: php4-gd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4-gd/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- php4-gd/Makefile 2001/05/14 14:12:31 1.4
+++ php4-gd/Makefile 2001/08/17 05:51:39
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.4 2001/05/14 14:12:31 jlam Exp $
+MODNAME= gd
.include "../../www/php4/Makefile.module"
-MODNAME= gd
CATEGORIES+= graphics
PHP_PKG_VERS= # empty
@@ -12,6 +12,8 @@
EVAL_PREFIX+= GDDIR=gd
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${GDDIR}
+CONFIGURE_ARGS+= --with-ttf=shared,${PREFIX}
+CONFIGURE_ARGS+= --enable-${MODNAME}-native-tt=shared,${PREFIX}
USE_X11= # defined