diff options
| -rw-r--r-- | Mk/bsd.java.mk | 2 | ||||
| -rw-r--r-- | java/bluej/Makefile | 2 | ||||
| -rw-r--r-- | java/linux-sun-jdk14/Makefile | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 3d05def01fbb..36d77bbd4962 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -48,7 +48,7 @@ _JAVA_HOME_SUN_LINUX_1_2= ${LOCALBASE}/linux-sun-jdk1.2.2 _JAVA_HOME_BLACKDOWN_LINUX_1_3= ${LOCALBASE}/linux-blackdown-jdk1.3.1 _JAVA_HOME_IBM_LINUX_1_3= ${LOCALBASE}/linux-ibm-jdk1.3.1 _JAVA_HOME_SUN_LINUX_1_3= ${LOCALBASE}/linux-sun-jdk1.3.1 -_JAVA_HOME_SUN_LINUX_1_4= ${LOCALBASE}/linux-sun-jdk1.4.0.01 +_JAVA_HOME_SUN_LINUX_1_4= ${LOCALBASE}/linux-sun-jdk1.4.0 # Set the JDK ports for all recognized JDK's _JAVA_PORT_FREEBSD_1_1= java/jdk11 diff --git a/java/bluej/Makefile b/java/bluej/Makefile index a020ea811cb9..b6d5d1925c51 100644 --- a/java/bluej/Makefile +++ b/java/bluej/Makefile @@ -23,7 +23,7 @@ NO_BUILD= yes # Called MY_JDK and MY_JDK_PORT so not to conflict with any other possible # definitions in the ports system. -MY_JDK= linux-sun-jdk1.4.0.01 +MY_JDK= linux-sun-jdk1.4.0 MY_JDK_PORT= linux-sun-jdk14 RUN_DEPENDS= ${LOCALBASE}/${MY_JDK}/bin/java:${PORTSDIR}/java/${MY_JDK_PORT} diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile index f537da8a9f0a..6fc38e241bec 100644 --- a/java/linux-sun-jdk14/Makefile +++ b/java/linux-sun-jdk14/Makefile @@ -30,16 +30,16 @@ EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= # empty WRKSRC= ${WRKDIR}/j2sdk1.4.0_01 -PLIST_SUB+= T=${TARGET_DIR:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} +PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} NO_BUILD= yes USE_LINUX= yes DL_JDK_VERSION= 1.4.0_01 INSTALL_JDK_VERSION= ${DL_JDK_VERSION:S/_/./g} ONLY_FOR_ARCHS= i386 -TARGET_DIR?= ${PREFIX}/${PKGBASE}${PORTVERSION} DOWNLOAD_URL?= http://java.sun.com/Download6?url=/Download6&config-file=j2sdk-${DL_JDK_VERSION:S/./_/g}.config&platform=linux-i586 PORTTITLE= Java 2 Development Kit ${INSTALL_JDK_VERSION} for Linux +APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${INSTALL_JDK_VERSION:R} .include <bsd.port.pre.mk> @@ -54,8 +54,8 @@ post-patch: find ${WRKSRC} -name '*.orig' -print | xargs ${RM} -f do-install: - ${MKDIR} ${PREFIX}/${PKGNAMEPREFIX}jdk${PORTVERSION} - ${TAR} -C ${WRKSRC} -cf- . | ${TAR} -C ${PREFIX}/${PKGNAMEPREFIX}jdk${PORTVERSION} -xpf- - ${LOCALBASE}/bin/registervm "${TARGET_DIR}/bin/java # Linux-Sun-JDK${PORTVERSION}" + ${MKDIR} ${APP_HOME} + ${TAR} -C ${WRKSRC} -cf- . | ${TAR} -C ${APP_HOME} -xpf- + ${LOCALBASE}/bin/registervm "${APP_HOME}/bin/java # Linux-Sun-JDK${PORTVERSION}" .include <bsd.port.post.mk> |