aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2007-07-11 10:43:08 +0800
committerglewis <glewis@FreeBSD.org>2007-07-11 10:43:08 +0800
commit914ec10efa781e8ece8e75dbb6ee830cf710f0db (patch)
tree9f095c363990eaee9ceafa3e0c5a9ef385004f96 /java
parent4821575da644420c25696f063cf7d77ee0c26385 (diff)
downloadfreebsd-ports-gnome-914ec10efa781e8ece8e75dbb6ee830cf710f0db.tar.gz
freebsd-ports-gnome-914ec10efa781e8ece8e75dbb6ee830cf710f0db.tar.zst
freebsd-ports-gnome-914ec10efa781e8ece8e75dbb6ee830cf710f0db.zip
. Unpack the timezone update in post-extract since unzip is only an
EXTRACT_DEPENDS, but keep the actual update in pre-install. Pointed out by: pav
Diffstat (limited to 'java')
-rw-r--r--java/diablo-jdk15/Makefile4
-rw-r--r--java/diablo-jre15/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile
index 6f6199eac96b..edcd5a8b48ac 100644
--- a/java/diablo-jdk15/Makefile
+++ b/java/diablo-jdk15/Makefile
@@ -102,8 +102,10 @@ time zone update file, ${TZUPDATEFILE}.\n\n
.if !defined(WITHOUT_TZUPDATE)
-pre-install:
+post-extract:
@${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR}
+
+pre-install:
@# Update time zones
@-${WRKSRC}/bin/java -jar \
${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc
diff --git a/java/diablo-jre15/Makefile b/java/diablo-jre15/Makefile
index 720c961f98a4..65ff5109b08c 100644
--- a/java/diablo-jre15/Makefile
+++ b/java/diablo-jre15/Makefile
@@ -101,8 +101,10 @@ time zone update file, ${TZUPDATEFILE}.\n\n
.endif
.if defined(WITH_TZUPDATE)
-pre-install:
+post-extract:
@${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR}
+
+pre-install:
@# Update time zones
@-${WRKSRC}/bin/java -jar \
${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc