svn commit: r353997 - head/misc/zoneinfo

[Edwin Groothuis]

Author: edwin
Date: Tue May 13 21:18:38 2014
New Revision: 353997
URL: http://svnweb.freebsd.org/changeset/ports/353997
QAT: https://qat.redports.org/buildarchive/r353997/

Log:
  Fix stagify.

Modified:
  head/misc/zoneinfo/Makefile
  head/misc/zoneinfo/pkg-plist

Modified: head/misc/zoneinfo/Makefile
==============================================================================
--- head/misc/zoneinfo/Makefile	Tue May 13 21:13:31 2014	(r353996)
+++ head/misc/zoneinfo/Makefile	Tue May 13 21:18:38 2014	(r353997)
@@ -29,7 +29,6 @@ NO_PACKAGE=	Overwrites files in the base
 MASTER_SITES+=	http://people.freebsd.org/~edwin/
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 # The following country codes can be missing from /usr/share/misc/iso3166 and
@@ -52,9 +51,9 @@ do-build:
 		${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES}
 
 do-install:
-	${MKDIR} ${PREFIX}/share/zoneinfo
-	${CP} -R -p ${WRKSRC}/zoneinfo/ ${PREFIX}/share/zoneinfo
-	${INSTALL_DATA} ${WRKSRC}/zone.tab ${PREFIX}/share/zoneinfo
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/zoneinfo
+	${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 \

Modified: head/misc/zoneinfo/pkg-plist
==============================================================================
--- head/misc/zoneinfo/pkg-plist	Tue May 13 21:13:31 2014	(r353996)
+++ head/misc/zoneinfo/pkg-plist	Tue May 13 21:18:38 2014	(r353997)
@@ -206,6 +206,7 @@
 %%DATADIR%%/Antarctica/Palmer
 %%DATADIR%%/Antarctica/Rothera
 %%DATADIR%%/Antarctica/Syowa
+%%DATADIR%%/Antarctica/Troll
 %%DATADIR%%/Antarctica/Vostok
 %%DATADIR%%/Arctic/Longyearbyen
 %%DATADIR%%/Asia/Aden
@@ -466,20 +467,3 @@
 %%DATADIR%%/WET
 %%DATADIR%%/posixrules
 %%DATADIR%%/zone.tab
- at dirrm %%DATADIR%%/SystemV
- at dirrm %%DATADIR%%/Pacific
- at dirrm %%DATADIR%%/Indian
- at dirrm %%DATADIR%%/Europe
- at dirrm %%DATADIR%%/Etc
- at dirrm %%DATADIR%%/Australia
- at dirrm %%DATADIR%%/Atlantic
- at dirrm %%DATADIR%%/Asia
- at dirrm %%DATADIR%%/Arctic
- at dirrm %%DATADIR%%/Antarctica
- at dirrm %%DATADIR%%/America/North_Dakota
- at dirrm %%DATADIR%%/America/Kentucky
- at dirrm %%DATADIR%%/America/Indiana
- at dirrm %%DATADIR%%/America/Argentina
- at dirrm %%DATADIR%%/America
- at dirrm %%DATADIR%%/Africa
- at dirrmtry %%DATADIR%%