From owner-svn-ports-branches@freebsd.org Tue Jul 28 23:43:53 2015 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 2136C9AC752; Tue, 28 Jul 2015 23:43:53 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 EBD20EE4; Tue, 28 Jul 2015 23:43:52 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6SNhqX6004044; Tue, 28 Jul 2015 23:43:52 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6SNhqPl004042; Tue, 28 Jul 2015 23:43:52 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201507282343.t6SNhqPl004042@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 28 Jul 2015 23:43:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r393138 - in branches/2015Q3/www/suphp: . 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.20 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: Tue, 28 Jul 2015 23:43:53 -0000 Author: bdrewery Date: Tue Jul 28 23:43:51 2015 New Revision: 393138 URL: https://svnweb.freebsd.org/changeset/ports/393138 Log: MFH: r393137 Fix build with Apache 2.4. PR: 193200 Submitted by: Daniel Austin Added: branches/2015Q3/www/suphp/files/patch-configure.ac - copied unchanged from r393137, head/www/suphp/files/patch-configure.ac Modified: branches/2015Q3/www/suphp/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/www/suphp/Makefile ============================================================================== --- branches/2015Q3/www/suphp/Makefile Tue Jul 28 23:43:01 2015 (r393137) +++ branches/2015Q3/www/suphp/Makefile Tue Jul 28 23:43:51 2015 (r393138) @@ -3,7 +3,7 @@ PORTNAME= suphp PORTVERSION= 0.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.suphp.org/download/ \ LOCAL/bdrewery/${PORTNAME}/ \ @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes USES= autoreconf libtool SUB_FILES= pkg-message -USE_APACHE= 22 +USE_APACHE= 22+ CFLAGS+= -I${LOCALBASE}/include USE_CSTD= gnu89 USE_PHP= yes @@ -28,7 +28,8 @@ MYPORTDOCS= apache/CONFIG \ CONFIG LICENSE \ INSTALL README -CONFIGURE_ARGS= CFLAGS="${CFLAGS}" --with-apxs=${APXS} +CONFIGURE_ARGS= CFLAGS="${CFLAGS} -I`${LOCALBASE}/bin/apr-1-config --includedir`" \ + --with-apxs=${APXS} # WITH_SETID_MODE should be a value of "owner", "force", or "paranoid". # It's important that you understand the differences between each mode. Copied: branches/2015Q3/www/suphp/files/patch-configure.ac (from r393137, head/www/suphp/files/patch-configure.ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/www/suphp/files/patch-configure.ac Tue Jul 28 23:43:51 2015 (r393138, copy of r393137, head/www/suphp/files/patch-configure.ac) @@ -0,0 +1,11 @@ +--- configure.ac.orig 2014-08-31 10:39:02.982846403 +0100 ++++ configure.ac 2014-08-31 10:39:31.763844267 +0100 +@@ -15343,7 +15343,7 @@ + | cut -f2 -d"/" \ + | cut -f1 -d" "` + major_version=`echo $APACHE_VERSION|cut -f1,2 -d.` +- if test "$major_version" = "2.0" -o "$major_version" = "2.2"; then ++ if test "$major_version" = "2.0" -o "$major_version" = "2.2" -o "$major_version" = "2.4"; then + APACHE_VERSION_2=true + APACHE_VERSION_1_3=false + else