From owner-svn-ports-head@freebsd.org Tue Feb 16 12:30:44 2016 Return-Path: Delivered-To: svn-ports-head@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 B719AAA9161; Tue, 16 Feb 2016 12:30:44 +0000 (UTC) (envelope-from miwi@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 6B81A17E2; Tue, 16 Feb 2016 12:30:44 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1GCUhqs090435; Tue, 16 Feb 2016 12:30:43 GMT (envelope-from miwi@FreeBSD.org) Received: (from miwi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1GCUhvi090433; Tue, 16 Feb 2016 12:30:43 GMT (envelope-from miwi@FreeBSD.org) Message-Id: <201602161230.u1GCUhvi090433@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: miwi set sender to miwi@FreeBSD.org using -f From: Martin Wilke Date: Tue, 16 Feb 2016 12:30:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408988 - in head/lang/php70: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Feb 2016 12:30:44 -0000 Author: miwi Date: Tue Feb 16 12:30:43 2016 New Revision: 408988 URL: https://svnweb.freebsd.org/changeset/ports/408988 Log: - Fix build for -openssl and -imap PR: 207244 Modified: head/lang/php70/Makefile head/lang/php70/files/patch-acinclude.m4 Modified: head/lang/php70/Makefile ============================================================================== --- head/lang/php70/Makefile Tue Feb 16 12:01:59 2016 (r408987) +++ head/lang/php70/Makefile Tue Feb 16 12:30:43 2016 (r408988) @@ -3,7 +3,7 @@ PORTNAME= php70 PORTVERSION= 7.0.3 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} Modified: head/lang/php70/files/patch-acinclude.m4 ============================================================================== --- head/lang/php70/files/patch-acinclude.m4 Tue Feb 16 12:01:59 2016 (r408987) +++ head/lang/php70/files/patch-acinclude.m4 Tue Feb 16 12:30:43 2016 (r408988) @@ -1,5 +1,5 @@ ---- acinclude.m4.orig 2016-02-03 00:32:19.000000000 +0800 -+++ acinclude.m4 2016-02-16 15:05:51.416291000 +0800 +--- 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 @@ if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then dnl ---------------------------------------------- CLI static module @@ -32,28 +32,17 @@ dnl Some systems require that we link $2 to $1 when building ]) -@@ -2321,9 +2309,9 @@ - test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no - - dnl Fallbacks for different configure options -- if test "$PHP_OPENSSL" != "no"; then -+ if test -n "$PHP_OPENSSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_OPENSSL -- elif test "$PHP_IMAP_SSL" != "no"; then -+ elif test -n "$PHP_IMAP_SSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_IMAP_SSL - fi - -@@ -2970,7 +2958,7 @@ +@@ -2970,8 +2958,7 @@ $abs_srcdir/$ac_provsrc:; $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc - CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ +- + CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ - \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj -@@ -2990,12 +2978,12 @@ + EOF +@@ -2990,12 +2977,12 @@ $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS) echo "[#] Generated by Makefile for libtool" > \$[]@ @test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir @@ -68,7 +57,7 @@ echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\] else [\\] echo "non_pic_object='none'" >> \$[]@ [;\\] -@@ -3007,7 +2995,7 @@ +@@ -3007,7 +2994,7 @@ *) cat>>Makefile.objects<