From pgollucci@mail.bluecottontech.com  Mon Apr 13 03:15:23 2009
Return-Path: <pgollucci@mail.bluecottontech.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79DEF106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 13 Apr 2009 03:15:23 +0000 (UTC)
	(envelope-from pgollucci@mail.bluecottontech.com)
Received: from mail.bluecottontech.com (static-76-161-175-34.dsl.cavtel.net [76.161.175.34])
	by mx1.freebsd.org (Postfix) with ESMTP id 2DDEB8FC16
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 13 Apr 2009 03:15:22 +0000 (UTC)
	(envelope-from pgollucci@mail.bluecottontech.com)
Received: from mail.bluecottontech.com (localhost [127.0.0.1])
	by mail.bluecottontech.com (8.14.3/8.14.3) with ESMTP id n3D3FJWX047877;
	Mon, 13 Apr 2009 03:15:20 GMT
	(envelope-from pgollucci@mail.bluecottontech.com)
Received: (from pgollucci@localhost)
	by mail.bluecottontech.com (8.14.3/8.14.3/Submit) id n3D3FEhv047876;
	Mon, 13 Apr 2009 03:15:14 GMT
	(envelope-from pgollucci)
Message-Id: <200904130315.n3D3FEhv047876@mail.bluecottontech.com>
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: [PATCH] www/mod_fcgid: apache@ cleanups
X-Send-Pr-Version: 3.113
X-GNATS-Notify: hemi@puresimplicity.net

>Number:         133684
>Category:       ports
>Synopsis:       [PATCH] www/mod_fcgid: apache@ cleanups
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 13 03:20:03 UTC 2009
>Closed-Date:    Wed Apr 22 00:25:38 UTC 2009
>Last-Modified:  Wed Apr 22 00:25:38 UTC 2009
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Apr 13 03:49:09 UTC 2009 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=133684 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Apr 13 03:49:15 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=133684 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: hemi@puresimplicity.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/133684: [PATCH] www/mod_fcgid: apache@ cleanups
Date: Mon, 13 Apr 2009 03:49:11 UT

 Maintainer of www/mod_fcgid,
 
 Please note that PR ports/133684 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/133684
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Josh Tolbert <hemi@puresimplicity.net>
To: bug-followup@FreeBSD.ORG
Cc:  
Subject: Re: ports/133684: [PATCH] www/mod_fcgid: apache@ cleanups
Date: Tue, 14 Apr 2009 18:50:41 -0500

 On Mon, Apr 13, 2009 at 03:49:11AM +0000, Edwin Groothuis wrote:
 > Maintainer of www/mod_fcgid,
 > 
 > Please note that PR ports/133684 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 > 
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/133684
 > 
 > -- 
 > Edwin Groothuis via the GNATS Auto Assign Tool
 > edwin@FreeBSD.org
 
 Approved.
 
 Cheers,
 
 Josh
 
 -- 
 Josh Tolbert
 hemi@puresimplicity.net  ||  http://www.puresimplicity.net/~hemi/
 
 Security is mostly a superstition. It does not exist in nature, nor
 do the children of men as a whole experience it. Avoiding danger
 is no safer in the long run than outright exposure. Life is either
 a daring adventure, or nothing.
     -- Helen Keller
State-Changed-From-To: feedback->open 
State-Changed-By: pgollucci 
State-Changed-When: Wed Apr 15 23:47:28 UTC 2009 
State-Changed-Why:  
feedback receieved 

http://www.freebsd.org/cgi/query-pr.cgi?pr=133684 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/133684: commit references a PR
Date: Wed, 22 Apr 2009 00:19:51 +0000 (UTC)

 pgollucci    2009-04-22 00:19:42 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/mod_fcgid        Makefile pkg-plist 
     www/mod_fcgid/files  pkg-message.in 
   Log:
   - WITH_APACHE2 is deprecated
   - Use SFE macro
   - Use APACHEMODDIR
   
   PR:             ports/133684
   Approved by:    maintainer
   Submitted by:   me
   
   Revision  Changes    Path
   1.15      +7 -8      ports/www/mod_fcgid/Makefile
   1.2       +1 -1      ports/www/mod_fcgid/files/pkg-message.in
   1.4       +1 -1      ports/www/mod_fcgid/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Wed Apr 22 00:25:37 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=133684 
>Unformatted:
