From 3c73cf2bd36aeae3bd178422f5e62da7bf471d06 Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Fri, 20 Jul 2012 12:30:36 +0000
Subject: - Reset PKG_REVISION by both php53 and php54 are updated. - Remove
 supporting php5 (PHP 5.2.x) supporting codes.

---
 archivers/php-zip/Makefile        | 9 +--------
 databases/php-dba/Makefile        | 3 +--
 databases/php-mssql/Makefile      | 3 +--
 databases/php-pdo_dblib/Makefile  | 3 +--
 databases/php-pdo_sqlite/Makefile | 3 +--
 databases/php-sqlite/Makefile     | 8 +-------
 devel/php-gettext/Makefile        | 3 +--
 devel/php-shmop/Makefile          | 3 +--
 graphics/php-exif/Makefile        | 3 +--
 graphics/php-gd/Makefile          | 3 +--
 net/php-soap/Makefile             | 3 +--
 net/php-xmlrpc/Makefile           | 3 +--
 textproc/php-dom/Makefile         | 3 +--
 textproc/php-intl/Makefile        | 3 +--
 textproc/php-pspell/Makefile      | 3 +--
 textproc/php-wddx/Makefile        | 3 +--
 textproc/php-xsl/Makefile         | 3 +--
 www/ap-php/Makefile               | 3 +--
 www/php-curl/Makefile             | 3 +--
 19 files changed, 19 insertions(+), 49 deletions(-)

diff --git a/archivers/php-zip/Makefile b/archivers/php-zip/Makefile
index df740326375..6830d3cb5a7 100644
--- a/archivers/php-zip/Makefile
+++ b/archivers/php-zip/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2012/06/16 02:49:39 taca Exp $
+# $NetBSD: Makefile,v 1.15 2012/07/20 12:30:36 taca Exp $
 
 MODNAME=		zip
-PKGREVISION=		2
 CATEGORIES+=		archivers
 COMMENT=		PHP extension for ZIP archive handling
 
@@ -13,12 +12,6 @@ CONFIGURE_ARGS+=	--enable-zip
 CONFIGURE_ARGS+=	--with-zlib-dir=${BUILDLINK_PREFIX.zlib}
 USE_PHP_EXT_PATCHES=	yes
 
-# Remove these PKGNAME tweak after PHP 5.2.18 release (after support of php52)
-.include "../../lang/php/phpversion.mk"
-.if ${PHP_BASE_VERS} == "5.2.17"
-PKGNAME:=		${PHP_PKG_PREFIX}-${MODNAME}-${PHP_BASE_VERS}.1.8.11
-.endif
-
 .include "../../lang/php/ext.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-dba/Makefile b/databases/php-dba/Makefile
index c4e2f5906d8..7bd44b1a954 100644
--- a/databases/php-dba/Makefile
+++ b/databases/php-dba/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2012/01/24 09:10:59 sbd Exp $
+# $NetBSD: Makefile,v 1.15 2012/07/20 12:30:36 taca Exp $
 
 MODNAME=		dba
-PKGREVISION=		2
 CATEGORIES+=		databases
 COMMENT=		PHP extension for DBM database access
 
diff --git a/databases/php-mssql/Makefile b/databases/php-mssql/Makefile
index c781cbd6686..05c25937434 100644
--- a/databases/php-mssql/Makefile
+++ b/databases/php-mssql/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2011/04/22 13:43:13 obache Exp $
+# $NetBSD: Makefile,v 1.14 2012/07/20 12:30:36 taca Exp $
 
 MODNAME=		mssql
-PKGREVISION=		1
 CATEGORIES+=		databases
 COMMENT=		PHP extension for MS SQL databases
 
diff --git a/databases/php-pdo_dblib/Makefile b/databases/php-pdo_dblib/Makefile
index 13e041af5c5..f03133ba6cd 100644
--- a/databases/php-pdo_dblib/Makefile
+++ b/databases/php-pdo_dblib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2011/04/22 13:43:14 obache Exp $
+# $NetBSD: Makefile,v 1.15 2012/07/20 12:30:36 taca Exp $
 
 MODNAME=		pdo_dblib
-PKGREVISION=		1
 CATEGORIES+=		databases
 COMMENT=		PHP extension for PHP Data Objects (FreeTDS/Sybase/MS SQL)
 
diff --git a/databases/php-pdo_sqlite/Makefile b/databases/php-pdo_sqlite/Makefile
index 376b6bd3c3f..e7a45834f9e 100644
--- a/databases/php-pdo_sqlite/Makefile
+++ b/databases/php-pdo_sqlite/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2012/04/27 12:31:39 obache Exp $
+# $NetBSD: Makefile,v 1.12 2012/07/20 12:30:36 taca Exp $
 
 MODNAME=		pdo_sqlite
-PKGREVISION=		2
 CATEGORIES+=		databases
 COMMENT=		PHP extension for PHP Data Objects (SQLite v3)
 
diff --git a/databases/php-sqlite/Makefile b/databases/php-sqlite/Makefile
index 529d43f875d..1cf85330066 100644
--- a/databases/php-sqlite/Makefile
+++ b/databases/php-sqlite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/06/16 22:34:23 dholland Exp $
+# $NetBSD: Makefile,v 1.16 2012/07/20 12:30:36 taca Exp $
 
 MODNAME=		sqlite
 CATEGORIES+=		databases
@@ -12,12 +12,6 @@ PHP_VERSIONS_ACCEPTED=	53
 
 .include "../../lang/php/phpversion.mk"
 
-# Remove these PKGNAME tweak after PHP 5.2.18 (or end of supporting php52)
-# *AND* after PHP 5.3.14 release
-.if ${PHP_BASE_VERS} == "5.2.17" || ${PHP_BASE_VERS} == "5.3.14"
-PKGNAME=		${PHP_PKG_PREFIX}-${MODNAME}-${PHP_BASE_VERS}.1.0.3
-.endif
-
 CONFIGURE_ARGS+=	--with-${PKGMODNAME}=shared,${BUILDLINK_PREFIX.sqlite}
 CONFIGURE_ENV+=		PHP_PDO=no
 
diff --git a/devel/php-gettext/Makefile b/devel/php-gettext/Makefile
index d9772691425..bc7401c361a 100644
--- a/devel/php-gettext/Makefile
+++ b/devel/php-gettext/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2011/04/22 13:43:22 obache Exp $
+# $NetBSD: Makefile,v 1.11 2012/07/20 12:30:36 taca Exp $
 
 MODNAME=		gettext
-PKGREVISION=		1
 CATEGORIES+=		devel
 COMMENT=		PHP extension for gettext support
 
diff --git a/devel/php-shmop/Makefile b/devel/php-shmop/Makefile
index b3d29b791d0..2b931aedce9 100644
--- a/devel/php-shmop/Makefile
+++ b/devel/php-shmop/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2011/03/21 16:08:28 taca Exp $
+# $NetBSD: Makefile,v 1.11 2012/07/20 12:30:36 taca Exp $
 
 MODNAME=		shmop
-PKGREVISION=		1
 CATEGORIES+=		devel
 COMMENT=		PHP extension for simple SysV shared memory operations
 
diff --git a/graphics/php-exif/Makefile b/graphics/php-exif/Makefile
index 4142b80c28d..964303ce48c 100644
--- a/graphics/php-exif/Makefile
+++ b/graphics/php-exif/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2011/02/22 07:36:08 taca Exp $
+# $NetBSD: Makefile,v 1.11 2012/07/20 12:30:36 taca Exp $
 
 MODNAME=		exif
-PKGREVISION=		2
 CATEGORIES+=		graphics
 COMMENT=		PHP extension to extract information from EXIF headers
 
diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile
index b274c22a3cb..2bb7c22cc71 100644
--- a/graphics/php-gd/Makefile
+++ b/graphics/php-gd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2011/11/01 06:01:42 sbd Exp $
+# $NetBSD: Makefile,v 1.28 2012/07/20 12:30:37 taca Exp $
 
 MODNAME=		gd
-PKGREVISION=		2
 CATEGORIES+=		graphics
 COMMENT=		PHP extension for GD graphics library
 
diff --git a/net/php-soap/Makefile b/net/php-soap/Makefile
index a1c47b46724..d27f17ab020 100644
--- a/net/php-soap/Makefile
+++ b/net/php-soap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/06/14 07:45:30 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/07/20 12:30:37 taca Exp $
 
 MODNAME=		soap
