svn commit: r487690 - head/Tools/scripts

[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}: " ; \