From 9e56b4ae6fbe12c4a534ea55c5d35302fa8012cd Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Mon, 11 Sep 2006 15:49:08 +0000
Subject: . Note that FreeBSD 5.x/amd64 isn't support (6.x/amd64 is). [1] .
 Only set IGNORE to the "fetch the distribution" message if there is  
 actually one to fetch.

Pointed out by:	pointyhat (via kris@) [1]
---
 java/diablo-jdk15/Makefile | 6 +++---
 java/diablo-jre15/Makefile | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'java')

diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile
index 9c47335897eb..3d2f50bc6b29 100644
--- a/java/diablo-jdk15/Makefile
+++ b/java/diablo-jdk15/Makefile
@@ -44,10 +44,10 @@ INSTALL_DIR=	${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION}
 
 .if ${OSVERSION} >= 600000
 JDK_OSREL=freebsd6
-.elif ${OSVERSION} >= 500000
+.elif ${OSVERSION} >= 500000 && ${ARCH} == "i386"
 JDK_OSREL=freebsd5
 .else
-IGNORE=		Only available for FreeBSD 5.x and later
+IGNORE=		Only available for FreeBSD 5.x/i386 and FreeBSD 6.x/amd64 and later
 .endif
 
 .if ${ARCH} == "i386"
@@ -58,7 +58,7 @@ PLIST_SUB+=	WEB="@comment "
 PLIST_SUB+=	CLIENTVM="@comment "
 .endif
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) && defined(JDK_OSREL)
 ECHO_MSG=/usr/bin/printf
 IGNORE=	:\n\
 Because of licensing restrictions, you must fetch the distribution\n\
diff --git a/java/diablo-jre15/Makefile b/java/diablo-jre15/Makefile
index 59b49c2e664d..ce7db7e5b66c 100644
--- a/java/diablo-jre15/Makefile
+++ b/java/diablo-jre15/Makefile
@@ -44,10 +44,10 @@ INSTALL_DIR=	${PREFIX}/${PKGNAMEPREFIX}jre${JRE_VERSION}
 
 .if ${OSVERSION} >= 600000
 JRE_OSREL=freebsd6
-.elif ${OSVERSION} >= 500000
+.elif ${OSVERSION} >= 500000 && ${ARCH} == "i386"
 JRE_OSREL=freebsd5
 .else
-IGNORE=		Only available for FreeBSD 5.x and later
+IGNORE=		Only available for FreeBSD 5.x/i386 and FreeBSD 6.x/amd64 and later
 .endif
 
 .if ${ARCH} == "i386"
@@ -58,7 +58,7 @@ PLIST_SUB+=	WEB="@comment "
 PLIST_SUB+=	CLIENTVM="@comment "
 .endif
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) && defined(JRE_OSREL)
 ECHO_MSG=/usr/bin/printf
 IGNORE=	:\n\
 Because of licensing restrictions, you must fetch the distribution\n\
-- 
cgit v1.2.3