Update to 2016f. [1]

While there, clean things up a bit and really do staging.

PR:		211260 [1]
Submitted by:	devel stasyan com
MFH:		2016Q3
With hat:	portmgr
Sponsored by:	Absolight

misc/zoneinfo/Makefile

@@ -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@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
@@ -50,14 +51,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zoneinfo
 	${CP} -R -p ${WRKSRC}/zoneinfo/ ${STAGEDIR}${PREFIX}/share/zoneinfo
 	${INSTALL_DATA} ${WRKSRC}/zone.tab ${STAGEDIR}${PREFIX}/share/zoneinfo
-	@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}

misc/zoneinfo/distinfo

@@ -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

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

misc/zoneinfo/pkg-message

@@ -1 +0,0 @@
-Now run tzsetup(8) again to install the right file to /etc/localtime.