From owner-svn-ports-head@freebsd.org Mon Dec 17 14:54:57 2018 Return-Path: Delivered-To: svn-ports-head@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 A6B68134233B; Mon, 17 Dec 2018 14:54:57 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1483371433; Mon, 17 Dec 2018 14:54:57 +0000 (UTC) (envelope-from crees@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 04BAD1882C; Mon, 17 Dec 2018 14:54:57 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBHEsutB012072; Mon, 17 Dec 2018 14:54:56 GMT (envelope-from crees@FreeBSD.org) Received: (from crees@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBHEsubK012071; Mon, 17 Dec 2018 14:54:56 GMT (envelope-from crees@FreeBSD.org) Message-Id: <201812171454.wBHEsubK012071@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: crees set sender to crees@FreeBSD.org using -f From: Chris Rees Date: Mon, 17 Dec 2018 14:54:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487690 - head/Tools/scripts X-SVN-Group: ports-head X-SVN-Commit-Author: crees X-SVN-Commit-Paths: head/Tools/scripts X-SVN-Commit-Revision: 487690 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1483371433 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_LONG(-1.00)[-0.996,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Dec 2018 14:54:57 -0000 Author: crees Date: Mon Dec 17 14:54:56 2018 New Revision: 487690 URL: https://svnweb.freebsd.org/changeset/ports/487690 Log: Support flavor_EXPIRATION_DATE Correctly ignore commented dates (why would that exist?) Handle more neatly when EXPIRATION_DATE is not in the main Makefile Modified: head/Tools/scripts/rmport Modified: head/Tools/scripts/rmport ============================================================================== --- head/Tools/scripts/rmport Mon Dec 17 14:40:09 2018 (r487689) +++ head/Tools/scripts/rmport Mon Dec 17 14:54:56 2018 (r487690) @@ -121,8 +121,9 @@ find_expired() EXPVAR=EXPIRATION_DATE find -H ${PORTSDIR} -mindepth 3 -maxdepth 3 -name "Makefile*" \ - |xargs grep -H "^[^#]*${EXPVAR}" \ - |sed -E "s|${PORTSDIR}/?([^/]+/[^/]+)/Makefile:${EXPVAR}=[[:space:]]*([0-9-]{10})$|\2 \1|g" \ + |xargs grep -H "^[0-9a-zA-Z_]*${EXPVAR}" \ + |grep -v '^#' \ + |sed -E "s|${PORTSDIR}/?([^/]+/[^/]+)/Makefile[^:]*:${EXPVAR}=[[:space:]]*([0-9-]{10})$|\2 \1|g" \ |perl -ne "if ((substr(\$_, 0, 10) cmp '${TODAY}') <= 0) { print(\$_); }" \ |while read expdate catport ; do \ echo -n "${expdate} ${catport}: " ; \