Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Mar 2019 17:34:20 +0000 (UTC)
From:      Greg Lewis <glewis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r496480 - in head/java: . openjdk12 openjdk12/files
Message-ID:  <201903211734.x2LHYKvo092285@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glewis
Date: Thu Mar 21 17:34:20 2019
New Revision: 496480
URL: https://svnweb.freebsd.org/changeset/ports/496480

Log:
  Re-add the port of OpenJDK 12

Added:
  head/java/openjdk12/
     - copied from r496477, head/java/openjdk11/
Modified:
  head/java/Makefile
  head/java/openjdk12/Makefile
  head/java/openjdk12/distinfo
  head/java/openjdk12/files/cacerts

Modified: head/java/Makefile
==============================================================================
--- head/java/Makefile	Thu Mar 21 17:31:47 2019	(r496479)
+++ head/java/Makefile	Thu Mar 21 17:34:20 2019	(r496480)
@@ -112,6 +112,7 @@
     SUBDIR += openjdk8
     SUBDIR += openjdk8-jre
     SUBDIR += openjdk11
+    SUBDIR += openjdk12
     SUBDIR += openjfx8-devel
     SUBDIR += openjfx8-scenebuilder
     SUBDIR += phpeclipse

Modified: head/java/openjdk12/Makefile
==============================================================================
--- head/java/openjdk11/Makefile	Thu Mar 21 17:22:38 2019	(r496477)
+++ head/java/openjdk12/Makefile	Thu Mar 21 17:34:20 2019	(r496480)
@@ -3,9 +3,9 @@
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
 CATEGORIES=	java devel
-MASTER_SITES=	https://github.com/battleblow/openjdk-jdk11u/archive/
+MASTER_SITES=	https://github.com/battleblow/openjdk-jdk12u/archive/
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
-DISTNAME=	jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+DISTNAME=	jdk-${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VERSION}
@@ -25,9 +25,9 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng16.so:graphics/png
 
 USES=		compiler:features gmake iconv jpeg pkgconfig
-USE_XORG=	xext x11 xrender xtst xi xt
+USE_XORG=	xext x11 xrender xtst xi xt xrandr
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}-${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-jdk-${JDK_MAJOR_VERSION}-${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
 
 _MAKE_JOBS=	#
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -44,17 +44,17 @@ MAKE_ENV=	LANG="C" \
 		USE_CLANG=true
 
 JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/}
-JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
+JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
 JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jdk
 INSTALLDIR=	${PREFIX}/${PKGBASE}
 
 NOPRECIOUSMAKEVARS=	yes
 
-JDK_MAJOR_VERSION=	11
+JDK_MAJOR_VERSION=	12
 JDK_MINOR_VERSION=	0
-JDK_PATCH_VERSION=	2
-JDK_BUILD_NUMBER=	9
-BSD_JDK_VERSION=	2
+JDK_PATCH_VERSION=	0
+JDK_BUILD_NUMBER=	33
+BSD_JDK_VERSION=	1
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC=/usr/bin/cc \
@@ -83,7 +83,7 @@ CONFIGURE_ARGS=	--with-boot-jdk=${BOOTSTRAPJDKDIR} \
 		--x-libraries=${LOCALBASE}/lib \
 		--with-package-path=${LOCALBASE} \
 		--with-cacerts-file=${FILESDIR}/cacerts \
-		--with-version-string=${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \
+		--with-version-string=${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \
 		--with-native-debug-symbols=none \
 		--with-debug-level=release
 
@@ -94,7 +94,8 @@ JDK_BUILD_TYPE=		release
 
 .include <bsd.port.pre.mk>
 
-BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk11 \
+BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk12 \
+		${LOCALBASE}/openjdk11 \
 		${LOCALBASE}/bootstrap-openjdk11
 
 # do we have valid native jdk installed?

Modified: head/java/openjdk12/distinfo
==============================================================================
--- head/java/openjdk11/distinfo	Thu Mar 21 17:22:38 2019	(r496477)
+++ head/java/openjdk12/distinfo	Thu Mar 21 17:34:20 2019	(r496480)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553112684
-SHA256 (jdk-11.0.2+9-2.tar.gz) = 00dbb8e268b9ce2311d5ce95ec18f11524e1ffc5f80d3859bd9a3d6f6b652379
-SIZE (jdk-11.0.2+9-2.tar.gz) = 116739508
+TIMESTAMP = 1553131068
+SHA256 (jdk-12+33-1.tar.gz) = a1aae0dc0adbb00c9733b91276a6f739e3dc234fd4c019fe7ee3f4e323fbe67f
+SIZE (jdk-12+33-1.tar.gz) = 110195427

Modified: head/java/openjdk12/files/cacerts
==============================================================================
Binary file (source and/or target). No diff available.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903211734.x2LHYKvo092285>