summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/ap2-fcgid/DESCR9
-rw-r--r--www/ap2-fcgid/Makefile21
-rw-r--r--www/ap2-fcgid/PLIST6
-rw-r--r--www/ap2-fcgid/distinfo9
-rw-r--r--www/ap2-fcgid/patches/patch-aa15
5 files changed, 41 insertions, 19 deletions
diff --git a/www/ap2-fcgid/DESCR b/www/ap2-fcgid/DESCR
index b7438892d76..8808aa93c91 100644
--- a/www/ap2-fcgid/DESCR
+++ b/www/ap2-fcgid/DESCR
@@ -1,4 +1,5 @@
-The mod_fcgid Apache module is a binary compatible alternative to
-Apache module mod_fastcgi, but only for apache2 and later.
-FastCGI provides a high-performance alternative to CGI for writing
-webserver applications.
+High performance alternative to mod_cgi or mod_cgid, which starts a sufficient
+number instances of the CGI program to handle concurrent requests, and these
+programs remain running to handle further incoming requests. It is favored by
+the PHP developers, for example, as a preferred alternative to running mod_php
+in-process, delivering very similar performance.
diff --git a/www/ap2-fcgid/Makefile b/www/ap2-fcgid/Makefile
index 8f765d23029..e866f47b175 100644
--- a/www/ap2-fcgid/Makefile
+++ b/www/ap2-fcgid/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2008/06/12 02:14:54 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2010/02/15 11:38:44 fhajny Exp $
-DISTNAME= mod_fcgid.2.2
-PKGNAME= ${APACHE_PKG_PREFIX}-fcgid-2.2
+DISTNAME= mod_fcgid-2.3.5
+PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mod-fcgid/}
+MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/mod_fcgid/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://fastcgi.coremail.cn/
-COMMENT= Binary compatible alternative to Apache module mod_fastcgi
+HOMEPAGE= http://httpd.apache.org/mod_fcgid/
+COMMENT= High performance alternative to mod_cgi or mod_cgid
+LICENSE= apache-2.0
PKG_DESTDIR_SUPPORT= user-destdir
@@ -15,13 +16,13 @@ PKG_APACHE_ACCEPTED= apache2 apache22
APACHE_MODULE= YES
USE_LIBTOOL= YES
+CONFIGURE_ENV+= APXS=${APXS:Q}
+
MAKE_FLAGS+= LIBTOOL=${LIBTOOL:Q}
MAKE_FLAGS+= INCLUDES="-I${BUILDLINK_PREFIX.apache}/include/httpd"
-SUBST_CLASSES+= ap2
-SUBST_STAGE.ap2= pre-build
-SUBST_FILES.ap2= Makefile
-SUBST_SED.ap2= -e s,/usr/local/apache2,${PREFIX}/share/httpd,
+do-configure:
+ cd ${WRKSRC} && ./configure.apxs
.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-fcgid/PLIST b/www/ap2-fcgid/PLIST
index f74be5c70b7..28127aa3910 100644
--- a/www/ap2-fcgid/PLIST
+++ b/www/ap2-fcgid/PLIST
@@ -1,2 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/25 20:22:54 abs Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/02/15 11:38:44 fhajny Exp $
lib/httpd/mod_fcgid.so
+share/httpd/manual/mod/mod_fcgid.html
+share/httpd/manual/mod/mod_fcgid.html.en
+share/httpd/manual/mod/mod_fcgid.xml
+share/httpd/manual/mod/mod_fcgid.xml.meta
diff --git a/www/ap2-fcgid/distinfo b/www/ap2-fcgid/distinfo
index 9213544658c..31e22746cf8 100644
--- a/www/ap2-fcgid/distinfo
+++ b/www/ap2-fcgid/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/04/17 18:18:08 abs Exp $
+$NetBSD: distinfo,v 1.3 2010/02/15 11:38:44 fhajny Exp $
-SHA1 (mod_fcgid.2.2.tar.gz) = dc817a20ad6528480a441e4b7ad6920ec11c55e0
-RMD160 (mod_fcgid.2.2.tar.gz) = 9c45c2b25fcf0f4069cee4fb8917493f0a13b338
-Size (mod_fcgid.2.2.tar.gz) = 56954 bytes
+SHA1 (mod_fcgid-2.3.5.tar.gz) = e64d21ee27b8c0327c1c2754a68173def5c80de6
+RMD160 (mod_fcgid-2.3.5.tar.gz) = 9e989b6f91dcffa8a61dd855aa305bfc5c698dab
+Size (mod_fcgid-2.3.5.tar.gz) = 97784 bytes
+SHA1 (patch-aa) = 412ff767f32e569e7cee1940d382ea2d0f4ea235
diff --git a/www/ap2-fcgid/patches/patch-aa b/www/ap2-fcgid/patches/patch-aa
new file mode 100644
index 00000000000..eccbc98f660
--- /dev/null
+++ b/www/ap2-fcgid/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2010/02/15 11:38:44 fhajny Exp $
+
+Do not mangle httpd.conf.
+
+--- Makefile.apxs.orig 2009-11-11 15:13:31.000000000 +0000
++++ Makefile.apxs
+@@ -21,7 +21,7 @@ SUBDIRS = modules/fcgid
+ CLEAN_SUBDIRS =
+
+ TARGETS =
+-INSTALL_TARGETS = install-conf install-manual
++INSTALL_TARGETS = install-manual
+ ## no such targets yet; install-include
+ DISTCLEAN_TARGETS = config.apxs.log modules/fcgid/fcgid_config.h
+ EXTRACLEAN_TARGETS =