diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2007-07-11 02:43:08 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2007-07-11 02:43:08 +0000 |
| commit | 032b7b7d95fb6b896eb8a1be036b44266c112789 (patch) | |
| tree | c993790a6b6444fc864e37902c7425f8fcb75012 | |
| parent | Update to 2007.07.10. (diff) | |
. 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
Notes
Notes:
svn path=/head/; revision=195395
| -rw-r--r-- | java/diablo-jdk15/Makefile | 4 | ||||
| -rw-r--r-- | java/diablo-jre15/Makefile | 4 |
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 |