Date: Sun, 27 May 2012 09:59:20 GMT From: Chris Rees <crees@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/168364: [PATCH] ports-mgmt/portlint Remove references to PATCHDIR Message-ID: <201205270959.q4R9xKLj060792@freefall.freebsd.org> Resent-Message-ID: <201205271000.q4RA09Rd060892@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 168364
>Category: ports
>Synopsis: [PATCH] ports-mgmt/portlint Remove references to PATCHDIR
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun May 27 10:00:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Chris Rees
>Release: FreeBSD 9.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 9.0-STABLE FreeBSD 9.0-STABLE #6 r235139: Tue May 8 21:19:03 UTC 2012 simon@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386
>Description:
Pretty trivial; portmgr has agreed to remove PATCHDIR from bsd.port.mk, so portlint should stop recommending it
(curiously, the warning for PATCHDIR appears bogus anyway, since it still refers to ${PKGDIR}/patches...)
>How-To-Repeat:
>Fix:
--- portlint-patchdir.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ports-mgmt/portlint/Makefile,v
retrieving revision 1.151
diff -u -r1.151 Makefile
--- Makefile 20 May 2012 16:36:50 -0000 1.151
+++ Makefile 27 May 2012 09:54:42 -0000
@@ -9,7 +9,7 @@
PORTNAME= portlint
PORTVERSION= 2.13.10
-PORTREVISION= 1
+PORTREVISION= 2
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.128
diff -u -r1.128 portlint.pl
--- src/portlint.pl 20 May 2012 16:36:50 -0000 1.128
+++ src/portlint.pl 27 May 2012 09:54:44 -0000
@@ -193,7 +193,7 @@
PORTNAME PORTVERSION PORTREVISION PORTEPOCH PKGNAME PKGNAMEPREFIX
PKGNAMESUFFIX DISTVERSIONPREFIX DISTVERSION DISTVERSIONSUFFIX
DISTNAME DISTFILES CATEGORIES MASTERDIR MAINTAINER MASTER_SITES
- WRKDIR WRKSRC NO_WRKSUBDIR PATCHDIR SCRIPTDIR FILESDIR
+ WRKDIR WRKSRC NO_WRKSUBDIR SCRIPTDIR FILESDIR
PKGDIR COMMENT DESCR PLIST PKGCATEGORY PKGINSTALL PKGDEINSTALL
PKGREQ PKGMESSAGE DISTINFO_FILE .CURDIR USE_LDCONFIG USE_AUTOTOOLS
INDEXFILE PKGORIGIN CONFLICTS PKG_VERSION PKGINSTALLVER
@@ -302,7 +302,7 @@
$checker{$i} = \&checkmfile;
}
}
-foreach my $i (<$makevar{PATCHDIR}/patch-*>) {
+foreach my $i (<$makevar{FILESDIR}/patch-*>) {
next if (! -T $i);
next if (defined $checker{$i});
push(@checker, $i);
@@ -3350,7 +3350,6 @@
pkg \${PKGDIR} instead
files \${FILESDIR} instead
scripts \${SCRIPTDIR} instead
-patches \${PATCHDIR} instead
work \${WRKDIR} instead
EOF
foreach my $i (keys %cmdnames) {
--- portlint-patchdir.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205270959.q4R9xKLj060792>