[Midnightbsd-cvs] mports [17485] trunk/Mk/extensions/php.mk: update php.mk

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Sep 24 08:12:40 EDT 2014


Revision: 17485
          http://svnweb.midnightbsd.org/mports/?rev=17485
Author:   laffer1
Date:     2014-09-24 08:12:39 -0400 (Wed, 24 Sep 2014)
Log Message:
-----------
update php.mk

Modified Paths:
--------------
    trunk/Mk/extensions/php.mk

Modified: trunk/Mk/extensions/php.mk
===================================================================
--- trunk/Mk/extensions/php.mk	2014-09-24 12:06:54 UTC (rev 17484)
+++ trunk/Mk/extensions/php.mk	2014-09-24 12:12:39 UTC (rev 17485)
@@ -17,6 +17,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.
@@ -28,20 +29,44 @@
 # Don't specify any WANT_PHP_* knob if your port will work with every PHP SAPI.
 #
 
-.if !defined(_POSTMKINCLUDED)
+.if !defined(_PHPMKINCLUDED)
 
-Php_Include_MAINTAINER=	ports at MidnightBSD.org
+PHP_Include_MAINTAINER=	ports at MidnightBSD.org
 
+_PHPMKINCLUDED=	yes
+
+.include "${PORTSDIR}/Mk/components/default-versions.mk"
+
+.if defined(DEFAULT_PHP_VER)
+WARNING+=	"DEFAULT_PHP_VER is defined, consider using DEFAULT_VERSIONS=php=${DEFAULT_PHP_VER} instead"
+.endif
+
 PHPBASE?=	${LOCALBASE}
 .if exists(${PHPBASE}/etc/php.conf) && !defined(PACKAGE_BUILDING)
 .include "${PHPBASE}/etc/php.conf"
 PHP_EXT_DIR!=	${PHPBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${PHPBASE}/lib/php/\(.*\),\1,p'
+
 .else
-DEFAULT_PHP_VER?=	5
+DEFAULT_PHP_VER?=	${PHP_DEFAULT:S/.//}
 
 PHP_VER?=	${DEFAULT_PHP_VER}
+.if ${PHP_VER}  == 53
+PHP_EXT_DIR=	20090626
+PHP_EXT_INC=	pcre spl
+.elif ${PHP_VER}  == 56
+PHP_EXT_DIR=	20131226
+PHP_EXT_INC=	pcre spl
+.elif ${PHP_VER}  == 55
+PHP_EXT_DIR=	20121212
+PHP_EXT_INC=	pcre spl
+.elif ${PHP_VER}  == 54
+PHP_VER=	5
 PHP_EXT_DIR=	20100525
 PHP_EXT_INC=	pcre spl
+.else
+PHP_EXT_DIR=	20100525
+PHP_EXT_INC=	pcre spl
+.endif
 
 HTTPD?=		${LOCALBASE}/sbin/httpd
 .if exists(${HTTPD}) && !defined(PACKAGE_BUILDING)
@@ -70,14 +95,11 @@
 
 PHP5_LAST_VER=	54
 
-# compatability shim
-.if defined(BROKEN_WITH_PHP)
-IGNORE_WITH_PHP=${BROKEN_WITH_PHP}
-.endif
 .if defined(IGNORE_WITH_PHP)
 .	for VER in ${IGNORE_WITH_PHP}
 .		if ${PHP_VER} == "${VER}"
-IGNORE=		cannot install: doesn't work with PHP version : ${PHP_VER} (Doesn't support PHP ${IGNORE_WITH_PHP})
+IGNORE=		cannot be installed: doesn't work with lang/php${PHP_VER} port\
+		(doesn't support PHP ${IGNORE_WITH_PHP:C/^5$/${PHP5_LAST_VER}/:C/^5/5./})
 .		endif
 .	endfor
 .endif
@@ -88,15 +110,13 @@
 		@${ECHO_CMD} "If you define WANT_PHP_WEB you cannot set also WANT_PHP_CGI"
 		@${ECHO_CMD} "or WANT_PHP_MOD. Use only one of them."
 		@${FALSE}
-.	else
-.	if defined(PHP_VERSION) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "" && ${PHP_SAPI:Mmod} == ""
+.	elif defined(PHP_VERSION) && ${PHP_VER} == 53 && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "" && ${PHP_SAPI:Mmod} == ""
 check-makevars::
 		@${ECHO_CMD} "This port requires the Apache Module or the CGI version of PHP, but you have"
 		@${ECHO_CMD} "already installed a PHP port without them."
 		@${FALSE}
 .	endif
-.	endif
-.else
+.endif
 
 .if defined(WANT_PHP_CGI)
 .	if defined(PHP_VERSION) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == ""
