ports/146988: [PATCH] ports-mgmt/portlint: APACHE updates

[Philip M. Gollucci]

>Number:         146988
>Category:       ports
>Synopsis:       [PATCH] ports-mgmt/portlint: APACHE updates
>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:   Tue May 25 22:30:06 UTC 2010
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: