From owner-svn-ports-all@freebsd.org  Wed Aug  1 18:13:40 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B0A01065679;
 Wed,  1 Aug 2018 18:13:40 +0000 (UTC)
 (envelope-from adamw@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 204A280BC7;
 Wed,  1 Aug 2018 18:13:40 +0000 (UTC)
 (envelope-from adamw@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0187726076;
 Wed,  1 Aug 2018 18:13:40 +0000 (UTC)
 (envelope-from adamw@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w71IDd7K006617;
 Wed, 1 Aug 2018 18:13:39 GMT (envelope-from adamw@FreeBSD.org)
Received: (from adamw@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w71IDdvt006616;
 Wed, 1 Aug 2018 18:13:39 GMT (envelope-from adamw@FreeBSD.org)
Message-Id: <201808011813.w71IDdvt006616@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adamw set sender to
 adamw@FreeBSD.org using -f
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Wed, 1 Aug 2018 18:13:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r476188 - head/ports-mgmt/portlint/src
X-SVN-Group: ports-head
X-SVN-Commit-Author: adamw
X-SVN-Commit-Paths: head/ports-mgmt/portlint/src
X-SVN-Commit-Revision: 476188
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2018 18:13:40 -0000

Author: adamw
Date: Wed Aug  1 18:13:39 2018
New Revision: 476188
URL: https://svnweb.freebsd.org/changeset/ports/476188

Log:
  Reevert change accidentally included in r476184

Modified:
  head/ports-mgmt/portlint/src/portlint.pl

Modified: head/ports-mgmt/portlint/src/portlint.pl
==============================================================================
--- head/ports-mgmt/portlint/src/portlint.pl	Wed Aug  1 18:04:33 2018	(r476187)
+++ head/ports-mgmt/portlint/src/portlint.pl	Wed Aug  1 18:13:39 2018	(r476188)
@@ -1713,7 +1713,7 @@ sub checkmakefile {
 		# skip global options
 		next if ($i eq 'DOCS' or $i eq 'NLS' or $i eq 'EXAMPLES' or $i eq 'IPV6' or $i eq 'X11' or $i eq 'DEBUG');
 		if (!grep(/^$i$/, (@mopt, @popt))) {
-			if ($whole !~ /\n${i}_($m)(_\w+)?(.)?=[^\n]+/ and $whole !~ /\n[-\w]+-${i}-(on|off):
+			if ($whole !~ /\n${i}_($m)(_\w+)?(.)?=[^\n]+/) {
      +\n/) {
 				if (!$slaveport) {
 					&perror("WARN", $file, -1, "$i is listed in ".