diff options
Diffstat (limited to 'java/diablo-jdk15/Makefile')
| -rw-r--r-- | java/diablo-jdk15/Makefile | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile index 9c215dfada5b..9c47335897eb 100644 --- a/java/diablo-jdk15/Makefile +++ b/java/diablo-jdk15/Makefile @@ -10,7 +10,7 @@ PORTVERSION= ${JDK_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION} CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= diablo- -DISTNAME= ${PKGNAMEPREFIX}caffe-freebsd${JDK_OSREL}-${JDK_VERSION}_${RELEASE_VERSION}-b${BUILD_VERSION} +DISTNAME= ${PKGNAMEPREFIX}caffe-${JDK_OSREL}-${ARCH}-${JDK_VERSION}_${RELEASE_VERSION}-b${BUILD_VERSION} EXTRACT_SUFX= .tar.bz2 MAINTAINER= glewis@FreeBSD.org @@ -22,11 +22,12 @@ RESTRICTED= "License doesn't allow distribution with fee" USE_BZIP2= yes USE_XLIB= yes -ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS= amd64 i386 JDK_VERSION= 1.5.0 -RELEASE_VERSION=06 +RELEASE_VERSION=07 BUILD_VERSION= 00 PLIST_SUB+= JDK_VERSION=${JDK_VERSION} +PLIST_SUB+= ARCH=${ARCH} DOWNLOAD_URL= http://www.FreeBSDFoundation.org/cgi-bin/download?download=${DISTNAME}${EXTRACT_SUFX} LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}15 @@ -42,13 +43,21 @@ INSTALL_DIR= ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} .include <bsd.port.pre.mk> .if ${OSVERSION} >= 600000 -JDK_OSREL=6 +JDK_OSREL=freebsd6 .elif ${OSVERSION} >= 500000 -JDK_OSREL=5 +JDK_OSREL=freebsd5 .else IGNORE= Only available for FreeBSD 5.x and later .endif +.if ${ARCH} == "i386" +PLIST_SUB+= WEB="" +PLIST_SUB+= CLIENTVM="" +.else +PLIST_SUB+= WEB="@comment " +PLIST_SUB+= CLIENTVM="@comment " +.endif + .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) ECHO_MSG=/usr/bin/printf IGNORE= :\n\ @@ -71,9 +80,6 @@ post-install: # Register the VM "${LOCALBASE}/bin/registervm" \ "${INSTALL_DIR}/bin/java # DiabloCaffe${JDK_VERSION}" - # Install cacerts - ${INSTALL_DATA} "${FILESDIR}/cacerts" \ - "${INSTALL_DIR}/jre/lib/security/cacerts" # Install the plugin ${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL |