Import of pkgsrc-2016Q3

2016-10-14 07:49:11 +02:00
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
--- a/lang/php/MESSAGE.module
+++ b/lang/php/MESSAGE.module
@@ -1,11 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE.module,v 1.3 2015/02/15 09:00:33 taca Exp $
+$NetBSD: MESSAGE.module,v 1.4 2016/07/17 15:49:44 jdolecek Exp $

-To enable this module, add the following to ${PKG_SYSCONFDIR}/php.ini:
+Module configuration file was created and module should be autoloaded:
+${EXT_CONF_DIR}/${MODNAME}.ini

-    ${EXTENSION_DIRECTIVE}=${MODNAME}.so
+Make sure to update your ${PKG_SYSCONFDIR}/php.ini to not load this
+extension explicitely, remove:
+${EXTENSION_DIRECTIVE}=${EXTENSION_FILE}

-and make sure extension_dir points to the dir where ${MODNAME}.so is.
-
-Then restart your ${PKG_PHP}-enabled HTTP server to load this module.
+Restart your ${PKG_PHP}-enabled HTTP server to load this module.
 ===========================================================================
--- a/lang/php/PLIST.module
+++ b/lang/php/PLIST.module
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST.module,v 1.1 2004/11/05 21:40:25 jdolecek Exp $
-${PHP_EXTENSION_DIR}/${MODNAME}.so
+@comment $NetBSD: PLIST.module,v 1.3 2016/07/26 08:19:45 jdolecek Exp $
+share/examples/php/${MODNAME}.ini
+${PHP_EXTENSION_DIR}/${PKGMODNAME}.${SHLIB_SUFFIX}
--- a/lang/php/common.mk
+++ b/lang/php/common.mk
@@ -1,6 +1,7 @@
-# $NetBSD: common.mk,v 1.4 2015/03/16 00:26:31 taca Exp $
-# used by lang/php54/Makefile.common
-# used by lang/php55/Makefile.common
+# $NetBSD: common.mk,v 1.5 2016/09/11 17:14:46 taca Exp $
+# used by lang/php56/Makefile.common
+# used by lang/php70/Makefile.common
+# used by lang/php71/Makefile.common
 # 
 .if !defined(PHPCOMMON_MK)
 PHPCOMMON_MK=	defined
--- a/lang/php/ext.ini
+++ b/lang/php/ext.ini
@@ -0,0 +1,2 @@
+;; enable @MODNAME@
+@EXTENSION_DIRECTIVE@= @EXTENSION_FILE@
--- a/lang/php/ext.mk
+++ b/lang/php/ext.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ext.mk,v 1.39 2015/03/16 09:21:11 taca Exp $
+# $NetBSD: ext.mk,v 1.42 2016/07/26 08:19:45 jdolecek Exp $
 #
 # PHP extension package framework, for both PECL and bundled PHP extensions.
 #
@@ -28,7 +28,10 @@ HOMEPAGE?=		http://pecl.php.net/package/${MODNAME}
 PKGMODNAME?=		${MODNAME:S/-/_/}
 PHPSETUPSUBDIR?=	#empty
 MODULESDIR?=		${WRKSRC}/modules
-PLIST_SUBST+=		MODNAME=${PKGMODNAME}
+PLIST_SUBST+=		MODNAME=${MODNAME}
+PLIST_SUBST+=		PKGMODNAME=${PKGMODNAME}
+PLIST_SUBST+=       SHLIB_SUFFIX=${SHLIB_SUFFIX}
+PLIST_SUBST+=       PKG_SYSCONFDIR=${PKG_SYSCONFDIR}

 .if !defined(PECL_VERSION)
 # bundled extension
@@ -46,6 +49,21 @@ DIST_SUBDIR?=		php-${MODNAME}
 EXTRACT_SUFX?=		.tgz
 .endif

