svn commit: r418869 - branches/2016Q3/misc/zoneinfo

[Mathieu Arnold]

Author: mat
Date: Thu Jul 21 10:03:52 2016
New Revision: 418869
URL: https://svnweb.freebsd.org/changeset/ports/418869

Log:
  MFH: r418868
  
  Update to 2016f. [1]
  
  While there, clean things up a bit and really do staging.
  
  PR:		211260 [1]
  Submitted by:	devel stasyan com
  With hat:	portmgr
  Sponsored by:	Absolight

Added:
  branches/2016Q3/misc/zoneinfo/pkg-install
     - copied unchanged from r418868, head/misc/zoneinfo/pkg-install
Deleted:
  branches/2016Q3/misc/zoneinfo/pkg-message
Modified:
  branches/2016Q3/misc/zoneinfo/Makefile
  branches/2016Q3/misc/zoneinfo/distinfo
Directory Properties:
  branches/2016Q3/   (props changed)

Modified: branches/2016Q3/misc/zoneinfo/Makefile
==============================================================================
--- branches/2016Q3/misc/zoneinfo/Makefile	Thu Jul 21 10:00:57 2016	(r418868)
+++ branches/2016Q3/misc/zoneinfo/Makefile	Thu Jul 21 10:03:52 2016	(r418869)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zoneinfo
-DISTVERSION=	2016d
+DISTVERSION=	2016f
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.iana.org/tz/releases/ \
 		ftp://munnari.oz.au/pub/
@@ -11,8 +11,9 @@ DISTNAME=	tzdata${DISTVERSION}
 MAINTAINER=	edwin at mavetju.org
 COMMENT=	Updated timezone definitions
 
-WRKSRC=		${WRKDIR}
+NO_WRKSUBDIR=	yes
 PREFIX=		/usr
+NO_ARCH=	yes
 
 TZFILES=	africa antarctica asia australasia etcetera europe \
 		factory northamerica southamerica systemv
@@ -51,16 +52,6 @@ do-install:
 	${CP} -R -p ${WRKSRC}/zoneinfo/ ${STAGEDIR}${PREFIX}/share/zoneinfo
 	${INSTALL_DATA} ${WRKSRC}/zone.tab ${STAGEDIR}${PREFIX}/share/zoneinfo
 
-post-install:
-	@if [ -f /var/db/zoneinfo -a -O /var/db/zoneinfo -a \
-	     -G /var/db/zoneinfo -a \
-	     -f /usr/share/zoneinfo/$$(cat /var/db/zoneinfo) ]; then \
-		tzsetup -r; \
-		echo "/etc/localtime is updated."; \
-	else \
-		${CAT} ${PKGMESSAGE}; \
-	fi
-
 test-patches:
 .for M in ${MISSING}
 	make clean

Modified: branches/2016Q3/misc/zoneinfo/distinfo
==============================================================================
--- branches/2016Q3/misc/zoneinfo/distinfo	Thu Jul 21 10:00:57 2016	(r418868)
+++ branches/2016Q3/misc/zoneinfo/distinfo	Thu Jul 21 10:03:52 2016	(r418869)
@@ -1,2 +1,3 @@
-SHA256 (tzdata2016d.tar.gz) = d9554dfba0efd76053582bd89e8c7036ef12eee14fdd506675b08a5b59f0a1b4
-SIZE (tzdata2016d.tar.gz) = 312481
+TIMESTAMP = 1469094101
+SHA256 (tzdata2016f.tar.gz) = ed8c951008d12f1db55a11e96fc055718c6571233327d9de16a7f8475e2502b0
+SIZE (tzdata2016f.tar.gz) = 313286

Copied: branches/2016Q3/misc/zoneinfo/pkg-install (from r418868, head/misc/zoneinfo/pkg-install)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/misc/zoneinfo/pkg-install	Thu Jul 21 10:03:52 2016	(r418869, copy of r418868, head/misc/zoneinfo/pkg-install)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ "$2" != "PRE-INSTALL" ]; then
+	exit 0
+fi
+
+if [ -f /var/db/zoneinfo -a -O /var/db/zoneinfo -a -G /var/db/zoneinfo ]; then
+	if [ -f /usr/share/zoneinfo/$(cat /var/db/zoneinfo) ]; then
+		tzsetup -r
+		echo "/etc/localtime is updated."
+	fi
+else
+	echo "Now run tzsetup(8) again to install the right file to /etc/localtime."
+fi