@@ -105,7 +125,7 @@
 		@${ECHO_CMD} "installed a PHP port without CGI."
 		@${FALSE}
 .	endif
-.else
+.endif
 
 .if defined(WANT_PHP_CLI)
 .	if defined(PHP_VERSION) && ${PHP_SAPI:Mcli} == ""
@@ -114,10 +134,10 @@
 		@${ECHO_CMD} "installed a PHP port without CLI."
 		@${FALSE}
 .	endif
-.else
+.endif
 
 .if defined(WANT_PHP_MOD)
-.	if defined(PHP_VERSION) && ${PHP_SAPI:Mmod} == ""
+.	if defined(PHP_VERSION) && ${PHP_VER} == 53 && ${PHP_SAPI:Mmod} == ""
 check-makevars::
 		@${ECHO_CMD} "This port requires the Apache Module for PHP, but you have already"
 		@${ECHO_CMD} "installed a PHP port without the Apache Module."
@@ -125,31 +145,41 @@
 .	endif
 .endif
 
+.if defined(WANT_PHP_EMB)
+.	if defined(PHP_VERSION) && ${PHP_SAPI:Membed} == ""
+check-makevars::
+		@${ECHO_CMD} "This port requires the embedded library version of PHP, but you have already"
+		@${ECHO_CMD} "installed a PHP port without the embedded library."
+		@${FALSE}
+.	endif
 .endif
 
+PHP_PORT?=	lang/php${PHP_VER}
+.if ${PHP_VER} == 53
+MOD_PHP_PORT?=	${PHP_PORT}
+.else
+MOD_PHP_PORT?=	www/mod_php${PHP_VER}
 .endif
 
-.endif
-
-PHP_PORT=	${PORTSDIR}/lang/php${PHP_VER}
-
 .if defined(USE_PHP_BUILD)
-BUILD_DEPENDS+=	${PHPBASE}/include/php/main/php.h:${PHP_PORT}
+BUILD_DEPENDS+=	${PHPBASE}/include/php/main/php.h:${PORTSDIR}/${PHP_PORT}
 .endif
-RUN_DEPENDS+=	${PHPBASE}/include/php/main/php.h:${PHP_PORT}
+RUN_DEPENDS+=	${PHPBASE}/include/php/main/php.h:${PORTSDIR}/${PHP_PORT}
+.if defined(WANT_PHP_MOD) || (defined(WANT_PHP_WEB) && defined(PHP_VERSION) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "")
+USE_APACHE_RUN=	22+
+.include "${PORTSDIR}/Mk/extensions/apache.mk"
+RUN_DEPENDS+=	${PHPBASE}/${APACHEMODDIR}/libphp5.so:${PORTSDIR}/${MOD_PHP_PORT}
+.endif
 
 PLIST_SUB+=	PHP_EXT_DIR=${PHP_EXT_DIR}
 SUB_LIST+=	PHP_EXT_DIR=${PHP_EXT_DIR}
 
-.if defined(USE_PHPIZE) || defined(USE_PHPEXT)
-BUILD_DEPENDS+=	${PHPBASE}/bin/phpize:${PHP_PORT}
-GNU_CONFIGURE=	YES
+.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
 CONFIGURE_ARGS+=--with-php-config=${PHPBASE}/bin/php-config
 
-# PECL uses INSTALL_ROOT
-DESTDIRNAME=	INSTALL_ROOT
-
 configure-message: phpize-message do-phpize
 
 phpize-message:
@@ -159,7 +189,9 @@
 	@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${PHPBASE}/bin/phpize)
 .endif
 
-.if defined(USE_PHPEXT)
+.endif
+
+.if defined(_POSTMKINCLUDED) && (defined(USE_PHPEXT) || defined(USE_ZENDEXT))
 PHP_MODNAME?=	${PORTNAME}
 PHP_HEADER_DIRS?=	""
 
