Date: Mon, 13 Apr 2009 03:15:14 GMT From: "Philip M. Gollucci" <pgollucci@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: hemi@puresimplicity.net Subject: ports/133684: [PATCH] www/mod_fcgid: apache@ cleanups Message-ID: <200904130315.n3D3FEhv047876@mail.bluecottontech.com> Resent-Message-ID: <200904130320.n3D3K3eq004379@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133684
>Category: ports
>Synopsis: [PATCH] www/mod_fcgid: apache@ cleanups
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 13 03:20:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Philip M. Gollucci
>Release: FreeBSD 7.1-RELEASE-p3 amd64
>Organization:
RideCharge Inc.
>Environment:
System: FreeBSD mail.bluecottontech.com 7.1-RELEASE-p3 FreeBSD 7.1-RELEASE-p3 #1: Tue Mar 10 22:10:18 UTC 2009
>Description:
- WITH_APACHE2 is deprecated
- Use SFE macro
- Use APACHEMODDIR
Port maintainer (hemi@puresimplicity.net) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- mod_fcgid-2.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/mod_fcgid/Makefile,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile
--- Makefile 19 Dec 2008 15:23:48 -0000 1.14
+++ Makefile 13 Apr 2009 03:14:08 -0000
@@ -8,7 +8,7 @@
PORTNAME= mod_fcgid
PORTVERSION= 2.2
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
+MASTER_SITES= SFE
MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
DISTNAME= ${PORTNAME}.${PORTVERSION}
@@ -16,24 +16,23 @@
COMMENT= An alternative FastCGI module for Apache2
USE_APACHE= 2.0+
-WITH_APACHE2= yes
SUB_FILES= pkg-message
.include <bsd.port.pre.mk>
.if ${APACHE_VERSION} >= 22
-MAKE_ARGS= top_dir="${LOCALBASE}/share/apache${APACHE_VERSION}"
+MAKE_ARGS+= top_dir="${LOCALBASE}/share/apache${APACHE_VERSION}"
MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include/apache${APACHE_VERSION} -I${LOCALBASE}/include/apr-1"
INSTALL_TARGET= install-modules-yes
-PLIST_SUB= APACHE_VERSION=${APACHE_VERSION}
-SUB_LIST= APACHE_VERSION=${APACHE_VERSION}
+PLIST_SUB+= APACHE_VERSION=${APACHE_VERSION}
+SUB_LIST+= APACHE_VERSION=${APACHE_VERSION}
.else
-MAKE_ARGS= top_dir="${LOCALBASE}/share/apache${APACHE_VERSION:S/20/2/}"
+MAKE_ARGS+= top_dir="${LOCALBASE}/share/apache${APACHE_VERSION:S/20/2/}"
MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include/apache${APACHE_VERSION:S/20/2/}"
INSTALL_TARGET= install-modules
-PLIST_SUB= APACHE_VERSION=${APACHE_VERSION:S/20/2/}
-SUB_LIST= APACHE_VERSION=${APACHE_VERSION:S/20/2/}
+PLIST_SUB+= APACHE_VERSION=${APACHE_VERSION:S/20/2/}
+SUB_LIST+= APACHE_VERSION=${APACHE_VERSION:S/20/2/}
.endif
post-install:
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/mod_fcgid/pkg-plist,v
retrieving revision 1.3
diff -u -u -r1.3 pkg-plist
--- pkg-plist 30 Sep 2007 11:25:51 -0000 1.3
+++ pkg-plist 13 Apr 2009 03:14:08 -0000
@@ -1,4 +1,4 @@
-libexec/apache%%APACHE_VERSION%%/mod_fcgid.so
+%%APACHEMODDIR%%/mod_fcgid.so
@exec /bin/mkdir -p -m 700 /var/run/fcgidsock
@exec /usr/sbin/chown www:www /var/run/fcgidsock
@unexec /bin/rmdir /var/run/fcgidsock 2>/dev/null || true
Index: files/pkg-message.in
===================================================================
RCS file: /home/pcvs/ports/www/mod_fcgid/files/pkg-message.in,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-message.in
--- files/pkg-message.in 23 Apr 2006 02:10:22 -0000 1.1
+++ files/pkg-message.in 13 Apr 2009 03:14:08 -0000
@@ -2,7 +2,7 @@
To enable this module, add something like the following
lines to your server configuration file:
- LoadModule fcgid_module libexec/apache%%APACHE_VERSION%%/mod_fcgid.so
+ LoadModule fcgid_module %%APACHEMODDIR%%/mod_fcgid.so
<IfModule mod_fcgid.c>
AddHandler fcgid-script .fcgi
--- mod_fcgid-2.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904130315.n3D3FEhv047876>