+EGDIR=      ${PREFIX}/share/examples/php
+CONF_FILES= ${EGDIR}/${MODNAME}.ini ${EXT_CONF_DIR}/${MODNAME}.ini
+
+EXT_CONF_DIR=   ${PKG_SYSCONFDIR}/php.d
+MAKE_DIRS+=     ${EXT_CONF_DIR}
+MAKE_DIRS+=     ${EGDIR}
+
+SUBST_CLASSES+=     ext-ini
+SUBST_FILES.ext-ini=  ${MODNAME}.ini
+SUBST_MESSAGE.ext-ini=Creating module ini file 
+SUBST_SED.ext-ini+=    -e 's,@MODNAME@,${PKGMODNAME},g'
+SUBST_SED.ext-ini+=    -e 's,@EXTENSION_FILE@,${EXTENSION_FILE},g'
+SUBST_SED.ext-ini+=    -e 's,@EXTENSION_DIRECTIVE@,${EXTENSION_DIRECTIVE},g'
+SUBST_STAGE.ext-ini=  post-build
+
 PHPIZE?=		${BUILDLINK_PREFIX.php}/bin/phpize
 PHP_CONFIG?=		${BUILDLINK_PREFIX.php}/bin/php-config

@@ -62,14 +80,18 @@ LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"

 PLIST_SRC+=		${.CURDIR}/../../lang/php/PLIST.module
-MESSAGE_SRC=		${.CURDIR}/../../lang/php/MESSAGE.module
+MESSAGE_SRC+=		${.CURDIR}/../../lang/php/MESSAGE.module
 MESSAGE_SUBST+=		MODNAME=${PKGMODNAME}
-MESSAGE_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
+MESSAGE_SUBST+=		EXT_CONF_DIR=${EXT_CONF_DIR}
 .if !empty(PHP_ZEND_EXTENSION:U:M[Yy][Ye][Ss])
-MESSAGE_SUBST+=		EXTENSION_DIRECTIVE=zend_extension
+EXTENSION_DIRECTIVE=    zend_extension
+EXTENSION_FILE=         ${PREFIX}/${PHP_EXTENSION_DIR}/${PKGMODNAME}.${SHLIB_SUFFIX}
 .else
-MESSAGE_SUBST+=		EXTENSION_DIRECTIVE=extension
+EXTENSION_DIRECTIVE=    extension
+EXTENSION_FILE=         ${PKGMODNAME}.${SHLIB_SUFFIX}
 .endif
+MESSAGE_SUBST+=		EXTENSION_DIRECTIVE=${EXTENSION_DIRECTIVE}
+MESSAGE_SUBST+=		EXTENSION_FILE=${EXTENSION_FILE}

 # Also include extension-specific message
 .if exists(${.CURDIR}/MESSAGE)
@@ -97,6 +119,9 @@ phpize-module:
 		${TOUCH} ${TOUCH_FLAGS} $${cookie};			\
 	fi

+pre-build:
+	${CP} ${.CURDIR}/../../lang/php/ext.ini ${WRKSRC}/${MODNAME}.ini
+
 do-install: do-module-install

 do-module-install:
@@ -104,6 +129,9 @@ do-module-install:
 	${INSTALL_LIB} ${MODULESDIR}/${PKGMODNAME}.${SHLIB_SUFFIX} \
 		${DESTDIR}${PREFIX}/${PHP_EXTENSION_DIR}

+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/${MODNAME}.ini ${DESTDIR}${EGDIR}
+
 .if defined(USE_PHP_EXT_PATCHES)
 PATCHDIR=		${.CURDIR}/${PHPPKGSRCDIR}/patches
 do-patch:
--- a/lang/php/pear.mk
+++ b/lang/php/pear.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pear.mk,v 1.27 2015/08/23 15:31:17 taca Exp $
+# $NetBSD: pear.mk,v 1.30 2016/04/10 16:39:27 joerg Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install pear packages.
@@ -44,9 +44,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-pear-[0-9]*:../../lang/pear

 PEAR_CMD=	${PREFIX}/bin/pear
 PEAR_LIB=	lib/php
