diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2011-02-17 22:48:52 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2011-02-17 22:48:52 +0000 |
| commit | a85b35a54536be63d0fccedd937d15073e02f57c (patch) | |
| tree | a0e2736fca0f879830ecae4cb9e570b805aade23 /java/linux-sun-jdk16 | |
| parent | a0f8f569cf3b77ec8c3d261f8ba34e90b2e6c5d2 (diff) | |
Unpack files more reliably.
Notes
Notes:
svn path=/head/; revision=269293
Diffstat (limited to 'java/linux-sun-jdk16')
| -rw-r--r-- | java/linux-sun-jdk16/Makefile | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/java/linux-sun-jdk16/Makefile b/java/linux-sun-jdk16/Makefile index 70e44cfab58a..9906ee723cd7 100644 --- a/java/linux-sun-jdk16/Makefile +++ b/java/linux-sun-jdk16/Makefile @@ -36,8 +36,8 @@ DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION} ONLY_FOR_ARCHS= i386 amd64 DOWNLOAD_URL?= http://www.oracle.com/technetwork/java/javase/downloads/index.html APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_VERSION} -PACKED_JARS= lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/deploy.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar -UNPACK_CMD= ${APP_HOME}/bin/unpack200 +PACKED_JARS= jre/lib/charsets jre/lib/deploy jre/lib/ext/localedata jre/lib/javaws jre/lib/jsse jre/lib/plugin jre/lib/rt lib/tools +UNPACK_CMD= ${WRKSRC}/bin/unpack200 .include <bsd.port.pre.mk> @@ -53,7 +53,10 @@ do-extract: @cd ${WRKDIR} \ && ${TAIL} -n +189 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/install.sfx \ && ${CHMOD} +x ${WRKDIR}/install.sfx \ - && ${WRKDIR}/install.sfx > /dev/null + && ${WRKDIR}/install.sfx -o > /dev/null +.for i in ${PACKED_JARS} + @${UNPACK_CMD} -r ${WRKSRC}/${i}.pack ${WRKSRC}/${i}.jar +.endfor post-patch: ${REINPLACE_CMD} -i.orig -e 's:^#!/bin/bash:#!/bin/sh:' ${WRKSRC}/bin/jcontrol @@ -65,12 +68,6 @@ do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . -print \ | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${APP_HOME} - for i in ${PACKED_JARS}; do \ - if [ -f ${APP_HOME}/`dirname $$i`/`basename $$i .jar`.pack ]; then \ - ${UNPACK_CMD} ${APP_HOME}/`dirname $$i`/`basename $$i .jar`.pack ${APP_HOME}/$$i; \ - ${RM} -f ${APP_HOME}/`dirname $$i`/`basename $$i .jar`.pack; \ - fi \ - done post-install: ${LOCALBASE}/bin/registervm "${APP_HOME}/bin/java # Linux-Sun-JDK${PORTVERSION}" |