Sun Mar 21 17:10:01 2010 UTC ()
explicitly disable sqlite3 and intl, we don't want to compile them into main PHP executable;
the extensions were not actually built since necessary libraries were not found due to pkgsrc
framework, but better be explicit

fix MESSAGE_SRC to use lang/php53 locations

bump PKGREVISION


(jdolecek)
diff -r1.1.1.1 -r1.2 pkgsrc/lang/php53/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/lang/php53/Makefile.php
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/php53/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php53/Attic/Makefile 2010/03/16 15:31:58 1.1.1.1
+++ pkgsrc/lang/php53/Attic/Makefile 2010/03/21 17:10:01 1.2
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: Makefile,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $ 1# $NetBSD: Makefile,v 1.2 2010/03/21 17:10:01 jdolecek Exp $
2 2
 3PKGREVISION= 1
3CATEGORIES= lang 4CATEGORIES= lang
4HOMEPAGE= http://www.php.net/ 5HOMEPAGE= http://www.php.net/
5COMMENT= PHP Hypertext Preprocessor version 5 6COMMENT= PHP Hypertext Preprocessor version 5
6 7
7TEST_TARGET= test 8TEST_TARGET= test
8PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
9 10
10USE_TOOLS+= gmake lex pkg-config 11USE_TOOLS+= gmake lex pkg-config
11LIBTOOL_OVERRIDE= # empty 12LIBTOOL_OVERRIDE= # empty
12 13
13.include "Makefile.php" 14.include "Makefile.php"
14 15
15CGIDIR= ${PREFIX}/libexec/cgi-bin 16CGIDIR= ${PREFIX}/libexec/cgi-bin
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/php53/Attic/Makefile.php (expand / switch to unified diff)

--- pkgsrc/lang/php53/Attic/Makefile.php 2010/03/16 15:31:58 1.1.1.1
+++ pkgsrc/lang/php53/Attic/Makefile.php 2010/03/21 17:10:01 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.php,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $ 1# $NetBSD: Makefile.php,v 1.2 2010/03/21 17:10:01 jdolecek Exp $
2# used by lang/php53/Makefile 2# used by lang/php53/Makefile
3# used by www/ap-php/Makefile 3# used by www/ap-php/Makefile
4 4
5.include "../../lang/php53/Makefile.common" 5.include "../../lang/php53/Makefile.common"
6 6
7DISTINFO_FILE= ${.CURDIR}/../../lang/php53/distinfo 7DISTINFO_FILE= ${.CURDIR}/../../lang/php53/distinfo
8PATCHDIR= ${.CURDIR}/../../lang/php53/patches 8PATCHDIR= ${.CURDIR}/../../lang/php53/patches
9 9
10USE_LIBTOOL= YES 10USE_LIBTOOL= YES
11USE_LANGUAGES= c c++ 11USE_LANGUAGES= c c++
12GNU_CONFIGURE= YES 12GNU_CONFIGURE= YES
13BUILD_DEFS+= VARBASE 13BUILD_DEFS+= VARBASE
14PLIST_VARS+= suhosin 14PLIST_VARS+= suhosin
@@ -19,28 +19,30 @@ PHP_EXTENSION_DIR= lib/php/20090630 @@ -19,28 +19,30 @@ PHP_EXTENSION_DIR= lib/php/20090630
19PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q} 19PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR:Q} 23CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR:Q}
24CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR:Q}/php.d 24CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR:Q}/php.d
25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
26CONFIGURE_ARGS+= --localstatedir=${VARBASE} 26CONFIGURE_ARGS+= --localstatedir=${VARBASE}
27 27
28CONFIGURE_ARGS+= --with-regex=system 28CONFIGURE_ARGS+= --with-regex=system
29 29
30CONFIGURE_ARGS+= --without-mysql 30CONFIGURE_ARGS+= --without-mysql
31CONFIGURE_ARGS+= --without-sqlite 31CONFIGURE_ARGS+= --without-sqlite
 32#CONFIGURE_ARGS+= --without-sqlite3
