Date: Tue, 11 Sep 2012 14:16:22 +0800 (CST) From: Hung-te Liang <lhd@cs.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: marcus@FreeBSD.org Subject: ports/171535: [PATCH] ports-mgmt/portlint: reduce wrong alarms of NOPORTDOCS check Message-ID: <20120911061622.C37B92E024@BBS.LHD.tw> Resent-Message-ID: <201209110650.q8B6o33A018805@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171535
>Category: ports
>Synopsis: [PATCH] ports-mgmt/portlint: reduce wrong alarms of NOPORTDOCS check
>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 Sep 11 06:50:02 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Hung-te Liang
>Release: FreeBSD 8.3-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #0: Mon Jun 11 23:52:38 UTC 2012
>Description:
portlint shouldn't say
"FATAL: Makefile: Both NOPORTDOCS and PORT_OPTIONS:MDOCS are found Remove one or another."
when using PORT_OPTIONS:MDOCS with ${PREFIX}/share/doc/${PORTNAME}
(Although it's better to use ${DOCSDIR})
Port maintainer (marcus@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
security/cryptopp/Makefile:
...
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${PREFIX}/share/doc/cryptopp
${CP} ${WRKSRC}/Readme.txt ${PREFIX}/share/doc/cryptopp/README
${CP} ${WRKSRC}/License.txt ${PREFIX}/share/doc/cryptopp/License
.endif
...
>Fix:
--- portlint-2.13.12.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/ports-mgmt/portlint/Makefile ./Makefile
--- /usr/ports/ports-mgmt/portlint/Makefile 2012-08-06 06:56:23.000000000 +0800
+++ ./Makefile 2012-09-11 13:02:32.000000000 +0800
@@ -1,11 +1,4 @@
-# New ports collection makefile for: portlint
-# Date created: 13 Jun 1997
-# Whom: Jun-ichiro itojun Hagino <itojun@itojun.org>
-#
# $FreeBSD: ports/ports-mgmt/portlint/Makefile,v 1.153 2012/08/05 22:56:23 marcus Exp $
-#
-# This port is self contained in the src directory.
-#
PORTNAME= portlint
PORTVERSION= 2.13.12
diff -ruN --exclude=CVS /usr/ports/ports-mgmt/portlint/src/portlint.pl ./src/portlint.pl
--- /usr/ports/ports-mgmt/portlint/src/portlint.pl 2012-08-06 06:56:23.000000000 +0800
+++ ./src/portlint.pl 2012-09-11 11:56:15.000000000 +0800
@@ -1762,9 +1762,8 @@
"mean NOPORTDOCS?");
}
if ($sharedocused && $whole !~ /defined\s*\(?NOPORTDOCS\)?/
- && $whole !~ /def\s*\(?NOPORTDOCS\)?/
- && $whole !~ m#(\$[\{\(]PREFIX[\}\)]|$localbase)/share/doc#) {
- if ($docsused == 0) {
+ && $whole !~ /def\s*\(?NOPORTDOCS\)?/) {
+ if ($docsused == 0 && $whole !~ m#(\$[\{\(]PREFIX[\}\)]|$localbase)/share/doc#) {
&perror("WARN", $file, -1, "use \".if !defined(NOPORTDOCS)\" to wrap ".
"installation of files into $localbase/share/doc.");
}
--- portlint-2.13.12.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
>portlint -a
WARN: /usr/ports/security/cryptopp/pkg-plist: [135]: installing shared libraries, please define USE_LDCONFIG as appropriate
FATAL: Makefile: Both NOPORTDOCS and PORT_OPTIONS:MDOCS are found Remove one or another.
1 fatal error and 1 warning found.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120911061622.C37B92E024>