diff options
| author | jschauma <jschauma@pkgsrc.org> | 2004-01-02 16:56:01 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2004-01-02 16:56:01 +0000 |
| commit | 0dcde9d835bbb5b4a1431e43bf61f2ee6ced570f (patch) | |
| tree | dd9f2fc43f307260046e037e2f2efb7701f15a2b /lang/sun-jre13 | |
| parent | 46ce46ab4f1246800a63d93853bc1f7bf077ffef (diff) | |
| download | pkgsrc-0dcde9d835bbb5b4a1431e43bf61f2ee6ced570f.tar.gz | |
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.
Diffstat (limited to 'lang/sun-jre13')
| -rw-r--r-- | lang/sun-jre13/Makefile | 18 | ||||
| -rw-r--r-- | lang/sun-jre13/Makefile.common | 21 |
2 files changed, 23 insertions, 16 deletions
diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile index 4a0631ce859..4f7d0c23224 100644 --- a/lang/sun-jre13/Makefile +++ b/lang/sun-jre13/Makefile @@ -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} diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common index cb07bddccba..b4440be485e 100644 --- a/lang/sun-jre13/Makefile.common +++ b/lang/sun-jre13/Makefile.common @@ -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 \ |