-PKGREVISION=		1
 CATEGORIES+=		net
 COMMENT=		PHP5 extension for SOAP functions
 
diff --git a/net/php-xmlrpc/Makefile b/net/php-xmlrpc/Makefile
index eb52e21a171..f3971ffc766 100644
--- a/net/php-xmlrpc/Makefile
+++ b/net/php-xmlrpc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2012/06/14 07:45:32 sbd Exp $
+# $NetBSD: Makefile,v 1.15 2012/07/20 12:30:37 taca Exp $
 
 MODNAME=		xmlrpc
-PKGREVISION=		1
 CATEGORIES+=		net
 COMMENT=		PHP extension for XML-RPC support
 
diff --git a/textproc/php-dom/Makefile b/textproc/php-dom/Makefile
index 0b5c5bfd69e..a4ea80fddf9 100644
--- a/textproc/php-dom/Makefile
+++ b/textproc/php-dom/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/06/14 07:45:20 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/07/20 12:30:37 taca Exp $
 
 MODNAME=		dom
-PKGREVISION=		2
 CATEGORIES+=		textproc
 COMMENT=		PHP5 extension for DOM support
 
diff --git a/textproc/php-intl/Makefile b/textproc/php-intl/Makefile
index 46015df741c..638ab9a69fc 100644
--- a/textproc/php-intl/Makefile
+++ b/textproc/php-intl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2012/06/18 15:16:49 taca Exp $
+# $NetBSD: Makefile,v 1.13 2012/07/20 12:30:37 taca Exp $
 
 MODNAME=		intl
-PKGREVISION=		1
 CATEGORIES+=		textproc
 COMMENT=		PHP extension for i18n
 LICENSE=		php
diff --git a/textproc/php-pspell/Makefile b/textproc/php-pspell/Makefile
index a99b15be170..f3214f8f262 100644
--- a/textproc/php-pspell/Makefile
+++ b/textproc/php-pspell/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2012/06/16 09:56:03 taca Exp $
+# $NetBSD: Makefile,v 1.13 2012/07/20 12:30:37 taca Exp $
 
 MODNAME=		pspell
-PKGREVISION=		1
 CATEGORIES+=		textproc
 COMMENT=		PHP extension for pspell support
 
diff --git a/textproc/php-wddx/Makefile b/textproc/php-wddx/Makefile
index 0a7f136f770..7ea8d513433 100644
--- a/textproc/php-wddx/Makefile
+++ b/textproc/php-wddx/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2012/06/14 07:45:28 sbd Exp $
+# $NetBSD: Makefile,v 1.17 2012/07/20 12:30:37 taca Exp $
 
 MODNAME=		wddx
-PKGREVISION=		1
 CATEGORIES+=		textproc
 COMMENT=		PHP extension for WDDX support
 
diff --git a/textproc/php-xsl/Makefile b/textproc/php-xsl/Makefile
index 1988938d35b..a44d587ecd6 100644
--- a/textproc/php-xsl/Makefile
+++ b/textproc/php-xsl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2012/06/14 07:44:45 sbd Exp $
+# $NetBSD: Makefile,v 1.5 2012/07/20 12:30:37 taca Exp $
 
 MODNAME=		xsl
-PKGREVISION=		2
 CATEGORIES+=		textproc
 COMMENT=		PHP5 extension for XSLT functions
 
diff --git a/www/ap-php/Makefile b/www/ap-php/Makefile
index 98d3664bbf9..ea4eeb5fe40 100644
--- a/www/ap-php/Makefile
+++ b/www/ap-php/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2011/09/21 13:10:25 adam Exp $
+# $NetBSD: Makefile,v 1.27 2012/07/20 12:30:37 taca 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-curl/Makefile b/www/php-curl/Makefile
index b5c9bc2abf5..8cefb635f66 100644
--- a/www/php-curl/Makefile
+++ b/www/php-curl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2011/04/22 13:45:00 obache Exp $
+# $NetBSD: Makefile,v 1.18 2012/07/20 12:30:38 taca Exp $
 
 MODNAME=		curl
-PKGREVISION=		1
 CATEGORIES+=		www
 COMMENT=		PHP extension for curl functions
 
-- 
cgit v1.2.3