Same as for 1.4:

Don't duplicate the FETCH_MESSAGE, move it to Makefile.common instead.
 Found a URL for older distfiles, so make that known.
This commit is contained in:
jschauma 2004-01-02 16:56:01 +00:00
parent 46ce46ab4f
commit 0dcde9d835
3 changed files with 26 additions and 31 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.23 2003/08/12 16:37:04 jschauma Exp $
# $NetBSD: Makefile,v 1.24 2004/01/02 16:56:01 jschauma Exp $
DISTNAME= j2sdk-1_3_1_09-linux-i586
PKGNAME= sun-jdk13-1.0.9
@ -7,6 +7,8 @@ MASTER_SITES= # empty
COMMENT= Sun's Java(tm) Development Kit 1.3.1
SHORT= JDK
DEPENDS= sun-jre13>=1.0.9:../../lang/sun-jre13
# Remove parts that are in common with the JRE.
@ -22,20 +24,6 @@ post-extract:
done
${LN} -sf . ${WRKSRC}/jre
_FETCH_MESSAGE= \
${ECHO} "======================================================================"; \
${ECHO} ; \
${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing the"; \
${ECHO} " Java(tm) 2 SDK, Standard Edition must be fetched"; \
${ECHO} " into:"; \
${ECHO} " ${DISTDIR}"; \
${ECHO} " from:"; \
${ECHO} " ${DOWNLOAD}"; \
${ECHO} ; \
${ECHO} " Choose 'Linux self-extracting file' from the 'SDK' column."; \
${ECHO} ; \
${ECHO} "======================================================================"
.include "../../lang/sun-jre13/Makefile.common"
PREFIX= ${JVM_HOME}

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.29 2003/08/12 16:37:05 jschauma Exp $
# $NetBSD: Makefile,v 1.30 2004/01/02 16:56:01 jschauma Exp $
DISTNAME= j2re-1_3_1_09-linux-i586
PKGNAME= sun-jre13-1.0.9
@ -7,6 +7,8 @@ MASTER_SITES= # empty
COMMENT= Sun's Java(tm) Runtime Environment 1.3.1
SHORT= JRE
USE_PKGINSTALL= yes
OWN_DIRS= ${PREFIX}
OWN_DIRS+= ${PREFIX}/lib
@ -28,20 +30,6 @@ do-configure:
${MV} -f $$file $$file.default; \
done
_FETCH_MESSAGE= \
${ECHO} "======================================================================"; \
${ECHO} ; \
${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing the"; \
${ECHO} " Java(tm) 2 Runtime Environment, Standard Edition must be fetched"; \
${ECHO} " into:"; \
${ECHO} " ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"; \
${ECHO} " from:"; \
${ECHO} " ${DOWNLOAD}"; \
${ECHO} ; \
${ECHO} " Choose 'Linux self-extracting file' from the 'JRE' column."; \
${ECHO} ; \
${ECHO} "======================================================================"
.include "../../lang/sun-jre13/Makefile.common"
PREFIX= ${JVM_HOME}

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.16 2003/08/23 15:14:02 jschauma Exp $
# $NetBSD: Makefile.common,v 1.17 2004/01/02 16:56:01 jschauma Exp $
# MASTER_SITES is very special, and must end in "=":
CATEGORIES= lang java
@ -7,6 +7,7 @@ EXTRACT_SUFX= .bin
MAINTAINER= jschauma@NetBSD.org
HOMEPAGE= http://java.sun.com/
DOWNLOAD= http://java.sun.com/j2se/1.3/download.html
ARCHIVE= http://java.sun.com/products/archive/index.html
EXTRACT_CMD= ${ECHO} yes | ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null
@ -50,6 +51,24 @@ LDD= ${TRUE}
ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-*
_FETCH_MESSAGE= \
${ECHO} "======================================================================"; \
${ECHO} ; \
${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing"; \
${ECHO} " ${COMMENT} must be fetched"; \
${ECHO} " into:"; \
${ECHO} " ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"; \
${ECHO} " from:"; \
${ECHO} " ${DOWNLOAD} or"; \
${ECHO} " ${ARCHIVE}"; \
${ECHO} ; \
${ECHO} " Choose 'Windows/Linux/Solaris SPARC/Solaris x86' from"; \
${ECHO} " the '${SHORT}' column, accept the license, then choose 'Linux ";\
${ECHO} " self-extracting file'."; \
${ECHO} ; \
${ECHO} "======================================================================"
.if ${OPSYS} != "Darwin"
post-fetch:
@if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \