diff options
| author | glewis <glewis@FreeBSD.org> | 2006-09-11 15:49:08 +0000 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2006-09-11 15:49:08 +0000 |
| commit | e264a099a18d9418fae31d5dfbd21c0fce0b2a88 (patch) | |
| tree | 2e29b6edd6f199d633d907347751d3d09bba9d21 | |
| parent | a59b0013d3596695c2e2a6b86e6f38b74fe27bd6 (diff) | |
| download | FreeBSD-ports-e264a099a18d9418fae31d5dfbd21c0fce0b2a88.zip FreeBSD-ports-e264a099a18d9418fae31d5dfbd21c0fce0b2a88.tar.gz | |
. 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]
| -rw-r--r-- | java/diablo-jdk15/Makefile | 6 | ||||
| -rw-r--r-- | java/diablo-jre15/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile index 9c47335..3d2f50b 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 59b49c2..ce7db7e 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\ |