-.if ${_USE_DESTDIR} != "no"
 PEAR_DESTDIR=	-P ${DESTDIR} -f
-.endif

 NO_BUILD=	yes

@@ -59,10 +57,10 @@ PEAR_GENERATE_PLIST=	\
 	${INSTALL_ENV} PREFIX=${PREFIX:Q} \
 	${PREFIX}/bin/php -d include_path=".:${PREFIX}/lib/php" \
 		-d log_errors=On -d display_errors=Off \
-		-C -n ${PKGDIR}/../../lang/php/pear_plist.php;
+		-C -n ${PKGDIR}/../../lang/php/pear_plist.php; \
+	${RM} -f ${PEAR_FILES_SKIP:S/^/${DESTDIR}&/};
 GENERATE_PLIST+=	${PEAR_GENERATE_PLIST}

-.if ${_USE_DESTDIR} != "no"
 PEAR_FILES_SKIP+=	${PREFIX}/lib/php/\.channels/\.alias/.*\.txt
 PEAR_FILES_SKIP+=	${PREFIX}/lib/php/\.channels/.*\.reg
 PEAR_FILES_SKIP+=	${PREFIX}/lib/php/\.depdb
@@ -70,7 +68,6 @@ PEAR_FILES_SKIP+=	${PREFIX}/lib/php/\.depdblock
 PEAR_FILES_SKIP+=	${PREFIX}/lib/php/\.filemap
 PEAR_FILES_SKIP+=	${PREFIX}/lib/php/\.lock
 CHECK_FILES_SKIP+=	${PEAR_FILES_SKIP}
-.endif

 post-extract:
 	@cd ${WRKSRC} && ${LN} -s ${WRKDIR}/package.xml package.xml
@@ -85,6 +82,7 @@ do-install:
 PLIST_SUBST+=	PEAR_LIB=${PEAR_LIB:Q}

 do-install:
+	${MKDIR} ${DESTDIR}${PREFIX}/${PEAR_LIB}
 	cd ${WRKSRC}/lib && ${PAX} -wr * ${DESTDIR}${PREFIX}/${PEAR_LIB}/

 .endif
--- a/lang/php/pear_plist.php
+++ b/lang/php/pear_plist.php
@@ -1,5 +1,5 @@
 <?php
-# $NetBSD: pear_plist.php,v 1.8 2010/08/29 06:08:07 obache Exp $
+# $NetBSD: pear_plist.php,v 1.9 2015/12/11 16:16:48 taca Exp $
 # Parses package XML file and outputs appropriate PLIST

 include_once "PEAR/Registry.php";
@@ -10,14 +10,14 @@ $PEAR_LIB = getenv('PEAR_LIB');
 $WRKSRC = getenv('WRKSRC');
 if(! $DESTDIR = getenv('DESTDIR')) $DESTDIR='';

-$config = &PEAR_Config::singleton();
-$package = &new PEAR_PackageFile($config);
+$config = PEAR_Config::singleton();
+$package = new PEAR_PackageFile($config);
 $info = $package->fromAnyFile("$WRKSRC/package.xml", PEAR_VALIDATE_INSTALLING);

 $pkg = $info->getName();
 $channel = $info->getChannel();

-$registry = &new PEAR_Registry($DESTDIR.$PREFIX."/".$PEAR_LIB);
+$registry = new PEAR_Registry($DESTDIR.$PREFIX."/".$PEAR_LIB);
 $flist = $registry->packageInfo($pkg, 'filelist', $channel);

 $regfile = $PEAR_LIB.'/.registry/.channel.'.$channel.'/'.strtolower($pkg).'.reg';
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.111 2015/09/06 12:27:43 taca Exp $
+# $NetBSD: phpversion.mk,v 1.158 2016/09/17 08:36:50 taca Exp $
 #
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
@@ -10,8 +10,8 @@
 #	The PHP version to choose when more than one is acceptable to
 #	the package.
 #
