Index: head/www/mod_scgi/Makefile
===================================================================
--- head/www/mod_scgi/Makefile	(revision 112546)
+++ head/www/mod_scgi/Makefile	(revision 112547)
@@ -1,25 +1,37 @@
 # New ports collection makefile for: scgi
 # Date created:		19 Aug 2002
 # Whom:			Neil Blakey-Milner <nbm@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	scgi
-PORTVERSION=	0.2
+PORTVERSION=	1.2.a2
 CATEGORIES=	www
 MASTER_SITES=	http://www.mems-exchange.org/software/files/scgi/
 PKGNAMEPREFIX=	mod_
+DISTNAME=	scgi-${PORTVERSION:S/.a/a/}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dryice@liu.com.cn
 COMMENT=	Apache module that implements the client side of the SCGI protocol
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+USE_APACHE=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME}/${APACHE_DIR}
 
-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
 
-do-install:
-	cd ${WRKSRC} && ${APXS} -i -a mod_scgi.so
+.if defined(WITH_APACHE2)
+APACHE_DIR=	apache2
+PLIST_SUB=	APACHE_DIR=apache2
+.else
+APACHE_DIR=	apache1
+PLIST_SUB=	APACHE_DIR=apache
+.endif
 
-.include <bsd.port.mk>
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.post.mk>

Property changes on: head/www/mod_scgi/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/mod_scgi/distinfo
===================================================================
--- head/www/mod_scgi/distinfo	(revision 112546)
+++ head/www/mod_scgi/distinfo	(revision 112547)
@@ -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

Property changes on: head/www/mod_scgi/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/www/mod_scgi/files/patch-apache2-Makefile
===================================================================
--- head/www/mod_scgi/files/patch-apache2-Makefile	(nonexistent)
+++ head/www/mod_scgi/files/patch-apache2-Makefile	(revision 112547)
@@ -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

Property changes on: head/www/mod_scgi/files/patch-apache2-Makefile
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/www/mod_scgi/pkg-message
===================================================================
--- head/www/mod_scgi/pkg-message	(nonexistent)
+++ head/www/mod_scgi/pkg-message	(revision 112547)
@@ -0,0 +1,3 @@
+********************************************************************
+* If your mod_scgi seg fault, try disable mod_fastcgi              *
+********************************************************************

Property changes on: head/www/mod_scgi/pkg-message
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/www/mod_scgi/pkg-plist
===================================================================
--- head/www/mod_scgi/pkg-plist	(revision 112546)
+++ head/www/mod_scgi/pkg-plist	(revision 112547)
@@ -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

Property changes on: head/www/mod_scgi/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property