ports/134610: [PATCH] ports-mgmt/portlint: add checks for apache related deaths

[Philip M. Gollucci]

>Number:         134610
>Category:       ports
>Synopsis:       [PATCH] ports-mgmt/portlint: add checks for apache related deaths
>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:   Sun May 17 11:10:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
Riderway Inc.
>Environment:
System: FreeBSD freefall.freebsd.org 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #36: Mon Dec 29 15:15:30 UTC 2008
>Description:
- www/apache* should never occur in a _DEPENDS line
  [USE_APACHE instead]
- USE_APACHE=yes is no longer valid
  [13|20|22+]
- WITH_APACHE2 should have never been created to begin with
  [WITH_APACHE pulls in APACHE_PORT according to USE_APACHE]

- XXX, should probably add checks for APACHE*DIR in pkg-plist
  maybe in round 2


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

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

--- portlint-2.11.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ports-mgmt/portlint/Makefile,v
retrieving revision 1.131
diff -u -u -r1.131 Makefile
--- Makefile	13 Apr 2009 01:56:17 -0000	1.131
+++ Makefile	17 May 2009 11:04:04 -0000
@@ -9,6 +9,7 @@
 
 PORTNAME=	portlint
 PORTVERSION=	2.11.1
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	# none
 DISTFILES=	# none
Index: src/portlint.pl
===================================================================
RCS file: /home/pcvs/ports/ports-mgmt/portlint/src/portlint.pl,v
retrieving revision 1.108
diff -u -u -r1.108 portlint.pl
--- src/portlint.pl	13 Apr 2009 01:56:17 -0000	1.108
+++ src/portlint.pl	17 May 2009 11:04:05 -0000
@@ -1190,6 +1190,12 @@
 					"\${X11BASE} instead.");
 			}
 
+			if ($m{'dep'} =~ /apache/i) {
+				&perror("FATAL", $file, -1, "Do not depend on".
+					"any apache port in *_DEPENDS directly".
+					"use USE_APACHE=13|20|22+ instead");
+			}
+
 			# check port dir existence
 			$k = $m{'dir'};
 			$k =~ s/\${PORTSDIR}/$ENV{'PORTSDIR'}/;
@@ -1640,6 +1646,7 @@
 	);
 
 	%deprecated = (
+			APACHE_COMPAT   => 'USE_APACHE',
 			USE_MESA		=> 'USE_GL',
 			USE_RCORDER		=> 'USE_RC_SUBR',
 			INSTALLS_SHLIB  => 'USE_LDCONFIG',
@@ -1900,6 +1907,20 @@
 	}
 
 	#
+	# whole file: check for USE_APACHE=yes
+	#
+	if ($whole =~ /^USE_APACHE[?:]?=\s*(yes)$/m) {
+		&perror("WARN", $file, -1, "Use USE_APACHE=13|20|22+ instead of yes");
+	}
+
+	#
+	# whole file: check for WITH_APACHE2
+	#
+	if ($whole =~ /WITH_APACHE2/m) {
+		&perror("WARN", $file, -1, "Use WITH_APACHE=13|20|22 instead to pull in APACHE_PORT");
+	}
+
+	#
 	# whole file: check for JAVA_BUILD and NO_BUILD
 	#
 	if ($whole =~ /^NO_BUILD[?:]?=\s*(.*)$/m &&
--- portlint-2.11.1_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: