Index: branches/2015Q3/www/suphp/Makefile
===================================================================
--- branches/2015Q3/www/suphp/Makefile	(revision 393137)
+++ branches/2015Q3/www/suphp/Makefile	(revision 393138)
@@ -1,59 +1,60 @@
 # Created by: Clement Laforet <sheepkiller@cultdeadsheep.org>
 # $FreeBSD$
 
 PORTNAME=	suphp
 PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.suphp.org/download/ \
 		LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Securely execute PHP scripts under Apache
 
 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
 WANT_PHP_CGI=	yes
 
 MYPORTDOCS=	apache/CONFIG \
 		apache/INSTALL \
 		apache/README \
 		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.
 # See /usr/local/share/doc/suphp/INSTALL for details.
 #
 WITH_SETID_MODE?=	owner
 CONFIGURE_ARGS+=	--with-setid-mode=${WITH_SETID_MODE}
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/apache
 .for f in ${MYPORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}/${f}
 .endfor
 .endif
 .if !defined(WITH_DEBUG)
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/suphp
 .endif
 	@${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example \
 	    ${STAGEDIR}${PREFIX}/etc/suphp.conf-example
 
 .include <bsd.port.mk>
Index: branches/2015Q3/www/suphp/files/patch-configure.ac
===================================================================
--- branches/2015Q3/www/suphp/files/patch-configure.ac	(nonexistent)
+++ branches/2015Q3/www/suphp/files/patch-configure.ac	(revision 393138)
@@ -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

Property changes on: branches/2015Q3/www/suphp/files/patch-configure.ac
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+1
\ No newline at end of property
Index: branches/2015Q3
===================================================================
--- branches/2015Q3	(revision 393137)
+++ branches/2015Q3	(revision 393138)

Property changes on: branches/2015Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r393137