mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

Update to 5.2.9 release and re-add pcre extension.

Browse Source
This commit is contained in:
Alex Dupre 2009-03-06 10:08:35 +00:00
parent 2a025b77c3
commit c99d0d7337
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=229565
22 changed files with 138 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mk/bsd.php.mk
View File

@ -49,7 +49,6 @@ PHP_VER?= ${DEFAULT_PHP_VER}
PHP_EXT_DIR= 20020429
.else
PHP_EXT_DIR= 20060613
PHP_EXT_INC= pcre
.endif
HTTPD?= ${LOCALBASE}/sbin/httpd
@ -162,7 +161,9 @@ do-phpize:
@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${PHPBASE}/bin/phpize)
.endif
.if defined(USE_PHPEXT)
.endif
.if defined(_POSTMKINCLUDED) && defined(USE_PHPEXT)
PHP_MODNAME?= ${PORTNAME}
PHP_HEADER_DIRS?= ""
@ -230,8 +231,6 @@ php-ini:
@${ECHO_CMD} "****************************************************************************"
.endif
.endif
# Extensions
.if defined(_POSTMKINCLUDED) && ${USE_PHP:L} != "yes"
# non-version specific components

1
devel/Makefile
View File

@ -2123,6 +2123,7 @@
SUBDIR += php5-json
SUBDIR += php5-ncurses
SUBDIR += php5-pcntl
SUBDIR += php5-pcre
SUBDIR += php5-phing
SUBDIR += php5-readline
SUBDIR += php5-shmop

14
devel/php5-pcre/Makefile Normal file
View File

@ -0,0 +1,14 @@
# New ports collection makefile for: php5-pcre
# Date created: 7 Jul 2004
# Whom: Alex Dupre <ale@FreeBSD.org>
#
# $FreeBSD$
#
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php5
PKGNAMESUFFIX= -pcre
.include "${MASTERDIR}/Makefile"

13
devel/php5-pcre/files/patch-php_pcre.c Normal file
View File

@ -0,0 +1,13 @@
--- php_pcre.c.orig 2009-03-06 10:58:43.000000000 +0100
+++ php_pcre.c 2009-03-06 10:58:56.000000000 +0100
@@ -18,6 +18,10 @@
/* $Id: php_pcre.c,v 1.168.2.9.2.30 2009/01/13 19:23:31 andrei Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "php.h"
#include "php_ini.h"
#include "php_globals.h"

1
ftp/php5-curl/Makefile
View File

@ -10,6 +10,5 @@ CATEGORIES= ftp
MASTERDIR= ${.CURDIR}/../../lang/php5
PKGNAMESUFFIX= -curl
PORTREVISION= 1
.include "${MASTERDIR}/Makefile"

1
graphics/php5-gd/Makefile
View File

@ -5,7 +5,6 @@
# $FreeBSD$
#
PORTREVISION= 1
CATEGORIES= graphics
MASTERDIR= ${.CURDIR}/../../lang/php5

11
graphics/php5-gd/files/patch-libgd_gd.c
View File

@ -1,11 +0,0 @@
--- libgd/gd.c.orig 2009-01-05 14:54:19.000000000 +0100
+++ libgd/gd.c 2009-01-05 14:54:53.000000000 +0100
@@ -3136,7 +3136,7 @@
return NULL;
}
- if (!gdImageTrueColor(src) && clrBack>=gdImageColorsTotal(src)) {
+ if (!gdImageTrueColor(src) && (clrBack < 0 || clrBack>=gdImageColorsTotal(src))) {
return NULL;
}

6
lang/php5-extensions/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= php5
PORTVERSION= 1.2
PORTVERSION= 1.3
CATEGORIES= lang
MASTER_SITES= # none
PKGNAMESUFFIX= -extensions
@ -28,6 +28,7 @@ WITH_FILTER= yes
WITH_HASH= yes
WITH_ICONV= yes
WITH_JSON= yes
WITH_PCRE= yes
WITH_PDO= yes
WITH_PDO_SQLITE=yes
WITH_POSIX= yes
@ -73,6 +74,7 @@ OPTIONS= BCMATH "bc style precision math functions" off \
ODBC "unixODBC support" off \
OPENSSL "OpenSSL support" off \
PCNTL "pcntl support (CLI only)" off \
PCRE "Perl Compatible Regular Expression support" on \
PDF "PDFlib support (implies GD)" off \
PDO "PHP Data Objects Interface (PDO)" on \
PDO_SQLITE "PDO sqlite driver" on \
@ -117,7 +119,7 @@ ALL_OPTIONS= BCMATH BZ2 CALENDAR CTYPE CURL DBA DBASE \
DOM EXIF FILEINFO FILTER FRIBIDI FTP GD GETTEXT \
GMP HASH ICONV IMAP INTERBASE JSON LDAP MBSTRING MCRYPT \
MHASH MING MSSQL MYSQL MYSQLI NCURSES \
ODBC OPENSSL PCNTL PDF PDO PDO_SQLITE PGSQL POSIX \
ODBC OPENSSL PCNTL PCRE PDF PDO PDO_SQLITE PGSQL POSIX \
PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOAP \
SOCKETS SPL SQLITE SYBASE_CT SYSVMSG SYSVSEM SYSVSHM \
TIDY TOKENIZER WDDX XML XMLREADER XMLRPC XMLWRITER XSL \

16
lang/php5/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= php5
PORTVERSION= 5.2.8
PORTVERSION= 5.2.9
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
@ -22,16 +22,12 @@ USE_BZIP2= yes
.if !defined(PKGNAMESUFFIX)
USE_AUTOTOOLS= autoconf:262
# use bundled pcre while apache2 does the same
#LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
CONFIGURE_ARGS= \
--with-layout=GNU \
--with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \
--enable-libxml \
--with-libxml-dir=${LOCALBASE} \
--with-pcre-regex=yes \
--enable-reflection \
--program-prefix=""
@ -59,8 +55,7 @@ MAN1= php-config.1 phpize.1
PATCH_DIST_STRIP= -p1
.if !defined(WITHOUT_SUHOSIN)
#PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.6.3.patch.gz:suhosin
PATCHFILES+= suhosin-patch-5.2.7-0.9.6.3.patch.gz:suhosin
PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.7.patch.gz:suhosin
PATCH_SITES+= http://download.suhosin.org/:suhosin
PLIST_SUB+= SUHOSIN=""
.else
@ -68,7 +63,8 @@ PLIST_SUB+= SUHOSIN="@comment "
.endif
.if defined(WITH_MAILHEAD)
PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail
#PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail
PATCHFILES+= php-5.2.8-mail-header.patch:mail
PATCH_SITES+= http://choon.net/opensource/php/:mail
.endif
@ -163,10 +159,6 @@ post-build:
@${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf
@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
@${ECHO_CMD} "PHP_EXT_INC=pcre" >> ${WRKDIR}/php.conf
test: build
@(cd ${WRKSRC} && ${MAKE} test)
post-install:
@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc

35
lang/php5/Makefile.ext
View File

@ -75,7 +75,11 @@ CONFIGURE_ARGS+=--enable-exif
.endif
.if ${PHP_MODNAME} == "filter"
CONFIGURE_ARGS+=--enable-filter
CONFIGURE_ARGS+=--enable-filter \
--with-pcre-dir=${LOCALBASE}
USE_PHP= pcre
USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "ftp"
@ -245,6 +249,10 @@ USE_OPENSSL= yes
CONFIGURE_ARGS+=--enable-pcntl
.endif
.if ${PHP_MODNAME} == "pcre"
OPTIONS= BUNDLED_PCRE "Select if you use apache 2.0.x" off
.endif
.if ${PHP_MODNAME} == "pdo"
CONFIGURE_ARGS+=--enable-pdo
.endif
@ -392,7 +400,7 @@ CONFIGURE_ARGS+=--enable-spl \
USE_GNOME= libxml2
USE_PHP= simplexml
USE_PHP= pcre simplexml
USE_PHP_BUILD= yes
.endif
@ -459,7 +467,7 @@ USE_GNOME= libxml2
.endif
.if ${PHP_MODNAME} == "xmlreader"
CONFIGURE_ARGS+=--with-xmlreader \
CONFIGURE_ARGS+=--enable-xmlreader \
--with-libxml-dir=${LOCALBASE}
USE_GNOME= libxml2
@ -483,7 +491,7 @@ USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "xmlwriter"
CONFIGURE_ARGS+=--with-xmlwriter \
CONFIGURE_ARGS+=--enable-xmlwriter \
--with-libxml-dir=${LOCALBASE}
USE_GNOME= libxml2
@ -529,10 +537,10 @@ LIB_DEPENDS+= qdbm.14:${PORTSDIR}/databases/qdbm
CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
. endif
. if defined(WITHOUT_INIFILE)
CONFIGURE_ARGS+=--without-inifile
CONFIGURE_ARGS+=--disable-inifile
. endif
. if defined(WITHOUT_FLATFILE)
CONFIGURE_ARGS+=--without-flatfile
CONFIGURE_ARGS+=--disable-flatfile
. endif
.endif
@ -570,6 +578,21 @@ pre-configure:
/usr/bin/ar rcs liboci8.a *.o
.endif
.if ${PHP_MODNAME} == "pcre"
. if defined(WITH_BUNDLED_PCRE)
CONFIGURE_ARGS+=--with-pcre-regex=yes
PHP_HEADER_DIRS=pcrelib
. else
LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
CONFIGURE_ARGS+=--with-pcre-regex=${LOCALBASE}
. endif
post-extract:
@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
.endif
.if ${PHP_MODNAME} == "pdo_dblib"
.if defined(WITH_MSSQL)
LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds-msdblib

12
lang/php5/distinfo
View File

@ -1,9 +1,9 @@
MD5 (php-5.2.8.tar.bz2) = 8760a833cf10433d3e72271ab0d0eccf
SHA256 (php-5.2.8.tar.bz2) = a70600e13410213a637f1c9825e9c0d45c64de8cefb1929f8f5aa761b20b2b67
SIZE (php-5.2.8.tar.bz2) = 9827180
MD5 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = d455c3dd5b652046dbac2951a58f64fa
SHA256 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 85e6262f53014e393977d1efed2d3a7e686767a07f96b14b2c3f126f694aee46
SIZE (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 23125
MD5 (php-5.2.9.tar.bz2) = 280d6cda7f72a4fc6de42fda21ac2db7
SHA256 (php-5.2.9.tar.bz2) = 30166dda7c3d8bdcb2753ab79260be25454cdf3673d681b7651f8d32006ee2a6
SIZE (php-5.2.9.tar.bz2) = 10203122
MD5 (suhosin-patch-5.2.9-0.9.7.patch.gz) = f80dbcd2773a98da1dab0c73c3654895
SHA256 (suhosin-patch-5.2.9-0.9.7.patch.gz) = 6f7a86cff1cdd1007ba248292f6adfe3b7c01adfed56c2e937c87c60210bbc38
SIZE (suhosin-patch-5.2.9-0.9.7.patch.gz) = 23026
MD5 (php-5.2.8-mail-header.patch) = 74bf3a2a123c284f908c4f5483ebe886
SHA256 (php-5.2.8-mail-header.patch) = 9bd306145153a371f619d89996cb329bdc36791b22a50daf4afe7cc69c46dccb
SIZE (php-5.2.8-mail-header.patch) = 3381

11
lang/php5/files/patch-ext_date_lib_timelib_structs.h
View File

@ -1,11 +0,0 @@
--- ext/date/lib/timelib_structs.h.orig Wed Dec 7 11:11:39 2005
+++ ext/date/lib/timelib_structs.h Wed Dec 7 11:11:53 2005
@@ -21,7 +21,7 @@
#ifndef __TIMELIB_STRUCTS_H__
#define __TIMELIB_STRUCTS_H__
-#include <timelib_config.h>
+#include "timelib_config.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>

9
lang/php5/pkg-plist
View File

@ -72,13 +72,6 @@ include/php/ext/date/lib/timelib_config.h
include/php/ext/date/lib/timelib_structs.h
include/php/ext/date/php_date.h
include/php/ext/libxml/php_libxml.h
include/php/ext/pcre/pcrelib/config.h
include/php/ext/pcre/pcrelib/pcre.h
include/php/ext/pcre/pcrelib/pcre_internal.h
include/php/ext/pcre/pcrelib/pcreposix.h
include/php/ext/pcre/pcrelib/ucp.h
include/php/ext/pcre/pcrelib/ucptable.h
include/php/ext/pcre/php_pcre.h
include/php/ext/standard/base64.h
include/php/ext/standard/basic_functions.h
include/php/ext/standard/crc32.h
@ -206,8 +199,6 @@ lib/php/build/shtool
@dirrm include/php/ext/date/lib
@dirrm include/php/ext/date
@dirrm include/php/ext/libxml
@dirrm include/php/ext/pcre/pcrelib
@dirrm include/php/ext/pcre
@dirrm include/php/ext/standard
@dirrmtry include/php/ext
@dirrm include/php/main/streams

16
lang/php53/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= php5
PORTVERSION= 5.2.8
PORTVERSION= 5.2.9
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
@ -22,16 +22,12 @@ USE_BZIP2= yes
.if !defined(PKGNAMESUFFIX)
USE_AUTOTOOLS= autoconf:262
# use bundled pcre while apache2 does the same
#LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
CONFIGURE_ARGS= \
--with-layout=GNU \
--with-config-file-scan-dir=${PREFIX}/etc/php \
--disable-all \
--enable-libxml \
--with-libxml-dir=${LOCALBASE} \
--with-pcre-regex=yes \
--enable-reflection \
--program-prefix=""
@ -59,8 +55,7 @@ MAN1= php-config.1 phpize.1
PATCH_DIST_STRIP= -p1
.if !defined(WITHOUT_SUHOSIN)
#PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.6.3.patch.gz:suhosin
PATCHFILES+= suhosin-patch-5.2.7-0.9.6.3.patch.gz:suhosin
PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.7.patch.gz:suhosin
PATCH_SITES+= http://download.suhosin.org/:suhosin
PLIST_SUB+= SUHOSIN=""
.else
@ -68,7 +63,8 @@ PLIST_SUB+= SUHOSIN="@comment "
.endif
.if defined(WITH_MAILHEAD)
PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail
#PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail
PATCHFILES+= php-5.2.8-mail-header.patch:mail
PATCH_SITES+= http://choon.net/opensource/php/:mail
.endif
@ -163,10 +159,6 @@ post-build:
@${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf
@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
@${ECHO_CMD} "PHP_EXT_INC=pcre" >> ${WRKDIR}/php.conf
test: build
@(cd ${WRKSRC} && ${MAKE} test)
post-install:
@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc

35
lang/php53/Makefile.ext
View File

@ -75,7 +75,11 @@ CONFIGURE_ARGS+=--enable-exif
.endif
.if ${PHP_MODNAME} == "filter"
CONFIGURE_ARGS+=--enable-filter
CONFIGURE_ARGS+=--enable-filter \
--with-pcre-dir=${LOCALBASE}
USE_PHP= pcre
USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "ftp"
@ -245,6 +249,10 @@ USE_OPENSSL= yes
CONFIGURE_ARGS+=--enable-pcntl
.endif
.if ${PHP_MODNAME} == "pcre"
OPTIONS= BUNDLED_PCRE "Select if you use apache 2.0.x" off
.endif
.if ${PHP_MODNAME} == "pdo"
CONFIGURE_ARGS+=--enable-pdo
.endif
@ -392,7 +400,7 @@ CONFIGURE_ARGS+=--enable-spl \
USE_GNOME= libxml2
USE_PHP= simplexml
USE_PHP= pcre simplexml
USE_PHP_BUILD= yes
.endif
@ -459,7 +467,7 @@ USE_GNOME= libxml2
.endif
.if ${PHP_MODNAME} == "xmlreader"
CONFIGURE_ARGS+=--with-xmlreader \
CONFIGURE_ARGS+=--enable-xmlreader \
--with-libxml-dir=${LOCALBASE}
USE_GNOME= libxml2
@ -483,7 +491,7 @@ USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "xmlwriter"
CONFIGURE_ARGS+=--with-xmlwriter \
CONFIGURE_ARGS+=--enable-xmlwriter \
--with-libxml-dir=${LOCALBASE}
USE_GNOME= libxml2
@ -529,10 +537,10 @@ LIB_DEPENDS+= qdbm.14:${PORTSDIR}/databases/qdbm
CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
. endif
. if defined(WITHOUT_INIFILE)
CONFIGURE_ARGS+=--without-inifile
CONFIGURE_ARGS+=--disable-inifile
. endif
. if defined(WITHOUT_FLATFILE)
CONFIGURE_ARGS+=--without-flatfile
CONFIGURE_ARGS+=--disable-flatfile
. endif
.endif
@ -570,6 +578,21 @@ pre-configure:
/usr/bin/ar rcs liboci8.a *.o
.endif
.if ${PHP_MODNAME} == "pcre"
. if defined(WITH_BUNDLED_PCRE)
CONFIGURE_ARGS+=--with-pcre-regex=yes
PHP_HEADER_DIRS=pcrelib
. else
LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
CONFIGURE_ARGS+=--with-pcre-regex=${LOCALBASE}
. endif
post-extract:
@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
.endif
.if ${PHP_MODNAME} == "pdo_dblib"
.if defined(WITH_MSSQL)
LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds-msdblib

12
lang/php53/distinfo
View File

@ -1,9 +1,9 @@
MD5 (php-5.2.8.tar.bz2) = 8760a833cf10433d3e72271ab0d0eccf
SHA256 (php-5.2.8.tar.bz2) = a70600e13410213a637f1c9825e9c0d45c64de8cefb1929f8f5aa761b20b2b67
SIZE (php-5.2.8.tar.bz2) = 9827180
MD5 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = d455c3dd5b652046dbac2951a58f64fa
SHA256 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 85e6262f53014e393977d1efed2d3a7e686767a07f96b14b2c3f126f694aee46
SIZE (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 23125
MD5 (php-5.2.9.tar.bz2) = 280d6cda7f72a4fc6de42fda21ac2db7
SHA256 (php-5.2.9.tar.bz2) = 30166dda7c3d8bdcb2753ab79260be25454cdf3673d681b7651f8d32006ee2a6
SIZE (php-5.2.9.tar.bz2) = 10203122
MD5 (suhosin-patch-5.2.9-0.9.7.patch.gz) = f80dbcd2773a98da1dab0c73c3654895
SHA256 (suhosin-patch-5.2.9-0.9.7.patch.gz) = 6f7a86cff1cdd1007ba248292f6adfe3b7c01adfed56c2e937c87c60210bbc38
SIZE (suhosin-patch-5.2.9-0.9.7.patch.gz) = 23026
MD5 (php-5.2.8-mail-header.patch) = 74bf3a2a123c284f908c4f5483ebe886
SHA256 (php-5.2.8-mail-header.patch) = 9bd306145153a371f619d89996cb329bdc36791b22a50daf4afe7cc69c46dccb
SIZE (php-5.2.8-mail-header.patch) = 3381

11
lang/php53/files/patch-ext_date_lib_timelib_structs.h
View File

@ -1,11 +0,0 @@
--- ext/date/lib/timelib_structs.h.orig Wed Dec 7 11:11:39 2005
+++ ext/date/lib/timelib_structs.h Wed Dec 7 11:11:53 2005
@@ -21,7 +21,7 @@
#ifndef __TIMELIB_STRUCTS_H__
#define __TIMELIB_STRUCTS_H__
-#include <timelib_config.h>
+#include "timelib_config.h"
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>

9
lang/php53/pkg-plist
View File

@ -72,13 +72,6 @@ include/php/ext/date/lib/timelib_config.h
include/php/ext/date/lib/timelib_structs.h
include/php/ext/date/php_date.h
include/php/ext/libxml/php_libxml.h
include/php/ext/pcre/pcrelib/config.h
include/php/ext/pcre/pcrelib/pcre.h
include/php/ext/pcre/pcrelib/pcre_internal.h
include/php/ext/pcre/pcrelib/pcreposix.h
include/php/ext/pcre/pcrelib/ucp.h
include/php/ext/pcre/pcrelib/ucptable.h
include/php/ext/pcre/php_pcre.h
include/php/ext/standard/base64.h
include/php/ext/standard/basic_functions.h
include/php/ext/standard/crc32.h
@ -206,8 +199,6 @@ lib/php/build/shtool
@dirrm include/php/ext/date/lib
@dirrm include/php/ext/date
@dirrm include/php/ext/libxml
@dirrm include/php/ext/pcre/pcrelib
@dirrm include/php/ext/pcre
@dirrm include/php/ext/standard
@dirrmtry include/php/ext
@dirrm include/php/main/streams

11
mail/php5-imap/files/patch-php_imap.c
View File

@ -1,11 +0,0 @@
--- php_imap.c.orig 2008-12-30 11:06:18.000000000 +0100
+++ php_imap.c 2008-12-30 11:06:56.000000000 +0100
@@ -2172,7 +2172,7 @@
/* rfc822_parse_adrlist() modifies passed string. Copy it. */
str_copy = estrndup(Z_STRVAL_PP(str), Z_STRLEN_PP(str));
- rfc822_parse_adrlist(&env->to, str_copy, defaulthost);
+ rfc822_parse_adrlist(&env->to, str_copy, Z_STRVAL_PP(defaulthost));
efree(str_copy);
array_init(return_value);

