- WITH_APACHE2 is deprecated, convert to WITH_APACHE

    which pulls in APACHE_PORT dep
- Bump PORTREVISION

PR:             ports/134602
Approved by:    maintainer timeout (skreuzer; 2 weeks)
Submitted by:   me

1 files changed, 2 insertions, 12 deletions

diff --git a/www/rt38/Makefile b/www/rt38/Makefile
index e9451a2890c4..3f3def09b0a2 100644
--- a/www/rt38/Makefile
+++ b/www/rt38/Makefile
@@ -13,7 +13,7 @@
 
 PORTNAME=	rt
 PORTVERSION=	3.8.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/ \
 		ftp://ftp.eu.uu.net/pub/unix/ticketing/rt/release/
@@ -29,14 +29,13 @@ CONFLICTS=	rt-2* rt-3.0* rt-3.2* rt-3.4* rt-3.6*
 LATEST_LINK=	rt38
 
 OPTIONS=	MYSQL 		"Enable MySQL backend" 		on  \
-		APACHE2		"Enable Apache2 server"		on  \
+		APACHE		"Enable ${APACHE_PORT} server"		on  \
 		MODPERL2	"Enable mod_perl2 support"	on  \
 		POSTGRESQL 	"Enable Postgresql backend"	off \
 		ORACLE		"Enable Oracle backend"		off \
 		SQLITE		"Enable SQLite backend" 	off \
 		DEV 		"Configure for Developers"	off \
 		STANDALONE	"Enable standalone server"	off \
-		APACHE		"Enable Apache1.3.x server"	off \
 		MODPERL		"Enable mod_perl support"	off \
 		FASTCGI		"Enable FastCGI support" 	off \
 		GRAPHVIZ	"Enable GraphViz charts"	on
@@ -70,10 +69,6 @@ BUILD_DEPENDS+=	${STANDALONE_DEPS}
 RUN_DEPENDS+=	${STANDALONE_DEPS}
 .endif
 
-.if defined(WITH_APACHE2)
-USE_APACHE=	2.0+
-.endif
-
 .if defined(WITH_APACHE)
 USE_APACHE=	1.3+
 .endif
@@ -133,11 +128,6 @@ IGNORE=	you must choose a database backend
 #IGNORE=	Select exactly one of WITH_MYSQL, WITH_POSTGRESQL, WITH_SQLITE, WITH_ORACLE
 #.endif
 
-### APACHE or APACHE2
-.if defined(WITH_APACHE) && defined(WITH_APACHE2)
-IGNORE=	options WITH_APACHE and WITH_APACHE2 are mutually exclusive
-.endif
-
 ### MODPERL or MODPERL2
 .if defined(WITH_MODPERL) && defined(WITH_MODPERL2)
 IGNORE=	options WITH_MODPERL and WITH_MODPERL2 are mutually exclusive