From 91f7cfe52729b2cf61776da82e285c2ef7b755b5 Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 31 Aug 2013 16:51:50 +0000 Subject: Pullup ticket #4226 - requested by bouyer lang/php53: build fix lang/php54: build fix Revisions pulled up: - lang/php53/Makefile 1.42 - lang/php54/Makefile 1.12 --- Module Name: pkgsrc Committed By: joerg Date: Tue Aug 13 10:22:26 UTC 2013 Modified Files: pkgsrc/lang/php53: Makefile pkgsrc/lang/php54: Makefile Log Message: Allow only the PHP version itself, otherwise the multi-version logic will trigger with failing distinfo entries. --- lang/php53/Makefile | 4 +++- lang/php54/Makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 90f5b4ace22..b37f154f708 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39.4.2 2013/08/25 16:56:44 tron Exp $ +# $NetBSD: Makefile,v 1.39.4.3 2013/08/31 16:51:50 tron Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. @@ -17,6 +17,8 @@ USE_TOOLS+= gmake lex pkg-config LIBTOOL_OVERRIDE= # empty PHP_CHECK_INSTALLED= No +PHP_VERSIONS_ACCEPTED?= 53 + .include "Makefile.php" CGIDIR= ${PREFIX}/libexec/cgi-bin diff --git a/lang/php54/Makefile b/lang/php54/Makefile index 7c97c2ec625..03277d4879d 100644 --- a/lang/php54/Makefile +++ b/lang/php54/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8.4.2 2013/08/25 17:26:38 tron Exp $ +# $NetBSD: Makefile,v 1.8.4.3 2013/08/31 16:51:50 tron Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. @@ -15,6 +15,8 @@ TEST_TARGET= test USE_TOOLS+= gmake lex pkg-config LIBTOOL_OVERRIDE= # empty +PHP_VERSIONS_ACCEPTED= 54 + .include "Makefile.php" CGIDIR= ${PREFIX}/libexec/cgi-bin -- cgit v1.2.3