1
net-mgmt/php5-snmp/Makefile
View File

@ -5,7 +5,6 @@
# $FreeBSD$
#
PORTREVISION= 2
CATEGORIES= net-mgmt
MASTERDIR= ${.CURDIR}/../../lang/php5

1
net/php5-ldap/Makefile
View File

@ -5,7 +5,6 @@
# $FreeBSD$
#
PORTREVISION= 1
CATEGORIES= net
MASTERDIR= ${.CURDIR}/../../lang/php5

25
security/php5-filter/files/patch-config.m4 Normal file
View File

@ -0,0 +1,25 @@
--- config.m4.orig 2009-03-06 08:25:45.000000000 +0100
+++ config.m4 2009-03-06 08:28:10.000000000 +0100
@@ -19,7 +19,7 @@
CPPFLAGS=$INCLUDES
AC_EGREP_CPP(yes,[
#include <main/php_config.h>
-#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
+#if defined(HAVE_BUNDLED_PCRE)
yes
#endif
],[
@@ -27,11 +27,12 @@
],[
AC_EGREP_CPP(yes,[
#include <main/php_config.h>
-#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
+#if defined(HAVE_PCRE)
yes
#endif
],[
PHP_PCRE_REGEX=pecl
+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
],[
PHP_PCRE_REGEX=no
])