From owner-svn-ports-branches@freebsd.org Mon Aug 29 14:34:19 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6DF02B78B45; Mon, 29 Aug 2016 14:34:19 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3211977A; Mon, 29 Aug 2016 14:34:19 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7TEYIxg059663; Mon, 29 Aug 2016 14:34:18 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7TEYHuP059657; Mon, 29 Aug 2016 14:34:17 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201608291434.u7TEYHuP059657@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 29 Aug 2016 14:34:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r421062 - in branches/2016Q3/lang/php70: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2016 14:34:19 -0000 Author: feld Date: Mon Aug 29 14:34:17 2016 New Revision: 421062 URL: https://svnweb.freebsd.org/changeset/ports/421062 Log: MFH: r419801 lang/php70: switch distfiles from bzip2 to xz While here also: - regenerate patches with make makepatch - replace "sed" with proper ${SED} - no longer mute ${INSTALL_DATA} PR: 209881 Reported by: Piotr Kubaj Approved by: pi (mentor) Approved by: ports-secteam (with hat) Modified: branches/2016Q3/lang/php70/Makefile branches/2016Q3/lang/php70/files/patch-acinclude.m4 branches/2016Q3/lang/php70/files/patch-configure.in branches/2016Q3/lang/php70/files/patch-main__php_config.h.in branches/2016Q3/lang/php70/files/patch-sapi_apache2handler_config.m4 branches/2016Q3/lang/php70/files/patch-sapi_fpm_config.m4 Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/lang/php70/Makefile ============================================================================== --- branches/2016Q3/lang/php70/Makefile Mon Aug 29 14:33:43 2016 (r421061) +++ branches/2016Q3/lang/php70/Makefile Mon Aug 29 14:34:17 2016 (r421062) @@ -15,7 +15,7 @@ LICENSE= PHP301 BROKEN_powerpc64= Does not build -USES+= tar:bzip2 cpe +USES+= tar:xz cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) @@ -183,13 +183,13 @@ post-build: @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf @${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf - @${SH} ${WRKSRC}/scripts/php-config --extension-dir | sed -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf + @${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf test: build @(cd ${WRKSRC} && ${MAKE} test) post-install: - @${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ + ${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc .else do-install: Modified: branches/2016Q3/lang/php70/files/patch-acinclude.m4 ============================================================================== --- branches/2016Q3/lang/php70/files/patch-acinclude.m4 Mon Aug 29 14:33:43 2016 (r421061) +++ branches/2016Q3/lang/php70/files/patch-acinclude.m4 Mon Aug 29 14:34:17 2016 (r421062) @@ -1,6 +1,6 @@ ---- acinclude.m4.orig 2016-02-16 19:01:10.026983000 +0800 -+++ acinclude.m4 2016-02-16 19:05:00.294501000 +0800 -@@ -985,15 +985,9 @@ +--- acinclude.m4.orig 2016-07-20 13:11:26 UTC ++++ acinclude.m4 +@@ -985,15 +985,9 @@ dnl ------------------------------------ if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then dnl ---------------------------------------------- CLI static module [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no @@ -19,7 +19,7 @@ EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir" fi PHP_ADD_BUILD_DIR($ext_builddir) -@@ -1043,12 +1037,6 @@ +@@ -1043,12 +1037,6 @@ You either need to build $1 shared or bu build to be successful. ]) fi @@ -32,7 +32,7 @@ dnl Some systems require that we link $2 to $1 when building ]) -@@ -2970,8 +2958,7 @@ +@@ -2975,8 +2963,7 @@ dnl in GNU Make which causes the .d file $abs_srcdir/$ac_provsrc:; $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc @@ -42,7 +42,7 @@ \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj EOF -@@ -2990,12 +2977,12 @@ +@@ -2995,12 +2982,12 @@ dnl Always attempt to create both PIC an $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS) echo "[#] Generated by Makefile for libtool" > \$[]@ @test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir @@ -57,7 +57,7 @@ echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\] else [\\] echo "non_pic_object='none'" >> \$[]@ [;\\] -@@ -3007,7 +2994,7 @@ +@@ -3012,7 +2999,7 @@ EOF *) cat>>Makefile.objects<