Date: Wed, 12 Jan 2000 00:31:50 +0900 (JST) From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16064: Update ports: portlint-2.1(devel/portlint) Message-ID: <200001111531.AAA72947@pis.toba-cmt.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 16064 >Category: ports >Synopsis: Update ports: portlint-2.1(devel/portlint) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jan 11 07:40:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: KIRIYAMA Kazuhiko >Release: FreeBSD 4.0-CURRENT i386 >Organization: Toba National College of Maritime Technology. Department of Electronic Mechanical Engineering >Environment: >Description: Updated the port portlint-2.1(devel/portlint). This changes have been permitted by portlint writer(itojun@itojun.org). Current modifications are : (1) Change src/portlint.pl to permit MAINTAINER?= and CATEGORIES{?|+}= I put the diff from ports-current in "Fix:". >How-To-Repeat: >Fix: diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^#.*\$Id.*$ -I ^# \$FreeBSD /usr/ports/current/devel/portlint/src/portlint.pl ./src/portlint.pl --- /usr/ports/current/devel/portlint/src/portlint.pl Wed Sep 29 12:31:20 1999 +++ ./src/portlint.pl Tue Jan 11 22:47:14 2000 @@ -677,15 +677,21 @@ # check the items that has to be there. $tmp = "\n" . $tmp; - foreach $i ('DISTNAME', 'CATEGORIES') { - print "OK: checking $i.\n" if ($verbose); - if ($tmp !~ /\n$i=/) { - &perror("FATAL: $i has to be there."); - } - if ($tmp =~ /\n$i(\?=)/) { - &perror("FATAL: $i has to be set by \"=\", ". - "not by \"$1\"."); - } + print "OK: checking DISTNAME.\n" if ($verbose); + if ($tmp !~ /\nDISTNAME=/) { + &perror("FATAL: DISTNAME has to be there."); + } + if ($tmp =~ /\nDISTNAME(\?=)/) { + &perror("FATAL: DISTNAME has be set by \"=\", ". + "not by \"$1\"."); + } + print "OK: checking CATEGORIES.\n" if ($verbose); + if ($tmp !~ /\nCATEGORIES(\??|\+?)=/) { + &perror("FATAL: $i has to be there."); + } + if ($tmp =~ /\nCATEGORIES((\?|\+)=)/) { + &perror("WARN: CATEGORIES should be set by \"=\", ". + "not by \"$1\"."); } # check x11 in CATEGORIES @@ -890,8 +896,8 @@ &checkearlier($tmp, @varnames); $tmp = "\n" . $tmp; - if ($tmp =~ /\nMAINTAINER=[^\n]+/) { - $tmp =~ s/\nMAINTAINER=[^\n]+//; + if ($tmp =~ /\nMAINTAINER\??=[^\n]+/) { + $tmp =~ s/\nMAINTAINER\??=[^\n]+//; } else { &perror("FATAL: no MAINTAINER listed in $file."); } >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001111531.AAA72947>