Tue Mar 16 15:36:39 2010 UTC ()
Use PKG_PHP_MAJOR_VERS instead of PKG_PHP_VERSION now
since the name of extension only contain major version.


(taca)
diff -r1.22 -r1.23 pkgsrc/www/ap-php/Makefile
cvs diff -r1.22 -r1.23 pkgsrc/www/ap-php/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap-php/Makefile 2010/02/21 08:01:46 1.22
+++ pkgsrc/www/ap-php/Makefile 2010/03/16 15:36:39 1.23
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.22 2010/02/21 08:01:46 obache Exp $ 1# $NetBSD: Makefile,v 1.23 2010/03/16 15:36:39 taca Exp $
2# 2#
3 3
4PKGNAME= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-${PHP_BASE_VERS} 4PKGNAME= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-${PHP_BASE_VERS}
5PKGREVISION= 1 5PKGREVISION= 1
6COMMENT= Apache (${PKG_APACHE}) module for ${PKG_PHP} 6COMMENT= Apache (${PKG_APACHE}) module for ${PKG_PHP}
7 7
8PKG_DESTDIR_SUPPORT= user-destdir 8PKG_DESTDIR_SUPPORT= user-destdir
9 9
10CONFLICTS= ap-php-[0-9]* 10CONFLICTS= ap-php-[0-9]*
11 11
12USE_TOOLS+= lex 12USE_TOOLS+= lex
13 13
14APACHE_MODULE= YES 14APACHE_MODULE= YES
15 15
16.include "../../lang/php/phpversion.mk" 16.include "../../lang/php/phpversion.mk"
17.include "${PHPPKGSRCDIR}/Makefile.php" 17.include "${PHPPKGSRCDIR}/Makefile.php"
18 18
19# Ensure we export symbols in the linked shared object. 19# Ensure we export symbols in the linked shared object.
20CONFIGURE_ENV+= EXTRA_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:M*:Q} 20CONFIGURE_ENV+= EXTRA_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:M*:Q}
21 21
22INSTALLATION_DIRS= lib/httpd 22INSTALLATION_DIRS= lib/httpd
23 23
24do-install: 24do-install:
25 if [ -f ${WRKSRC}/.libs/libphp${PKG_PHP_VERSION}.so ]; then \ 25 if [ -f ${WRKSRC}/.libs/libphp${PKG_PHP_MAJOR_VERS}.so ]; then \
26 ${INSTALL_DATA} ${WRKSRC}/.libs/libphp${PKG_PHP_VERSION}.so \ 26 ${INSTALL_DATA} ${WRKSRC}/.libs/libphp${PKG_PHP_MAJOR_VERS}.so \
27 ${DESTDIR}${PREFIX}/lib/httpd/mod_php${PKG_PHP_VERSION}.so; \ 27 ${DESTDIR}${PREFIX}/lib/httpd/mod_php${PKG_PHP_MAJOR_VERS}.so; \
28 elif [ -f ${WRKSRC}/libs/libphp${PKG_PHP_VERSION}.so ]; then \ 28 elif [ -f ${WRKSRC}/libs/libphp${PKG_PHP_MAJOR_VERS}.so ]; then \
29 ${INSTALL_DATA} ${WRKSRC}/libs/libphp${PKG_PHP_VERSION}.so \ 29 ${INSTALL_DATA} ${WRKSRC}/libs/libphp${PKG_PHP_MAJOR_VERS}.so \
30 ${DESTDIR}${PREFIX}/lib/httpd/mod_php${PKG_PHP_VERSION}.so; \ 30 ${DESTDIR}${PREFIX}/lib/httpd/mod_php${PKG_PHP_MAJOR_VERS}.so; \
31 fi 31 fi
32 32
33.include "${PHPPKGSRCDIR}/buildlink3.mk" 33.include "${PHPPKGSRCDIR}/buildlink3.mk"
34.include "../../mk/apache.mk" 34.include "../../mk/apache.mk"
35.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"