Clean up php's framework.

* Define PHP's version at one place.
* Remove obsolete description in comments.
* Add "used by www/php-fpm/Makefile" in php5[34]/Makefile.php.
* Remove commented out support for suhosin extension from php54.
* Add PHP_CHECK_INSTALLED and PHP_EXTENSION_DIR to php/phpversion.mk.

No functional should be made.

4 files changed, 12 insertions, 77 deletions

diff --git a/lang/php54/MESSAGE.suhosin b/lang/php54/MESSAGE.suhosin
deleted file mode 100644
index 884861d1e5e..00000000000
--- a/lang/php54/MESSAGE.suhosin
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.suhosin,v 1.1 2012/06/16 05:21:55 taca Exp $
-
-As you have chosen to install the Suhosin patch you may also want to
-install the Suhosin extension which can be found in security/php-suhosin.
-
-===========================================================================
diff --git a/lang/php54/Makefile.common b/lang/php54/Makefile.common
index a71a501ae35..6b102469f4f 100644
--- a/lang/php54/Makefile.common
+++ b/lang/php54/Makefile.common
@@ -1,49 +1,16 @@
-# $NetBSD: Makefile.common,v 1.14 2013/07/07 13:37:53 taca Exp $
+# $NetBSD: Makefile.common,v 1.15 2013/07/21 17:29:47 taca Exp $
 # used by lang/php54/Makefile.php
 # used by lang/php/ext.mk
 # used by meta-pkgs/php54-extensions/Makefile
 
-#
-# NOTE:
-# The suhosin option includes a patch from http://www.hardened-php.net/
-# Which tracks with the exact version number of PHP.  There may be a delay
-# in the patch which can leave the option broken until an updated patch
-# is released.  When updating PHP please don't forget to update the
-# distnfo with the details of the suhosin patch as well.
-#
-# Check these packages when update to new release of PHP and consider to
-# reset PKG_REVISION:
-#
-#	databases/php-mysqlnd (not yet packaged)
-#	misc/php-intl
-#	textproc/php-enchant
-#
-# Since other PHP extensions are shared between www/php5, we can't reset
-# PKGREVSION.
-#
+PHP_VERSION_REQD=	54
+PHP_BASE_VERS=		${PHP54_VERSION}
+PHP_CHECK_INSTALLED=	No
 
-.if !defined(DISTNAME)
-DISTNAME=		php-${PHP_BASE_VERS}
-.endif
-CATEGORIES+=		www
-
-.if !defined(PECL_VERSION)
-MASTER_SITES?=		http://www.php.net/distributions/ \
-			http://uk.php.net/distributions/ \
-			http://de.php.net/distributions/ \
-			http://us.php.net/distributions/
-EXTRACT_SUFX?=		.tar.bz2
-.endif
+.include "../../lang/php/common.mk"
 
+CATEGORIES+=		www
 MAINTAINER?=		pkgsrc-users@NetBSD.org
-HOMEPAGE?=		http://www.php.net/
-
-PHP_BASE_VERS=		5.4.17
-
-PHP_EXTENSION_DIR=	lib/php/20120301
-PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
-
-PKG_SYSCONFVAR?=	php
 
 # needed due to (broken?) configure checks in php-xmlrpc and php5-dom
 CONFIGURE_ENV+=		PHP_LIBXML_SHARED="1"
diff --git a/lang/php54/Makefile.php b/lang/php54/Makefile.php
index b03e67df47b..63b79bbf6e9 100644
--- a/lang/php54/Makefile.php
+++ b/lang/php54/Makefile.php
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.php,v 1.5 2013/07/15 02:02:24 ryoon Exp $
+# $NetBSD: Makefile.php,v 1.6 2013/07/21 17:29:47 taca Exp $
 # used by lang/php54/Makefile
 # used by www/ap-php/Makefile
+# used by www/php-fpm/Makefile
 
 .include "../../lang/php54/Makefile.common"
 
@@ -11,7 +12,7 @@ USE_LIBTOOL=		YES
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 BUILD_DEFS+=		VARBASE
-PLIST_VARS+=		suhosin dtrace
+PLIST_VARS+=		dtrace
 
 CONFIGURE_ENV+=		EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
 
@@ -38,44 +39,21 @@ CONFIGURE_ARGS+=	--disable-json
 CONFIGURE_ARGS+=	--enable-cgi
 CONFIGURE_ARGS+=	--enable-xml
 CONFIGURE_ARGS+=	--with-libxml-dir=${PREFIX}
+
 .include "../../textproc/libxml2/buildlink3.mk"
 
 # Note: This expression is the same as ${PKGBASE}, but the latter is
 # not defined yet, so we cannot use it here.
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
-PKG_SUPPORTED_OPTIONS+=	inet6 ssl maintainer-zts readline # suhosin
+PKG_SUPPORTED_OPTIONS+=	inet6 ssl maintainer-zts readline
 PKG_SUGGESTED_OPTIONS+=	inet6 ssl
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
 PKG_SUPPORTED_OPTIONS+=	dtrace
 .endif
 
-#SUBST_CLASSES+=		ini
-#SUBST_STAGE.ini=	post-patch
-#SUBST_FILES.ini=	php.ini-development
-#SUBST_FILES.ini+=	php.ini-production
-#SUBST_SED.ini=		-e "s|\\;include_path = \".:/php/includes\"|include_path = \".:${PREFIX}/lib/php\"|g"
-#SUBST_MESSAGE.ini=	Fixing default ini files.
-
 .include "../../mk/bsd.options.mk"
 
-#.if !empty(PKG_OPTIONS:Msuhosin)
-#SUHOSIN_PHPVER=		5.4.0
-#.  if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS}
-#PKG_FAIL_REASON+=	"The suhosin patch is currently not available for"
-#PKG_FAIL_REASON+=	"this version of PHP.  You may have to wait until"
-#PKG_FAIL_REASON+=	"an updated patch is released or temporarily"
-#PKG_FAIL_REASON+=	"build this package without the suhosin option."
-#.  else
-#PATCH_SITES=		http://download.suhosin.org/
-#PATCHFILES+=		suhosin-patch-${SUHOSIN_PHPVER}-0.9.10.patch.gz
-#PATCH_DIST_STRIP=	-p1
-#PLIST.suhosin=		yes
-#MESSAGE_SRC=		${.CURDIR}/../../lang/php54/MESSAGE
-#MESSAGE_SRC+=		${.CURDIR}/../../lang/php54/MESSAGE.suhosin
-#.  endif
-#.endif
-
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
diff --git a/lang/php54/PLIST b/lang/php54/PLIST
index 6646f4e949b..3dda1bbaf97 100644
--- a/lang/php54/PLIST
+++ b/lang/php54/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/08/17 15:34:01 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/07/21 17:29:47 taca Exp $
 bin/phar
 bin/phar.phar
 bin/php
@@ -213,9 +213,6 @@ include/php/main/streams/php_stream_plain_wrapper.h
 include/php/main/streams/php_stream_transport.h
 include/php/main/streams/php_stream_userspace.h
 include/php/main/streams/php_streams_int.h
-${PLIST.suhosin}include/php/main/suhosin_globals.h
-${PLIST.suhosin}include/php/main/suhosin_logo.h
-${PLIST.suhosin}include/php/main/suhosin_patch.h
 include/php/main/win32_internal_function_disabled.h
 include/php/main/win95nt.h
 include/php/sapi/cli/cli.h