@@ -201,12 +233,22 @@
 		>> ${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" \
@@ -214,7 +256,7 @@
 	@${ECHO_CMD} "@unexec rmdir %D/etc/php 2> /dev/null || true" \
 		>> ${TMPPLIST}
 
-security-check: php-ini
+package-message: php-ini
 
 php-ini:
 	@${ECHO_CMD} "****************************************************************************"
@@ -222,27 +264,32 @@
 	@${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
 
 # Extensions
-.if ${USE_PHP:L} != "yes"
+.if defined(_POSTMKINCLUDED) && ${USE_PHP:tl} != "yes"
 # non-version specific components
-_USE_PHP_ALL=	apc bcmath bitset bz2 calendar ctype curl dba \
-		exif fileinfo fribidi ftp gd gettext gmp \
-		hash iconv imap interbase json ldap mbstring mcrypt \
-		memcache mssql mysql odbc \
-		openssl pcntl pcre pdf pgsql posix \
-		pspell radius readline recode session shmop snmp \
-		sockets sybase_ct sysvmsg sysvsem sysvshm \
-		tokenizer wddx xml xmlrpc yaz zip zlib
+_USE_PHP_ALL=	apc bcmath bitset bz2 calendar ctype curl dba dom \
+		exif fileinfo filter ftp gd gettext gmp \
+		hash iconv igbinary imap interbase intl json ldap mbstring mcrypt \
+		memcache mssql mysql mysqli odbc opcache \
+		openssl pcntl pcre pdf pdo pdo_dblib pdo_firebird pdo_mysql \
+		pdo_odbc pdo_pgsql pdo_sqlite pgsql posix \
+		pspell radius readline recode session shmop simplexml snmp soap\
+		sockets spl sybase_ct sysvmsg sysvsem sysvshm \
+		tidy tokenizer wddx xml xmlreader xmlrpc xmlwriter xsl zip zlib
 # version specific components
-_USE_PHP_VER5=	${_USE_PHP_ALL} dbase dom filter mysqli oci8 pdo \
-		pdo_mysql pdo_pgsql pdo_sqlite \
-		simplexml soap spl sqlite3 \
-		tidy xmlreader xmlwriter xsl phar
+_USE_PHP_VER5=	${_USE_PHP_ALL} phar sqlite3
+_USE_PHP_VER53=	${_USE_PHP_ALL} phar sqlite sqlite3
+_USE_PHP_VER55=	${_USE_PHP_ALL} phar sqlite3
+_USE_PHP_VER56=	${_USE_PHP_ALL} phar sqlite3
 
 apc_DEPENDS=	www/pecl-APC
 bcmath_DEPENDS=	math/php${PHP_VER}-bcmath
@@ -249,20 +296,14 @@
 bitset_DEPENDS=	math/pecl-bitset
 bz2_DEPENDS=	archivers/php${PHP_VER}-bz2
 calendar_DEPENDS=	misc/php${PHP_VER}-calendar
-crack_DEPENDS=	security/php${PHP_VER}-crack
 ctype_DEPENDS=	textproc/php${PHP_VER}-ctype
 curl_DEPENDS=	ftp/php${PHP_VER}-curl
 dba_DEPENDS=	databases/php${PHP_VER}-dba
 dbase_DEPENDS=	databases/php${PHP_VER}-dbase
-dbx_DEPENDS=	databases/php${PHP_VER}-dbx
-dio_DEPENDS=	devel/php${PHP_VER}-dio
 dom_DEPENDS=	textproc/php${PHP_VER}-dom
-domxml_DEPENDS=	textproc/php${PHP_VER}-domxml
 exif_DEPENDS=	graphics/php${PHP_VER}-exif
 fileinfo_DEPENDS=	sysutils/php${PHP_VER}-fileinfo
-filepro_DEPENDS=databases/php${PHP_VER}-filepro
 filter_DEPENDS=	security/php${PHP_VER}-filter
-fribidi_DEPENDS=converters/pecl-fribidi
 ftp_DEPENDS=	ftp/php${PHP_VER}-ftp
 gd_DEPENDS=	graphics/php${PHP_VER}-gd
 gettext_DEPENDS=devel/php${PHP_VER}-gettext
@@ -269,14 +310,14 @@
 gmp_DEPENDS=	math/php${PHP_VER}-gmp
 hash_DEPENDS=	security/php${PHP_VER}-hash
 iconv_DEPENDS=	converters/php${PHP_VER}-iconv
+igbinary_DEPENDS=	converters/pecl-igbinary
 imap_DEPENDS=	mail/php${PHP_VER}-imap
 interbase_DEPENDS=	databases/php${PHP_VER}-interbase
+intl_DEPENDS=	devel/pecl-intl
 json_DEPENDS=	devel/php${PHP_VER}-json
 ldap_DEPENDS=	net/php${PHP_VER}-ldap
 mbstring_DEPENDS=	converters/php${PHP_VER}-mbstring
-mcal_DEPENDS=	misc/php${PHP_VER}-mcal
 mcrypt_DEPENDS=	security/php${PHP_VER}-mcrypt
-mcve_DEPENDS=	devel/php${PHP_VER}-mcve
 memcache_DEPENDS=	databases/pecl-memcache
 mhash_DEPENDS=	security/php${PHP_VER}-mhash
 mssql_DEPENDS=	databases/php${PHP_VER}-mssql
@@ -283,19 +324,24 @@
 mysql_DEPENDS=	databases/php${PHP_VER}-mysql
 mysqli_DEPENDS=	databases/php${PHP_VER}-mysqli
 ncurses_DEPENDS=devel/php${PHP_VER}-ncurses
+odbc_DEPENDS=	databases/php${PHP_VER}-odbc
 oci8_DEPENDS=	databases/php${PHP_VER}-oci8
-odbc_DEPENDS=	databases/php${PHP_VER}-odbc
+.if ${PHP_VER} == 55 || ${PHP_VER} == 56
+opcache_DEPENDS=	www/php${PHP_VER}-opcache
+.else
+opcache_DEPENDS=	www/pecl-zendopcache
+.endif	
 openssl_DEPENDS=security/php${PHP_VER}-openssl
-oracle_DEPENDS=	databases/php${PHP_VER}-oracle
-overload_DEPENDS=lang/php${PHP_VER}-overload
 pcntl_DEPENDS=	devel/php${PHP_VER}-pcntl
 pcre_DEPENDS=	devel/php${PHP_VER}-pcre
 pdf_DEPENDS=	print/pecl-pdflib
 pdo_DEPENDS=	databases/php${PHP_VER}-pdo
+pdo_dblib_DEPENDS=	databases/php${PHP_VER}-pdo_dblib
+pdo_firebird_DEPENDS=	databases/php${PHP_VER}-pdo_firebird
 pdo_mysql_DEPENDS=	databases/php${PHP_VER}-pdo_mysql
+pdo_odbc_DEPENDS=	databases/php${PHP_VER}-pdo_odbc
 pdo_pgsql_DEPENDS=	databases/php${PHP_VER}-pdo_pgsql
 pdo_sqlite_DEPENDS=	databases/php${PHP_VER}-pdo_sqlite
-pfpro_DEPENDS=	finance/php${PHP_VER}-pfpro
 pgsql_DEPENDS=	databases/php${PHP_VER}-pgsql
 phar_DEPENDS=	archivers/php${PHP_VER}-phar
 posix_DEPENDS=	sysutils/php${PHP_VER}-posix
@@ -310,7 +356,8 @@
 soap_DEPENDS=	net/php${PHP_VER}-soap
 sockets_DEPENDS=net/php${PHP_VER}-sockets
 spl_DEPENDS=	devel/php${PHP_VER}-spl
-sqlite3_DEPENDS=	databases/php${PHP_VER}-sqlite3
+sqlite_DEPENDS=	databases/php${PHP_VER}-sqlite
+sqlite3_DEPENDS=databases/php${PHP_VER}-sqlite3
 sybase_ct_DEPENDS=	databases/php${PHP_VER}-sybase_ct
 sysvmsg_DEPENDS=devel/php${PHP_VER}-sysvmsg
 sysvsem_DEPENDS=devel/php${PHP_VER}-sysvsem
@@ -323,9 +370,6 @@
 xmlrpc_DEPENDS=	net/php${PHP_VER}-xmlrpc
 xmlwriter_DEPENDS=	textproc/php${PHP_VER}-xmlwriter
 xsl_DEPENDS=	textproc/php${PHP_VER}-xsl
-xslt_DEPENDS=	textproc/php${PHP_VER}-xslt
-yaz_DEPENDS=	net/pecl-yaz
-yp_DEPENDS=	net/php${PHP_VER}-yp
 zip_DEPENDS=	archivers/php${PHP_VER}-zip
 zlib_DEPENDS=	archivers/php${PHP_VER}-zlib
 
@@ -333,20 +377,22 @@
 .		if ${_USE_PHP_VER${PHP_VER}:M${extension}} != ""
 .			if ${PHP_EXT_INC:M${extension}} == ""
 .				if defined(USE_PHP_BUILD)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
+BUILD_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
 .				endif
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
+RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
 .			endif
 .		else
-isyes=		${extension}
-.			if ${isyes:L} != "yes"
+ext=		${extension}
+.			if ${ext} == "mhash"
+.				if defined(USE_PHP_BUILD)
+BUILD_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/hash.so:${PORTSDIR}/${hash_DEPENDS}
+.				endif
+RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/hash.so:${PORTSDIR}/${hash_DEPENDS}
+.			elif ${ext:tl} != "yes"
 check-makevars::
-				@${ECHO_CMD} "Unknown extension ${extension} for PHP ${PHP_VER}."
-				@${FALSE}
+			@${ECHO_CMD} "Unknown extension ${extension} for PHP ${PHP_VER}."
+			@${FALSE}
 .			endif
 .		endif
 .	endfor
 .endif
-
-
-.endif # !defined(_POSTMKINCLUDED)



More information about the Midnightbsd-cvs mailing list