From 4b5ebe33b8dc31b3e4b3a0a68fa5c79b3f39303e Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Tue, 1 Jul 2008 05:47:11 +0000 Subject: . Report when the time zone data is being updated. . Error if the time zone update fails. This is a bit of a double edged sword. It prevents installing a broken port with a broken packing list if Diablo won't run on this version of FreeBSD, but it also creates a situation where the install can fail without really needing to if you have to retry it for some reason (e.g. you forget the root password when installing as a user). If the latter is the case, you'll need to first clean to before trying to install again to resolve the issue. Making pre-install somewhat bogusly pre-install or checking for the existence of an updated time zone file before running tzupdate may alleviate the problem with this solution. PR: 125085 --- java/diablo-jdk15/Makefile | 5 +++-- java/diablo-jre15/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'java') diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile index 5362a06f170b..7cb53f5e315c 100644 --- a/java/diablo-jdk15/Makefile +++ b/java/diablo-jdk15/Makefile @@ -106,9 +106,10 @@ post-extract: @${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR} pre-install: - @# Update time zones - @-${WRKSRC}/bin/java -jar \ + @echo -n "Updating time zones..." + @${WRKSRC}/bin/java -jar \ ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc + @echo "done" @-${RM} -rf ${WRKSRC}/jre/lib/zi.tzdata* .endif diff --git a/java/diablo-jre15/Makefile b/java/diablo-jre15/Makefile index d13c663dc27f..fdb822a93a00 100644 --- a/java/diablo-jre15/Makefile +++ b/java/diablo-jre15/Makefile @@ -105,9 +105,10 @@ post-extract: @${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR} pre-install: - @# Update time zones - @-${WRKSRC}/bin/java -jar \ + @echo -n "Updating time zones..." + @${WRKSRC}/bin/java -jar \ ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc + @echo "done" @${RM} -rf ${WRKSRC}/lib/zi.tzdata* .endif -- cgit v1.2.3