Sat Aug 31 16:51:50 2013 UTC ()
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.


(tron)
diff -r1.39.4.2 -r1.39.4.3 pkgsrc/lang/php53/Makefile
diff -r1.8.4.2 -r1.8.4.3 pkgsrc/lang/php54/Makefile
cvs diff -r1.39.4.2 -r1.39.4.3 pkgsrc/lang/php53/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php53/Attic/Makefile 2013/08/25 16:56:44 1.39.4.2
+++ pkgsrc/lang/php53/Attic/Makefile 2013/08/31 16:51:50 1.39.4.3
@@ -1,32 +1,34 @@ @@ -1,32 +1,34 @@
1# $NetBSD: Makefile,v 1.39.4.2 2013/08/25 16:56:44 tron Exp $ 1# $NetBSD: Makefile,v 1.39.4.3 2013/08/31 16:51:50 tron Exp $
2 2
3# 3#
4# We can't omit PKGNAME here to handle PKG_OPTIONS. 4# We can't omit PKGNAME here to handle PKG_OPTIONS.
5# 5#
6PKGNAME= php-${PHP_BASE_VERS} 6PKGNAME= php-${PHP_BASE_VERS}
7PKGREVISION= 2 7PKGREVISION= 2
8CATEGORIES= lang 8CATEGORIES= lang
9 9
10HOMEPAGE= http://www.php.net/ 10HOMEPAGE= http://www.php.net/
11COMMENT= PHP Hypertext Preprocessor version 5 11COMMENT= PHP Hypertext Preprocessor version 5
12LICENSE= php 12LICENSE= php
13 13
14TEST_TARGET= test 14TEST_TARGET= test
15 15
16USE_TOOLS+= gmake lex pkg-config 16USE_TOOLS+= gmake lex pkg-config
17LIBTOOL_OVERRIDE= # empty 17LIBTOOL_OVERRIDE= # empty
18PHP_CHECK_INSTALLED= No 18PHP_CHECK_INSTALLED= No
19 19
 20PHP_VERSIONS_ACCEPTED?= 53
 21
20.include "Makefile.php" 22.include "Makefile.php"
21 23
22CGIDIR= ${PREFIX}/libexec/cgi-bin 24CGIDIR= ${PREFIX}/libexec/cgi-bin
23EGDIR= ${PREFIX}/share/examples/php 25EGDIR= ${PREFIX}/share/examples/php
24MESSAGE_SUBST+= CGIDIR=${CGIDIR} 26MESSAGE_SUBST+= CGIDIR=${CGIDIR}
25 27
26CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} 28CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q}
27MAKE_ENV+= INSTALL_ROOT=${DESTDIR} 29MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
28 30
29CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini 31CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
30PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" 32PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}"
31 33
32SUBST_CLASSES+= path 34SUBST_CLASSES+= path
cvs diff -r1.8.4.2 -r1.8.4.3 pkgsrc/lang/php54/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php54/Attic/Makefile 2013/08/25 17:26:38 1.8.4.2
+++ pkgsrc/lang/php54/Attic/Makefile 2013/08/31 16:51:50 1.8.4.3
@@ -1,30 +1,32 @@ @@ -1,30 +1,32 @@
1# $NetBSD: Makefile,v 1.8.4.2 2013/08/25 17:26:38 tron Exp $ 1# $NetBSD: Makefile,v 1.8.4.3 2013/08/31 16:51:50 tron Exp $
2 2
3# 3#
4# We can't omit PKGNAME here to handle PKG_OPTIONS. 4# We can't omit PKGNAME here to handle PKG_OPTIONS.
5# 5#
6PKGNAME= php-${PHP_BASE_VERS} 6PKGNAME= php-${PHP_BASE_VERS}
7CATEGORIES= lang 7CATEGORIES= lang
8 8
9HOMEPAGE= http://www.php.net/ 9HOMEPAGE= http://www.php.net/
10COMMENT= PHP Hypertext Preprocessor version 5 10COMMENT= PHP Hypertext Preprocessor version 5
11LICENSE= php 11LICENSE= php
12 12
13TEST_TARGET= test 13TEST_TARGET= test
14 14
15USE_TOOLS+= gmake lex pkg-config 15USE_TOOLS+= gmake lex pkg-config
16LIBTOOL_OVERRIDE= # empty 16LIBTOOL_OVERRIDE= # empty
17 17
 18PHP_VERSIONS_ACCEPTED= 54
 19
18.include "Makefile.php" 20.include "Makefile.php"
19 21
20CGIDIR= ${PREFIX}/libexec/cgi-bin 22CGIDIR= ${PREFIX}/libexec/cgi-bin
21EGDIR= ${PREFIX}/share/examples/php 23EGDIR= ${PREFIX}/share/examples/php
22MESSAGE_SUBST+= CGIDIR=${CGIDIR} 24MESSAGE_SUBST+= CGIDIR=${CGIDIR}
23 25
24CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} 26CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q}
25MAKE_ENV+= INSTALL_ROOT=${DESTDIR} 27MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
26 28
27CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini 29CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
28PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" 30PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}"
29 31
30SUBST_CLASSES+= path 32SUBST_CLASSES+= path