[Midnightbsd-cvs] CVS Commit: java/diablo-jdk15: This is a work in progress.

[laffer1 at midnightbsd.org]

Log Message:
-----------
This is a work in progress.

Add LICENSE and set to restricted because it's a Java 5 binary from the FreeBSD foundation.

Set USE_GCPIO so that CURRENT works with it.

Fix EST/EDT bug by adding parameters to tzupdate utility

Update TZUPDATE utility to the latest.

Change javavmwrapper installation so it works with fake. (it has to be present first)

Modified Files:
--------------
    mports/java/diablo-jdk15:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/java/diablo-jdk15/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ljava/diablo-jdk15/Makefile -Ljava/diablo-jdk15/Makefile -u -r1.3 -r1.4
--- java/diablo-jdk15/Makefile
+++ java/diablo-jdk15/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -18,11 +18,13 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Java Development Kit ${JDK_VERSION}_${RELEASE_VERSION}.${BUILD_VERSION}
 
-RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
+BUILD_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
+LICENSE=	restricted
 RESTRICTED=	"License doesn't allow distribution with fee"
 
 USE_BZIP2=	yes
+USE_GCPIO=	yes
 USE_XLIB=	yes
 ONLY_FOR_ARCHS=	amd64 i386
 JDK_VERSION=	1.5.0
@@ -48,11 +50,11 @@
 
 JDK_OSREL=freebsd6
 
-.if defined(WITH_TZUPDATE)
+.if !defined(WITHOUT_TZUPDATE)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-TZUPDATE_VERSION=	1.1.0
-TZUPDATE_TZVERSION=	2007c
-TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
+TZUPDATE_VERSION=	1.2.1
+TZUPDATE_TZVERSION=	2007f
+TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 PLIST_SUB+=		TZORIGINAL="@comment "
@@ -70,7 +72,7 @@
 PLIST_SUB+=	CLIENTVM="@comment "
 .endif
 
-.if (!exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) || (defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE}))) && !defined(PACKAGE_BUILDING) && defined(JDK_OSREL)
+.if (!exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) || (!defined(WITHOUT_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE}))) && !defined(PACKAGE_BUILDING) && defined(JDK_OSREL)
 ECHO_MSG=/usr/bin/printf
 IGNORE=	:\n\
 Because of licensing restrictions, you must fetch the distribution\n\
@@ -84,7 +86,7 @@
 \"Caffe Diablo ${JDK_VERSION}\".  Please place the downloaded\n\
 ${DISTNAME}${EXTRACT_SUFX} in ${DISTDIR}.\n\n
 .endif
-.if defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})
+.if !defined(WITHOUT_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})
 IGNORE += Please open http://java.sun.com/javase/downloads/index.jsp\n\
 in a web browser and follow the \"Download\" link for\n\
 \"JDK US DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
@@ -92,13 +94,12 @@
 .endif
 .endif
 
-
-.if defined(WITH_TZUPDATE)
+.if !defined(WITHOUT_TZUPDATE)
 post-extract:
 	@${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR}
 	@# Update time zones
 	@-${WRKSRC}/bin/java -jar \
-		${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u
+		${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc
 	@-${RM} -rf ${WRKSRC}/jre/lib/zi.tzdata*
 .endif
 
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/java/diablo-jdk15/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ljava/diablo-jdk15/distinfo -Ljava/diablo-jdk15/distinfo -u -r1.2 -r1.3
--- java/diablo-jdk15/distinfo
+++ java/diablo-jdk15/distinfo
@@ -1,12 +1,6 @@
-MD5 (diablo-caffe-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 81f42aad4c46e68bde254cffa2a8f61e
-SHA256 (diablo-caffe-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 2f2964506589589ccf4c7175f18c5a7053047ae1beeb3fdd167139c639c37585
-SIZE (diablo-caffe-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 46868094
 MD5 (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 611e29db0b841d8c1cd170582946a666
 SHA256 (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = b7e010658271bebadaa9ea1f410d7af27fcbc0f864a69feea5cd60c6683aa4c9
 SIZE (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 54347274
-MD5 (diablo-caffe-freebsd5-i386-1.5.0_07-b01.tar.bz2) = ac3a83b3a52cef7e1727ce32d91574d6
-SHA256 (diablo-caffe-freebsd5-i386-1.5.0_07-b01.tar.bz2) = fda84f24f4eb489b04ce3185dfe7d70bffbbe624400ae086222a3892cc1ba305
-SIZE (diablo-caffe-freebsd5-i386-1.5.0_07-b01.tar.bz2) = 54304946
-MD5 (tzupdater-1.1.0-2007c.zip) = 1f1e1573d77dd9387a0ef3f2d93e759b
-SHA256 (tzupdater-1.1.0-2007c.zip) = 252d2d390bb1a0df27650603cbca6e5931e29c13d9c3b3538290a58cad06d769
-SIZE (tzupdater-1.1.0-2007c.zip) = 480534
+MD5 (tzupdater-1_2_1-2007f.zip) = f2ea5ca92b89ef767488a7ffd351cb3f
+SHA256 (tzupdater-1_2_1-2007f.zip) = 48c21fe64c9fcf8c612ea2ec5043e4bbeb37fea2e07d980d7297b130a32a29c1
+SIZE (tzupdater-1_2_1-2007f.zip) = 258198