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.

2 files changed, 9 insertions, 39 deletions

diff --git a/lang/php53/Makefile.common b/lang/php53/Makefile.common
index 48f7b532177..5f7f1ca4b8c 100644
--- a/lang/php53/Makefile.common
+++ b/lang/php53/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2013/07/12 00:07:04 taca Exp $
+# $NetBSD: Makefile.common,v 1.28 2013/07/21 17:29:47 taca Exp $
 # used by lang/php53/Makefile.php
 # used by lang/php/ext.mk
 # used by meta-pkgs/php53-extensions/Makefile
@@ -10,40 +10,15 @@
 # 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.
-#
 
-.if !defined(DISTNAME)
-DISTNAME=		php-${PHP_BASE_VERS}
-.endif
-CATEGORIES+=		www
+PHP_VERSION_REQD=	53
+PHP_BASE_VERS=		${PHP53_VERSION}
+PHP_CHECK_INSTALLED=	No
 
-.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.3.27
-
-PHP_EXTENSION_DIR=	lib/php/20090630
-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/php53/Makefile.php b/lang/php53/Makefile.php
index c727c194911..f7eab1380e6 100644
--- a/lang/php53/Makefile.php
+++ b/lang/php53/Makefile.php
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.php,v 1.36 2013/07/15 02:02:24 ryoon Exp $
+# $NetBSD: Makefile.php,v 1.37 2013/07/21 17:29:47 taca Exp $
 # used by lang/php53/Makefile
 # used by www/ap-php/Makefile
+# used by www/php-fpm/Makefile
 
 .include "../../lang/php53/Makefile.common"
 
@@ -39,6 +40,7 @@ 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
@@ -47,13 +49,6 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
 PKG_SUPPORTED_OPTIONS+=	inet6 ssl maintainer-zts suhosin readline
 PKG_SUGGESTED_OPTIONS+=	inet6 ssl
 
-#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)