ports/96158: [maintainer-update] update www/mod_fcgid to 1.08

[Josh Tolbert]

>Number:         96158
>Category:       ports
>Synopsis:       [maintainer-update] update www/mod_fcgid to 1.08
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 22 05:30:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Josh Tolbert <hemi at puresimplicity.net>
>Release:        FreeBSD 6.0-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD just.puresimplicity.net 6.0-RELEASE-p4 FreeBSD 6.0-RELEASE-p4 #0: Tue Jan 31 14:20:08 CST 2006 root at just.puresimplicity.net:/usr/obj/usr/src/sys/JUST i386
>Description:
Updated www/mod_fcgid to version 1.08. Updated Makefile and other files to
handle cases for both www/apache20 and www/apache22.

Removed www/mod_fcgid/pkg_message. Added www/mod_fcgid/files/pkg_message.in.
>How-To-Repeat:
Install this port.
>Fix:


diff -ruN mod_fcgid.old/Makefile mod_fcgid/Makefile
--- mod_fcgid.old/Makefile	Thu Apr 13 22:52:23 2006
+++ mod_fcgid/Makefile	Sat Apr 22 00:13:37 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mod_fcgid
-PORTVERSION=	1.07
+PORTVERSION=	1.08
 CATEGORIES=	www
 MASTER_SITES=	http://fastcgi.coremail.cn/ \
 		${MASTER_SITE_LOCAL}
@@ -16,14 +16,32 @@
 MAINTAINER=	hemi at puresimplicity.net
 COMMENT=	An alternative FastCGI module for Apache2
 
-USE_APACHE=	yes
+USE_APACHE=	2.0+
 WITH_APACHE2=	yes
-MAKE_ARGS=	top_dir="${LOCALBASE}/share/apache2" INCLUDES="-I${LOCALBASE}/include/apache2"
+
+SUB_FILES=	pkg-message
+
+.include <bsd.port.pre.mk>
+
+.if ${APACHE_VERSION} >= 22
+MAKE_ARGS=	top_dir="${LOCALBASE}/share/apache${APACHE_VERSION}"
+MAKE_ARGS+=	INCLUDES="-I${LOCALBASE}/include/apache${APACHE_VERSION} -I${LOCALBASE}/include/apr-1"
+INSTALL_TARGET=	install-modules-yes
+PLIST_SUB=	APACHE_VERSION=${APACHE_VERSION}
+PLIST_FILES+=	libexec/apache%%APACHE_VERSION%%/mod_fcgid.a
+PLIST_FILES+=	libexec/apache%%APACHE_VERSION%%/mod_fcgid.la
+SUB_LIST=	APACHE_VERSION=${APACHE_VERSION}
+.else
+MAKE_ARGS=	top_dir="${LOCALBASE}/share/apache${APACHE_VERSION:S/20/2/}"
+MAKE_ARGS+=	INCLUDES="-I${LOCALBASE}/include/apache${APACHE_VERSION:S/20/2/}"
 INSTALL_TARGET=	install-modules
+PLIST_SUB=	APACHE_VERSION=${APACHE_VERSION:S/20/2/}
+SUB_LIST=	APACHE_VERSION=${APACHE_VERSION:S/20/2/}
+.endif
 
 post-install:
 	${MKDIR} -m 700 /var/run/fcgidsock
 	${CHOWN} www:www /var/run/fcgidsock
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN mod_fcgid.old/distinfo mod_fcgid/distinfo
--- mod_fcgid.old/distinfo	Thu Apr 13 22:52:23 2006
+++ mod_fcgid/distinfo	Thu Apr 13 22:56:55 2006
@@ -1,3 +1,3 @@
-MD5 (mod_fcgid.1.07.tar.gz) = ae74bcb009b044739dc22757581b09f3
-SHA256 (mod_fcgid.1.07.tar.gz) = 22b935f1c65da19e39b295a4bce935fa962094a517f6a6612c1f2b9a76eed3ef
-SIZE (mod_fcgid.1.07.tar.gz) = 48521
+MD5 (mod_fcgid.1.08.tar.gz) = 5e053b090f89ff610347e4b4fbe9a81a
+SHA256 (mod_fcgid.1.08.tar.gz) = dd8ada827e099f881bff89dd823fb5e7c05ba6e476e19995cc55211277b669f7
+SIZE (mod_fcgid.1.08.tar.gz) = 48963
diff -ruN mod_fcgid.old/files/pkg-message.in mod_fcgid/files/pkg-message.in
--- mod_fcgid.old/files/pkg-message.in	Wed Dec 31 18:00:00 1969
+++ mod_fcgid/files/pkg-message.in	Fri Apr 21 23:33:05 2006
@@ -0,0 +1,10 @@
+************************************************************
+To enable this module, add something like the following
+lines to your server configuration file:
+
+  LoadModule fcgid_module libexec/apache%%APACHE_VERSION%%/mod_fcgid.so
+
+  <IfModule mod_fcgid.c>
+    AddHandler fcgid-script .fcgi
+  </IfModule>
+************************************************************
diff -ruN mod_fcgid.old/pkg-message mod_fcgid/pkg-message
--- mod_fcgid.old/pkg-message	Thu Apr 13 22:52:23 2006
+++ mod_fcgid/pkg-message	Wed Dec 31 18:00:00 1969
@@ -1,10 +0,0 @@
-************************************************************
-To enable this module, add something like the following
-lines to your server configuration file:
-
-  LoadModule fcgid_module libexec/apache2/mod_fcgid.so
-
-  <IfModule mod_fcgid.c>
-    AddHandler fcgid-script .fcgi
-  </IfModule>
-************************************************************
diff -ruN mod_fcgid.old/pkg-plist mod_fcgid/pkg-plist
--- mod_fcgid.old/pkg-plist	Thu Apr 13 22:52:23 2006
+++ mod_fcgid/pkg-plist	Fri Apr 21 23:15:40 2006
@@ -1,4 +1,4 @@
-libexec/apache2/mod_fcgid.so
+libexec/apache%%APACHE_VERSION%%/mod_fcgid.so
 @exec /bin/mkdir -p -m 700 /var/run/fcgidsock
 @exec /bin/chown www:www /var/run/fcgidsock
 @unexec /bin/rmdir /var/run/fcgidsock 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted: