Changeset 79834

Timestamp:

06/27/11 15:22:14 (4 years ago)

Author:

pixilla@…

Message:

www/mod_fcgid: Upgrade 2.3.5. Take maintainership. Closes #26396

Location:

trunk/dports/www/mod_fcgid

Files:

• Portfile (modified) (3 diffs)
• files/patch-fcgid_conf.c (modified) (1 diff)

trunk/dports/www/mod_fcgid/Portfile

@@ -1 +1 @@
 # $Id$
 
-PortSystem 1.0
+PortSystem          1.0
 
 name                mod_fcgid
-version             2.2
+version             2.3.5
 
 categories          www
 platforms           darwin
-maintainers         nomaintainer
+maintainers         pixilla
 
 description         An alternative FastCGI module for Apache2
@@ -14 +14 @@
 
 homepage            http://httpd.apache.org/mod_fcgid/
-master_sites        sourceforge:mod-fcgid
+master_sites        apache:httpd/${name}
 
-distname            ${name}.${version}
-checksums           md5     ce7d7b16e69643dbd549d43d85025983 \
-                    sha1    dc817a20ad6528480a441e4b7ad6920ec11c55e0 \
-                    rmd160  9c45c2b25fcf0f4069cee4fb8917493f0a13b338
+use_bzip2           yes
+checksums           sha1    11034ad8231a6ea1e3c9385b9017e0f8dd7faff0 \
+                    rmd160  35f153326cd3688fd66f4654a8d72a96cfb5709f
+
 patchfiles          patch-fcgid_conf.c
 
 depends_lib         port:apache2
 
-use_configure       no
-
-post-patch {
-   reinplace "s|/usr/local/apache2|${prefix}/apache2|g" \
-      ${worksrcpath}/Makefile
-}
+configure.env       APXS=${prefix}/apache2/bin/apxs
+configure.cmd       ./configure.apxs
+configure.pre_args  
 
 destroot.violate_mtree   yes
 post-destroot {
-   xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
-      ${destroot}${prefix}/share/doc/${name}
-   xinstall -m 644 -W ${worksrcpath} AUTHOR COPYING ChangeLog INSTALL.txt \
+   xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
+   xinstall -m 644 -W ${worksrcpath} \
+      CHANGES-FCGID LICENSE-FCGID NOTICE-FCGID README-FCGID STATUS-FCGID \
       ${destroot}${prefix}/share/doc/${name}
 }
@@ -47 +44 @@
 For further configuration information please visit
    http://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
+
+When upgrading from version 2.2, please see the above URL
+   about deprecated config options!
 =========="

trunk/dports/www/mod_fcgid/files/patch-fcgid_conf.c

@@ -1 @@
---- fcgid_conf.c.org    2007-02-15 18:34:41.000000000 -0800
-+++ fcgid_conf.c        2007-05-15 09:40:35.000000000 -0700
-@@ -16,7 +16,7 @@
- #define DEFAULT_ERROR_SCAN_INTERVAL 3
- #define DEFAULT_ZOMBIE_SCAN_INTERVAL 3
- #define DEFAULT_PROC_LIFETIME (60*60)
--#define DEFAULT_SOCKET_PREFIX "logs/fcgidsock"
-+#define DEFAULT_SOCKET_PREFIX "/var/run/fcgidsock"
- #define DEFAULT_SHM_PATH "logs/fcgid_shm"
- #define DEFAULT_SPAWNSOCRE_UPLIMIT 10
- #define DEFAULT_SPAWN_SCORE 1
+--- modules/fcgid/fcgid_conf.c.orig     2011-06-24 15:15:55.000000000 -0700
++++ modules/fcgid/fcgid_conf.c  2011-06-24 15:41:58.000000000 -0700
+@@ -28,9 +28,7 @@
+ #include "fcgid_global.h"
+ #include "fcgid_conf.h"
+ 
+-#ifndef DEFAULT_REL_RUNTIMEDIR /* Win32, etc. */
+-#define DEFAULT_REL_RUNTIMEDIR "logs"
+-#endif
++#define DEFAULT_REL_RUNTIMEDIR "var/run"
+ 
+ #define DEFAULT_IDLE_TIMEOUT 300
+ #define DEFAULT_IDLE_SCAN_INTERVAL 120