summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2011-12-17 13:46:27 +0000
committerobache <obache@pkgsrc.org>2011-12-17 13:46:27 +0000
commit9ce09e1be1edcebbde3094976733ba75ad25424b (patch)
tree0201099d58a10a76fa4a723dc2af453a6d168585
parent27c643b7045792492113ae29806e36ac723f5995 (diff)
downloadpkgsrc-9ce09e1be1edcebbde3094976733ba75ad25424b.tar.gz
Change default PKGNAME scheme for PECL packages.
Drop ${PHP_BASE_VARS} from PKGVERSION by default. It used to be required to support multiple php version. But after PHP version based ${PHP_PKG_PREFIX} was introduced, such trick is not required anymore. In addition to this, such version name schme invokes unwanted version bump when base php version is bumped, plus, such version scheme is hard to use for DEPENDS pattern. To avoid downgrading of package using such legacy version scheme, PECL_LEGACY_VERSION_SCHEME is introduced. If it is defined, current version scheme is still used for currently supported PHP version (5 and 53), but instead of ${PHP_BASE_VARS}, current fixed PHP base version in pkgsrc is used to avoid unwanted version bump from update of PHP base package. With newer PHP (54, or so on), new version scheme will be used if it is defined. This trick will not be required and should be removed after php5 and php53 will be gone away from pkgsrc.
-rw-r--r--databases/php-dbx/Makefile3
-rw-r--r--databases/php-redis/Makefile3
-rw-r--r--devel/php-memcache/Makefile3
-rw-r--r--lang/php/ext.mk13
-rw-r--r--net/php-yaz/Makefile3
-rw-r--r--print/php-pdflib/Makefile3
-rw-r--r--security/php-suhosin/Makefile3
-rw-r--r--textproc/php-enchant/Makefile3
-rw-r--r--textproc/php-intl/Makefile3
-rw-r--r--textproc/php-mecab/Makefile3
-rw-r--r--www/php-apc/Makefile3
-rw-r--r--www/php-eaccelerator/Makefile3
-rw-r--r--www/php-phrasea2/Makefile3
-rw-r--r--www/php-uploadprogress/Makefile3
14 files changed, 36 insertions, 16 deletions
diff --git a/databases/php-dbx/Makefile b/databases/php-dbx/Makefile
index 5d8b4a30f23..4412605aac9 100644
--- a/databases/php-dbx/Makefile
+++ b/databases/php-dbx/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2011/08/20 14:08:12 taca Exp $
+# $NetBSD: Makefile,v 1.12 2011/12/17 13:46:27 obache Exp $
MODNAME= dbx
PECL_VERSION= 1.1.2
+PECL_LEGACY_VERSION_SCHEME= yes
CATEGORIES+= databases
COMMENT= PHP database abstraction layer extension
diff --git a/databases/php-redis/Makefile b/databases/php-redis/Makefile
index 321ed702069..ffd87f3f573 100644
--- a/databases/php-redis/Makefile
+++ b/databases/php-redis/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2011/06/29 03:03:31 taca Exp $
+# $NetBSD: Makefile,v 1.3 2011/12/17 13:46:27 obache Exp $
#
MODNAME= redis
PECL_VERSION= 2.1.3
+PECL_LEGACY_VERSION_SCHEME= yes
PECL_DISTNAME= nicolasff-phpredis-${PECL_VERSION}-0-g43bc590
CATEGORIES= databases
MASTER_SITES= http://download.github.com/
diff --git a/devel/php-memcache/Makefile b/devel/php-memcache/Makefile
index 993422c9984..335a1a82114 100644
--- a/devel/php-memcache/Makefile
+++ b/devel/php-memcache/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/12/19 03:00:52 taca Exp $
+# $NetBSD: Makefile,v 1.9 2011/12/17 13:46:27 obache Exp $
#
MODNAME= memcache
PECL_VERSION= 2.2.6
+PECL_LEGACY_VERSION_SCHEME= yes
CATEGORIES+= devel
COMMENT= PHP extension for memcached
diff --git a/lang/php/ext.mk b/lang/php/ext.mk
index 9495ff949c6..b5b61aa3ca3 100644
--- a/lang/php/ext.mk
+++ b/lang/php/ext.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ext.mk,v 1.22 2011/04/13 13:23:39 adam Exp $
+# $NetBSD: ext.mk,v 1.23 2011/12/17 13:46:27 obache Exp $
#
# PHP extension package framework, for both PECL and bundled PHP extensions.
#
@@ -35,7 +35,16 @@ WRKSRC?= ${WRKDIR}/${EXTRACT_ELEMENTS}
DISTINFO_FILE= ${.CURDIR}/${PHPPKGSRCDIR}/distinfo
.else
# PECL extension
-PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PHP_BASE_VERS}.${PECL_VERSION}
+.if defined(PECL_LEGACY_VERSION_SCHEME) && \
+ (${PKG_PHP_VERSION} == "5" || ${PKG_PHP_VERSION} == "53")
+. if ${PKG_PHP_VERSION} == "5"
+PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-5.2.17.${PECL_VERSION}
+. elif ${PKG_PHP_VERSION} == "53"
+PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-5.3.8.${PECL_VERSION}
+. endif
+.else
+PKGNAME?= ${PHP_PKG_PREFIX}-${MODNAME}-${PECL_VERSION}
+.endif
MASTER_SITES?= http://pecl.php.net/get/
PECL_DISTNAME?= ${MODNAME}-${PECL_VERSION}
DISTNAME= ${PECL_DISTNAME}
diff --git a/net/php-yaz/Makefile b/net/php-yaz/Makefile
index 87854e12f9d..b7bbf3052dc 100644
--- a/net/php-yaz/Makefile
+++ b/net/php-yaz/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2011/08/20 14:15:32 taca Exp $
+# $NetBSD: Makefile,v 1.15 2011/12/17 13:46:28 obache Exp $
MODNAME= yaz
PECL_VERSION= 1.1.1
+PECL_LEGACY_VERSION_SCHEME= yes
CATEGORIES+= net
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= PHP extension for YAZ
diff --git a/print/php-pdflib/Makefile b/print/php-pdflib/Makefile
index b89a478dbb9..a21c3d9b8d3 100644
--- a/print/php-pdflib/Makefile
+++ b/print/php-pdflib/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2011/01/13 13:39:13 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2011/12/17 13:46:28 obache Exp $
MODNAME= pdflib
PKGMODNAME= pdf
PECL_VERSION= 2.1.8
PKGREVISION= 1
+PECL_LEGACY_VERSION_SCHEME= yes
CATEGORIES+= print
COMMENT= PHP extension for PDFlib on-the-fly PDF generation
diff --git a/security/php-suhosin/Makefile b/security/php-suhosin/Makefile
index e459c0ce231..cb9f6e054a3 100644
--- a/security/php-suhosin/Makefile
+++ b/security/php-suhosin/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/12/19 02:22:15 taca Exp $
+# $NetBSD: Makefile,v 1.4 2011/12/17 13:46:28 obache Exp $
#
MODNAME= suhosin
DISTNAME= suhosin-${PECL_VERSION}
PECL_VERSION= 0.9.32.1
+PECL_LEGACY_VERSION_SCHEME= yes
CATEGORIES= www
MASTER_SITES= http://download.suhosin.org/
EXTRACT_SUFX= .tar.gz
diff --git a/textproc/php-enchant/Makefile b/textproc/php-enchant/Makefile
index a2f23fd25ad..23532968dcd 100644
--- a/textproc/php-enchant/Makefile
+++ b/textproc/php-enchant/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2011/04/22 13:44:51 obache Exp $
+# $NetBSD: Makefile,v 1.4 2011/12/17 13:46:28 obache Exp $
MODNAME= enchant
PECL_VERSION= 1.1.0
PKGREVISION= 1
+PECL_LEGACY_VERSION_SCHEME= yes
CATEGORIES+= textproc
COMMENT= PHP extension for ENCHANT (spelling) support
diff --git a/textproc/php-intl/Makefile b/textproc/php-intl/Makefile
index 283e6889501..65ec46e19bf 100644
--- a/textproc/php-intl/Makefile
+++ b/textproc/php-intl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2011/10/29 13:47:03 cheusov Exp $
+# $NetBSD: Makefile,v 1.8 2011/12/17 13:46:28 obache Exp $
MODNAME= intl
PECL_VERSION= 1.1.2
PKGREVISION= 2
+PECL_LEGACY_VERSION_SCHEME= yes
CATEGORIES+= textproc
COMMENT= PHP extension for i18n
diff --git a/textproc/php-mecab/Makefile b/textproc/php-mecab/Makefile
index b82c3fc2f76..0124a2a55be 100644
--- a/textproc/php-mecab/Makefile
+++ b/textproc/php-mecab/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/12/19 02:13:50 taca Exp $
+# $NetBSD: Makefile,v 1.2 2011/12/17 13:46:28 obache Exp $
#
MODNAME= mecab
PECL_VERSION= 0.4.1
+PECL_LEGACY_VERSION_SCHEME= yes
CATEGORIES= textproc japanese
MASTER_SITES= http://pecl.opendogs.org/get/
diff --git a/www/php-apc/Makefile b/www/php-apc/Makefile
index 7eadec98c86..d2ed1be79ea 100644
--- a/www/php-apc/Makefile
+++ b/www/php-apc/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2011/06/29 03:02:43 taca Exp $
+# $NetBSD: Makefile,v 1.16 2011/12/17 13:46:28 obache Exp $
MODNAME= apc
PECL_VERSION= 3.1.9
PKGREVISION= 1
+PECL_LEGACY_VERSION_SCHEME= yes
CATEGORIES+= sysutils
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/www/php-eaccelerator/Makefile b/www/php-eaccelerator/Makefile
index a53c030746e..96cd4ed6687 100644
--- a/www/php-eaccelerator/Makefile
+++ b/www/php-eaccelerator/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2011/08/20 14:19:35 taca Exp $
+# $NetBSD: Makefile,v 1.15 2011/12/17 13:46:29 obache Exp $
MODNAME= eaccelerator
PECL_VERSION= 0.9.6.1
+PECL_LEGACY_VERSION_SCHEME= yes
CATEGORIES+= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eaccelerator/} \
http://bart.eaccelerator.net/source/${PECL_VERSION}/
diff --git a/www/php-phrasea2/Makefile b/www/php-phrasea2/Makefile
index d3df1772166..6fb2d5d113b 100644
--- a/www/php-phrasea2/Makefile
+++ b/www/php-phrasea2/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2011/12/16 14:51:21 obache Exp $
+# $NetBSD: Makefile,v 1.4 2011/12/17 13:46:29 obache Exp $
#
.include "../../www/phraseanet/Makefile.common"
MODNAME= phrasea2
PECL_VERSION= ${VERS}
+PECL_LEGACY_VERSION_SCHEME= yes
PKG_DESTDIR_SUPPORT= user-destdir
EXTRACT_ELEMENTS= ${DISTNAME}/bin/src/php_phrasea2
USE_LANGUAGES= c c++
diff --git a/www/php-uploadprogress/Makefile b/www/php-uploadprogress/Makefile
index fe93fd4ac3d..883e0e0a8d3 100644
--- a/www/php-uploadprogress/Makefile
+++ b/www/php-uploadprogress/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/11 07:32:17 obache Exp $
+# $NetBSD: Makefile,v 1.2 2011/12/17 13:46:29 obache Exp $
#
MODNAME= uploadprogress
PECL_VERSION= 1.0.1
-PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME}
CATEGORIES= www
MAINTAINER= mbowie@buzmo.com