ports/74805: [PATCH] devel/portlint: expect a new DISTVERSION macro

[Sergey Matveychuk]

>Number:         74805
>Category:       ports
>Synopsis:       [PATCH] devel/portlint: expect a new DISTVERSION macro
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 07 09:50:26 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Matveychuk
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD current-test.sem-home.ciam.ru 6.0-CURRENT FreeBSD 6.0-CURRENT #4: Mon Dec  6 11:39:04 MSK
>Description:

According to the change in bsd.port.mk, a port can set DISTVERSION macro
instead of PORTVERSION.
portlint knows nothing about DISTVERSION. Teach it.

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

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

--- portlint-2.6.10.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/portlint/Makefile,v
retrieving revision 1.85
diff -u -u -r1.85 Makefile
--- Makefile	22 Nov 2004 18:28:40 -0000	1.85
+++ Makefile	7 Dec 2004 09:39:36 -0000
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	portlint
-PORTVERSION=	2.6.9
+PORTVERSION=	2.6.10
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
Index: src/portlint.pl
===================================================================
RCS file: /home/pcvs/ports/devel/portlint/src/portlint.pl,v
retrieving revision 1.66
diff -u -u -r1.66 portlint.pl
--- src/portlint.pl	22 Nov 2004 18:28:40 -0000	1.66
+++ src/portlint.pl	7 Dec 2004 09:39:37 -0000
@@ -170,12 +170,12 @@
 # get make vars
 my @varlist =  qw(
 	PORTNAME PORTVERSION PORTREVISION PORTEPOCH PKGNAME PKGNAMEPREFIX
-	PKGNAMESUFFIX DISTNAME DISTFILES CATEGORIES MASTERDIR MAINTAINER
-	MASTER_SITES WRKDIR WRKSRC NO_WRKSUBDIR PATCHDIR SCRIPTDIR FILESDIR
-	PKGDIR COMMENT DESCR PLIST PKGCATEGORY PKGINSTALL PKGDEINSTALL
-	PKGREQ PKGMESSAGE MD5_FILE .CURDIR INSTALLS_SHLIB USE_LIBTOOL_VER
-	INDEXFILE PKGORIGIN CONFLICTS PKG_VERSION PKGINSTALLVER PLIST_FILES
-	OPTIONS INSTALLS_OMF
+	PKGNAMESUFFIX DISTNAME DISTFILES DISTVERSION CATEGORIES MASTERDIR
+	MAINTAINER MASTER_SITES WRKDIR WRKSRC NO_WRKSUBDIR PATCHDIR
+	SCRIPTDIR FILESDIR PKGDIR COMMENT DESCR PLIST PKGCATEGORY PKGINSTALL
+	PKGDEINSTALL PKGREQ PKGMESSAGE MD5_FILE .CURDIR INSTALLS_SHLIB
+	USE_LIBTOOL_VER INDEXFILE PKGORIGIN CONFLICTS PKG_VERSION
+	PKGINSTALLVER PLIST_FILES OPTIONS INSTALLS_OMF
 );
 
 my $cmd = join(' -V ', "make $makeenv MASTER_SITE_BACKUP=''", @varlist);
@@ -1457,7 +1457,7 @@
 
 	# check the order of items.
 	&checkorder('PORTNAME', $tmp, $file, qw(
-PORTNAME PORTVERSION PORTREVISION PORTEPOCH CATEGORIES MASTER_SITES
+PORTNAME PORTVERSION PORTREVISION PORTEPOCH DISTVERSION CATEGORIES MASTER_SITES
 MASTER_SITE_SUBDIR PKGNAMEPREFIX PKGNAMESUFFIX DISTNAME EXTRACT_SUFX
 DISTFILES DIST_SUBDIR EXTRACT_ONLY
 	));
@@ -1471,12 +1471,15 @@
 		&perror("WARN: $file: unless this is a master port, PORTNAME has to be set by \"=\", ".
 			"not by \"$1=\".") unless ($masterport);
 	}
-	if ($tmp !~ /\nPORTVERSION(.)?=/) {
-		&perror("FATAL: $file: PORTVERSION has to be there.") unless ($slaveport && $makevar{PORTVERSION} ne '');
+	if ($tmp !~ /\nPORTVERSION(.)?=/ && $tmp !~ /\nDISTVERSION(.)?=/) {
+		&perror("FATAL: $file: PORTVERSION or DISTVERSION has to be there.") unless ($slaveport && ($makevar{PORTVERSION} ne '' || $makevar{DISTVERSION} ne ''));
 	} elsif ($1 ne '') {
-		&perror("WARN: $file: unless this is a master port, PORTVERSION has to be set by \"=\", ".
+		&perror("WARN: $file: unless this is a master port, PORTVERSION or DISTVERSION has to be set by \"=\", ".
 			"not by \"$1=\".") unless ($masterport);
 	}
+	if ($tmp =~ /\nPORTVERSION(.)?=/ && $tmp =~ /\nDISTVERSION(.)?=/) {
+		&perror("FATAL: $file: Either PORTVERSION or DISTVERSION has to be there. Not both.") unless ($slaveport && ($makevar{PORTVERSION} ne '' && $makevar{DISTVERSION} ne ''));
+	}
 	if ($newport) {
 		print "OK: checking for existence of PORTREVISION in new port.\n"
 			if ($verbose);
@@ -1642,7 +1645,7 @@
 			" consider using PKGNAMEPREFIX and/or PKGNAMESUFFIX.");
 	}
 	if ($portversion eq '') {
-		&perror("FATAL: $file: PORTVERSION must be specified");
+		&perror("FATAL: $file: PORTVERSION or DISTVERSION must be specified");
 	}
 	if ($portversion =~ /^pl[0-9]*$/
 	|| $portversion =~ /^[0-9]*[A-Za-z]?[0-9]*(\.[0-9]*[A-Za-z]?[0-9+]*)*$/) {
--- portlint-2.6.10.patch ends here ---

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