diff --git a/lang/php5-perl/Makefile b/lang/php5-perl/Makefile index c78b7e0e80440..e4097310ed02b 100644 --- a/lang/php5-perl/Makefile +++ b/lang/php5-perl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/06/16 02:56:29 taca Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/18 15:14:19 taca Exp $ MODNAME= perl PKGMODNAME= perl @@ -9,16 +9,10 @@ COMMENT= PHP extension embedding Perl in PHP PKG_DESTDIR_SUPPORT= user-destdir -PHP_VERSIONS_ACCEPTED= 52 53 +PHP_VERSIONS_ACCEPTED= 53 CONFIGURE_ARGS+= --with-perl=${PERLDIR} -.include "../../lang/php/phpversion.mk" - -.if ${PKG_PHP_VERSION} == "52" -PECL_LEGACY_VERSION_SCHEME= yes -.endif - .include "../../lang/perl5/buildlink3.mk" .include "../../lang/php/ext.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/php-ming/Makefile b/multimedia/php-ming/Makefile index 32dc223a79001..135d70b142f44 100644 --- a/multimedia/php-ming/Makefile +++ b/multimedia/php-ming/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/05/12 11:32:39 obache Exp $ +# $NetBSD: Makefile,v 1.17 2012/06/18 15:15:48 taca Exp $ .include "../../multimedia/ming/Makefile.common" PECL_VERSION= ${MING_VERSION} @@ -24,12 +24,6 @@ CONFIGURE_DIRS= ${PHPSETUPSUBDIR} post-extract: ${CP} ${FILESDIR}/config.m4 ${WRKSRC}/${PHPSETUPSUBDIR} -# to avoid downgrade version -.include "../../lang/php/phpversion.mk" -.if ${PKG_PHP_VERSION} == "5" || ${PKG_PHP_VERSION} == "52" -PECL_LEGACY_VERSION_SCHEME= yes -.endif - .include "../../lang/php/ext.mk" .include "../../multimedia/ming/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/php-enchant/Makefile b/textproc/php-enchant/Makefile index 467a5298265dc..04cc83fcd22ea 100644 --- a/textproc/php-enchant/Makefile +++ b/textproc/php-enchant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/06/16 03:02:09 taca Exp $ +# $NetBSD: Makefile,v 1.8 2012/06/18 15:16:16 taca Exp $ MODNAME= enchant CATEGORIES+= textproc @@ -10,15 +10,6 @@ CONFIGURE_ARGS+= --with-enchant=shared,${BUILDLINK_PREFIX.enchant} BUILDLINK_API_DEPENDS.enchant+= enchant>=1.2.4 -.include "../../lang/php/phpversion.mk" - -# PHP 5.2.x needs pecl version -.if ${PKG_PHP_VERSION} == 52 -PECL_VERSION= 1.1.0 -PKGREVISION= 3 -PECL_LEGACY_VERSION_SCHEME= yes -.endif - .include "../../lang/php/ext.mk" .include "../../textproc/enchant/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/php-intl/Makefile b/textproc/php-intl/Makefile index 9fe14a7153381..46015df741c84 100644 --- a/textproc/php-intl/Makefile +++ b/textproc/php-intl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/06/16 03:02:32 taca Exp $ +# $NetBSD: Makefile,v 1.12 2012/06/18 15:16:49 taca Exp $ MODNAME= intl PKGREVISION= 1 @@ -11,16 +11,6 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c c++ CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} -.include "../../lang/php/phpversion.mk" - -# PHP 5.2.x needs pecl version -.if ${PKG_PHP_VERSION} == 52 -PECL_VERSION= 2.0.0 -PECL_LEGACY_VERSION_SCHEME= yes -.else -PATCHDIR= # ignore patch in current directory -.endif - .include "../../lang/php/ext.mk" .include "../../textproc/icu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/php-intl/distinfo b/textproc/php-intl/distinfo deleted file mode 100644 index f0c0e6bb948fb..0000000000000 --- a/textproc/php-intl/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.4 2012/04/25 18:55:39 adam Exp $ - -SHA1 (php-intl/intl-2.0.0.tgz) = b5876f140ad7bb071d6a8d9505446800855b4645 -RMD160 (php-intl/intl-2.0.0.tgz) = a3816f670ff7ab1ff88254f1ae8936d0ad4403d9 -Size (php-intl/intl-2.0.0.tgz) = 145979 bytes -SHA1 (patch-aj) = 6c0ea08f73d50b43afe442bd67decc9608c5db29 diff --git a/textproc/php-intl/patches/patch-aj b/textproc/php-intl/patches/patch-aj deleted file mode 100644 index e5464dd9f95f3..0000000000000 --- a/textproc/php-intl/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2012/04/25 18:55:40 adam Exp $ - ---- resourcebundle/resourcebundle_iterator.c.orig 2010-03-15 23:03:30.000000000 +0100 -+++ resourcebundle/resourcebundle_iterator.c -@@ -18,6 +18,8 @@ - #include - #include - -+#include "php_intl.h" -+ - #include "resourcebundle/resourcebundle.h" - #include "resourcebundle/resourcebundle_class.h" - #include "resourcebundle/resourcebundle_iterator.h"