--- trunk/include/php5.sminc	2012/01/14 01:48:34	9880
+++ trunk/include/php5.sminc	2012/10/31 19:27:07	13929
@@ -1,41 +1,50 @@
-# $Header: /magellan-cvs/smage/include/php5.sminc,v 1.2 2007-07-11 17:51:45 niro Exp $
+# $Id$
 
 # default includes
 sminclude mtools
 
 # default extension name if not already given
-: ${PHP5_EXTENSION="${PNAME/#php5-/}"}
+: ${PHP_EXTENSION="${PNAME/#php-/}"}
+
+# default config locations
+: ${PHP_CONFIG_DIR="/etc/php"}
+: ${PHP_CONFIG_SCAN_DIR="/etc/php/conf.d"}
+: ${PHP_EXTENSIONS_DIR="/usr/$(mlibdir)/php/extensions"}
+: ${PHP_PEAR_DIR="/usr/share/php/pear"}
 
 # some sane default dependencies
-DEPEND=">= dev-lang/php5-5.2"
+DEPEND=">= dev-lang/php-5.4"
 
 SDEPEND=">= sys-dev/m4-1.4
 	>= sys-dev/libtool-1.5"
 
 # default SRCFILE SRCDIR and SRC_URI
-: ${SRCFILE="${PNAME/#php5-/}-${PVER}.tar.bz2"}
-: ${SRCDIR="${BUILDDIR}/${PNAME/#php5-/}-${PVER}"}
+: ${SRCFILE="${PNAME/#php-/}-${PVER}.tar.bz2"}
+: ${SRCDIR="${BUILDDIR}/${PNAME/#php-/}-${PVER}"}
 : ${SRC_URI=( mirror://${PNAME}/${SRCFILE} )}
 
-php5_phpize()
+php_phpize()
 {
 	phpize || die
 
 	# regen aclocal, libtoolize etc to fix libtool-2 issues
-	rm -f aclocal.m4 || die
-	autoreconf --verbose --force --install || die
+	if [ -f aclocal.m4 ]
+	then
+		rm aclocal.m4 || die
+	fi
+	mautoreconf || die
 	mlibtoolize || die
 }
 
-php5_src_prepare()
+php_src_prepare()
 {
 	munpack ${SRCFILE} || die
 	cd ${SRCDIR}
 
-	php5_phpize || die
+	php_phpize || die
 }
 
-php5_src_configure()
+php_src_configure()
 {
 	local configure_opts="$@"
 
@@ -45,25 +54,32 @@
 		|| die
 }
 
-php5_src_compile()
+php_src_compile()
 {
 	cd ${SRCDIR}
-	php5_src_configure || die
+	php_src_configure || die
 	mmake || die
 }
 
-php5_src_install()
+php_src_check()
+{
+	cd ${SRCDIR}
+	mmake -k check || die
+}
+
+php_src_install()
 {
 	cd ${SRCDIR}
 
 	# needed directories
-	minstalldir /etc/php5/conf.d || die
+	minstalldir ${PHP_CONFIG_SCAN_DIR} || die
 	minstalldir $(php-config --extension-dir) || die
 
 	# install extensions and the config ini
-	minstallexec modules/${PHP5_EXTENSION}.so $(php-config --extension-dir) || die
-	echo "extension=${PHP5_EXTENSION}.so" \
-		> ${BINDIR}/etc/php5/conf.d/${PHP5_EXTENSION}.ini || die
+	minstallexec modules/${PHP_EXTENSION}.so $(php-config --extension-dir) || die
+	local MCONFIG="${PHP_CONFIG_SCAN_DIR}/${PHP_EXTENSION}.ini"
+	mclearconfig || die
+	maddconfig "extension=${PHP_EXTENSION}.so" || die
 
 	# install docs
 	local i
@@ -77,4 +93,4 @@
 	done
 }
 
-export_inherits php5 src_prepare src_compile src_install
+export_inherits php src_prepare src_compile src_check src_install