diff options
| author | Steve Price <steve@FreeBSD.org> | 2001-06-17 18:08:03 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 2001-06-17 18:08:03 +0000 |
| commit | 401f2a77d8bd35d98aff425e2bebfaef01a18bc3 (patch) | |
| tree | 1fc3c8a0469aece16646cd8213c7ef26273aa6f0 /java | |
| parent | Convert to use USE_QT_VER to avoid warnings. (diff) | |
Cleanups from maintainer and fix the URL from which to retrieve the
distfile.
PR: 28137
Submitted by: maintainer, Dave Glowacki <dglo@ssec.wisc.edu>
Diffstat (limited to 'java')
| -rw-r--r-- | java/linux-jdk14/Makefile | 22 | ||||
| -rw-r--r-- | java/linux-sun-jdk14/Makefile | 22 |
2 files changed, 24 insertions, 20 deletions
diff --git a/java/linux-jdk14/Makefile b/java/linux-jdk14/Makefile index 410517ef23d0..16f1b5862aad 100644 --- a/java/linux-jdk14/Makefile +++ b/java/linux-jdk14/Makefile @@ -6,11 +6,12 @@ # PORTNAME= jdk -PORTVERSION= ${JDK_VERSION:S/-//g} +PORTVERSION= ${INSTALL_JDK_VERSION} CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= linux- -DISTFILES= j2sdk-${JDK_VERSION:S/./_/g}-linux-i386.bin +DISTNAME= j2sdk-${DL_JDK_VERSION:S/./_/g}-linux-i386 +EXTRACT_SUFX= .bin MAINTAINER= ernst@jollem.com @@ -28,21 +29,22 @@ EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= # empty WRKSRC= ${WRKDIR}/j2sdk1.4.0 -PLIST_SUB+= TARGET_PREFIX=${TARGET_PREFIX:S/^${PREFIX}\///} +PLIST_SUB+= TARGET_PREFIX=${TARGET_DIR:S/^${PREFIX}\///} NO_BUILD= yes USE_LINUX= yes -JDK_VERSION= 1.4.0-beta +DL_JDK_VERSION= 1.4.0-beta +INSTALL_JDK_VERSION= 1.4.0b1 ONLY_FOR_ARCHS= i386 -TARGET_PREFIX?= ${PREFIX}/${PKGBASE}${PORTVERSION} +TARGET_DIR?= ${PREFIX}/${PKGBASE}${PORTVERSION} +DOWNLOAD_URL?= http://java.sun.com/j2se/1.4/#linux +PORTTITLE= Java 2 Development Kit ${INSTALL_JDK_VERSION} for Linux .include <bsd.port.pre.mk> -.for file in ${DISTFILES} -.if !exists(${DISTDIR}/${file}) -IGNORE=You must manually fetch the Java 2 Development Kit ${JDK_VERSION} for Linux archive (${DISTFILES}) from http://java.sun.com/j2se/1.3/download-linux.html, place it in ${DISTDIR} and then run make again +.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) +IGNORE=You must manually fetch the ${PORTTITLE} archive (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again .endif -.endfor post-fetch: @${CHMOD} +x ${DISTDIR}/${DISTFILES} @@ -53,6 +55,6 @@ post-patch: 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}" + ${LOCALBASE}/bin/registervm "${TARGET_DIR}/bin/java # Linux-Sun-JDK${PORTVERSION}" .include <bsd.port.post.mk> diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile index 410517ef23d0..16f1b5862aad 100644 --- a/java/linux-sun-jdk14/Makefile +++ b/java/linux-sun-jdk14/Makefile @@ -6,11 +6,12 @@ # PORTNAME= jdk -PORTVERSION= ${JDK_VERSION:S/-//g} +PORTVERSION= ${INSTALL_JDK_VERSION} CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= linux- -DISTFILES= j2sdk-${JDK_VERSION:S/./_/g}-linux-i386.bin +DISTNAME= j2sdk-${DL_JDK_VERSION:S/./_/g}-linux-i386 +EXTRACT_SUFX= .bin MAINTAINER= ernst@jollem.com @@ -28,21 +29,22 @@ EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= # empty WRKSRC= ${WRKDIR}/j2sdk1.4.0 -PLIST_SUB+= TARGET_PREFIX=${TARGET_PREFIX:S/^${PREFIX}\///} +PLIST_SUB+= TARGET_PREFIX=${TARGET_DIR:S/^${PREFIX}\///} NO_BUILD= yes USE_LINUX= yes -JDK_VERSION= 1.4.0-beta +DL_JDK_VERSION= 1.4.0-beta +INSTALL_JDK_VERSION= 1.4.0b1 ONLY_FOR_ARCHS= i386 -TARGET_PREFIX?= ${PREFIX}/${PKGBASE}${PORTVERSION} +TARGET_DIR?= ${PREFIX}/${PKGBASE}${PORTVERSION} +DOWNLOAD_URL?= http://java.sun.com/j2se/1.4/#linux +PORTTITLE= Java 2 Development Kit ${INSTALL_JDK_VERSION} for Linux .include <bsd.port.pre.mk> -.for file in ${DISTFILES} -.if !exists(${DISTDIR}/${file}) -IGNORE=You must manually fetch the Java 2 Development Kit ${JDK_VERSION} for Linux archive (${DISTFILES}) from http://java.sun.com/j2se/1.3/download-linux.html, place it in ${DISTDIR} and then run make again +.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) +IGNORE=You must manually fetch the ${PORTTITLE} archive (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again .endif -.endfor post-fetch: @${CHMOD} +x ${DISTDIR}/${DISTFILES} @@ -53,6 +55,6 @@ post-patch: 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}" + ${LOCALBASE}/bin/registervm "${TARGET_DIR}/bin/java # Linux-Sun-JDK${PORTVERSION}" .include <bsd.port.post.mk> |