Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jul 2015 23:43:02 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r393137 - in head/www/suphp: . files
Message-ID:  <201507282343.t6SNh2vr003850@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Tue Jul 28 23:43:01 2015
New Revision: 393137
URL: https://svnweb.freebsd.org/changeset/ports/393137

Log:
  Fix build with Apache 2.4.
  
  PR:		193200
  Submitted by:	Daniel Austin <freebsd-ports@dan.me.uk>

Added:
  head/www/suphp/files/patch-configure.ac   (contents, props changed)
Modified:
  head/www/suphp/Makefile

Modified: head/www/suphp/Makefile
==============================================================================
--- head/www/suphp/Makefile	Tue Jul 28 23:28:42 2015	(r393136)
+++ head/www/suphp/Makefile	Tue Jul 28 23:43:01 2015	(r393137)
@@ -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.

Added: head/www/suphp/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/suphp/files/patch-configure.ac	Tue Jul 28 23:43:01 2015	(r393137)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507282343.t6SNh2vr003850>