ports/68353: [update]www/mod_scgi: upgrade to 1.2a2 and take maintainership

[Dryice Liu]

>Number:         68353
>Category:       ports
>Synopsis:       [update]www/mod_scgi: upgrade to 1.2a2 and take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 26 02:40:17 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Dryice Liu
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD dryice.3322.org 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #1: Mon Mar 1 16:17:42 CST 2004 


>Description:
	Changes:
		- Upgrade to 1.2a2
		- support Apache2
		- Take maintainership
		- new file: files/patch-apache2-Makefile
		- new file: pkg-message
>How-To-Repeat:
	N/A
>Fix:

--- mod_scgi.diff begins here ---
diff -ruN mod_scgi.old/Makefile mod_scgi/Makefile
--- mod_scgi.old/Makefile	Sat Mar 27 03:14:44 2004
+++ mod_scgi/Makefile	Sat Jun 26 10:35:35 2004
@@ -6,20 +6,36 @@
 #
 
 PORTNAME=	scgi
-PORTVERSION=	0.2
+PORTVERSION=	1.2a2
 CATEGORIES=	www
 MASTER_SITES=	http://www.mems-exchange.org/software/files/scgi/
 PKGNAMEPREFIX=	mod_
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	dryice at liu.com.cn
 COMMENT=	Apache module that implements the client side of the SCGI protocol
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+USE_APACHE=	yes
 
-do-build:
-	cd ${WRKSRC} && ${APXS} -c -o mod_scgi.so mod_scgi.c
+.include <bsd.port.pre.mk>
+.if exists(${LOCALBASE}/include/apache2/apr.h)
+WITH_APACHE2=	yes
+.endif
 
+.if defined(WITH_APACHE2)
+APACHE_DIR=	apache2
+do-build:
+	cd ${WRKSRC}/apache2 && make all
 do-install:
-	cd ${WRKSRC} && ${APXS} -i -a mod_scgi.so
+	cd ${WRKSRC}/apache2 && make install
+.else
+APACHE_DIR=	apache
+do-build:
+	cd ${WRKSRC}/apache1 && make all
+do-install:
+	cd ${WRKSRC}/apache1 && make install
+.endif
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN mod_scgi.old/distinfo mod_scgi/distinfo
--- mod_scgi.old/distinfo	Thu Apr  1 04:26:33 2004
+++ mod_scgi/distinfo	Sat Jun 26 10:25:08 2004
@@ -1,2 +1,2 @@
-MD5 (scgi-0.2.tar.gz) = 586892ad689e31383c21267590474f89
-SIZE (scgi-0.2.tar.gz) = 11251
+MD5 (scgi-1.2a2.tar.gz) = 7ed218368a2dadaf8773cef944faa0bf
+SIZE (scgi-1.2a2.tar.gz) = 17713
diff -ruN mod_scgi.old/files/patch-apache2-Makefile mod_scgi/files/patch-apache2-Makefile
--- mod_scgi.old/files/patch-apache2-Makefile	Thu Jan  1 08:00:00 1970
+++ mod_scgi/files/patch-apache2-Makefile	Sat Jun 26 08:56:10 2004
@@ -0,0 +1,11 @@
+--- apache2/Makefile.orig	Sat Jun 26 08:54:08 2004
++++ apache2/Makefile	Sat Jun 26 08:54:56 2004
+@@ -1,6 +1,6 @@
+ 
+-APXS=apxs2
+-APACHECTL=apache2ctl
++APXS=apxs
++APACHECTL=apachectl
+ 
+ all:
+ 	$(APXS) -c mod_scgi.c
diff -ruN mod_scgi.old/pkg-message mod_scgi/pkg-message
--- mod_scgi.old/pkg-message	Thu Jan  1 08:00:00 1970
+++ mod_scgi/pkg-message	Sat Jun 26 10:23:14 2004
@@ -0,0 +1,3 @@
+********************************************************************
+* If your mod_scgi seg fault, try disable mod_fastcgi              *
+********************************************************************
diff -ruN mod_scgi.old/pkg-plist mod_scgi/pkg-plist
--- mod_scgi.old/pkg-plist	Wed Aug 21 00:31:06 2002
+++ mod_scgi/pkg-plist	Sat Jun 26 10:25:10 2004
@@ -1,3 +1,3 @@
-libexec/apache/mod_scgi.so
+libexec/%%APACHE_DIR%%/mod_scgi.so
 @exec %D/sbin/apxs -e -a -n scgi %f
 @unexec %D/sbin/apxs -e -A -n scgi %f
--- mod_scgi.diff ends here ---



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