[90663] trunk/dports/www/mod_fcgid

[pixilla at macports.org]

Revision: 90663
          http://trac.macports.org/changeset/90663
Author:   pixilla at macports.org
Date:     2012-03-11 15:26:31 -0700 (Sun, 11 Mar 2012)
Log Message:
-----------
www/mod_fcgid:
- Set DEFAULT_REL_RUNTIMEDIR to ${prefix}/var/run/${name} and add to destroot.keepdirs.
- Rename patch file.
- Add a conf file at ${prefix}/apache2/conf/extra/httpd-fcgid.conf.
- Change notes to activate mod_fcgid by including the new conf file.

Modified Paths:
--------------
    trunk/dports/www/mod_fcgid/Portfile

Added Paths:
-----------
    trunk/dports/www/mod_fcgid/files/httpd-fcgid.conf
    trunk/dports/www/mod_fcgid/files/patch-modules-fcgid-fcgid_conf.c.diff

Removed Paths:
-------------
    trunk/dports/www/mod_fcgid/files/patch-fcgid_conf.c

Modified: trunk/dports/www/mod_fcgid/Portfile
===================================================================
--- trunk/dports/www/mod_fcgid/Portfile	2012-03-11 22:22:25 UTC (rev 90662)
+++ trunk/dports/www/mod_fcgid/Portfile	2012-03-11 22:26:31 UTC (rev 90663)
@@ -4,6 +4,7 @@
 
 name                mod_fcgid
 version             2.3.6
+revision            1
 
 categories          www
 platforms           darwin
@@ -20,33 +21,50 @@
 checksums           rmd160  f3dc009de05b68033471f38e50f39cfc8539c2ed \
                     sha256  16a96e6210875cd9cc5350a0dd774c8580f39f43f7f0176702b2d1f1ca502fdd
 
-patchfiles          patch-fcgid_conf.c
-
 depends_lib         port:apache2
 
+patch.pre_args      -p1
+patchfiles          patch-modules-fcgid-fcgid_conf.c.diff
+
+post-patch {
+    reinplace "s|@PREFIX@|${prefix}|g" \
+        ${worksrcpath}/modules/fcgid/fcgid_conf.c
+    reinplace "s|@NAME@|${name}|g" \
+        ${worksrcpath}/modules/fcgid/fcgid_conf.c
+}
+
 configure.env       APXS=${prefix}/apache2/bin/apxs
 configure.cmd       ./configure.apxs
 configure.pre_args  
 
 destroot.violate_mtree   yes
+destroot.keepdirs   ${destroot}${prefix}/var/run/${name}
 post-destroot {
-   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}
+    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}
+    xinstall -m 755 -d ${destroot}${prefix}/apache2/conf/extra
+    xinstall -m 644 ${filespath}/httpd-fcgid.conf \
+        ${destroot}${prefix}/apache2/conf/extra/
 }
 
 notes "
 ==========
-To enable mod_fcgid in Apache, add
-   LoadModule fcgid_module modules/mod_fcgid.so
-to ${prefix}/apache2/conf/httpd.conf
+This port installs a configuration file to enable mod_fcgid in Apache.
+After install add these lines to the end of ${prefix}/apache2/conf/httpd.conf to enable mod_fcgid.
+    # Include module mod_fcgid
+    Include conf/extra/httpd-fcgid.conf
 
+You should then restart apache2 to load the module.
+    $ sudo port unload apache2
+    $ sudo port load apache2
+
 For further configuration information please visit
-   http://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
+    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!
+    about deprecated config options!
 =========="
 
 livecheck.url       http://httpd.apache.org/download.cgi

Added: trunk/dports/www/mod_fcgid/files/httpd-fcgid.conf
===================================================================
--- trunk/dports/www/mod_fcgid/files/httpd-fcgid.conf	                        (rev 0)
+++ trunk/dports/www/mod_fcgid/files/httpd-fcgid.conf	2012-03-11 22:26:31 UTC (rev 90663)
@@ -0,0 +1 @@
+LoadModule fcgid_module modules/mod_fcgid.so

Deleted: trunk/dports/www/mod_fcgid/files/patch-fcgid_conf.c
===================================================================
--- trunk/dports/www/mod_fcgid/files/patch-fcgid_conf.c	2012-03-11 22:22:25 UTC (rev 90662)
+++ trunk/dports/www/mod_fcgid/files/patch-fcgid_conf.c	2012-03-11 22:26:31 UTC (rev 90663)
@@ -1,13 +0,0 @@
---- 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

Copied: trunk/dports/www/mod_fcgid/files/patch-modules-fcgid-fcgid_conf.c.diff (from rev 90629, trunk/dports/www/mod_fcgid/files/patch-fcgid_conf.c)
===================================================================
--- trunk/dports/www/mod_fcgid/files/patch-modules-fcgid-fcgid_conf.c.diff	                        (rev 0)
+++ trunk/dports/www/mod_fcgid/files/patch-modules-fcgid-fcgid_conf.c.diff	2012-03-11 22:26:31 UTC (rev 90663)
@@ -0,0 +1,13 @@
+--- a/modules/fcgid/fcgid_conf.c	2012-03-10 11:15:56.000000000 -0800
++++ b/modules/fcgid/fcgid_conf.c	2012-03-10 11:15:42.000000000 -0800
+@@ -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 "@PREFIX@/var/run/@NAME@"
+ 
+ #define DEFAULT_IDLE_TIMEOUT 300
+ #define DEFAULT_IDLE_SCAN_INTERVAL 120
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120311/02886dcb/attachment.html>