ports/146899: [PATCH] www/ap13-mod_auth_mysql_another: WITH_APACHE2 is dead

[Philip M. Gollucci]

>Number:         146899
>Category:       ports
>Synopsis:       [PATCH] www/ap13-mod_auth_mysql_another: WITH_APACHE2 is dead
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 24 01:20:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Mon Apr 26 16:20:00 EDT 2010
>Description:
also fix some whitespace

Port maintainer (mbr at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- ap13-mod_auth_mysql_another-3.0.0_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_mysql_another/Makefile,v
retrieving revision 1.16
diff -u -u -r1.16 Makefile
--- Makefile	22 Aug 2009 00:38:13 -0000	1.16
+++ Makefile	24 May 2010 01:18:26 -0000
@@ -14,26 +14,25 @@
 MAINTAINER=	mbr at FreeBSD.org
 COMMENT=	Allows users to use MySQL databases for user authentication
 
-MAKE_JOBS_SAFE=  yes
+MAKE_JOBS_SAFE=	yes
 
 USE_MYSQL=	YES
+USE_APACHE=	13+
 
-SHORTMODNAME=   mysql_auth
-AP_FAST_BUILD=  YES
-AP_GENPLIST=    YES
-AP_INC=		${LOCALBASE}/include/mysql
-AP_LIB=		${LOCALBASE}/lib/mysql
-.if defined(WITH_APACHE2)
+SHORTMODNAME=	mysql_auth
+AP_FAST_BUILD=	YES
+AP_GENPLIST=	YES
+AP_INC=	${LOCALBASE}/include/mysql
+AP_LIB=	${LOCALBASE}/lib/mysql
 AP_EXTRAS=	-lmysqlclient -lz -lm
-USE_APACHE=     20+
-.else
-USE_APACHE=     13+
-AP_EXTRAS=	-DAPACHE${AP_VER} -lmysqlclient -lz -lm
-.endif
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_APACHE2)
+.if ${APACHE_VERSION} > 20
+AP_EXTRAS+=	-DAPACHE2
+.endif
+
+.if ${APACHE_VERSION} > 20
 post-patch:
 	${REINPLACE_CMD} -e "s|APR_XtOffsetOf|APR_OFFSETOF|g" \
 		-e "s|APR_XtOffset|APR_OFFSET|g" ${WRKSRC}/mod_auth_mysql.c
--- ap13-mod_auth_mysql_another-3.0.0_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: