diff options
Diffstat (limited to 'www/php4')
-rw-r--r-- | www/php4/Makefile | 24 | ||||
-rw-r--r-- | www/php4/Makefile.common | 74 | ||||
-rw-r--r-- | www/php4/Makefile.module | 47 | ||||
-rw-r--r-- | www/php4/Makefile.php | 34 | ||||
-rw-r--r-- | www/php4/buildlink.mk | 49 | ||||
-rw-r--r-- | www/php4/distinfo | 22 | ||||
-rw-r--r-- | www/php4/patches/patch-aa | 34 | ||||
-rw-r--r-- | www/php4/patches/patch-ab | 51 | ||||
-rw-r--r-- | www/php4/patches/patch-ac | 26 | ||||
-rw-r--r-- | www/php4/patches/patch-ad | 70 | ||||
-rw-r--r-- | www/php4/patches/patch-ae | 23 | ||||
-rw-r--r-- | www/php4/patches/patch-af | 23 | ||||
-rw-r--r-- | www/php4/patches/patch-ag | 35 | ||||
-rw-r--r-- | www/php4/patches/patch-ah | 22 | ||||
-rw-r--r-- | www/php4/patches/patch-ai | 25 | ||||
-rw-r--r-- | www/php4/patches/patch-aj | 13 | ||||
-rw-r--r-- | www/php4/pkg/DESCR | 8 | ||||
-rw-r--r-- | www/php4/pkg/PLIST | 28 |
18 files changed, 360 insertions, 248 deletions
diff --git a/www/php4/Makefile b/www/php4/Makefile index e2355871afd..c9ff0eb38a9 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,14 +1,19 @@ -# $NetBSD: Makefile,v 1.13 2001/07/13 07:09:26 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2001/10/16 04:54:24 jlam Exp $ -.include "../../www/php4/Makefile.common" +.include "../php4/Makefile.php" PKGNAME= php-${PHP_VERS} +PHP_PKG_VERS= # empty CATEGORIES+= lang - -COMMENT= PHP4: Hypertext Preprocessor +COMMENT= HTML-embedded scripting language CONFLICTS+= ap-php-4.0.3pl1 +USE_BUILDLINK_ONLY= YES + +# Ensure we export symbols in the linked shared object. +LDFLAGS+= -Wl,--export-dynamic + CGIDIR= ${PREFIX}/libexec/cgi-bin EGDIR= ${PREFIX}/share/examples/php @@ -23,6 +28,17 @@ FILES_SUBST+= CP=${CP:Q} FILES_SUBST+= RM=${RM:Q} FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +# On NetBSD, we need to link libgcc.a whole-archive so that certain symbols +# from the C++ implementation (__get_eh_context, etc.) referenced by DSOs +# written in C++ will resolve correctly. We need to prefix the linker flags +# "-whole-archive -lgcc -no-whole-archive" with "-Wl," to force all of the +# flags to be passed down to the linker without change. +# +.if ${OPSYS} == "NetBSD" +LINK_LIBGCC_LDFLAGS= -Wl,--whole-archive -Wl,-lgcc -Wl,--no-whole-archive +MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" +.endif + pre-install: ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common index 6b7d1e6dd32..87879f55658 100644 --- a/www/php4/Makefile.common +++ b/www/php4/Makefile.common @@ -1,9 +1,6 @@ -# $NetBSD: Makefile.common,v 1.16 2001/09/27 23:18:57 jlam Exp $ +# $NetBSD: Makefile.common,v 1.17 2001/10/16 04:54:24 jlam Exp $ DISTNAME= php-${PHP_DIST_VERS} -PHP_DIST_VERS= 4.0.5 -PHP_BASE_VERS= ${PHP_DIST_VERS} -PHP_VERS= ${PHP_BASE_VERS} CATEGORIES+= www php4 MASTER_SITES= http://www.php.net/distributions/ \ http://php3.de/distributions/ \ @@ -12,68 +9,27 @@ MASTER_SITES= http://www.php.net/distributions/ \ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.php.net/ -# Put this dependency here to compile in dbm support for all PHP4 modules. -DEPENDS+= gdbm>=1.7.3:../../databases/gdbm - -DISTINFO_FILE= ${.CURDIR}/../../www/php4/distinfo -FILESDIR= ${.CURDIR}/../../www/php4/files -PATCHDIR= ${.CURDIR}/../../www/php4/patches +# Version numbering scheme: +# +# PHP_DIST_VERS version number on the php distfile +# PHP_BASE_VERS pkgsrc-mangled version number (convert pl -> .) +# PHP_PKG_VERS pkgsrc revisions of php (nbX, etc.) +# PHP_VERS pkgsrc version number of package +# +PHP_DIST_VERS= 4.0.6 +PHP_BASE_VERS= ${PHP_DIST_VERS} +PHP_PKG_VERS?= # empty +PHP_VERS= ${PHP_BASE_VERS}${PHP_PKG_VERS} # Location of installed PHP4 loadable modules under ${PREFIX}. # This is derived from the value of `php-config --extension-dir`. +# The number for the last part of the path represents a specific version +# of the Zend API. # -PHP_EXTENSION_DIR= lib/php/extensions/no-debug-non-zts-20001222 +PHP_EXTENSION_DIR= lib/php/20001222 PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} -USE_LIBTOOL= # defined -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig - .include "../../mk/bsd.prefs.mk" PHP_CONFDIR?= ${LOCALBASE}/etc MESSAGE_SUBST+= PHP_CONFDIR=${PHP_CONFDIR} - -.if ${OPSYS} == "SunOS" -DEPENDS+= zlib-[0-9]*:../../devel/zlib -.endif - -# Here we configure only for what NetBSD ships. We add the rest via modules. -# -GNU_CONFIGURE= # defined - -USE_LIBINTL= # defined -.if exists(/usr/include/libintl.h) -GETTEXTDIR= /usr -.else -GETTEXTDIR= ${LOCALBASE} -.endif - -CONFIGURE_ARGS+= --without-gd -CONFIGURE_ARGS+= --without-mysql -CONFIGURE_ARGS+= --without-pcre-regex -CONFIGURE_ARGS+= --with-gdbm=${LOCALBASE} -CONFIGURE_ARGS+= --with-gettext=${GETTEXTDIR} -CONFIGURE_ARGS+= --with-yp -CONFIGURE_ARGS+= --with-zlib -CONFIGURE_ARGS+= --with-config-file-path=${PHP_CONFDIR} -CONFIGURE_ARGS+= --with-system-regex -CONFIGURE_ARGS+= --with-exec-dir=${PREFIX}/libexec/php4 -CONFIGURE_ARGS+= --enable-track-vars -CONFIGURE_ARGS+= --enable-force-cgi-redirect -CONFIGURE_ARGS+= --enable-discard-path -CONFIGURE_ARGS+= --enable-memory-limit -CONFIGURE_ARGS+= --enable-sysvsem -CONFIGURE_ARGS+= --enable-sysvshm -CONFIGURE_ARGS+= --enable-wddx -CONFIGURE_ARGS+= --enable-sockets - -# The following two modules are bogus to include, but we need it to maintain -# version/capability compatibility with older binary packages of ap-php4. -# -CONFIGURE_ARGS+= --with-dbase -CONFIGURE_ARGS+= --with-filepro - -pre-configure: pre-common-configure - -pre-common-configure: - ${LN} -sf ${WRKSRC}/libtool ${WRKSRC}/shlibtool diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module index 9ae90694c46..5d502fae517 100644 --- a/www/php4/Makefile.module +++ b/www/php4/Makefile.module @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.module,v 1.9 2001/06/21 22:44:03 kim Exp $ +# $NetBSD: Makefile.module,v 1.10 2001/10/16 04:54:24 jlam Exp $ # # This Makefile is provided to ease creating PHP4 packages for the extension # modules distributed in the PHP4 sources. @@ -11,33 +11,52 @@ # of the PHP4 module package that don't affect other PHP4 modules. It is # typically left empty. -.include "../../www/php4/Makefile.common" +.include "../php4/Makefile.common" -PKGNAME= php-${MODNAME}-${PHP_MODULE_VERS} +PKGNAME= php-${MODNAME}-${PHP_VERS} PHP_PKG_VERS?= # empty -PHP_MODULE_VERS= ${PHP_BASE_VERS}${PHP_PKG_VERS} -DEPENDS+= php-${PHP_VERS}:../../www/php4 +BUILD_DEPENDS+= automake>=1.4:../../devel/automake +DEPENDS+= php>=${PHP_BASE_VERS}:../php4 -EXTDIR= ${WRKSRC}/ext/${MODNAME:S/-/_/} +PKGMODNAME= ${MODNAME:S/-/_/} MODULESDIR= ${WRKSRC}/modules -PLIST_SUBST+= MODNAME=${MODNAME:S/-/_/} +PLIST_SUBST+= MODNAME=${PKGMODNAME} -MESSAGE_SRC= ${.CURDIR}/../../www/php4/pkg/MESSAGE.module -MESSAGE_SUBST+= MODNAME=${MODNAME:S/-/_/} -MESSAGE_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} +EXTRACT_ELEMENTS= ${DISTNAME}/ext/${PKGMODNAME} +WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS} + +PHPIZE?= ${BUILDLINK_PREFIX.php4}/bin/phpize -PLIST_SRC= ${.CURDIR}/../../www/php4/pkg/PLIST.module +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --with-php-config=${PHP_CONFIG} + +USE_CONFIG_WRAPPER= YES +USE_LIBTOOL= YES +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig # Ensure we export symbols in the linked shared objects. LDFLAGS+= -Wl,--export-dynamic -do-build: - @cd ${EXTDIR}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${ALL_TARGET} +PLIST_SRC= ${.CURDIR}/../php4/pkg/PLIST.module +MESSAGE_SRC= ${.CURDIR}/../php4/pkg/MESSAGE.module +MESSAGE_SUBST+= MODNAME=${PKGMODNAME} +MESSAGE_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} + +pre-configure: phpize-module + +phpize-module: + @cookie=${WRKDIR}/.phpize_module_done; \ + if [ ! -f $${cookie} ]; then \ + ( cd ${WRKSRC} && ${PHPIZE} ); \ + ${TOUCH} ${TOUCH_FLAGS} $${cookie}; \ + fi do-install: do-module-install do-module-install: ${INSTALL_DATA_DIR} ${PREFIX}/${PHP_EXTENSION_DIR} - ${INSTALL_DATA} ${MODULESDIR}/${MODNAME:S/-/_/}.so \ + ${INSTALL_DATA} ${MODULESDIR}/${PKGMODNAME}.so \ ${PREFIX}/${PHP_EXTENSION_DIR} + +.include "../php4/buildlink.mk" diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php new file mode 100644 index 00000000000..6d667cd10c2 --- /dev/null +++ b/www/php4/Makefile.php @@ -0,0 +1,34 @@ +# $NetBSD: Makefile.php,v 1.1 2001/10/16 04:54:24 jlam Exp $ + +.include "../php4/Makefile.common" + +DISTINFO_FILE= ${.CURDIR}/../php4/distinfo +PATCHDIR= ${.CURDIR}/../php4/patches + +USE_LIBTOOL= YES +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig + +GNU_CONFIGURE= YES + +CONFIGURE_ARGS+= --without-mysql +CONFIGURE_ARGS+= --without-pcre-regex + +CONFIGURE_ARGS+= --disable-posix +CONFIGURE_ARGS+= --disable-session +CONFIGURE_ARGS+= --disable-xml + +CONFIGURE_ARGS+= --with-config-file-path=${PHP_CONFDIR} +CONFIGURE_ARGS+= --with-exec-dir=${PREFIX}/libexec/php4 +CONFIGURE_ARGS+= --with-regex=system + +CONFIGURE_ARGS+= --enable-discard-path +CONFIGURE_ARGS+= --enable-force-cgi-redirect +CONFIGURE_ARGS+= --enable-memory-limit +CONFIGURE_ARGS+= --enable-track-vars + +CONFIGURE_ENV+= ac_cv_lib_pam_pam_start=no + +post-configure: create-shlibtool + +create-shlibtool: + cd ${WRKSRC}; ${RM} -f shlibtool; ${LN} -sf libtool shlibtool diff --git a/www/php4/buildlink.mk b/www/php4/buildlink.mk new file mode 100644 index 00000000000..a73129372eb --- /dev/null +++ b/www/php4/buildlink.mk @@ -0,0 +1,49 @@ +# $NetBSD: buildlink.mk,v 1.1 2001/10/16 04:54:24 jlam Exp $ +# +# This Makefile fragment is included by packages that use php4. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.php4 to the dependency pattern +# for the version of php4 desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(PHP4_BUILDLINK_MK) +PHP4_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +# This adds a build-dependency as php4 has no libraries. +BUILDLINK_DEPENDS.php4?= php>=4.0.6 +BUILD_DEPENDS+= ${BUILDLINK_DEPENDS.php4}:../../www/php4 + +EVAL_PREFIX+= BUILDLINK_PREFIX.php4=php +BUILDLINK_PREFIX.php4_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.php4= include/php/*/*/*.h +BUILDLINK_FILES.php4+= include/php/*/*.h +BUILDLINK_FILES.php4+= include/php/*.h + +BUILDLINK_TARGETS.php4= php4-buildlink +BUILDLINK_TARGETS.php4+= php4-buildlink-config-wrapper +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.php4} + +BUILDLINK_CONFIG.php4= ${BUILDLINK_PREFIX.php4}/bin/php-config +BUILDLINK_CONFIG_WRAPPER.php4= ${BUILDLINK_DIR}/bin/php-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.php4}|${BUILDLINK_CONFIG.php4}|g" + +.if defined(USE_CONFIG_WRAPPER) +PHP_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.php4} +CONFIGURE_ENV+= PHP_CONFIG="${PHP_CONFIG}" +MAKE_ENV+= PHP_CONFIG="${PHP_CONFIG}" +.endif + +pre-configure: ${BUILDLINK_TARGETS.php4} +php4-buildlink: _BUILDLINK_USE +php4-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE + +.endif # PHP4_BUILDLINK_MK diff --git a/www/php4/distinfo b/www/php4/distinfo index d5b491528e9..4ed8b35077c 100644 --- a/www/php4/distinfo +++ b/www/php4/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.4 2001/05/14 14:12:28 jlam Exp $ +$NetBSD: distinfo,v 1.5 2001/10/16 04:54:24 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 (patch-ae) = 02544646e87acea327b22d53956b5551c8a9a623 -SHA1 (patch-af) = b1ab346ff1b71d9a68908af31c1f62475220f677 -SHA1 (patch-ag) = c5f04ef52b9d44cd0a4251d3074e4dbc668987e7 -SHA1 (patch-ai) = 9f142482852f31079e553afe0cd55c7b4f727af6 -SHA1 (patch-aj) = 54ac6761303048f06d469e9d1162b0f39cb7d3ae +SHA1 (php-4.0.6.tar.gz) = 6544eb1085b916541af914a11074e9bb8a037a03 +Size (php-4.0.6.tar.gz) = 3157346 bytes +SHA1 (patch-aa) = 08f98c6b41c24a2aa8fa417bba50cf0cb5f711af +SHA1 (patch-ab) = f5b7660b78e9555af27dbb50dd104cd099396341 +SHA1 (patch-ac) = 40bc1a1fd8ff07eeec4ec4c4e65467e6adac4863 +SHA1 (patch-ad) = 0cbb6381e8a72cdd7f76056a8901304ad9f6b0a9 +SHA1 (patch-ae) = e7acc06a63f47053c81ab442b53c68d89d122f78 +SHA1 (patch-af) = bb76894ca29b9f3a53bc7c0675f63ec16126c0ab +SHA1 (patch-ag) = 0b22f10386cbe27aec6a90f95fc30d1bf2e65856 +SHA1 (patch-ah) = 4e720082fb8e02931d66770b544a6328fe569489 diff --git a/www/php4/patches/patch-aa b/www/php4/patches/patch-aa index 07ed1518ba5..39eb7c9a362 100644 --- a/www/php4/patches/patch-aa +++ b/www/php4/patches/patch-aa @@ -1,25 +1,13 @@ -$NetBSD: patch-aa,v 1.6 2001/05/14 14:12:28 jlam Exp $ +$NetBSD: patch-aa,v 1.7 2001/10/16 04:54:24 jlam Exp $ ---- configure.in.orig Mon Apr 30 09:37:22 2001 -+++ configure.in -@@ -353,7 +353,8 @@ +--- Makefile.in.orig Sat Apr 21 21:09:12 2001 ++++ Makefile.in +@@ -19,7 +19,7 @@ + PROGRAM_NAME = php + PROGRAM_SOURCES = stub.c + PROGRAM_LDADD = libphp4.la $(EXT_PROGRAM_LDADD) +-PROGRAM_LDFLAGS = -export-dynamic ++PROGRAM_LDFLAGS = -static -export-dynamic $(LINK_LIBGCC_LDFLAGS) + PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD) - 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 @@ - 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 - - CC="$old_CC" + targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM) diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab index 5e20eefecfa..2fd1f72ef34 100644 --- a/www/php4/patches/patch-ab +++ b/www/php4/patches/patch-ab @@ -1,39 +1,14 @@ -$NetBSD: patch-ab,v 1.7 2001/05/14 14:12:29 jlam Exp $ +$NetBSD: patch-ab,v 1.8 2001/10/16 04:54:24 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 @@ - 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 - ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` -@@ -43693,6 +43695,8 @@ - else - echo "$ac_t""no" 1>&6 - fi -+ -+fi # if false - - - for ac_func in getcwd getwd -@@ -51503,9 +51507,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 - +--- Zend/zend_alloc.c.orig Tue Jun 19 14:04:53 2001 ++++ Zend/zend_alloc.c +@@ -446,6 +446,9 @@ + for (i=1; i<MAX_CACHED_MEMORY; i++) { + for (j=0; j<AG(cache_count)[i]; j++) { + ptr = (zend_mem_header *) AG(cache)[i][j]; ++#if MEMORY_LIMIT ++ AG(allocated_memory) -= REAL_SIZE(ptr->size); ++#endif + REMOVE_POINTER_FROM_LIST(ptr); + free(ptr); + } diff --git a/www/php4/patches/patch-ac b/www/php4/patches/patch-ac new file mode 100644 index 00000000000..ee38f37c012 --- /dev/null +++ b/www/php4/patches/patch-ac @@ -0,0 +1,26 @@ +$NetBSD: patch-ac,v 1.4 2001/10/16 04:54:24 jlam Exp $ + +--- acinclude.m4.orig Sun Jun 10 15:52:56 2001 ++++ acinclude.m4 +@@ -251,10 +251,19 @@ + ;; + esac + ++dnl Having php_always_shared=yes override the configure options breaks ++dnl because it's assumed that the answer to every question is yes. We ++dnl really only want just the ext_shared=yes to denote that we'll be ++dnl using outside shared libraries. ++dnl ++dnl if test "$php_always_shared" = "yes"; then ++dnl ext_output="yes, shared" ++dnl ext_shared=yes ++dnl test "[$]$1" = "no" && $1=yes ++dnl fi ++ + if test "$php_always_shared" = "yes"; then +- ext_output="yes, shared" + ext_shared=yes +- test "[$]$1" = "no" && $1=yes + fi + + AC_MSG_RESULT($ext_output) diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad index 8ecc31550f4..964189e449d 100644 --- a/www/php4/patches/patch-ad +++ b/www/php4/patches/patch-ad @@ -1,17 +1,55 @@ -$NetBSD: patch-ad,v 1.4 2001/05/14 14:12:29 jlam Exp $ +$NetBSD: patch-ad,v 1.5 2001/10/16 04:54:24 jlam Exp $ ---- ext/imap/php_imap.c.orig Tue Apr 24 10:17:41 2001 -+++ ext/imap/php_imap.c -@@ -427,7 +427,11 @@ - ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL) - - --#if 1 -+/* -+ * Use the installed c-client linkage.c to determine which drivers and -+ * authenticators are linked in. -+ */ -+#if 0 - #ifndef PHP_WIN32 - mail_link(&unixdriver); /* link in the unix driver */ - #endif +--- configure.orig Thu Jun 21 02:28:57 2001 ++++ configure +@@ -14903,10 +14903,6 @@ + + else + echo "$ac_t""no" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_DBA 0 +-EOF +- + fi + + +@@ -21394,19 +21390,10 @@ + + + else +- cat >> confdefs.h <<\EOF +-#define HYPERWAVE 0 +-EOF +- + echo "$ac_t""no" 1>&6 + fi + + else +- +- cat >> confdefs.h <<\EOF +-#define HYPERWAVE 0 +-EOF +- + echo "$ac_t""no" 1>&6 + + fi +@@ -55797,7 +55784,7 @@ + + if test "$enable_debug" != "yes"; then + +- LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' ++ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + fi + +@@ -55815,8 +55802,8 @@ + $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 $@' ++ PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<' ++ CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<' + fi + fi + diff --git a/www/php4/patches/patch-ae b/www/php4/patches/patch-ae index 52bb5830642..f603980eec2 100644 --- a/www/php4/patches/patch-ae +++ b/www/php4/patches/patch-ae @@ -1,16 +1,13 @@ -$NetBSD: patch-ae,v 1.2 2001/05/14 14:12:29 jlam Exp $ +$NetBSD: patch-ae,v 1.3 2001/10/16 04:54:24 jlam Exp $ ---- ext/standard/config.m4.orig Sun Mar 11 05:08:27 2001 -+++ ext/standard/config.m4 -@@ -187,9 +187,11 @@ +--- main/php_open_temporary_file.c.orig Mon Apr 30 08:43:40 2001 ++++ main/php_open_temporary_file.c +@@ -110,7 +110,7 @@ + trailing_slash = "/"; + } - AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL,1,[ ])]) - -+if false; then - AC_CHECK_LIB(pam, pam_start, [ - EXTRA_LIBS="$EXTRA_LIBS -lpam" - AC_DEFINE(HAVE_LIBPAM,1,[ ]) ], []) -+fi # if false - - AC_CHECK_FUNCS(getcwd getwd) +- (void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXX", path, trailing_slash, pfx); ++ (void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXXXXXX", path, trailing_slash, pfx); + #ifdef PHP_WIN32 + if (GetTempFileName(path, pfx, 0, opened_path)) { diff --git a/www/php4/patches/patch-af b/www/php4/patches/patch-af index ee2a5a884d0..332aaf28285 100644 --- a/www/php4/patches/patch-af +++ b/www/php4/patches/patch-af @@ -1,13 +1,12 @@ -$NetBSD: patch-af,v 1.2 2001/05/14 14:12:30 jlam Exp $ +$NetBSD: patch-af,v 1.3 2001/10/16 04:54:24 jlam Exp $ ---- Makefile.in.orig Tue Mar 20 13:15:10 2001 -+++ Makefile.in -@@ -19,7 +19,7 @@ - PROGRAM_NAME = php - PROGRAM_SOURCES = stub.c - PROGRAM_LDADD = libphp4.la $(EXT_PROGRAM_LDADD) --PROGRAM_LDFLAGS = -export-dynamic -+PROGRAM_LDFLAGS = -static -export-dynamic - PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD) - - targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM) +--- pear/Makefile.in.orig Tue May 15 06:17:21 2001 ++++ pear/Makefile.in +@@ -157,6 +157,7 @@ + / \ + Zend \ + TSRM \ ++ ext/session \ + ext/standard \ + ext/xml \ + ext/xml/expat/xmlparse \ diff --git a/www/php4/patches/patch-ag b/www/php4/patches/patch-ag index 30c4274b09c..a71349ae109 100644 --- a/www/php4/patches/patch-ag +++ b/www/php4/patches/patch-ag @@ -1,12 +1,25 @@ -$NetBSD: patch-ag,v 1.1 2001/02/12 04:14:29 jlam Exp $ +$NetBSD: patch-ag,v 1.2 2001/10/16 04:54:24 jlam Exp $ ---- ext/imap/Makefile.in.orig Tue May 23 19:36:44 2000 -+++ ext/imap/Makefile.in -@@ -2,6 +2,6 @@ - LTLIBRARY_NAME = libimap.la - LTLIBRARY_SOURCES = php_imap.c - LTLIBRARY_SHARED_NAME = imap.la --LTLIBRARY_SHARED_LIBADD = $(IMAP_SHARED_LIBADD) -+LTLIBRARY_SHARED_LIBADD = - - include $(top_srcdir)/build/dynlib.mk +--- php.ini-dist.orig Thu May 31 23:20:49 2001 ++++ php.ini-dist +@@ -320,8 +320,9 @@ + ; if nonempty. + user_dir = + +-; Directory in which the loadable extensions (modules) reside. +-extension_dir = ./ ++; Directory in which the loadable extensions (modules) reside. If not ++; defined, then use the extension directory specified at compile-time. ++;extension_dir = ./ + + ; Whether or not to enable the dl() function. The dl() function does NOT work + ; properly in multithreaded servers, such as IIS or Zeus, and is automatically +@@ -338,7 +339,7 @@ + + ; Temporary directory for HTTP uploaded files (will use system default if not + ; specified). +-;upload_tmp_dir = ++upload_tmp_dir = /tmp + + ; Maximum allowed size for uploaded files. + upload_max_filesize = 2M diff --git a/www/php4/patches/patch-ah b/www/php4/patches/patch-ah new file mode 100644 index 00000000000..abca36dacb6 --- /dev/null +++ b/www/php4/patches/patch-ah @@ -0,0 +1,22 @@ +$NetBSD: patch-ah,v 1.3 2001/10/16 04:54:24 jlam Exp $ + +--- php.ini-optimized.orig Thu May 31 23:20:49 2001 ++++ php.ini-optimized +@@ -231,7 +231,7 @@ + include_path = ; UNIX: "/path1:/path2" Windows: "\path1;\path2" + doc_root = ; the root of the php pages, used only if nonempty + user_dir = ; the directory under which php opens the script using /~username, used only if nonempty +-extension_dir = ./ ; directory in which the loadable extensions (modules) reside ++;extension_dir = ./ ; directory in which the loadable extensions (modules) reside + enable_dl = On ; Whether or not to enable the dl() function. + ; The dl() function does NOT properly work in multithreaded + ; servers, such as IIS or Zeus, and is automatically disabled +@@ -242,7 +242,7 @@ + ; File Uploads ; + ;;;;;;;;;;;;;;;; + file_uploads = On ; Whether to allow HTTP file uploads +-;upload_tmp_dir = ; temporary directory for HTTP uploaded files (will use system default if not specified) ++upload_tmp_dir = /tmp ; temporary directory for HTTP uploaded files (will use system default if not specified) + upload_max_filesize = 2M ; Maximum allowed size for uploaded files + + diff --git a/www/php4/patches/patch-ai b/www/php4/patches/patch-ai deleted file mode 100644 index 80857e5abbb..00000000000 --- a/www/php4/patches/patch-ai +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2001/05/14 14:12:30 jlam Exp $ - ---- php.ini-dist.orig Sun Apr 22 07:58:49 2001 -+++ php.ini-dist -@@ -318,8 +318,9 @@ - ; if nonempty. - user_dir = - --; Directory in which the loadable extensions (modules) reside. --extension_dir = ./ -+; Directory in which the loadable extensions (modules) reside. If not -+; defined, then use the extension directory specified at compile-time. -+;extension_dir = ./ - - ; Whether or not to enable the dl() function. The dl() function does NOT work - ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -@@ -336,7 +337,7 @@ - - ; Temporary directory for HTTP uploaded files (will use system default if not - ; specified). --;upload_tmp_dir = -+upload_tmp_dir = /tmp - - ; Maximum allowed size for uploaded files. - upload_max_filesize = 2M diff --git a/www/php4/patches/patch-aj b/www/php4/patches/patch-aj deleted file mode 100644 index 804e051cccd..00000000000 --- a/www/php4/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2001/05/14 14:12:30 jlam Exp $ - ---- main/php_open_temporary_file.c.orig Mon Feb 26 01:07:31 2001 -+++ main/php_open_temporary_file.c -@@ -110,7 +110,7 @@ - trailing_slash = "/"; - } - -- (void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXX", path, trailing_slash, pfx); -+ (void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXXXXXX", path, trailing_slash, pfx); - - #ifdef PHP_WIN32 - if (GetTempFileName(path, pfx, 0, opened_path)) { diff --git a/www/php4/pkg/DESCR b/www/php4/pkg/DESCR index 14527807a53..ca7fa215929 100644 --- a/www/php4/pkg/DESCR +++ b/www/php4/pkg/DESCR @@ -1,4 +1,4 @@ -PHP is an HTML-embedded scripting language. Much of its syntax is -borrowed from C, Java and Perl with a couple of unique PHP-specific -features thrown in. The goal of the language is to allow web -developers to write dynamically generated pages quickly. +PHP is an HTML-embedded scripting language. Much of its syntax is borrowed +from C, Java and Perl with a couple of unique PHP-specific features thrown +in. The goal of the language is to allow web developers to write +dynamically generated pages quickly. diff --git a/www/php4/pkg/PLIST b/www/php4/pkg/PLIST index 5850d172933..298fddaefbd 100644 --- a/www/php4/pkg/PLIST +++ b/www/php4/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2001/05/14 14:12:31 jlam Exp $ +@comment $NetBSD: PLIST,v 1.10 2001/10/16 04:54:25 jlam Exp $ bin/pear bin/php bin/php-config @@ -12,6 +12,7 @@ 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/TSRM/tsrm_win32.h include/php/Zend/FlexLexer.h include/php/Zend/acconfig.h include/php/Zend/zend.h @@ -48,6 +49,10 @@ include/php/Zend/zend_stack.h include/php/Zend/zend_static_allocator.h include/php/Zend/zend_variables.h include/php/acconfig.h +include/php/ext/session/mod_files.h +include/php/ext/session/mod_mm.h +include/php/ext/session/mod_user.h +include/php/ext/session/php_session.h include/php/ext/standard/base64.h include/php/ext/standard/basic_functions.h include/php/ext/standard/credits.h @@ -131,6 +136,7 @@ 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_streams.h include/php/main/php_syslog.h include/php/main/php_ticks.h include/php/main/php_variables.h @@ -146,23 +152,28 @@ include/php/regex/regex.h include/php/regex/regex2.h include/php/regex/regex_extra.h include/php/regex/utils.h +${PHP_EXTENSION_DIR}/.directory lib/php/Benchmark/Iterate.php lib/php/Benchmark/Timer.php 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 +187,14 @@ lib/php/Date/Human.php 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 @@ -202,11 +217,15 @@ lib/php/Net/SMTP.php lib/php/Net/Socket.php lib/php/Numbers/Roman.php lib/php/PEAR.php +lib/php/PEAR/Common.php lib/php/PEAR/Installer.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 @@ -220,16 +239,14 @@ 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-20001222/.directory libexec/cgi-bin/php share/examples/php/php.ini-dist share/examples/php/php.ini-optimized share/php/php4.gif @dirrm share/php @dirrm share/examples/php -@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,7 +267,7 @@ share/php/php4.gif @dirrm lib/php/Cache/Container @dirrm lib/php/Cache @dirrm lib/php/Benchmark -@dirrm lib/php +@unexec rmdir -p %D/${PHP_EXTENSION_DIR} 2>/dev/null || true @dirrm include/php/regex @dirrm include/php/main @dirrm include/php/ext/xml/expat/xmltok @@ -258,6 +275,7 @@ share/php/php4.gif @dirrm include/php/ext/xml/expat @dirrm include/php/ext/xml @dirrm include/php/ext/standard +@dirrm include/php/ext/session @dirrm include/php/ext @dirrm include/php/Zend @dirrm include/php/TSRM |