From owner-svn-ports-all@freebsd.org Mon Dec 17 15:10:09 2018 Return-Path: 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 14BA71342870; Mon, 17 Dec 2018 15:10:09 +0000 (UTC) (envelope-from crees@freebsd.org) Received: from mail50c50.megamailservers.eu (mail166c50.megamailservers.eu [91.136.10.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 592F471DC6; Mon, 17 Dec 2018 15:10:08 +0000 (UTC) (envelope-from crees@freebsd.org) X-Authenticated-User: bayofrum@uwclub.net Received: from pegasus.bayofrum.net (host-80-41-58-105.as13285.net [80.41.58.105]) (authenticated bits=0) by mail50c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id wBHF5QGe025640; Mon, 17 Dec 2018 15:05:27 +0000 Received: from www.bayofrum.net (unknown [192.168.1.70]) by pegasus.bayofrum.net (Postfix) with ESMTPA id 47687C6C1; Mon, 17 Dec 2018 15:05:23 +0000 (GMT) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Mon, 17 Dec 2018 15:05:23 +0000 From: Chris Rees To: René Ladan CC: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r487690 - head/Tools/scripts In-Reply-To: References: <201812171454.wBHEsubK012071@repo.freebsd.org> Message-ID: <2c7a4786566ce7767e7b2f5579d52a5d@FreeBSD.org> X-Sender: crees@FreeBSD.org User-Agent: Roundcube Webmail/1.3.7 X-bayofrum-MailScanner-Information: Please contact the ISP for more information X-bayofrum-MailScanner-ID: 47687C6C1.AE0BB X-bayofrum-MailScanner: Found to be clean X-bayofrum-MailScanner-From: crees@freebsd.org X-Spam-Status: No X-CTCH-RefID: str=0001.0A0B0210.5C17BB37.0069, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Rules: X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=H6v1PdQi c=1 sm=1 tr=0 a=EuuEpbt/dLJjUk3psnl2FQ==:117 a=EuuEpbt/dLJjUk3psnl2FQ==:17 a=IkcTkHD0fZMA:10 a=2ur7OfE09M0A:10 a=6I5d2MoRAAAA:8 a=QI__XLNZUaY0gwD4XUYA:9 a=QEXdDO2ut3YA:10 a=IjZwj45LgO3ly-622nXo:22 X-Rspamd-Queue-Id: 592F471DC6 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.989,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TAGGED_RCPT(0.00)[]; REPLY(-4.00)[] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Dec 2018 15:10:09 -0000 Hey, I sense it's not all worth it, so I'll just revert the flavoured part then. Chris On 2018-12-17 15:01, René Ladan wrote: > Support for flavored expiration dates was withdrawn in r487602. This > script > would also need to know how to handle flavored deprecation messages. > > René > > Op ma 17 dec. 2018 15:55 schreef Chris Rees >> 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}: " ; \ >> >> -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.