From 51b3a662528dbc5455b2feb587f88755cfd9918f Mon Sep 17 00:00:00 2001
From: pgollucci <pgollucci@FreeBSD.org>
Date: Wed, 29 Apr 2009 01:41:18 +0000
Subject: - WITH_APACHE2 is deprecated and was never needed - Remove version
 check USE_APACHE=2.0 takes care of it - Use some bsd.apache.mk vars -
 PREFIX->LOCALBASE

PR:             ports/133683
Approved by:    maintainer timeout (2 weeks)
Submitted by:   me
---
 www/mod_clamav/Makefile | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'www/mod_clamav')

diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index 5d87fd94a6bb..25a6c2b5ed93 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -17,15 +17,8 @@ COMMENT=	Scans content delivered by the Apache20 proxy module for viruses
 
 USE_AUTOTOOLS=	libtool:15
 USE_APACHE=	2.0
-WITH_APACHE2=	YES
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/include/apache22/http_core.h) || exists(${LOCALBASE}/include/apache/http_core.h)
-IGNORE=	mod_clamav only compile and run with apache-2.0.x
-.endif
-
 .if defined(WITH_CLAMAVDEVEL)
 LIB_DEPENDS+=	clamav.6:${PORTSDIR}/security/clamav-devel
 .else
@@ -33,7 +26,7 @@ CLAMAV_PORT=	security/clamav
 LIB_DEPENDS+=	clamav.6:${PORTSDIR}/security/clamav
 .endif
 
-CONFIGURE_ARGS=	--with-apxs=${PREFIX}/sbin/apxs \
+CONFIGURE_ARGS=	--with-apxs=${APXS} \
 		--libdir=${PREFIX}/lib/apache2
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include \
@@ -45,4 +38,5 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+
+.include <bsd.port.mk>
-- 
cgit