summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcheusov <cheusov@pkgsrc.org>2011-10-29 13:47:03 +0000
committercheusov <cheusov@pkgsrc.org>2011-10-29 13:47:03 +0000
commit8caf07b575b56baddef81fe73cd0c6440c6641ad (patch)
treecae0f6bec714f678eda47f05c84877b3beeeab45
parent1949086f4eedcefb6d1b678433b0ad725575a996 (diff)
downloadpkgsrc-8caf07b575b56baddef81fe73cd0c6440c6641ad.tar.gz
Do not change PHP_VERSIONS_ACCEPTED in phpversion.mk.
It is not necessary anymore. No objections in tech-pkg@.
-rw-r--r--lang/php/phpversion.mk15
-rw-r--r--textproc/php-intl/Makefile4
2 files changed, 2 insertions, 17 deletions
diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 6083973bf29..53cc6a50a1d 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.15 2011/09/14 16:44:26 taca Exp $
+# $NetBSD: phpversion.mk,v 1.16 2011/10/29 13:47:03 cheusov Exp $
#
# This file selects a PHP version, based on the user's preferences and
# the installed packages. It does not add a dependency on the PHP
@@ -78,19 +78,6 @@ PHP_VERSIONS_ACCEPTED?= 5 53
_PHP_VERSION_${pv}_OK= yes
.endfor
-# most pkgsrc PHP5 extensions work on both PHP 5.2.* and 5.3.*; if marked
-# as '5', accent any 5.*
-.if defined(_PHP_VERSION_5_OK)
-. if !defined(_PHP_VERSION_53_OK)
-_PHP_VERSION_53_OK= yes
-PHP_VERSIONS_ACCEPTED+= 53
-. endif
-. if !defined(_PHP_VERSION_52_OK)
-_PHP_VERSION_52_OK= yes
-PHP_VERSIONS_ACCEPTED+= 52
-. endif
-.endif
-
# check what is installed
.if exists(${LOCALBASE}/lib/php/20040412)
_PHP_VERSION_5_INSTALLED= yes
diff --git a/textproc/php-intl/Makefile b/textproc/php-intl/Makefile
index 21ae8711238..283e6889501 100644
--- a/textproc/php-intl/Makefile
+++ b/textproc/php-intl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/06/10 09:40:01 obache Exp $
+# $NetBSD: Makefile,v 1.7 2011/10/29 13:47:03 cheusov Exp $
MODNAME= intl
PECL_VERSION= 1.1.2
@@ -6,8 +6,6 @@ PKGREVISION= 2
CATEGORIES+= textproc
COMMENT= PHP extension for i18n
-PHP_VERSIONS_ACCEPTED= 5
-
PKG_DESTDIR_SUPPORT= user-destdir
CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR}