* Introduce BLACKDOWN_ARCH, which is usually just ${MACHINE_ARCH}

  (but is "ppc" on powerpc), and use it instead of MACHINE_ARCH where
  applicable.

* Introduce BLACKDOWN_REL, which is usually just "FCS-02b" (but is
  "rc1" on arm).

* Simplify how MASTER_SITES and DISTFILES get defined.

* Improve some formatting.

* Replace literal "i386" in PLIST with ${BLACKDOWN_ARCH}.

* Adjust bin/.java_wrapper for powerpc platforms, and update the
  similar patch for bin/realpath.

On NetBSD/powerpc, this greatly reduces noise during package
installation, and gets us further at runtime. Believe it or not,
seeing "/lib/libc.so.6: version `GLIBC_2.2' not found" is an
improvement.

1 files changed, 27 insertions, 27 deletions

diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common
index 4aafb97a3b8..ebb03206bc9 100644
--- a/lang/blackdown-jre13/Makefile.common
+++ b/lang/blackdown-jre13/Makefile.common
@@ -1,34 +1,32 @@
-# $NetBSD: Makefile.common,v 1.3 2002/09/03 21:44:12 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.4 2002/09/08 09:59:51 schmonz Exp $
 #
 
 RELVERSION=	1.3.1
+BLACKDOWN_REL=	FCS-02b
 RELNAME=	${RELVERSION}-02b-FCS-linux
 EXTNAME=	${BASENAME}-${RELNAME}
 EXTRACT_SUFX=	.bin
 
+BD_SUBDIR=	JDK-${RELVERSION}/${BLACKDOWN_ARCH}/${BLACKDOWN_REL}
+MASTER_SITES=	ftp://ftp.tux.org/pub/java/${BD_SUBDIR}/ \
+	ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/${BD_SUBDIR}/ \
+	ftp://mirror.aarnet.edu.au/pub/java-linux/${BD_SUBDIR}/ \
+	ftp://ftp.informatik.hu-berlin.de/pub/Java/Linux/${BD_SUBDIR}/
+
 .if ${MACHINE_ARCH:Mi[3-6]86} != ""
 MACHINE_ARCH=i386
 .endif
 
-.if ${MACHINE_ARCH} == "arm"
-MASTER_SITES= \
-	ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/arm/rc1/ \
-	ftp://ftp.tux.org/pub/java/JDK-1.3.1/arm/rc1/ \
-	ftp://ftp.informatik.hu-berlin.de/pub/Java/Linux/JDK-1.3.1/arm/rc1/ \
-	ftp://mirror.aarnet.edu.au/pub/java-linux/JDK-1.3.1/arm/rc1/
+.if ${MACHINE_ARCH} == "powerpc"
+BLACKDOWN_ARCH?=	ppc
+.else
+BLACKDOWN_ARCH?=	${MACHINE_ARCH}
+.endif
+
+.if	${BLACKDOWN_ARCH} == "arm"
+BLACKDOWN_REL=	rc1
 EXTRACT_SUFX=	.tar.bz2
-.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc"
-MASTER_SITES=	\
-	ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/${MACHINE_ARCH}/FCS-02b/ \
-	ftp://ftp.tux.org/pub/java/JDK-1.3.1/${MACHINE_ARCH}/FCS-02b/ \
-	ftp://ftp.informatik.hu-berlin.de/pub/Java/Linux/JDK-1.3.1/${MACHINE_ARCH}/FCS-02b/ \
-	ftp://mirror.aarnet.edu.au/pub/java-linux/JDK-1.3.1/${MACHINE_ARCH}/FCS-02b/
-.elif ${MACHINE_ARCH} == "powerpc"
-MASTER_SITES=	\
-	ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/ppc/FCS-02b/ \
-	ftp://ftp.tux.org/pub/java/JDK-1.3.1/ppc/FCS-02b/ \
-	ftp://ftp.informatik.hu-berlin.de/pub/Java/Linux/JDK-1.3.1/ppc/FCS-02b/ \
-	ftp://mirror.aarnet.edu.au/pub/java-linux/JDK-1.3.1/ppc/FCS-02b/
+.elif	${BLACKDOWN_ARCH} == "ppc"
 DEPENDS+=	linuxppc_lib>=2000.4.2:../../emulators/linuxppc_lib
 .endif
 
@@ -37,11 +35,12 @@ CATEGORIES=	lang
 MAINTAINER=	jschauma@netbsd.org
 HOMEPAGE=	http://www.blackdown.org
 
-RESTRICTED= "Redistribution of repackaged binaries not permitted"
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
+RESTRICTED=		"Redistribution of repackaged binaries not permitted"
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+
 CHECK_SHLIBS=	NO		#This would use NetBSD ldd on Linux shlibs.
 
 .include "../../mk/bsd.prefs.mk"
@@ -53,14 +52,15 @@ JDK_HOME:=	${LOCALBASE}/java/blackdown-${RELVERSION}
 WRKSRC=		${WRKDIR}/${BASENAME}${RELVERSION}
 
 NO_BUILD=	yes
-# since we change PREFIX:
-NO_MTREE=	yes
+NO_MTREE=	yes	# since we change PREFIX
+
 PLIST_SUBST+=	RELVERSION=${RELVERSION}
+PLIST_SUBST+=	BLACKDOWN_ARCH=${BLACKDOWN_ARCH}
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \
 			Linux-*-i[3-6]86 Linux-*-powerpc Linux-*-sparc
 
-.if ${MACHINE_ARCH} != "arm"
+.if ${EXTRACT_SUFX} == ".bin"
 EXTRACT_CMD=	${ECHO} yes | ${DISTDIR}/${DISTFILES} --nox11 > /dev/null
 post-fetch:
 	@${CHMOD} +x ${DISTDIR}/${DISTFILES}