From owner-svn-ports-all@FreeBSD.ORG Wed Oct 30 13:28:01 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3F264628; Wed, 30 Oct 2013 13:28:01 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1E3732105; Wed, 30 Oct 2013 13:28:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9UDS0YB083653; Wed, 30 Oct 2013 13:28:00 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9UDS0u9083652; Wed, 30 Oct 2013 13:28:00 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201310301328.r9UDS0u9083652@svn.freebsd.org> From: Alex Dupre Date: Wed, 30 Oct 2013 13:28:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332106 - 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2013 13:28:01 -0000 Author: ale Date: Wed Oct 30 13:28:00 2013 New Revision: 332106 URL: http://svnweb.freebsd.org/changeset/ports/332106 Log: Add support for staging PHP extensions. Submitted by: antoine Modified: head/Mk/bsd.php.mk Modified: head/Mk/bsd.php.mk ============================================================================== --- head/Mk/bsd.php.mk Wed Oct 30 13:12:08 2013 (r332105) +++ head/Mk/bsd.php.mk Wed Oct 30 13:28:00 2013 (r332106) @@ -173,20 +173,21 @@ PHP_MODNAME?= ${PORTNAME} PHP_HEADER_DIRS?= "" do-install: - @${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR} @${INSTALL_DATA} ${WRKSRC}/modules/${PHP_MODNAME}.so \ - ${PREFIX}/lib/php/${PHP_EXT_DIR} + ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR} . for header in . ${PHP_HEADER_DIRS} - @${MKDIR} ${PREFIX}/include/php/ext/${PHP_MODNAME}/${header} + @${MKDIR} ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/${header} @${INSTALL_DATA} ${WRKSRC}/${header}/*.h \ - ${PREFIX}/include/php/ext/${PHP_MODNAME}/${header} + ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/${header} . endfor - @${RM} -f ${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h + @${RM} -f ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h @${GREP} "#define \(COMPILE\|HAVE\|USE\)_" ${WRKSRC}/config.h \ - > ${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h + > ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/php +.if defined(NO_STAGE) @${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 @@ -194,6 +195,7 @@ do-install: @${ECHO_CMD} extension=${PHP_MODNAME}.so \ >> ${PREFIX}/etc/php/extensions.ini .endif +.endif add-plist-info: add-plist-phpext add-plist-phpext: @@ -201,10 +203,10 @@ add-plist-phpext: >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir %D/lib/php/${PHP_EXT_DIR} 2> /dev/null || true" \ >> ${TMPPLIST} - @${FIND} -P ${PREFIX}/include/php/ext/${PHP_MODNAME} ! -type d 2>/dev/null | \ - ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST} - @${FIND} -P -d ${PREFIX}/include/php/ext/${PHP_MODNAME} -type d 2>/dev/null | \ - ${SED} -ne 's,^${PREFIX}/,@dirrm ,p' >> ${TMPPLIST} + @${FIND} -P ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME} ! -type d 2>/dev/null | \ + ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST} + @${FIND} -P -d ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME} -type d 2>/dev/null | \ + ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,@dirrm ,p' >> ${TMPPLIST} @${ECHO_CMD} "@exec echo \#include \\\"ext/${PHP_MODNAME}/config.h\\\" >> %D/include/php/ext/php_config.h" \ >> ${TMPPLIST} @${ECHO_CMD} "@unexec cp %D/include/php/ext/php_config.h %D/include/php/ext/php_config.h.orig" \ @@ -238,7 +240,7 @@ add-plist-phpext: @${ECHO_CMD} "@unexec rmdir %D/etc/php 2> /dev/null || true" \ >> ${TMPPLIST} -security-check: php-ini +package-message: php-ini php-ini: @${ECHO_CMD} "****************************************************************************"