summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/php-mysql/Makefile3
-rw-r--r--databases/php-mysqli/Makefile3
-rw-r--r--databases/php-pdo_mysql/Makefile3
-rw-r--r--lang/php5/Makefile.common4
-rw-r--r--lang/php5/distinfo11
-rw-r--r--lang/php53/Makefile.common4
-rw-r--r--lang/php53/distinfo13
-rw-r--r--lang/php53/patches/patch-ab24
-rw-r--r--www/ap-php/Makefile3
-rw-r--r--www/php-eaccelerator/Makefile3
10 files changed, 30 insertions, 41 deletions
diff --git a/databases/php-mysql/Makefile b/databases/php-mysql/Makefile
index 3a15f364f71..7c9de40441a 100644
--- a/databases/php-mysql/Makefile
+++ b/databases/php-mysql/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2010/09/30 10:49:15 obache Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2010/12/23 10:10:55 sbd Exp $
MODNAME= mysql
-PKGREVISION= 1
CATEGORIES+= databases
COMMENT= PHP extension for MySQL databases
diff --git a/databases/php-mysqli/Makefile b/databases/php-mysqli/Makefile
index 65b20d402ac..7072f10e28d 100644
--- a/databases/php-mysqli/Makefile
+++ b/databases/php-mysqli/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2010/09/30 10:49:16 obache Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2010/12/23 10:10:55 sbd Exp $
MODNAME= mysqli
-PKGREVISION= 1
CATEGORIES+= databases
COMMENT= PHP5 extension for MySQL 4.1 and later databases
diff --git a/databases/php-pdo_mysql/Makefile b/databases/php-pdo_mysql/Makefile
index a04fa57a405..ad5f4754c08 100644
--- a/databases/php-pdo_mysql/Makefile
+++ b/databases/php-pdo_mysql/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2010/09/30 10:49:15 obache Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2010/12/23 10:10:55 sbd Exp $
MODNAME= pdo_mysql
-PKGREVISION= 1
CATEGORIES+= databases
COMMENT= PHP extension for PHP Data Objects (MySQL)
diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common
index 8b05c9261cd..dce070f0e39 100644
--- a/lang/php5/Makefile.common
+++ b/lang/php5/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2010/07/24 22:23:15 tron Exp $
+# $NetBSD: Makefile.common,v 1.42.2.1 2010/12/23 10:10:54 sbd Exp $
# used by lang/php5/Makefile.php
# used by lang/php/ext.mk
# used by meta-pkgs/php5-extensions/Makefile
@@ -41,7 +41,7 @@ EXTRACT_SUFX?= .tar.bz2
MAINTAINER?= jdolecek@NetBSD.org
HOMEPAGE?= http://www.php.net/
-PHP_BASE_VERS= 5.2.14
+PHP_BASE_VERS= 5.2.16
PHP_EXTENSION_DIR= lib/php/20040412
PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 0e3ec25b6df..d5c907c3ae2 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.79 2010/07/24 22:23:15 tron Exp $
+$NetBSD: distinfo,v 1.79.2.1 2010/12/23 10:10:54 sbd Exp $
-SHA1 (php-5.2.14/php-5.2.14.tar.bz2) = 311b44b2c0f2eea8ab8dab876d2a6b6e7a55632e
-RMD160 (php-5.2.14/php-5.2.14.tar.bz2) = f699488f5b266a1c5e36df570c4d5896dc4e0aea
-Size (php-5.2.14/php-5.2.14.tar.bz2) = 9055945 bytes
-SHA1 (php-5.2.14/suhosin-patch-5.2.14-0.9.7.patch.gz) = 0a12d3589f9c26dc7d6b6452ef7987b2e6527a30
-RMD160 (php-5.2.14/suhosin-patch-5.2.14-0.9.7.patch.gz) = bc7790cd36dc4101322684b754db3ca2d4385ba6
-Size (php-5.2.14/suhosin-patch-5.2.14-0.9.7.patch.gz) = 23057 bytes
+SHA1 (php-5.2.16/php-5.2.16.tar.bz2) = b4d11c6593614fa4ad8bf133f622208ee5e8e9af
+RMD160 (php-5.2.16/php-5.2.16.tar.bz2) = 2ab6de444af478f3b2b3a8a074c1656e8da0a4e1
+Size (php-5.2.16/php-5.2.16.tar.bz2) = 9090930 bytes
SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20
SHA1 (patch-af) = 68c5a31dccf1854ba1aff653e4c524767d6a64f6
SHA1 (patch-ag) = 5e3e822657925a77fbccaca63f283863a1cc6d94
diff --git a/lang/php53/Makefile.common b/lang/php53/Makefile.common
index 20440975e68..85934e5e9df 100644
--- a/lang/php53/Makefile.common
+++ b/lang/php53/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2010/07/24 22:23:37 tron Exp $
+# $NetBSD: Makefile.common,v 1.2.2.1 2010/12/23 10:10:54 sbd Exp $
# used by lang/php53/Makefile.php
# used by lang/php/ext.mk
# used by meta-pkgs/php53-extensions/Makefile
@@ -39,7 +39,7 @@ EXTRACT_SUFX?= .tar.bz2
MAINTAINER?= pkgsrc-users@NetBSD.org
HOMEPAGE?= http://www.php.net/
-PHP_BASE_VERS= 5.3.3
+PHP_BASE_VERS= 5.3.4
PHP_EXTENSION_DIR= lib/php/20090630
PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 4995e348c53..64311fce55b 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.6 2010/07/24 22:23:37 tron Exp $
+$NetBSD: distinfo,v 1.6.2.1 2010/12/23 10:10:54 sbd Exp $
-SHA1 (php-5.3.3/php-5.3.3.tar.bz2) = 9f66716b341119e4e4f8fe3d81b7d0a5daf3cbc8
-RMD160 (php-5.3.3/php-5.3.3.tar.bz2) = 9edb51663feac9b787f8382012893f1ac98fec6a
-Size (php-5.3.3/php-5.3.3.tar.bz2) = 10662227 bytes
-SHA1 (php-5.3.3/suhosin-patch-5.3.3-0.9.10.patch.gz) = 76675242cfdeff763767900213346af622002490
-RMD160 (php-5.3.3/suhosin-patch-5.3.3-0.9.10.patch.gz) = 8dcd8b51ea0357b6cc51e70e495e18f341c62f7c
-Size (php-5.3.3/suhosin-patch-5.3.3-0.9.10.patch.gz) = 41298 bytes
+SHA1 (php-5.3.4/php-5.3.4.tar.bz2) = 0b33926e78e1683e3383b3b5c840ee60ba669b0b
+RMD160 (php-5.3.4/php-5.3.4.tar.bz2) = dffbeced87117fd34c948de3ebdde01a25c24dae
+Size (php-5.3.4/php-5.3.4.tar.bz2) = 10804376 bytes
SHA1 (patch-aa) = f51491af7c577f36979fc07d52b5857368392e09
-SHA1 (patch-ab) = 8ac388f50afc03f3f4eacbfed42ae295a2e8d700
+SHA1 (patch-ab) = 7aeb5148056e7f0b150388c4cf60a139f6aeec44
SHA1 (patch-ac) = a896371d3343c07a5cf46c79d9ca9e1b2164797a
SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881
SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56
diff --git a/lang/php53/patches/patch-ab b/lang/php53/patches/patch-ab
index ad8856baaaf..66735d6c9e2 100644
--- a/lang/php53/patches/patch-ab
+++ b/lang/php53/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2010/07/24 22:23:37 tron Exp $
+$NetBSD: patch-ab,v 1.2.2.1 2010/12/23 10:10:54 sbd Exp $
---- configure.orig 2010-07-24 22:35:41.000000000 +0100
-+++ configure 2010-07-24 22:39:23.000000000 +0100
-@@ -13778,7 +13778,7 @@
+--- configure.orig 2010-12-08 21:46:58.000000000 +0000
++++ configure
+@@ -13699,7 +13699,7 @@ EOF
PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH"
- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
+ INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php"
- PHP_SAPI=cgi
-
-@@ -23206,7 +23206,7 @@
+ if test "$PHP_SAPI" != "default"; then
+ { echo "configure: error:
+@@ -22963,7 +22963,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.2 2010/07/24 22:23:37 tron Exp $
fi
for i in $PHP_OPENSSL_DIR; do
-@@ -25179,7 +25179,7 @@
+@@ -24930,7 +24930,7 @@ echo "configure:24910: checking bundled
PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.2 2010/07/24 22:23:37 tron Exp $
unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -36124,7 +36124,7 @@
+@@ -35788,7 +35788,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.2 2010/07/24 22:23:37 tron Exp $
fi
for i in $PHP_OPENSSL_DIR; do
-@@ -50201,7 +50201,7 @@
+@@ -49814,7 +49814,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -47,7 +47,7 @@ $NetBSD: patch-ab,v 1.2 2010/07/24 22:23:37 tron Exp $
fi
for i in $PHP_OPENSSL_DIR; do
-@@ -84421,7 +84421,7 @@
+@@ -83900,7 +83900,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -56,7 +56,7 @@ $NetBSD: patch-ab,v 1.2 2010/07/24 22:23:37 tron Exp $
fi
for i in $PHP_OPENSSL_DIR; do
-@@ -107682,12 +107682,7 @@
+@@ -107040,12 +107040,7 @@ old_CC=$CC
if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
diff --git a/www/ap-php/Makefile b/www/ap-php/Makefile
index 7a69e24bba9..28648d5a3a5 100644
--- a/www/ap-php/Makefile
+++ b/www/ap-php/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/03/16 15:36:39 taca Exp $
+# $NetBSD: Makefile,v 1.23.6.1 2010/12/23 10:10:55 sbd Exp $
#
PKGNAME= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-${PHP_BASE_VERS}
-PKGREVISION= 1
COMMENT= Apache (${PKG_APACHE}) module for ${PKG_PHP}
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/www/php-eaccelerator/Makefile b/www/php-eaccelerator/Makefile
index 8be747d6408..272dd05e290 100644
--- a/www/php-eaccelerator/Makefile
+++ b/www/php-eaccelerator/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2010/10/02 19:11:35 jdolecek Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2010/12/23 10:10:55 sbd Exp $
MODNAME= eaccelerator
PECL_VERSION= 0.9.6
-PKGREVISION= 1
CATEGORIES+= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eaccelerator/} \
http://bart.eaccelerator.net/source/${PECL_VERSION}/