-#	Possible: 54 55 56
-#	Default: 54
+#	Possible: 56 70 71
+#	Default: 56
 #
 # === Infrastructure variables ===
 #
@@ -27,12 +27,18 @@
 # PHP_VERSIONS_ACCEPTED
 #	The PHP versions that are accepted by the package.
 #
-#	Possible: 54 55 56
-#	Default: 54
+#	Possible: 56 70 71
+#	Default: 56
+#
+# PHP_VERSIONS_INCOMPATIBLE
+#	The PHP versions that are not supported by the package.
+#
+#	Possible: 56 70 71
+#	Default: (empty)
 #
 # PHP_CHECK_INSTALLED
-#	Check installed version of PHP.  Should be used by lang/php54,
-#	lang/php55 and lang/php56 only.
+#	Check installed version of PHP.  Should be used by lang/php56,
+#	lang/php70, or lang/php71 only.
 #
 #	Possible: Yes No
 #	Default: Yes
@@ -42,7 +48,7 @@
 # PKG_PHP_VERSION
 #	The selected PHP version.
 #
-#	Possible: 54 55 56
+#	Possible: 56 70 71
 #	Default: ${PHP_VERSION_DEFAULT}
 #
 # PHP_BASE_VERS
@@ -51,7 +57,7 @@
 # PKG_PHP_MAJOR_VERS
 #	The selected PHP's major version.
 #
-#	Possible: 5
+#	Possible: 5 7
 #	Default: 5
 #
 # PKG_PHP
@@ -61,18 +67,18 @@
 #	The directory of the PHP implementation, relative to the
 #	package directory.
 #
-#	Example: ../../lang/php54
+#	Example: ../../lang/php56
 #
 # PHP_PKG_PREFIX
 #	The prefix that is prepended to the package name.
 #
-#	Example: php54, php55 php56
+#	Example: php56 php70 php71
 #
 # PHP_EXTENSION_DIR
 #	Relative path to ${PREFIX} for PHP's extensions.  It is derived from
 #	initial release of major version.
 #
-#	Example: lib/php/20090630
+#	Example: lib/php/20140828
 #
 # Keywords: php
 #
@@ -81,14 +87,14 @@
 PHPVERSION_MK=	defined

 # Define each PHP's version.
-PHP54_VERSION=	5.4.45
-PHP55_VERSION=	5.5.29
-PHP56_VERSION=	5.6.13
+PHP56_VERSION=	5.6.26
+PHP70_VERSION=	7.0.11
+PHP71_VERSION=	7.1.0RC2

 # Define initial release of major version.
-PHP54_RELDATE=	20120301
-PHP55_RELDATE=	20130620
 PHP56_RELDATE=	20140828
+PHP70_RELDATE=	20151203
+PHP71_RELDATE=	20160303

 _VARGROUPS+=	php
 _USER_VARS.php=	PHP_VERSION_DEFAULT
@@ -98,24 +104,29 @@ _SYS_VARS.php=	PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \

 .include "../../mk/bsd.prefs.mk"

-PHP_VERSION_DEFAULT?=		54
-PHP_VERSIONS_ACCEPTED?=		54 55 56
+PHP_VERSION_DEFAULT?=		56
+PHP_VERSIONS_ACCEPTED?=		56 70 71
+.for pv in ${PHP_VERSIONS_ACCEPTED}
+.  if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv})
+_PHP_VERSIONS_ACCEPTED+=	${pv}
+.  endif
+.endfor

 # transform the list into individual variables
-.for pv in ${PHP_VERSIONS_ACCEPTED}
+.for pv in ${_PHP_VERSIONS_ACCEPTED}
 _PHP_VERSION_${pv}_OK=	yes
 .endfor

 # check what is installed
