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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -33,27 +33,27 @@ CONFIGURE_ARGS+= --without-pear @@ -33,27 +33,27 @@ CONFIGURE_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