summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/mod_php4/Makefile2
-rw-r--r--www/mod_php4/distinfo2
-rw-r--r--www/mod_php4/files/patch-at11
-rw-r--r--www/mod_php4/files/patch-ext_domxml_php_domxml.c69
-rw-r--r--www/mod_php4/files/patch-ext_sybase_ct_config.m442
-rw-r--r--www/mod_php4/scripts/configure.php15
-rw-r--r--www/mod_php5/Makefile2
-rw-r--r--www/mod_php5/distinfo2
-rw-r--r--www/mod_php5/files/patch-at11
-rw-r--r--www/mod_php5/files/patch-ext_domxml_php_domxml.c69
-rw-r--r--www/mod_php5/files/patch-ext_sybase_ct_config.m442
-rw-r--r--www/mod_php5/scripts/configure.php15
12 files changed, 48 insertions, 234 deletions
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 0fe5c8ab5563..27646bd7d6e7 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= mod_php4
-PORTVERSION= 4.1.2
+PORTVERSION= 4.2.0
PORTREVISION?= 0
CATEGORIES?= www
MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index 038be6430935..23140b4ee5c2 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-4.1.2.tar.gz) = 75a62553076c20e91d3be575ce158be2
+MD5 (php-4.2.0.tar.gz) = 88d55481de32ab0168aa580f7b611022
MD5 (php4_mbregex-1.2.1.tar.gz) = 46d151afa9ab668df880a70cf786a2c2
diff --git a/www/mod_php4/files/patch-at b/www/mod_php4/files/patch-at
deleted file mode 100644
index fbb234901747..000000000000
--- a/www/mod_php4/files/patch-at
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/pspell/pspell.c.orig Mon Feb 26 07:07:13 2001
-+++ ext/pspell/pspell.c Tue Jun 12 22:08:33 2001
-@@ -32,7 +32,7 @@
- #define USE_ORIGINAL_MANAGER_FUNCS
-
- #include "php_pspell.h"
--#include <pspell/pspell.h>
-+#include <pspell.h>
- #include "ext/standard/info.h"
-
- #define PSPELL_FAST 1L
diff --git a/www/mod_php4/files/patch-ext_domxml_php_domxml.c b/www/mod_php4/files/patch-ext_domxml_php_domxml.c
deleted file mode 100644
index 9992cffd8428..000000000000
--- a/www/mod_php4/files/patch-ext_domxml_php_domxml.c
+++ /dev/null
@@ -1,69 +0,0 @@
-===================================================================
-RCS file: /repository/php4/ext/domxml/php_domxml.c,v
-retrieving revision 1.67.2.9
-retrieving revision 1.90
-diff -p --unified=3 -r1.67.2.9 -r1.90
---- ext/domxml/php_domxml.c 2001/12/14 10:45:46 1.67.2.9
-+++ ext/domxml/php_domxml.c 2001/12/20 14:40:43 1.90
-@@ -16,7 +16,7 @@
- +----------------------------------------------------------------------+
- */
-
--/* $Id: php_domxml.c,v 1.67.2.9 2001/12/14 10:45:46 mfischer Exp $ */
-+/* $Id: php_domxml.c,v 1.90 2001/12/20 14:40:43 mfischer Exp $ */
-
-
- #ifdef HAVE_CONFIG_H
-@@ -411,9 +411,14 @@ static inline void node_list_wrapper_dto
- {
- while (node != NULL) {
- node_list_wrapper_dtor(node->children);
-- // FIXME temporary fix; think of something better
-- if (node->type != XML_ATTRIBUTE_DECL && node->type != XML_DTD_NODE) {
-- attr_list_wrapper_dtor(node->properties);
-+ switch (node->type) {
-+ /* Skip property freeing for the following types */
-+ case XML_ATTRIBUTE_DECL:
-+ case XML_DTD_NODE:
-+ case XML_ENTITY_DECL:
-+ break;
-+ default:
-+ attr_list_wrapper_dtor(node->properties);
- }
- node_wrapper_dtor(node);
- node = node->next;
-@@ -817,7 +822,6 @@ static zval *php_domobject_new(xmlNodePt
- xmlNodePtr nodep = obj;
- object_init_ex(wrapper, domxmlentityref_class_entry);
- rsrc_type = le_domxmlentityrefp;
-- content = xmlNodeGetContent(nodep);
- add_property_stringl(wrapper, "name", (char *) nodep->name, strlen(nodep->name), 1);
- break;
- }
-@@ -932,12 +936,12 @@ PHP_MINIT_FUNCTION(domxml)
- le_domxmlelementp = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domelement", module_number);
- le_domxmldtdp = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domdtd", module_number);
- le_domxmlcdatap = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domcdata", module_number);
-+ le_domxmlentityrefp = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domentityref", module_number);
-
- /* Not yet initialized le_*s */
- le_domxmldoctypep = -10000;
- le_domxmlpip = -10002;
- le_domxmlnotationp = -10003;
-- le_domxmlentityrefp = -10004;
-
- #if defined(LIBXML_XPATH_ENABLED)
- le_xpathctxp = zend_register_list_destructors_ex(php_free_xpath_context, NULL, "xpathcontext", module_number);
-@@ -1586,11 +1590,7 @@ PHP_FUNCTION(domxml_node_unlink_node)
- zval *id;
- xmlNode *nodep;
-
-- DOMXML_NO_ARGS();
--
-- DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep);
--
-- DOMXML_NO_ARGS();
-+ DOMXML_PARAM_NONE(nodep, id, le_domxmlnodep);
-
- xmlUnlinkNode(nodep);
- xmlFreeNode(nodep);
diff --git a/www/mod_php4/files/patch-ext_sybase_ct_config.m4 b/www/mod_php4/files/patch-ext_sybase_ct_config.m4
index 0c5f32e997d0..127a369b1085 100644
--- a/www/mod_php4/files/patch-ext_sybase_ct_config.m4
+++ b/www/mod_php4/files/patch-ext_sybase_ct_config.m4
@@ -1,21 +1,21 @@
---- ext/sybase_ct/config.m4.orig Wed Dec 19 19:36:23 2001
-+++ ext/sybase_ct/config.m4 Wed Dec 19 19:38:08 2001
-@@ -19,17 +19,12 @@
-
- PHP_ADD_INCLUDE($SYBASE_CT_INCDIR)
- PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
-- PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
- PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
-- PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD)
-- PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
-
-- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
-+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
-
- AC_CHECK_LIB(tcl, netg_errstr, [
- PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD)
-- ],[
-- PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
- ],[
- $SYBASE_CT_LIBS
- ])
+--- ext/sybase_ct/config.m4.orig Fri Nov 30 23:12:31 2001
++++ ext/sybase_ct/config.m4 Tue Apr 23 21:53:54 2002
+@@ -30,17 +30,12 @@
+ PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
+ else
+- PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
+ PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
+- PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD)
+- PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
+
+- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
++ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
+
+ PHP_CHECK_LIBRARY(tcl, netg_errstr, [
+ PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD)
+- ],[
+- PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
+ ],[
+ $SYBASE_CT_LIBS
+ ])
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 674317bf2b68..5b3e1a9e6dd4 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -307,20 +307,7 @@ while [ "$1" ]; do
echo "CONFIGURE_ARGS+=--with-pspell=\${LOCALBASE}"
;;
\"mbregex\")
- ${CAT} << EOF
-MASTER_SITES+= ftp://night.fminn.nagano.nagano.jp/php4/
-DISTFILES= \${DISTNAME}\${EXTRACT_SUFX} php4_mbregex-1.2.1.tar.gz
-CONFIGURE_ARGS+=--enable-mbregex
-BUILD_DEPENDS+= automake:\${PORTSDIR}/devel/automake
-BUILD_DEPENDS+= autoconf:\${PORTSDIR}/devel/autoconf
-POSTEXTRACT+= post-extract-mbregex
-
-post-extract-mbregex:
- [ -d \${WRKDIR}/mbregex ] && \\
- (cd \${WRKSRC}; \\
- \${MV} ${WRKDIR}/mbregex ext)
-
-EOF
+ echo "CONFIGURE_ARGS+=--enable-mbregex"
;;
\"mbstring\")
echo "CONFIGURE_ARGS+=--enable-mbstring"
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 0fe5c8ab5563..27646bd7d6e7 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= mod_php4
-PORTVERSION= 4.1.2
+PORTVERSION= 4.2.0
PORTREVISION?= 0
CATEGORIES?= www
MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index 038be6430935..23140b4ee5c2 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-4.1.2.tar.gz) = 75a62553076c20e91d3be575ce158be2
+MD5 (php-4.2.0.tar.gz) = 88d55481de32ab0168aa580f7b611022
MD5 (php4_mbregex-1.2.1.tar.gz) = 46d151afa9ab668df880a70cf786a2c2
diff --git a/www/mod_php5/files/patch-at b/www/mod_php5/files/patch-at
deleted file mode 100644
index fbb234901747..000000000000
--- a/www/mod_php5/files/patch-at
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/pspell/pspell.c.orig Mon Feb 26 07:07:13 2001
-+++ ext/pspell/pspell.c Tue Jun 12 22:08:33 2001
-@@ -32,7 +32,7 @@
- #define USE_ORIGINAL_MANAGER_FUNCS
-
- #include "php_pspell.h"
--#include <pspell/pspell.h>
-+#include <pspell.h>
- #include "ext/standard/info.h"
-
- #define PSPELL_FAST 1L
diff --git a/www/mod_php5/files/patch-ext_domxml_php_domxml.c b/www/mod_php5/files/patch-ext_domxml_php_domxml.c
deleted file mode 100644
index 9992cffd8428..000000000000
--- a/www/mod_php5/files/patch-ext_domxml_php_domxml.c
+++ /dev/null
@@ -1,69 +0,0 @@
-===================================================================
-RCS file: /repository/php4/ext/domxml/php_domxml.c,v
-retrieving revision 1.67.2.9
-retrieving revision 1.90
-diff -p --unified=3 -r1.67.2.9 -r1.90
---- ext/domxml/php_domxml.c 2001/12/14 10:45:46 1.67.2.9
-+++ ext/domxml/php_domxml.c 2001/12/20 14:40:43 1.90
-@@ -16,7 +16,7 @@
- +----------------------------------------------------------------------+
- */
-
--/* $Id: php_domxml.c,v 1.67.2.9 2001/12/14 10:45:46 mfischer Exp $ */
-+/* $Id: php_domxml.c,v 1.90 2001/12/20 14:40:43 mfischer Exp $ */
-
-
- #ifdef HAVE_CONFIG_H
-@@ -411,9 +411,14 @@ static inline void node_list_wrapper_dto
- {
- while (node != NULL) {
- node_list_wrapper_dtor(node->children);
-- // FIXME temporary fix; think of something better
-- if (node->type != XML_ATTRIBUTE_DECL && node->type != XML_DTD_NODE) {
-- attr_list_wrapper_dtor(node->properties);
-+ switch (node->type) {
-+ /* Skip property freeing for the following types */
-+ case XML_ATTRIBUTE_DECL:
-+ case XML_DTD_NODE:
-+ case XML_ENTITY_DECL:
-+ break;
-+ default:
-+ attr_list_wrapper_dtor(node->properties);
- }
- node_wrapper_dtor(node);
- node = node->next;
-@@ -817,7 +822,6 @@ static zval *php_domobject_new(xmlNodePt
- xmlNodePtr nodep = obj;
- object_init_ex(wrapper, domxmlentityref_class_entry);
- rsrc_type = le_domxmlentityrefp;
-- content = xmlNodeGetContent(nodep);
- add_property_stringl(wrapper, "name", (char *) nodep->name, strlen(nodep->name), 1);
- break;
- }
-@@ -932,12 +936,12 @@ PHP_MINIT_FUNCTION(domxml)
- le_domxmlelementp = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domelement", module_number);
- le_domxmldtdp = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domdtd", module_number);
- le_domxmlcdatap = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domcdata", module_number);
-+ le_domxmlentityrefp = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domentityref", module_number);
-
- /* Not yet initialized le_*s */
- le_domxmldoctypep = -10000;
- le_domxmlpip = -10002;
- le_domxmlnotationp = -10003;
-- le_domxmlentityrefp = -10004;
-
- #if defined(LIBXML_XPATH_ENABLED)
- le_xpathctxp = zend_register_list_destructors_ex(php_free_xpath_context, NULL, "xpathcontext", module_number);
-@@ -1586,11 +1590,7 @@ PHP_FUNCTION(domxml_node_unlink_node)
- zval *id;
- xmlNode *nodep;
-
-- DOMXML_NO_ARGS();
--
-- DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep);
--
-- DOMXML_NO_ARGS();
-+ DOMXML_PARAM_NONE(nodep, id, le_domxmlnodep);
-
- xmlUnlinkNode(nodep);
- xmlFreeNode(nodep);
diff --git a/www/mod_php5/files/patch-ext_sybase_ct_config.m4 b/www/mod_php5/files/patch-ext_sybase_ct_config.m4
index 0c5f32e997d0..127a369b1085 100644
--- a/www/mod_php5/files/patch-ext_sybase_ct_config.m4
+++ b/www/mod_php5/files/patch-ext_sybase_ct_config.m4
@@ -1,21 +1,21 @@
---- ext/sybase_ct/config.m4.orig Wed Dec 19 19:36:23 2001
-+++ ext/sybase_ct/config.m4 Wed Dec 19 19:38:08 2001
-@@ -19,17 +19,12 @@
-
- PHP_ADD_INCLUDE($SYBASE_CT_INCDIR)
- PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
-- PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
- PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
-- PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD)
-- PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
-
-- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
-+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
-
- AC_CHECK_LIB(tcl, netg_errstr, [
- PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD)
-- ],[
-- PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
- ],[
- $SYBASE_CT_LIBS
- ])
+--- ext/sybase_ct/config.m4.orig Fri Nov 30 23:12:31 2001
++++ ext/sybase_ct/config.m4 Tue Apr 23 21:53:54 2002
+@@ -30,17 +30,12 @@
+ PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
+ else
+- PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
+ PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
+- PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD)
+- PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
+
+- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
++ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
+
+ PHP_CHECK_LIBRARY(tcl, netg_errstr, [
+ PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD)
+- ],[
+- PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
+ ],[
+ $SYBASE_CT_LIBS
+ ])
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 674317bf2b68..5b3e1a9e6dd4 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -307,20 +307,7 @@ while [ "$1" ]; do
echo "CONFIGURE_ARGS+=--with-pspell=\${LOCALBASE}"
;;
\"mbregex\")
- ${CAT} << EOF
-MASTER_SITES+= ftp://night.fminn.nagano.nagano.jp/php4/
-DISTFILES= \${DISTNAME}\${EXTRACT_SUFX} php4_mbregex-1.2.1.tar.gz
-CONFIGURE_ARGS+=--enable-mbregex
-BUILD_DEPENDS+= automake:\${PORTSDIR}/devel/automake
-BUILD_DEPENDS+= autoconf:\${PORTSDIR}/devel/autoconf
-POSTEXTRACT+= post-extract-mbregex
-
-post-extract-mbregex:
- [ -d \${WRKDIR}/mbregex ] && \\
- (cd \${WRKSRC}; \\
- \${MV} ${WRKDIR}/mbregex ext)
-
-EOF
+ echo "CONFIGURE_ARGS+=--enable-mbregex"
;;
\"mbstring\")
echo "CONFIGURE_ARGS+=--enable-mbstring"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 13:14:02 +0000