Wed Mar 3 10:51:35 2010 UTC ()
Re-enable suhosin option since there is no need to disable it.

Noted by Volkmar Seifert and I misunderstood something.


(taca)
diff -r1.39 -r1.40 pkgsrc/lang/php5/Makefile.php
cvs diff -r1.39 -r1.40 pkgsrc/lang/php5/Attic/Makefile.php (switch to unified diff)

--- pkgsrc/lang/php5/Attic/Makefile.php 2010/02/27 03:25:16 1.39
+++ pkgsrc/lang/php5/Attic/Makefile.php 2010/03/03 10:51:35 1.40
@@ -1,95 +1,95 @@ @@ -1,95 +1,95 @@
1# $NetBSD: Makefile.php,v 1.39 2010/02/27 03:25:16 taca Exp $ 1# $NetBSD: Makefile.php,v 1.40 2010/03/03 10:51:35 taca Exp $
2# 2#
3 3
4.include "../../lang/php5/Makefile.common" 4.include "../../lang/php5/Makefile.common"
5 5
6DISTINFO_FILE= ${.CURDIR}/../../lang/php5/distinfo 6DISTINFO_FILE= ${.CURDIR}/../../lang/php5/distinfo
7PATCHDIR= ${.CURDIR}/../../lang/php5/patches 7PATCHDIR= ${.CURDIR}/../../lang/php5/patches
8 8
9USE_LIBTOOL= YES 9USE_LIBTOOL= YES
10USE_LANGUAGES= c c++ 10USE_LANGUAGES= c c++
11GNU_CONFIGURE= YES 11GNU_CONFIGURE= YES
12BUILD_DEFS+= VARBASE 12BUILD_DEFS+= VARBASE
13PLIST_VARS+= suhosin 13PLIST_VARS+= suhosin
14 14
15CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" 15CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
16 16
17PHP_EXTENSION_DIR= lib/php/20040412 17PHP_EXTENSION_DIR= lib/php/20040412
18PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q} 18PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR:Q} 22CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR:Q}
23CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR:Q}/php.d 23CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR:Q}/php.d
24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
25CONFIGURE_ARGS+= --localstatedir=${VARBASE} 25CONFIGURE_ARGS+= --localstatedir=${VARBASE}
26 26
27CONFIGURE_ARGS+= --with-regex=system 27CONFIGURE_ARGS+= --with-regex=system
28 28
29CONFIGURE_ARGS+= --without-mysql 29CONFIGURE_ARGS+= --without-mysql
30CONFIGURE_ARGS+= --without-sqlite 30CONFIGURE_ARGS+= --without-sqlite
31CONFIGURE_ARGS+= --without-iconv 31CONFIGURE_ARGS+= --without-iconv
32CONFIGURE_ARGS+= --without-pear 32CONFIGURE_ARGS+= --without-pear
33 33
34CONFIGURE_ARGS+= --disable-posix 34CONFIGURE_ARGS+= --disable-posix
35CONFIGURE_ARGS+= --disable-dom 35CONFIGURE_ARGS+= --disable-dom
36CONFIGURE_ARGS+= --disable-pdo 36CONFIGURE_ARGS+= --disable-pdo
37CONFIGURE_ARGS+= --disable-json 37CONFIGURE_ARGS+= --disable-json
38 38
39CONFIGURE_ARGS+= --enable-xml 39CONFIGURE_ARGS+= --enable-xml
40CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX:Q} 40CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX:Q}
41.include "../../textproc/libxml2/buildlink3.mk" 41.include "../../textproc/libxml2/buildlink3.mk"
42 42
43# Note: This expression is the same as ${PKGBASE}, but the latter is 43# Note: This expression is the same as ${PKGBASE}, but the latter is
44# not defined yet, so we cannot use it here. 44# not defined yet, so we cannot use it here.
45PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} 45PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
46PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts # suhosin 46PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts suhosin
47PKG_SUGGESTED_OPTIONS+= ssl 47PKG_SUGGESTED_OPTIONS+= ssl
48 48
49SUBST_CLASSES+= ini 49SUBST_CLASSES+= ini
50SUBST_STAGE.ini= post-patch 50SUBST_STAGE.ini= post-patch
51SUBST_FILES.ini= php.ini-dist 51SUBST_FILES.ini= php.ini-dist
52SUBST_FILES.ini+= php.ini-recommended 52SUBST_FILES.ini+= php.ini-recommended
53SUBST_SED.ini= -e "s|\\;include_path = \".:/php/includes\"|include_path = \".:${PREFIX}/lib/php\"|g" 53SUBST_SED.ini= -e "s|\\;include_path = \".:/php/includes\"|include_path = \".:${PREFIX}/lib/php\"|g"
54SUBST_MESSAGE.ini= Fixing default ini files. 54SUBST_MESSAGE.ini= Fixing default ini files.
55 55
56.include "../../mk/bsd.options.mk" 56.include "../../mk/bsd.options.mk"
57 57
58.if !empty(PKG_OPTIONS:Msuhosin) 58.if !empty(PKG_OPTIONS:Msuhosin)
59SUHOSIN_PHPVER= 5.2.12 59SUHOSIN_PHPVER= 5.2.12
60. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} 60. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS}
61PKG_FAIL_REASON+= "The suhosin patch is currently not available for" 61PKG_FAIL_REASON+= "The suhosin patch is currently not available for"
62PKG_FAIL_REASON+= "this version of PHP. You may have to wait until" 62PKG_FAIL_REASON+= "this version of PHP. You may have to wait until"
63PKG_FAIL_REASON+= "an updated patch is released or temporarily" 63PKG_FAIL_REASON+= "an updated patch is released or temporarily"
64PKG_FAIL_REASON+= "build this package without the suhosin option." 64PKG_FAIL_REASON+= "build this package without the suhosin option."
65. else 65. else
66PATCH_SITES= http://download.suhosin.org/ 66PATCH_SITES= http://download.suhosin.org/
67PATCHFILES+= suhosin-patch-${SUHOSIN_PHPVER}-0.9.7.patch.gz 67PATCHFILES+= suhosin-patch-${SUHOSIN_PHPVER}-0.9.7.patch.gz
68PATCH_DIST_STRIP= -p1 68PATCH_DIST_STRIP= -p1
69PLIST.suhosin= yes 69PLIST.suhosin= yes
70MESSAGE_SRC= ${.CURDIR}/../../lang/php5/MESSAGE 70MESSAGE_SRC= ${.CURDIR}/../../lang/php5/MESSAGE
71MESSAGE_SRC+= ${.CURDIR}/../../lang/php5/MESSAGE.suhosin 71MESSAGE_SRC+= ${.CURDIR}/../../lang/php5/MESSAGE.suhosin
72. endif 72. endif
73.endif 73.endif
74 74
75.if !empty(PKG_OPTIONS:Minet6) 75.if !empty(PKG_OPTIONS:Minet6)
76CONFIGURE_ARGS+= --enable-ipv6 76CONFIGURE_ARGS+= --enable-ipv6
77.else 77.else
78CONFIGURE_ARGS+= --disable-ipv6 78CONFIGURE_ARGS+= --disable-ipv6
79.endif 79.endif
80 80
81.if !empty(PKG_OPTIONS:Mssl) 81.if !empty(PKG_OPTIONS:Mssl)
82. include "../../security/openssl/buildlink3.mk" 82. include "../../security/openssl/buildlink3.mk"
83. if ${OPSYS} == "SunOS" 83. if ${OPSYS} == "SunOS"
84CONFIGURE_ARGS+= --with-openssl=yes 84CONFIGURE_ARGS+= --with-openssl=yes
85LIBS.SunOS+= -lcrypto 85LIBS.SunOS+= -lcrypto
86. else 86. else
87CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 87CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
88. endif 88. endif
89.else 89.else
90CONFIGURE_ARGS+= --without-openssl 90CONFIGURE_ARGS+= --without-openssl
91.endif 91.endif
92 92
93.if !empty(PKG_OPTIONS:Mmaintainer-zts) 93.if !empty(PKG_OPTIONS:Mmaintainer-zts)
94CONFIGURE_ARGS+= --enable-maintainer-zts 94CONFIGURE_ARGS+= --enable-maintainer-zts
95.endif 95.endif