-.if exists(${LOCALBASE}/lib/php/20140828)
+.if exists(${LOCALBASE}/lib/php/${PHP71_RELDATE})
+_PHP_VERSION_71_INSTALLED=	yes
+_PHP_INSTALLED=			yes
+.elif exists(${LOCALBASE}/lib/php/${PHP70_RELDATE})
+_PHP_VERSION_70_INSTALLED=	yes
+_PHP_INSTALLED=			yes
+.elif exists(${LOCALBASE}/lib/php/${PHP56_RELDATE})
 _PHP_VERSION_56_INSTALLED=	yes
 _PHP_INSTALLED=			yes
-.elif exists(${LOCALBASE}/lib/php/20130620)
-_PHP_VERSION_55_INSTALLED=	yes
-_PHP_INSTALLED=			yes
-.elif exists(${LOCALBASE}/lib/php/20120301)
-_PHP_VERSION_54_INSTALLED=	yes
-_PHP_INSTALLED=			yes
 .endif

 # if a version is explicitely required, take it
@@ -132,7 +143,7 @@ _PHP_VERSION=	${PHP_VERSION_DEFAULT}
 .endif
 # prefer an already installed version, in order of "accepted"
 .if !defined(_PHP_VERSION)
-.for pv in ${PHP_VERSIONS_ACCEPTED}
+.for pv in ${_PHP_VERSIONS_ACCEPTED}
 .if defined(_PHP_VERSION_${pv}_INSTALLED)
 _PHP_VERSION?=	${pv}
 .else
@@ -160,8 +171,8 @@ MULTI+=	PHP_VERSION_REQD=${_PHP_VERSION}
 PKG_PHP_VERSION:=	${_PHP_VERSION:C/\.[0-9]//}
 PKG_PHP:=		PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/}

-# currently we have only PHP 5.x packages.
-PKG_PHP_MAJOR_VERS:=	5
+# Major version
+PKG_PHP_MAJOR_VERS:=	${_PHP_VERSION:C/^([0-9]).*/\1/}

 PHP_CHECK_INSTALLED?=	Yes

@@ -184,24 +195,24 @@ PHP_VERSION_REQD:=	${PKG_PHP_VERSION}
 #
 # set variables for the version we decided to use:
 #
-.if ${_PHP_VERSION} == "54"
-PHPPKGSRCDIR=		../../lang/php54
-PHP_VERSION=		${PHP54_VERSION}
-PHP_INITIAL_TEENY=	4
-PHP_PKG_PREFIX=		php54
-PHP_EXTENSION_DIR=	lib/php/${PHP54_RELDATE}
-.elif ${_PHP_VERSION} == "55"
-PHPPKGSRCDIR=		../../lang/php55
-PHP_VERSION=		${PHP55_VERSION}
-PHP_INITIAL_TEENY=	1
-PHP_PKG_PREFIX=		php55
-PHP_EXTENSION_DIR=	lib/php/${PHP55_RELDATE}
-.elif ${_PHP_VERSION} == "56"
+.if ${_PHP_VERSION} == "56"
 PHPPKGSRCDIR=		../../lang/php56
 PHP_VERSION=		${PHP56_VERSION}
 PHP_INITIAL_TEENY=	3
 PHP_PKG_PREFIX=		php56
 PHP_EXTENSION_DIR=	lib/php/${PHP56_RELDATE}
+.elif ${_PHP_VERSION} == "70"
+PHPPKGSRCDIR=		../../lang/php70
+PHP_VERSION=		${PHP70_VERSION}
+PHP_INITIAL_TEENY=	0
+PHP_PKG_PREFIX=		php70
+PHP_EXTENSION_DIR=	lib/php/${PHP70_RELDATE}
+.elif ${_PHP_VERSION} == "71"
+PHPPKGSRCDIR=		../../lang/php71
+PHP_VERSION=		${PHP71_VERSION}
+PHP_INITIAL_TEENY=	0
+PHP_PKG_PREFIX=		php71
+PHP_EXTENSION_DIR=	lib/php/${PHP71_RELDATE}
 .else
 # force an error
 PKG_FAIL_REASON+=	"${PKG_PHP} is not a valid package"