Use USE_GITHUB when appropriate.

6 files changed, 24 insertions, 22 deletions

diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile
index 1d4b4c4c8f50..343605d75bae 100644
--- a/java/openjdk11/Makefile
+++ b/java/openjdk11/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	openjdk
-PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
+DISTVERSIONPREFIX=	jdk-	
+DISTVERSION=	${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/
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
-DISTNAME=	jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VERSION}
@@ -28,7 +27,9 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 USES=		compiler:features gmake iconv jpeg pkgconfig
 USE_XORG=	x11 xext xi xrender xt xtst
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}-${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+USE_GITHUB=	yes
+GH_ACCOUNT=	battleblow
+GH_PROJECT=	openjdk-jdk11u
 
 _MAKE_JOBS=	#
 MAKE_ENV=	LANG="C" \
diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo
index 8f72c5260084..3c7eef74c8e5 100644
--- a/java/openjdk11/distinfo
+++ b/java/openjdk11/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555524590
-SHA256 (jdk-11.0.3+7-1.tar.gz) = 1a75f453c5e819c2399d802a972f9ea6c296208d8fe0b810dad89067e637419c
-SIZE (jdk-11.0.3+7-1.tar.gz) = 116791459
+TIMESTAMP = 1557601910
+SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.3+7-1_GH0.tar.gz) = 1a75f453c5e819c2399d802a972f9ea6c296208d8fe0b810dad89067e637419c
+SIZE (battleblow-openjdk-jdk11u-jdk-11.0.3+7-1_GH0.tar.gz) = 116791459
diff --git a/java/openjdk12/Makefile b/java/openjdk12/Makefile
index 49fb7a40fc10..0356d59c9205 100644
--- a/java/openjdk12/Makefile
+++ b/java/openjdk12/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	openjdk
-PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
+DISTVERSIONPREFIX=	jdk-
+DISTVERSION=	${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-jdk12u/archive/
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
-DISTNAME=	jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VERSION}
@@ -28,7 +27,9 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 USES=		compiler:features gmake iconv jpeg pkgconfig
 USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-jdk-${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}-${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+USE_GITHUB=	yes
+GH_ACCOUNT=	battleblow
+GH_PROJECT=	openjdk-jdk12u
 
 _MAKE_JOBS=	#
 MAKE_ENV=	LANG="C" \
diff --git a/java/openjdk12/distinfo b/java/openjdk12/distinfo
index 5bab45027656..aff03ec80757 100644
--- a/java/openjdk12/distinfo
+++ b/java/openjdk12/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555525600
-SHA256 (jdk-12.0.1+12-1.tar.gz) = f398da1f0eb7b8dea409061d38e04210254de51e1cb06480baa61fb171a1d4e2
-SIZE (jdk-12.0.1+12-1.tar.gz) = 110249732
+TIMESTAMP = 1557602121
+SHA256 (battleblow-openjdk-jdk12u-jdk-12.0.1+12-1_GH0.tar.gz) = f398da1f0eb7b8dea409061d38e04210254de51e1cb06480baa61fb171a1d4e2
+SIZE (battleblow-openjdk-jdk12u-jdk-12.0.1+12-1_GH0.tar.gz) = 110249732
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index cb3f224f7128..1c1900feaa9e 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -3,11 +3,8 @@
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}.${BSD_JDK_VERSION}
 CATEGORIES=	java devel
-MASTER_SITES=	https://github.com/battleblow/openjdk-jdk8u/archive/:jdk \
-		LOCAL/jkim:jtreg
+MASTER_SITES=	LOCAL/jkim:jtreg
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
-DISTNAME=	jdk${JDK_MAJOR_VERSION}u${JDK_UPDATE_VERSION}-b${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
-DISTFILES=	${DISTNAME}.tar.gz:jdk
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT?=	Java Development Kit ${JDK_MAJOR_VERSION}
@@ -25,9 +22,12 @@ RUN_DEPENDS=	javavm:java/javavmwrapper \
 		dejavu>0:x11-fonts/dejavu
 
 USES=		compiler:features gmake iconv pkgconfig shebangfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	battleblow
+GH_PROJECT=	openjdk-jdk8u
+GH_TAGNAME=	jdk${JDK_MAJOR_VERSION}u${JDK_UPDATE_VERSION}-b${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64
-WRKSRC=		${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-${DISTNAME}
 
 SHEBANG_FILES=	configure
 
diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo
index 6b6032bd40aa..198842530bf2 100644
--- a/java/openjdk8/distinfo
+++ b/java/openjdk8/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1555604894
-SHA256 (jdk8u212-b04.1.tar.gz) = b69b2601bd1ddb68700df801b0ad5c8351ca8c937573130603910614e7d478d6
-SIZE (jdk8u212-b04.1.tar.gz) = 85191465
+TIMESTAMP = 1557602353
 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c
 SIZE (jtreg4.1-b08.tar.gz) = 6834252
+SHA256 (battleblow-openjdk-jdk8u-8.212.4.1-jdk8u212-b04.1_GH0.tar.gz) = b69b2601bd1ddb68700df801b0ad5c8351ca8c937573130603910614e7d478d6
+SIZE (battleblow-openjdk-jdk8u-8.212.4.1-jdk8u212-b04.1_GH0.tar.gz) = 85191465