From 1afa6cb96cb43f6a4b106351cb3ab91bf609e3a0 Mon Sep 17 00:00:00 2001
From: Yi-Jheng Lin <yzlin@FreeBSD.org>
Date: Sun, 6 Jun 2010 03:37:03 +0000
Subject: [PATCH] - Work with apache2/apr changes

PR:		ports/146914
Submitted by:	Anish Mistry <amistry AT am-productions.biz>
---
 www/suphp/Makefile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index 031879eb6213..8d44936c9d8b 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	suphp
 PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.suphp.org/download/ \
 		${MASTER_SITE_LOCAL:S|%SUBDIR%|koitsu|}
@@ -37,14 +37,7 @@ CONFIGURE_ARGS+=	--with-setid-mode=${WITH_SETID_MODE}
 
 .include <bsd.port.pre.mk>
 
-# Apache 2.0 (www/apache2) has apr-config in LOCALBASE/lib/apache2, while
-# Apache 2.2 (www/apache22) has apr-1-config in LOCALBASE/bin.
-#
-.if ${APACHE_VERSION} == 20
-CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/lib/apache2
-.else
 CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|2.61|2.62|g' ${WRKSRC}/aclocal.m4