Date: Fri, 12 Jan 2018 12:57:19 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458821 - in head/lang: php56 php56/files php70 php70/files php71 php71/files php72 php72/files Message-ID: <201801121257.w0CCvJdh029398@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Fri Jan 12 12:57:18 2018 New Revision: 458821 URL: https://svnweb.freebsd.org/changeset/ports/458821 Log: - Replace USE_AUTOTOOLS with USES=autoreconf:build and run an upstream script in pre-configure to regenerate configure scripts. Because this regenerates php_config.h.in, merge a patch for that file into the patch for configure.in. - Remove redundant --localstatedir=/var (added by bsd.port.mk). Deleted: head/lang/php56/files/patch-main__php_config.h.in head/lang/php70/files/patch-main__php_config.h.in head/lang/php71/files/patch-main__php_config.h.in head/lang/php72/files/patch-main__php_config.h.in Modified: head/lang/php56/Makefile head/lang/php56/files/patch-configure.in head/lang/php70/Makefile head/lang/php70/files/patch-configure.in head/lang/php71/Makefile head/lang/php71/files/patch-configure.in head/lang/php72/Makefile head/lang/php72/files/patch-configure.in Modified: head/lang/php56/Makefile ============================================================================== --- head/lang/php56/Makefile Fri Jan 12 11:48:59 2018 (r458820) +++ head/lang/php56/Makefile Fri Jan 12 12:57:18 2018 (r458821) @@ -17,12 +17,10 @@ USES+= tar:xz cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) -USE_AUTOTOOLS= autoconf - LIB_DEPENDS= libpcre.so:devel/pcre +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-layout=GNU \ - --localstatedir=/var \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ @@ -31,7 +29,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \ --with-pcre-regex=${LOCALBASE} \ --with-zlib-dir=/usr \ --program-prefix="" - +USES+= autoreconf:build USE_GNOME= libxml2 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS @@ -171,12 +169,8 @@ post-patch: ${WRKSRC}/sapi/fpm/php-fpm.conf.in .endif -# Work around issues with newer (>=2.64) autoconf pre-configure: - @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ - ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` - @${RM} ${WRKSRC}/configure - @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 + @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force) .if !defined(PKGNAMEPREFIX) post-build: Modified: head/lang/php56/files/patch-configure.in ============================================================================== --- head/lang/php56/files/patch-configure.in Fri Jan 12 11:48:59 2018 (r458820) +++ head/lang/php56/files/patch-configure.in Fri Jan 12 12:57:18 2018 (r458821) @@ -1,6 +1,14 @@ ---- configure.in.orig 2014-04-01 12:32:03.000000000 +0000 -+++ configure.in 2014-04-09 07:56:27.824397653 +0000 -@@ -370,7 +370,6 @@ +--- configure.in.orig 2017-10-25 01:48:22 UTC ++++ configure.in +@@ -115,6 +115,7 @@ int zend_sprintf(char *buffer, const char *format, ... + #endif + + #undef PTHREADS ++#include <ext/php_config.h> + ]) + + PHP_MAJOR_VERSION=5 +@@ -370,7 +371,6 @@ sinclude(TSRM/tsrm.m4) dnl . dnl ------------------------------------------------------------------------- @@ -8,7 +16,7 @@ PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAMES PHP_BUILD_PROGRAM -@@ -401,15 +400,9 @@ +@@ -401,15 +401,9 @@ else AC_MSG_RESULT([none]) fi @@ -24,7 +32,7 @@ fi dnl Starting system checks. -@@ -688,7 +681,7 @@ +@@ -691,7 +685,7 @@ nanosleep \ ) dnl Some systems (like OpenSolaris) do not have nanosleep in libc @@ -33,7 +41,7 @@ dnl Check for getaddrinfo, should be a better way, but... dnl Also check for working getaddrinfo -@@ -1225,7 +1218,7 @@ +@@ -1242,7 +1236,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` @@ -42,12 +50,12 @@ exec_prefix=$old_exec_prefix libdir=$old_libdir -@@ -1435,7 +1428,7 @@ +@@ -1452,7 +1446,7 @@ PHP_SUBST(all_targets) PHP_SUBST(install_targets) PHP_SUBST(install_binary_targets) -PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/]) +PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/]) - PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c) + PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c) Modified: head/lang/php70/Makefile ============================================================================== --- head/lang/php70/Makefile Fri Jan 12 11:48:59 2018 (r458820) +++ head/lang/php70/Makefile Fri Jan 12 12:57:18 2018 (r458821) @@ -17,15 +17,10 @@ USES+= tar:xz cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) -USE_AUTOTOOLS= autoconf -#NOTE: libtools ends with Version mismatch error -#USES+= autoreconf gmake -#GNU_CONFIGURE= yes - LIB_DEPENDS= libpcre.so:devel/pcre +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-layout=GNU \ - --localstatedir=/var \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ @@ -33,7 +28,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \ --with-libxml-dir=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \ --program-prefix="" - +USES+= autoreconf:build USE_GNOME= libxml2 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS @@ -159,12 +154,8 @@ post-patch: ${WRKSRC}/sapi/fpm/php-fpm.conf.in .endif -# Work around issues with newer (>=2.64) autoconf pre-configure: - @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ - ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` - @${RM} ${WRKSRC}/configure - @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 + @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force) .if !defined(PKGNAMEPREFIX) post-build: Modified: head/lang/php70/files/patch-configure.in ============================================================================== --- head/lang/php70/files/patch-configure.in Fri Jan 12 11:48:59 2018 (r458820) +++ head/lang/php70/files/patch-configure.in Fri Jan 12 12:57:18 2018 (r458821) @@ -1,6 +1,14 @@ ---- configure.in.orig 2016-07-20 13:11:23 UTC +--- configure.in.orig 2018-01-02 08:50:07 UTC +++ configure.in -@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4) +@@ -115,6 +115,7 @@ int zend_sprintf(char *buffer, const char *format, ... + #endif + + #undef PTHREADS ++#include <ext/php_config.h> + ]) + + PHP_MAJOR_VERSION=7 +@@ -370,7 +371,6 @@ sinclude(TSRM/tsrm.m4) dnl . dnl ------------------------------------------------------------------------- @@ -8,7 +16,7 @@ PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAMES PHP_BUILD_PROGRAM -@@ -401,15 +400,9 @@ else +@@ -401,15 +401,9 @@ else AC_MSG_RESULT([none]) fi @@ -24,7 +32,7 @@ fi dnl Starting system checks. -@@ -700,7 +693,7 @@ nanosleep \ +@@ -701,7 +695,7 @@ nanosleep \ ) dnl Some systems (like OpenSolaris) do not have nanosleep in libc @@ -33,7 +41,7 @@ dnl Check for getaddrinfo, should be a better way, but... dnl Also check for working getaddrinfo -@@ -1251,7 +1244,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd +@@ -1252,7 +1246,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` @@ -42,7 +50,7 @@ exec_prefix=$old_exec_prefix libdir=$old_libdir -@@ -1460,7 +1453,7 @@ PHP_SUBST(all_targets) +@@ -1461,7 +1455,7 @@ PHP_SUBST(all_targets) PHP_SUBST(install_targets) PHP_SUBST(install_binary_targets) Modified: head/lang/php71/Makefile ============================================================================== --- head/lang/php71/Makefile Fri Jan 12 11:48:59 2018 (r458820) +++ head/lang/php71/Makefile Fri Jan 12 12:57:18 2018 (r458821) @@ -18,15 +18,10 @@ CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) -USE_AUTOTOOLS= autoconf -#NOTE: libtools ends with Version mismatch error -#USES+= autoreconf gmake -#GNU_CONFIGURE= yes - LIB_DEPENDS= libpcre.so:devel/pcre +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-layout=GNU \ - --localstatedir=/var \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ @@ -34,7 +29,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \ --with-libxml-dir=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \ --program-prefix="" - +USES+= autoreconf:build USE_GNOME= libxml2 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS @@ -161,12 +156,8 @@ post-patch: ${WRKSRC}/sapi/fpm/php-fpm.conf.in .endif -# Work around issues with newer (>=2.64) autoconf pre-configure: - @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ - ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` - @${RM} ${WRKSRC}/configure - @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 + @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force) .if !defined(PKGNAMEPREFIX) post-build: Modified: head/lang/php71/files/patch-configure.in ============================================================================== --- head/lang/php71/files/patch-configure.in Fri Jan 12 11:48:59 2018 (r458820) +++ head/lang/php71/files/patch-configure.in Fri Jan 12 12:57:18 2018 (r458821) @@ -1,6 +1,14 @@ ---- configure.in.orig 2016-07-20 13:11:23 UTC +--- configure.in.orig 2018-01-03 02:32:22 UTC +++ configure.in -@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4) +@@ -115,6 +115,7 @@ int zend_sprintf(char *buffer, const char *format, ... + #endif + + #undef PTHREADS ++#include <ext/php_config.h> + ]) + + PHP_MAJOR_VERSION=7 +@@ -370,7 +371,6 @@ sinclude(TSRM/tsrm.m4) dnl . dnl ------------------------------------------------------------------------- @@ -8,7 +16,7 @@ PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAMES PHP_BUILD_PROGRAM -@@ -401,15 +400,9 @@ else +@@ -401,15 +401,9 @@ else AC_MSG_RESULT([none]) fi @@ -24,7 +32,7 @@ fi dnl Starting system checks. -@@ -700,7 +693,7 @@ nanosleep \ +@@ -701,7 +695,7 @@ nanosleep \ ) dnl Some systems (like OpenSolaris) do not have nanosleep in libc @@ -33,7 +41,7 @@ dnl Check for getaddrinfo, should be a better way, but... dnl Also check for working getaddrinfo -@@ -1251,7 +1244,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd +@@ -1252,7 +1246,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` @@ -42,7 +50,7 @@ exec_prefix=$old_exec_prefix libdir=$old_libdir -@@ -1460,7 +1453,7 @@ PHP_SUBST(all_targets) +@@ -1461,7 +1455,7 @@ PHP_SUBST(all_targets) PHP_SUBST(install_targets) PHP_SUBST(install_binary_targets) Modified: head/lang/php72/Makefile ============================================================================== --- head/lang/php72/Makefile Fri Jan 12 11:48:59 2018 (r458820) +++ head/lang/php72/Makefile Fri Jan 12 12:57:18 2018 (r458821) @@ -17,16 +17,11 @@ CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) -USE_AUTOTOOLS= autoconf -#NOTE: libtools ends with Version mismatch error -#USES+= autoreconf gmake -#GNU_CONFIGURE= yes - LIB_DEPENDS= libpcre.so:devel/pcre \ libargon2.so:security/libargon2 +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-layout=GNU \ - --localstatedir=/var \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ @@ -35,7 +30,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \ --with-pcre-regex=${LOCALBASE} \ --with-password-argon2=${LOCALBASE} \ --program-prefix="" - +USES+= autoreconf:build USE_GNOME= libxml2 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS @@ -154,12 +149,8 @@ post-patch: ${WRKSRC}/sapi/fpm/php-fpm.conf.in .endif -# Work around issues with newer (>=2.64) autoconf pre-configure: - @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ - ${WRKSRC}/configure.ac `${FIND} ${WRKSRC} -name '*.m4'` - @${RM} ${WRKSRC}/configure - @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 + @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force) .if !defined(PKGNAMEPREFIX) post-build: Modified: head/lang/php72/files/patch-configure.in ============================================================================== --- head/lang/php72/files/patch-configure.in Fri Jan 12 11:48:59 2018 (r458820) +++ head/lang/php72/files/patch-configure.in Fri Jan 12 12:57:18 2018 (r458821) @@ -1,6 +1,14 @@ ---- configure.ac.orig 2016-07-20 13:11:23 UTC +--- configure.ac.orig 2018-01-02 22:35:55 UTC +++ configure.ac -@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4) +@@ -102,6 +102,7 @@ int zend_sprintf(char *buffer, const char *format, ... + + #undef PTHREADS + ++#include <ext/php_config.h> + #endif /* PHP_CONFIG_H */ + ]) + +@@ -339,7 +340,6 @@ sinclude(TSRM/tsrm.m4) dnl . dnl ------------------------------------------------------------------------- @@ -8,7 +16,7 @@ PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAMES PHP_BUILD_PROGRAM -@@ -401,15 +400,9 @@ else +@@ -370,15 +370,9 @@ else AC_MSG_RESULT([none]) fi @@ -24,7 +32,7 @@ fi dnl Starting system checks. -@@ -700,7 +693,7 @@ nanosleep \ +@@ -682,7 +676,7 @@ nanosleep \ ) dnl Some systems (like OpenSolaris) do not have nanosleep in libc @@ -33,7 +41,7 @@ dnl Check for getaddrinfo, should be a better way, but... dnl Also check for working getaddrinfo -@@ -1251,7 +1244,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd +@@ -1235,7 +1229,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` @@ -42,7 +50,7 @@ exec_prefix=$old_exec_prefix libdir=$old_libdir -@@ -1460,7 +1453,7 @@ PHP_SUBST(all_targets) +@@ -1434,7 +1428,7 @@ PHP_SUBST(all_targets) PHP_SUBST(install_targets) PHP_SUBST(install_binary_targets)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801121257.w0CCvJdh029398>