32CONFIGURE_ARGS+= --without-iconv 33CONFIGURE_ARGS+= --without-iconv
33CONFIGURE_ARGS+= --without-pear 34CONFIGURE_ARGS+= --without-pear
 35#CONFIGURE_ARGS+= --without-intl
34 36
35CONFIGURE_ARGS+= --disable-posix 37CONFIGURE_ARGS+= --disable-posix
36CONFIGURE_ARGS+= --disable-dom 38CONFIGURE_ARGS+= --disable-dom
37CONFIGURE_ARGS+= --disable-pdo 39CONFIGURE_ARGS+= --disable-pdo
38CONFIGURE_ARGS+= --disable-json 40CONFIGURE_ARGS+= --disable-json
39 41
40CONFIGURE_ARGS+= --enable-xml 42CONFIGURE_ARGS+= --enable-xml
41CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX:Q} 43CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX:Q}
42.include "../../textproc/libxml2/buildlink3.mk" 44.include "../../textproc/libxml2/buildlink3.mk"
43 45
44# Note: This expression is the same as ${PKGBASE}, but the latter is 46# Note: This expression is the same as ${PKGBASE}, but the latter is
45# not defined yet, so we cannot use it here. 47# not defined yet, so we cannot use it here.
46PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} 48PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
@@ -58,28 +60,28 @@ PKG_SUGGESTED_OPTIONS+= ssl @@ -58,28 +60,28 @@ PKG_SUGGESTED_OPTIONS+= ssl
58 60
59.if !empty(PKG_OPTIONS:Msuhosin) 61.if !empty(PKG_OPTIONS:Msuhosin)
60SUHOSIN_PHPVER= 5.3.2 62SUHOSIN_PHPVER= 5.3.2
61. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} 63. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS}
62PKG_FAIL_REASON+= "The suhosin patch is currently not available for" 64PKG_FAIL_REASON+= "The suhosin patch is currently not available for"
63PKG_FAIL_REASON+= "this version of PHP. You may have to wait until" 65PKG_FAIL_REASON+= "this version of PHP. You may have to wait until"
64PKG_FAIL_REASON+= "an updated patch is released or temporarily" 66PKG_FAIL_REASON+= "an updated patch is released or temporarily"
65PKG_FAIL_REASON+= "build this package without the suhosin option." 67PKG_FAIL_REASON+= "build this package without the suhosin option."
66. else 68. else
67PATCH_SITES= http://download.suhosin.org/ 69PATCH_SITES= http://download.suhosin.org/
68PATCHFILES+= suhosin-patch-${SUHOSIN_PHPVER}-0.9.9.1.patch.gz 70PATCHFILES+= suhosin-patch-${SUHOSIN_PHPVER}-0.9.9.1.patch.gz
69PATCH_DIST_STRIP= -p1 71PATCH_DIST_STRIP= -p1
70PLIST.suhosin= yes 72PLIST.suhosin= yes
71MESSAGE_SRC= ${.CURDIR}/../../lang/php5/MESSAGE 73MESSAGE_SRC= ${.CURDIR}/../../lang/php53/MESSAGE
72MESSAGE_SRC+= ${.CURDIR}/../../lang/php5/MESSAGE.suhosin 74MESSAGE_SRC+= ${.CURDIR}/../../lang/php53/MESSAGE.suhosin
73. endif 75. endif
74.endif 76.endif
75 77
76.if !empty(PKG_OPTIONS:Minet6) 78.if !empty(PKG_OPTIONS:Minet6)
77CONFIGURE_ARGS+= --enable-ipv6 79CONFIGURE_ARGS+= --enable-ipv6
78.else 80.else
79CONFIGURE_ARGS+= --disable-ipv6 81CONFIGURE_ARGS+= --disable-ipv6
80.endif 82.endif
81 83
82.if !empty(PKG_OPTIONS:Mssl) 84.if !empty(PKG_OPTIONS:Mssl)
83. include "../../security/openssl/buildlink3.mk" 85. include "../../security/openssl/buildlink3.mk"
84. if ${OPSYS} == "SunOS" 86. if ${OPSYS} == "SunOS"
85CONFIGURE_ARGS+= --with-openssl=yes 87CONFIGURE_ARGS+= --with-openssl=yes