From 73e9acb547868c4a1c010fd7d39470568ab4c7f2 Mon Sep 17 00:00:00 2001 From: sobomax Date: Mon, 10 Sep 2001 12:05:28 +0000 Subject: Don't hardcode minor revision number into installation directory, because it breaks some port that expect that directory to be linux-jdk1.3.1. This also is more consistent with other ports of JDKs/JREs out there. Reported by: olgeni --- java/linux-jdk13/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'java/linux-jdk13') diff --git a/java/linux-jdk13/Makefile b/java/linux-jdk13/Makefile index e75c669266c..ea860e5dbef 100644 --- a/java/linux-jdk13/Makefile +++ b/java/linux-jdk13/Makefile @@ -7,6 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}.${JDK_REVISION} +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= linux- @@ -37,13 +38,13 @@ USE_LINUX= yes JDK_VERSION= 1.3.1 JDK_REVISION= 01 ONLY_FOR_ARCHS= i386 -TARGET_DIR?= ${PREFIX}/${PKGBASE}${PORTVERSION} +TARGET_DIR?= ${PREFIX}/${PKGBASE}${JDK_VERSION} DOWNLOAD_URL?= http://java.sun.com/j2se/1.3/download-linux.html .include .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) -IGNORE= You must manually fetch the Java 2 Development Kit ${JDK_VERSION} \ +IGNORE= You must manually fetch the Java 2 Development Kit ${PORTVERSION} \ for Linux archive (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, \ choose the "GUNZIP Tar shell script" one and place it in ${DISTDIR} \ and then run make again @@ -56,8 +57,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 "${PREFIX}/linux-jdk${PORTVERSION}/bin/java # Linux-JDK${PORTVERSION}" + @${MKDIR} ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} + @${TAR} -C ${WRKSRC} -cf- . | ${TAR} -C ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} -xpf- + @${LOCALBASE}/bin/registervm "${PREFIX}/linux-jdk${JDK_VERSION}/bin/java # Linux-JDK${JDK_VERSION}" .include -- cgit