From owner-svn-ports-head@FreeBSD.ORG Thu Mar 7 09:20:23 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id F2F03BC0; Thu, 7 Mar 2013 09:20:22 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E5379D26; Thu, 7 Mar 2013 09:20:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r279KMvn091484; Thu, 7 Mar 2013 09:20:22 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r279KMp6091461; Thu, 7 Mar 2013 09:20:22 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201303070920.r279KMp6091461@svn.freebsd.org> From: Alex Dupre Date: Thu, 7 Mar 2013 09:20:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313569 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Mar 2013 09:20:23 -0000 Author: ale Date: Thu Mar 7 09:20:22 2013 New Revision: 313569 URL: http://svnweb.freebsd.org/changeset/ports/313569 Log: Add support to register Zend extensions. Submitted by: delphij Modified: head/Mk/bsd.php.mk Modified: head/Mk/bsd.php.mk ============================================================================== --- head/Mk/bsd.php.mk Thu Mar 7 08:00:10 2013 (r313568) +++ head/Mk/bsd.php.mk Thu Mar 7 09:20:22 2013 (r313569) @@ -21,6 +21,7 @@ # IGNORE_WITH_PHP=N - The port doesn't work with PHP version N. # USE_PHPIZE=yes - Use to build a PHP extension. # USE_PHPEXT=yes - Use to build, install and register a PHP extension. +# USE_ZENDEXT=yes - Use to build, install and register a Zend extension. # USE_PHP_BUILD=yes - Set PHP also as a build dependency. # WANT_PHP_CLI=yes - Want the CLI version of PHP. # WANT_PHP_CGI=yes - Want the CGI version of PHP. @@ -148,7 +149,7 @@ RUN_DEPENDS+= ${PHPBASE}/include/php/mai PLIST_SUB+= PHP_EXT_DIR=${PHP_EXT_DIR} SUB_LIST+= PHP_EXT_DIR=${PHP_EXT_DIR} -.if defined(USE_PHPIZE) || defined(USE_PHPEXT) +.if defined(USE_PHPIZE) || defined(USE_PHPEXT) || defined(USE_ZENDEXT) BUILD_DEPENDS+= ${PHPBASE}/bin/phpize:${PORTSDIR}/${PHP_PORT} GNU_CONFIGURE= yes USE_AUTOTOOLS+= autoconf:env @@ -165,7 +166,7 @@ do-phpize: .endif -.if defined(_POSTMKINCLUDED) && defined(USE_PHPEXT) +.if defined(_POSTMKINCLUDED) && (defined(USE_PHPEXT) || defined(USE_ZENDEXT)) PHP_MODNAME?= ${PORTNAME} PHP_HEADER_DIRS?= "" @@ -184,8 +185,13 @@ do-install: @${ECHO_CMD} \#include \"ext/${PHP_MODNAME}/config.h\" \ >> ${PREFIX}/include/php/ext/php_config.h @${MKDIR} ${PREFIX}/etc/php +.if defined(USE_ZENDEXT) + @${ECHO_CMD} zend_extension=${PREFIX}/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so \ + >> ${PREFIX}/etc/php/extensions.ini +.else @${ECHO_CMD} extension=${PHP_MODNAME}.so \ >> ${PREFIX}/etc/php/extensions.ini +.endif add-plist-info: add-plist-phpext add-plist-phpext: @@ -207,12 +213,22 @@ add-plist-phpext: >> ${TMPPLIST} @${ECHO_CMD} "@exec mkdir -p %D/etc/php" \ >> ${TMPPLIST} +.if defined(USE_ZENDEXT) + @${ECHO_CMD} "@exec echo zend_extension=%D/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so >> %D/etc/php/extensions.ini" \ + >> ${TMPPLIST} +.else @${ECHO_CMD} "@exec echo extension=${PHP_MODNAME}.so >> %D/etc/php/extensions.ini" \ >> ${TMPPLIST} +.endif @${ECHO_CMD} "@unexec cp %D/etc/php/extensions.ini %D/etc/php/extensions.ini.orig" \ >> ${TMPPLIST} +.if defined(USE_ZENDEXT) + @${ECHO_CMD} "@unexec grep -v zend_extension=%D/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}\\\.so %D/etc/php/extensions.ini.orig > %D/etc/php/extensions.ini || true" \ + >> ${TMPPLIST} +.else @${ECHO_CMD} "@unexec grep -v extension=${PHP_MODNAME}\\\.so %D/etc/php/extensions.ini.orig > %D/etc/php/extensions.ini || true" \ >> ${TMPPLIST} +.endif @${ECHO_CMD} "@unexec rm %D/etc/php/extensions.ini.orig" \ >> ${TMPPLIST} @${ECHO_CMD} "@unexec [ -s %D/etc/php/extensions.ini ] || rm %D/etc/php/extensions.ini" \ @@ -228,7 +244,11 @@ php-ini: @${ECHO_CMD} "The following line has been added to your ${PREFIX}/etc/php/extensions.ini" @${ECHO_CMD} "configuration file to automatically load the installed extension:" @${ECHO_CMD} "" +.if defined(USE_ZENDEXT) + @${ECHO_CMD} "zend_extension=${PREFIX}/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so" +.else @${ECHO_CMD} "extension=${PHP_MODNAME}.so" +.endif @${ECHO_CMD} "" @${ECHO_CMD} "****************************************************************************" .endif