diff options
| -rw-r--r-- | databases/php52-dba/files/patch-config.m4 | 23 | ||||
| -rw-r--r-- | databases/php52-sybase_ct/files/patch-config.m4 | 11 | ||||
| -rw-r--r-- | lang/php52/Makefile | 5 | ||||
| -rw-r--r-- | lang/php52/distinfo | 18 | ||||
| -rw-r--r-- | math/php52-gmp/Makefile | 2 |
5 files changed, 20 insertions, 39 deletions
diff --git a/databases/php52-dba/files/patch-config.m4 b/databases/php52-dba/files/patch-config.m4 index 02761b927e42..6c5485dcbb47 100644 --- a/databases/php52-dba/files/patch-config.m4 +++ b/databases/php52-dba/files/patch-config.m4 @@ -1,9 +1,13 @@ ---- config.m4.orig 2007-12-06 15:17:43.000000000 +0100 -+++ config.m4 2008-12-11 12:50:27.000000000 +0100 -@@ -280,6 +280,34 @@ +--- config.m4.orig 2010-07-26 00:28:32.111202104 +0200 ++++ config.m4 2010-07-26 00:28:35.656577336 +0200 +@@ -280,6 +280,38 @@ THIS_PREFIX=$i THIS_INCLUDE=$i/db4/db.h break ++ elif test -f "$i/include/db48/db.h"; then ++ THIS_PREFIX=$i ++ THIS_INCLUDE=$i/include/db48/db.h ++ break + elif test -f "$i/include/db47/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db47/db.h @@ -32,15 +36,6 @@ + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db41/db.h + break - elif test -f "$i/include/db4.6/db.h"; then + elif test -f "$i/include/db4.8/db.h"; then THIS_PREFIX=$i - THIS_INCLUDE=$i/include/db4.6/db.h -@@ -306,7 +334,7 @@ - break - fi - done -- PHP_DBA_DB_CHECK(4, db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) -+ PHP_DBA_DB_CHECK(4, db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) - fi - PHP_DBA_STD_RESULT(db4,Berkeley DB4) - + THIS_INCLUDE=$i/include/db4.8/db.h diff --git a/databases/php52-sybase_ct/files/patch-config.m4 b/databases/php52-sybase_ct/files/patch-config.m4 deleted file mode 100644 index ef121d7c4730..000000000000 --- a/databases/php52-sybase_ct/files/patch-config.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- config.m4.orig 2009-03-26 09:53:49.000000000 +0100 -+++ config.m4 2009-03-26 09:55:35.000000000 +0100 -@@ -31,7 +31,7 @@ - fi - - PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD) -- if test -f $SYBASE_CT_INCDIR/tds.h; then -+ if test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then - PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD) - SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" - else diff --git a/lang/php52/Makefile b/lang/php52/Makefile index 2d0d78b7fda0..d26d65b89b2a 100644 --- a/lang/php52/Makefile +++ b/lang/php52/Makefile @@ -6,8 +6,7 @@ # PORTNAME= php52 -PORTVERSION= 5.2.13 -PORTREVISION= 4 +PORTVERSION= 5.2.14 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions @@ -60,7 +59,7 @@ PATCH_DIST_STRIP= -p1 . if defined(WITHOUT_FASTCGI) IGNORE= FPM requires FastCGI support . endif -PATCHFILES+= php-5.2.13-fpm-0.5.14-freebsd.patch.gz +PATCHFILES+= php-${PORTVERSION}-fpm-0.5.14-freebsd.patch.gz PATCH_SITES+= ${MASTER_SITE_LOCAL} PATCH_SITE_SUBDIR+= mm LIB_DEPENDS+= event-1.4:${PORTSDIR}/devel/libevent diff --git a/lang/php52/distinfo b/lang/php52/distinfo index af75a800f56a..3777946eb4ce 100644 --- a/lang/php52/distinfo +++ b/lang/php52/distinfo @@ -1,12 +1,12 @@ -MD5 (php-5.2.13.tar.bz2) = eb4d0766dc4fb9667f05a68b6041e7d1 -SHA256 (php-5.2.13.tar.bz2) = 2b50a2535e3bb9a98cd4d1633f9452d877276c40b385915261f040d535c7eadb -SIZE (php-5.2.13.tar.bz2) = 9084518 -MD5 (php-5.2.13-fpm-0.5.14-freebsd.patch.gz) = 74d8888de5ffcec18ba066d81bd20cea -SHA256 (php-5.2.13-fpm-0.5.14-freebsd.patch.gz) = bef7e8395e8602c3b73acd478d6ac0729ef1113c610db048b29224ab2b5e2655 -SIZE (php-5.2.13-fpm-0.5.14-freebsd.patch.gz) = 100550 -MD5 (suhosin-patch-5.2.13-0.9.7.patch.gz) = 8188e119ce7abce98b8f004de46fbac5 -SHA256 (suhosin-patch-5.2.13-0.9.7.patch.gz) = 787743e5d201ab2ce3fcc3f252eedd7f167470fa1f55af0646d7f03aab89d184 -SIZE (suhosin-patch-5.2.13-0.9.7.patch.gz) = 22989 +MD5 (php-5.2.14.tar.bz2) = bfdfc0e62fe437020cc04078269d1414 +SHA256 (php-5.2.14.tar.bz2) = 515b5fd41258798d59b93d86b0d752ab0b03e5738c32af444fba1907763c2bd1 +SIZE (php-5.2.14.tar.bz2) = 9055945 +MD5 (php-5.2.14-fpm-0.5.14-freebsd.patch.gz) = 4f619a6189a8002813070ba70a93062b +SHA256 (php-5.2.14-fpm-0.5.14-freebsd.patch.gz) = 354ce451417d14ef47761ae55147e9cee30fa0ff6f59447da021194c539f4d7f +SIZE (php-5.2.14-fpm-0.5.14-freebsd.patch.gz) = 43550 +MD5 (suhosin-patch-5.2.14-0.9.7.patch.gz) = 84cf0142b8a3637b8784b5ee1e6cbc07 +SHA256 (suhosin-patch-5.2.14-0.9.7.patch.gz) = bd03ade44673f7e6fa116d746350f16c60be7170d6c41816a2d51faaeb5a31ae +SIZE (suhosin-patch-5.2.14-0.9.7.patch.gz) = 23057 MD5 (php-5.2.10-mail-header.patch) = 7f73682e78d32e22989c3fb3678d668b SHA256 (php-5.2.10-mail-header.patch) = a61d50540f4aae32390118453845c380fe935b6d1e46cef6819c8561946e942f SIZE (php-5.2.10-mail-header.patch) = 3383 diff --git a/math/php52-gmp/Makefile b/math/php52-gmp/Makefile index 750ab322ddbd..d48e2865920f 100644 --- a/math/php52-gmp/Makefile +++ b/math/php52-gmp/Makefile @@ -5,8 +5,6 @@ # $FreeBSD$ # -PORTREVISION= 1 - CATEGORIES= math MASTERDIR= ${.CURDIR}/../../lang/php52 |