From pgollucci@frieza.p6m7g8.net  Tue May 25 22:25:55 2010
Return-Path: <pgollucci@frieza.p6m7g8.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 83AE51065678
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 May 2010 22:25:55 +0000 (UTC)
	(envelope-from pgollucci@frieza.p6m7g8.net)
Received: from frieza.p6m7g8.net (wsip-174-79-184-239.dc.dc.cox.net [174.79.184.239])
	by mx1.freebsd.org (Postfix) with ESMTP id 404E88FC23
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 May 2010 22:25:54 +0000 (UTC)
Received: from frieza.p6m7g8.net (localhost [127.0.0.1])
	by frieza.p6m7g8.net (8.14.4/8.14.4) with ESMTP id o4PMPsAF096201;
	Tue, 25 May 2010 18:25:54 -0400 (EDT)
	(envelope-from pgollucci@frieza.p6m7g8.net)
Received: (from pgollucci@localhost)
	by frieza.p6m7g8.net (8.14.4/8.14.4/Submit) id o4PMPsHo096200;
	Tue, 25 May 2010 18:25:54 -0400 (EDT)
	(envelope-from pgollucci)
Message-Id: <201005252225.o4PMPsHo096200@frieza.p6m7g8.net>
Date: Tue, 25 May 2010 18:25:54 -0400 (EDT)
From: "Philip M. Gollucci" <pgollucci@p6m7g8.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: marcus@freebsd.org
Subject: [PATCH] ports-mgmt/portlint: APACHE updates
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         146988
>Category:       ports
>Synopsis:       [PATCH] ports-mgmt/portlint: APACHE updates
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marcus
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 25 22:30:06 UTC 2010
>Closed-Date:    Wed Jun 16 03:53:40 UTC 2010
>Last-Modified:  Wed Jun 16 04:00:06 UTC 2010
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
RideCharge Inc / TaxiMagic
>Environment:
System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Mon Apr 26 16:20:00 EDT 2010
>Description:
- USE_APACHE=yes is now fatal
- clean up WITH_APACHEX=X variants.  WITH_APACHE=yes is now the only allowed one


Port maintainer (marcus@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- portlint-2.13.0.patch begins here ---
Index: src/portlint.pl
===================================================================
RCS file: /home/ncvs/ports/ports-mgmt/portlint/src/portlint.pl,v
retrieving revision 1.113
diff -u -u -r1.113 portlint.pl
--- src/portlint.pl	4 Apr 2010 18:12:45 -0000	1.113
+++ src/portlint.pl	25 May 2010 22:24:44 -0000
@@ -2028,19 +2028,18 @@
 	# whole file: check for USE_APACHE=yes
 	#
 	if ($whole =~ /^USE_APACHE[?:]?=\s*(yes)$/m) {
-		&perror("WARN", $file, -1, "Use USE_APACHE=VERSION ".
+		&perror("FATAL", $file, -1, "Use USE_APACHE=VERSION ".
 			"(where version can be found in \${PORTSDIR}/Mk/bsd.apache.mk) ".
 			"instead of yes");
 	}
 
 	#
-	# whole file: check for WITH_APACHE2
+	# whole file: check for WITH_APACHE\d+
 	#
-	if ($whole =~ /^WITH_APACHE2[?:]?=/m) {
-		&perror("WARN", $file, -1, "Use WITH_APACHE=VERSION (where VERSION ".
-			"can be found in \${PORTSDIR}/Mk/bsd.apache.mk) instead to pull ".
-			"in APACHE_PORT");
-	}
+        if ($whole =~ /WITH_APACHE\d+/) {
+                &perror("FATAL", $file, -1, "Use WITH_APACHE=yes and .if ".
+                        "\${APACHE_VERSION} [==|<|>] 13|20|22|24");
+        }
 
 	#
 	# whole file: check for JAVA_BUILD and NO_BUILD
--- portlint-2.13.0.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->marcus 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue May 25 22:34:33 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146988 
State-Changed-From-To: open->patched 
State-Changed-By: marcus 
State-Changed-When: Sun May 30 17:11:58 UTC 2010 
State-Changed-Why:  
Committed to my CVS repo pending the next portlint release. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146988 
Responsible-Changed-From-To: marcus->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Tue Jun 8 21:55:35 UTC 2010 
Responsible-Changed-Why:  
maintainer timeout (clsung; 14 days) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146988 
Responsible-Changed-From-To: pgollucci->marcus 
Responsible-Changed-By: marcus 
Responsible-Changed-When: Tue Jun 8 21:57:29 UTC 2010 
Responsible-Changed-Why:  
This is not a timeout, I committed the code to my CVS repo.  I will be 
committing a new rev of portlint this weekend. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146988 
State-Changed-From-To: patched->closed 
State-Changed-By: marcus 
State-Changed-When: Wed Jun 16 03:53:28 UTC 2010 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146988: commit references a PR
Date: Wed, 16 Jun 2010 03:53:31 +0000 (UTC)

 marcus      2010-06-16 03:53:15 UTC
 
   FreeBSD ports repository
 
   Modified files:
     ports-mgmt/portlint  Makefile 
     ports-mgmt/portlint/src portlint.pl 
   Log:
   Update to 2.13.1.
   
   * USE_APACHE=yes is now fatal
   * Clean up WITH_APACHEX=X variants. WITH_APACHE=yes is now the only allowed one
   
   PR:             146988
   Submitted by:   pgollucci
   
   Revision  Changes    Path
   1.137     +1 -1      ports/ports-mgmt/portlint/Makefile
   1.114     +7 -8      ports/ports-mgmt/portlint/src/portlint.pl
 _______________________________________________
 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"
 
>Unformatted:
