aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2003-10-01 07:42:51 +0800
committerglewis <glewis@FreeBSD.org>2003-10-01 07:42:51 +0800
commit2486a127029bd260441cb59b9f63d3b70d52e889 (patch)
tree0c97e85f5862974b4a69ade55e2514683c675858
parent53de9543abb75cb398f30976f0bfb12e9e9b9027 (diff)
downloadfreebsd-ports-gnome-2486a127029bd260441cb59b9f63d3b70d52e889.tar.gz
freebsd-ports-gnome-2486a127029bd260441cb59b9f63d3b70d52e889.tar.zst
freebsd-ports-gnome-2486a127029bd260441cb59b9f63d3b70d52e889.zip
. Install in ${LOCALBASE}/linux-sun-jdk1.4.2, not
${LOCALBASE}/linux-sun-jdk1.4.2_01 as the latter is wrong and breaks detection in bsd.java.mk. . Bump PORTREVISION for this fix. PR: 57420
-rw-r--r--java/linux-sun-jdk14/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile
index 7e28dbc6a4bc..3ca4219504ee 100644
--- a/java/linux-sun-jdk14/Makefile
+++ b/java/linux-sun-jdk14/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${INSTALL_JDK_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= #
PKGNAMEPREFIX= linux-sun-
@@ -29,13 +29,15 @@ PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION}
NO_BUILD= yes
USE_LINUX= yes
-DL_JDK_VERSION= 1.4.2_01
+JDK_VERSION= 1.4.2
+JDK_REVISION= 01
+DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION}
INSTALL_JDK_VERSION= ${DL_JDK_VERSION:S/_/./g}
ONLY_FOR_ARCHS= i386
SUN_BUNDLE_ID= 8948
DOWNLOAD_URL?= http://java.sun.com/webapps/download/Display?BundleId=${SUN_BUNDLE_ID}&Referer=http://java.sun.com/j2se/1.4.2/download.html
PORTTITLE= Java 2 Development Kit ${DL_JDK_VERSION} for Linux
-APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${DL_JDK_VERSION}
+APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_VERSION}
CPIO?= /usr/bin/cpio
PACKED_JARS= lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar
UNPACK_CMD= ${APP_HOME}/lib/unpack