From 032b7b7d95fb6b896eb8a1be036b44266c112789 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Wed, 11 Jul 2007 02:43:08 +0000 Subject: . 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 --- java/diablo-jdk15/Makefile | 4 +++- java/diablo-jre15/Makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'java') 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 -- cgit v1.2.3