diff options
| author | schmonz <schmonz> | 2002-07-28 12:31:35 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2002-07-28 12:31:35 +0000 |
| commit | 10c66ea96a0ed70c6c635a3bc117179043893e25 (patch) | |
| tree | 0076979d87d206a088b5a287cba096d743ae336d /lang/blackdown-jre13 | |
| parent | 06e4ff6edd30be6a83becb8210b472735a083cab (diff) | |
| download | pkgsrc-10c66ea96a0ed70c6c635a3bc117179043893e25.tar.gz | |
Shuffle logic to ensure that DISTNAME is always set, even on systems
unsupported by this JRE. In such cases, this avoids the error
message "CATEGORIES and DISTNAME are mandatory" and allows the
usual NOT_FOR_PLATFORM message to be displayed. Also, entab a bit.
Diffstat (limited to 'lang/blackdown-jre13')
| -rw-r--r-- | lang/blackdown-jre13/Makefile | 15 | ||||
| -rw-r--r-- | lang/blackdown-jre13/Makefile.common | 16 |
2 files changed, 15 insertions, 16 deletions
diff --git a/lang/blackdown-jre13/Makefile b/lang/blackdown-jre13/Makefile index d5b36a1af59..448cd714866 100644 --- a/lang/blackdown-jre13/Makefile +++ b/lang/blackdown-jre13/Makefile @@ -1,17 +1,16 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/07/27 22:39:50 jschauma Exp $ +# $NetBSD: Makefile,v 1.2 2002/07/28 12:31:35 schmonz Exp $ # -BASENAME= j2re -PKGNAME= blackdown-jre13-1 +BASENAME= j2re +DISTNAME= ${EXTNAME}-${MACHINE_ARCH} +PKGNAME= blackdown-jre13-1 .if ${MACHINE_ARCH} == "arm" -DISTNAME= ${BASENAME}-RC1-linux-arm -.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc" -DISTNAME= ${EXTNAME}-${MACHINE_ARCH} +DISTNAME= ${BASENAME}-RC1-linux-arm .elif ${MACHINE_ARCH} == "powerpc" -DISTFILES= ${EXTNAME}-ppc +DISTFILES= ${EXTNAME}-ppc .endif -COMMENT= Blackdown's Java(tm) Runtime Environment 1.3.1 +COMMENT= Blackdown's Java(tm) Runtime Environment 1.3.1 ONLY_FOR_PLATFORM+= NetBSD-*-arm Linux-*-arm diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common index f0bf5faf954..2b43fd327bb 100644 --- a/lang/blackdown-jre13/Makefile.common +++ b/lang/blackdown-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2002/07/27 22:39:51 jschauma Exp $ +# $NetBSD: Makefile.common,v 1.2 2002/07/28 12:31:35 schmonz Exp $ # RELVERSION= 1.3.1 @@ -27,10 +27,10 @@ MASTER_SITES= \ DEPENDS+= linuxppc_lib>=2000.4.2:../../emulators/linuxppc_lib .endif -CATEGORIES= lang +CATEGORIES= lang -MAINTAINER= jschauma@netbsd.org -HOMEPAGE= http://www.blackdown.org +MAINTAINER= jschauma@netbsd.org +HOMEPAGE= http://www.blackdown.org RESTRICTED= "Redistribution of repackaged binaries not permitted" NO_SRC_ON_CDROM=${RESTRICTED} @@ -47,13 +47,13 @@ JDK_HOME:= ${LOCALBASE}/java/blackdown-${RELVERSION} WRKSRC= ${WRKDIR}/${BASENAME}${RELVERSION} -NO_BUILD= yes +NO_BUILD= yes # since we change PREFIX: -NO_MTREE= yes +NO_MTREE= yes PLIST_SUBST+= RELVERSION=${RELVERSION} -ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \ - Linux-*-i386 Linux-*-powerpc Linux-*-sparc +ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \ + Linux-*-i386 Linux-*-powerpc Linux-*-sparc .if ${MACHINE_ARCH} != "arm" EXTRACT_CMD= ${ECHO} yes | ${DISTDIR}/${DISTFILES} --nox11 > /dev/null |