diff options
author | Greg Lewis <glewis@FreeBSD.org> | 2012-01-03 10:43:38 +0800 |
---|---|---|
committer | Greg Lewis <glewis@FreeBSD.org> | 2012-01-03 10:43:38 +0800 |
commit | bd05fd536a9a7bc62b97182fa54eb07deb0aa7ea (patch) | |
tree | 983a01e6ebf4e1dc82d0a11b03e2974682ccfdc9 /java | |
parent | a756ea4f1784d366b45da2555e4176374a435696 (diff) | |
download | freebsd-ports-gnome-bd05fd536a9a7bc62b97182fa54eb07deb0aa7ea.tar.gz freebsd-ports-gnome-bd05fd536a9a7bc62b97182fa54eb07deb0aa7ea.tar.zst freebsd-ports-gnome-bd05fd536a9a7bc62b97182fa54eb07deb0aa7ea.zip |
. Fix the reinstall target by using cp rather than mv for updating the
zoneinfo files (otherwise they are no longer present during reinstall).
PR: 163790
Submitted by: "A.J. Kehoe IV (Nanoman)" <cT2CTdJ6@nanoman.ca>
Diffstat (limited to 'java')
-rw-r--r-- | java/diablo-jdk16/Makefile | 2 | ||||
-rw-r--r-- | java/diablo-jre16/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/diablo-jdk16/Makefile b/java/diablo-jdk16/Makefile index b56610443b2f..a194ab26eb6d 100644 --- a/java/diablo-jdk16/Makefile +++ b/java/diablo-jdk16/Makefile @@ -134,7 +134,7 @@ post-extract: pre-install: @${ECHO_CMD} -n "Updating time zones..." @${RM} -rf ${WRKSRC}/jre/lib/zi - @${MV} -f ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/zi ${WRKSRC}/jre/lib/ + @${CP} -R -f ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/zi ${WRKSRC}/jre/lib/ @${ECHO_CMD} "done" @-${RM} -rf ${WRKSRC}/jre/lib/zi.tzdata* .endif diff --git a/java/diablo-jre16/Makefile b/java/diablo-jre16/Makefile index ec8fceb66c0c..12f5c4f2e633 100644 --- a/java/diablo-jre16/Makefile +++ b/java/diablo-jre16/Makefile @@ -138,7 +138,7 @@ post-extract: pre-install: @${ECHO_CMD} -n "Updating time zones..." @${RM} -rf ${WRKSRC}/lib/zi - @${MV} -f ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/zi ${WRKSRC}/lib/ + @${CP} -R -f ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/zi ${WRKSRC}/lib/ @${ECHO_CMD} "done" @-${RM} -rf ${WRKSRC}/lib/zi.tzdata* .endif |