[Midnightbsd-cvs] mports [17427] trunk/Mk/components/maintainer.mk: teach makepatch about time zones

[laffer1 at midnightbsd.org]

Revision: 17427
          http://svnweb.midnightbsd.org/mports/?rev=17427
Author:   laffer1
Date:     2014-09-20 11:34:51 -0400 (Sat, 20 Sep 2014)
Log Message:
-----------
teach makepatch about time zones

Modified Paths:
--------------
    trunk/Mk/components/maintainer.mk

Modified: trunk/Mk/components/maintainer.mk
===================================================================
--- trunk/Mk/components/maintainer.mk	2014-09-20 04:08:40 UTC (rev 17426)
+++ trunk/Mk/components/maintainer.mk	2014-09-20 15:34:51 UTC (rev 17427)
@@ -13,13 +13,16 @@
 	@cd ${.CURDIR} && ${MKDIR} ${FILESDIR}
 	@(cd ${WRKSRC}; \
 		for i in `find . -type f -name '*.orig'`; do \
-			ORG=$$i; \
+			ORIG=$$i; \
 			NEW=$${i%.orig}; \
-			OUT=${FILESDIR}`${ECHO} $${NEW} | \
-				${SED} -e 's|/|__|g' \
-					-e 's|^\.__|/patch-|'`; \
-			${ECHO} ${DIFF} -ud $${ORG} $${NEW} '>' $${OUT}; \
-			${DIFF} -ud $${ORG} $${NEW} > $${OUT} || ${TRUE}; \
+			cmp -s $${ORIG} $${NEW} && continue; \
+			PATCH=`${ECHO} $${NEW} | ${SED} -e 's|/|__|g'`; \
+			OUT=${FILESDIR}/patch-$${PATCH}; \
+			${ECHO} ${DIFF} -ud $${ORIG} $${NEW} '>' $${OUT}; \
+			TZ=UTC ${DIFF} -ud $${ORIG} $${NEW} | ${SED} -e \
+				'/^---/s|\.[0-9]* +0000$$| UTC|' -e \
+				'/^+++/s|\([[:blank]][-0-9:.+]*\)*\)*$$||' \
+				> $${OUT} || ${TRUE}; \
 		done \
 	)
 .endif