diff options
| -rw-r--r-- | Mk/bsd.java.mk | 2 | ||||
| -rw-r--r-- | games/robocode/Makefile | 2 | ||||
| -rw-r--r-- | java/bugseeker-demo/Makefile | 2 | ||||
| -rw-r--r-- | java/bugseeker/Makefile | 2 | ||||
| -rw-r--r-- | java/forte/Makefile | 2 | ||||
| -rw-r--r-- | java/jdk13/Makefile | 2 | ||||
| -rw-r--r-- | java/jdk14/Makefile | 2 | ||||
| -rw-r--r-- | java/jdk15/Makefile | 2 | ||||
| -rw-r--r-- | java/jdk16/Makefile | 2 | ||||
| -rw-r--r-- | java/linux-sun-jdk13/Makefile | 5 |
10 files changed, 12 insertions, 11 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index cd819ab68ebb..72abb55d52e3 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -47,7 +47,7 @@ _JAVA_HOME_BLACKDOWN_LINUX_1_2= ${LOCALBASE}/linux-blackdown-jdk1.2.2 _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-jdk1.3.1 +_JAVA_HOME_SUN_LINUX_1_3= ${LOCALBASE}/linux-sun-jdk1.3.1 _JAVA_HOME_SUN_LINUX_1_4= ${LOCALBASE}/linux-jdk1.4.0.01 # Set the JDK ports for all recognized JDK's diff --git a/games/robocode/Makefile b/games/robocode/Makefile index 782821157a19..0425d48dfd90 100644 --- a/games/robocode/Makefile +++ b/games/robocode/Makefile @@ -17,7 +17,7 @@ MAINTAINER= sobomax@FreeBSD.org BUILD_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13 RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13 -JDK13DIR?= ${LOCALBASE}/linux-jdk1.3.1 +JDK13DIR?= ${LOCALBASE}/linux-sun-jdk1.3.1 JAVAVM= ${JDK13DIR}/bin/java JAVAJAR= ${JDK13DIR}/bin/jar diff --git a/java/bugseeker-demo/Makefile b/java/bugseeker-demo/Makefile index dfa21ca67de0..9b8d6633d151 100644 --- a/java/bugseeker-demo/Makefile +++ b/java/bugseeker-demo/Makefile @@ -16,7 +16,7 @@ PATCHFILES= bugseeker2demo.sh.diff MAINTAINER= znerd@FreeBSD.org -RUN_DEPENDS= ${LOCALBASE}/linux-jdk1.3.1/bin/java:${PORTSDIR}/java/linux-sun-jdk13 +RUN_DEPENDS= ${LOCALBASE}/linux-sun-jdk1.3.1/bin/java:${PORTSDIR}/java/linux-sun-jdk13 NO_BUILD= YES diff --git a/java/bugseeker/Makefile b/java/bugseeker/Makefile index 489fe80dff82..cc2f7a824552 100644 --- a/java/bugseeker/Makefile +++ b/java/bugseeker/Makefile @@ -23,7 +23,7 @@ NO_BUILD= YES WRKSRC= ${WRKDIR}/bugseeker2 PLIST_SUB+= T=${TARGET_DIR:S/^${PREFIX}\///} TARGET_DIR= ${PREFIX}/${PKGBASE}${PORTVERSION} -JAVA_HOME?= ${LOCALBASE}/linux-jdk1.3.1 +JAVA_HOME?= ${LOCALBASE}/linux-sun-jdk1.3.1 DOWNLOAD_URL?= http://www.karmira.com/store/index.html .include <bsd.port.pre.mk> diff --git a/java/forte/Makefile b/java/forte/Makefile index b193f81ea3ba..98773fa07f31 100644 --- a/java/forte/Makefile +++ b/java/forte/Makefile @@ -19,7 +19,7 @@ MAINTAINER= sobomax@FreeBSD.org BUILD_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13 RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13 -JDK13DIR?= ${LOCALBASE}/linux-jdk1.3.1 +JDK13DIR?= ${LOCALBASE}/linux-sun-jdk1.3.1 JAVAVM= ${JDK13DIR}/bin/java RESTRICTED= "Restrictive license" diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index e16a3b4c9658..cdb855b22662 100644 --- a/java/jdk13/Makefile +++ b/java/jdk13/Makefile @@ -39,7 +39,7 @@ JDK_PATCHSET_VERSION= 7 .if defined(NATIVE_BOOTSTRAP) JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION} .else -JDK13DIR?= ${LOCALBASE}/linux-jdk${JDK_VERSION} +JDK13DIR?= ${LOCALBASE}/linux-sun-jdk${JDK_VERSION} .endif ONLY_FOR_ARCHS= i386 diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile index e16a3b4c9658..cdb855b22662 100644 --- a/java/jdk14/Makefile +++ b/java/jdk14/Makefile @@ -39,7 +39,7 @@ JDK_PATCHSET_VERSION= 7 .if defined(NATIVE_BOOTSTRAP) JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION} .else -JDK13DIR?= ${LOCALBASE}/linux-jdk${JDK_VERSION} +JDK13DIR?= ${LOCALBASE}/linux-sun-jdk${JDK_VERSION} .endif ONLY_FOR_ARCHS= i386 diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index e16a3b4c9658..cdb855b22662 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -39,7 +39,7 @@ JDK_PATCHSET_VERSION= 7 .if defined(NATIVE_BOOTSTRAP) JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION} .else -JDK13DIR?= ${LOCALBASE}/linux-jdk${JDK_VERSION} +JDK13DIR?= ${LOCALBASE}/linux-sun-jdk${JDK_VERSION} .endif ONLY_FOR_ARCHS= i386 diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index e16a3b4c9658..cdb855b22662 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -39,7 +39,7 @@ JDK_PATCHSET_VERSION= 7 .if defined(NATIVE_BOOTSTRAP) JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION} .else -JDK13DIR?= ${LOCALBASE}/linux-jdk${JDK_VERSION} +JDK13DIR?= ${LOCALBASE}/linux-sun-jdk${JDK_VERSION} .endif ONLY_FOR_ARCHS= i386 diff --git a/java/linux-sun-jdk13/Makefile b/java/linux-sun-jdk13/Makefile index 50a838e1904e..e17345a5a69c 100644 --- a/java/linux-sun-jdk13/Makefile +++ b/java/linux-sun-jdk13/Makefile @@ -7,9 +7,10 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}.${JDK_REVISION} +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= # -PKGNAMEPREFIX= linux- +PKGNAMEPREFIX= linux-sun- DISTNAME= j2sdk-${JDK_VERSION:S/./_/g}_${JDK_REVISION}-linux-i586 EXTRACT_SUFX= .bin @@ -70,6 +71,6 @@ post-patch: do-install: @${MKDIR} ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} @${TAR} -C ${WRKSRC} -cf- . | ${TAR} -C ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} --unlink -xpf- - @${LOCALBASE}/bin/registervm "${PREFIX}/linux-jdk${JDK_VERSION}/bin/java # Linux-JDK${JDK_VERSION}" + @${LOCALBASE}/bin/registervm "${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION}/bin/java # Linux-JDK${JDK_VERSION}" .include <bsd.port.post.mk> |