Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 May 2019 19:52:08 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r501298 - in head: games/bsdgames java/openjdk11 java/openjdk12 java/openjdk8 x11-fonts/comic-neue
Message-ID:  <201905111952.x4BJq8WD053561@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Sat May 11 19:52:08 2019
New Revision: 501298
URL: https://svnweb.freebsd.org/changeset/ports/501298

Log:
  Use USE_GITHUB when appropriate.

Modified:
  head/games/bsdgames/Makefile   (contents, props changed)
  head/games/bsdgames/distinfo   (contents, props changed)
  head/java/openjdk11/Makefile   (contents, props changed)
  head/java/openjdk11/distinfo   (contents, props changed)
  head/java/openjdk12/Makefile   (contents, props changed)
  head/java/openjdk12/distinfo   (contents, props changed)
  head/java/openjdk8/Makefile   (contents, props changed)
  head/java/openjdk8/distinfo   (contents, props changed)
  head/x11-fonts/comic-neue/Makefile   (contents, props changed)
  head/x11-fonts/comic-neue/distinfo   (contents, props changed)

Modified: head/games/bsdgames/Makefile
==============================================================================
--- head/games/bsdgames/Makefile	Sat May 11 19:37:04 2019	(r501297)
+++ head/games/bsdgames/Makefile	Sat May 11 19:52:08 2019	(r501298)
@@ -3,12 +3,11 @@
 
 PORTNAME=	bsdgames
 PORTVERSION=	5.5.0
+DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	games
-MASTER_SITES=	https://github.com/DragonFlyBSD/DragonFlyBSD/archive/ \
-		https://deb.debian.org/debian/pool/main/b/bsdgames/
-DISTFILES=	v${PORTVERSION}.zip \
-		${PORTNAME}_2.17.orig.tar.gz
+MASTER_SITES=	https://deb.debian.org/debian/pool/main/b/bsdgames/:deb
+DISTFILES=	${PORTNAME}_2.17.orig.tar.gz:deb
 
 MAINTAINER=	jockl@pianojockl.org
 COMMENT=	Traditional BSD games taken from DragonFly BSD
@@ -16,6 +15,9 @@ COMMENT=	Traditional BSD games taken from DragonFly BS
 LICENSE=	BSD3CLAUSE
 
 USES=		ncurses tar:xz uidfix
+USE_GITHUB=	nodefault
+GH_ACCOUNT=	DragonFlyBSD:bsd
+GH_PROJECT=	DragonFlyBSD:bsd
 
 CONFLICTS=	hangman-[0-9]*
 
@@ -46,7 +48,10 @@ GAMESPATH_FILES=backgammon/backgammon/backgammon.6 \
 		phantasia/pathnames.h \
 		wargames/wargames.sh
 
-.include <bsd.port.pre.mk>
+post-extract:
+	${MV} ${WRKSRC_bsd}/games  ${WRKSRC}
+	${MV} ${WRKDIR}/bsd-games-2.17/sail/*.[ch] ${WRKSRC}/sail/
+	${MV} ${WRKDIR}/bsd-games-2.17/sail/pathnames.h.in ${WRKSRC}/sail/pathnames.h
 
 post-patch:
 	@for f in ${SHAREPATH_FILES}; do \
@@ -76,12 +81,4 @@ post-install:
 	@${TOUCH} ${STAGEDIR}/var/games/atc_score
 	@${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \;
 
-do-extract:
-	${MKDIR} ${WRKDIR}
-	${TAR} -xzf ${DISTDIR}/v${PORTVERSION}.zip -C ${WRKDIR}
-	${TAR} -xzf ${DISTDIR}/${PORTNAME}_2.17.orig.tar.gz -C ${WRKDIR}
-	${MV} ${WRKDIR}/DragonFlyBSD-${PORTVERSION}/games  ${WRKSRC}
-	${MV} ${WRKDIR}/bsd-games-2.17/sail/*.[ch] ${WRKSRC}/sail/
-	${MV} ${WRKDIR}/bsd-games-2.17/sail/pathnames.h.in ${WRKSRC}/sail/pathnames.h
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/games/bsdgames/distinfo
==============================================================================
--- head/games/bsdgames/distinfo	Sat May 11 19:37:04 2019	(r501297)
+++ head/games/bsdgames/distinfo	Sat May 11 19:52:08 2019	(r501298)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1552233173
-SHA256 (v5.5.0.zip) = c6afd51d0283e9d5f0911f046824bddf41926c277ce995ab78e128b32737e400
-SIZE (v5.5.0.zip) = 169083630
+TIMESTAMP = 1557603153
 SHA256 (bsdgames_2.17.orig.tar.gz) = 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60
 SIZE (bsdgames_2.17.orig.tar.gz) = 2563311
+SHA256 (DragonFlyBSD-DragonFlyBSD-v5.5.0_GH0.tar.gz) = e54ca3fea6e4ae4b384df4718f5ca749e597537112f1b2170e8fb5c296c1720b
+SIZE (DragonFlyBSD-DragonFlyBSD-v5.5.0_GH0.tar.gz) = 137084047

Modified: head/java/openjdk11/Makefile
==============================================================================
--- head/java/openjdk11/Makefile	Sat May 11 19:37:04 2019	(r501297)
+++ head/java/openjdk11/Makefile	Sat May 11 19:52:08 2019	(r501298)
@@ -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" \

Modified: head/java/openjdk11/distinfo
==============================================================================
--- head/java/openjdk11/distinfo	Sat May 11 19:37:04 2019	(r501297)
+++ head/java/openjdk11/distinfo	Sat May 11 19:52:08 2019	(r501298)
@@ -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

Modified: head/java/openjdk12/Makefile
==============================================================================
--- head/java/openjdk12/Makefile	Sat May 11 19:37:04 2019	(r501297)
+++ head/java/openjdk12/Makefile	Sat May 11 19:52:08 2019	(r501298)
@@ -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" \

Modified: head/java/openjdk12/distinfo
==============================================================================
--- head/java/openjdk12/distinfo	Sat May 11 19:37:04 2019	(r501297)
+++ head/java/openjdk12/distinfo	Sat May 11 19:52:08 2019	(r501298)
@@ -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

Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile	Sat May 11 19:37:04 2019	(r501297)
+++ head/java/openjdk8/Makefile	Sat May 11 19:52:08 2019	(r501298)
@@ -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
 

Modified: head/java/openjdk8/distinfo
==============================================================================
--- head/java/openjdk8/distinfo	Sat May 11 19:37:04 2019	(r501297)
+++ head/java/openjdk8/distinfo	Sat May 11 19:52:08 2019	(r501298)
@@ -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

Modified: head/x11-fonts/comic-neue/Makefile
==============================================================================
--- head/x11-fonts/comic-neue/Makefile	Sat May 11 19:37:04 2019	(r501297)
+++ head/x11-fonts/comic-neue/Makefile	Sat May 11 19:52:08 2019	(r501298)
@@ -2,9 +2,9 @@
 
 PORTNAME=	comic-neue
 PORTVERSION=	2.4
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	https://github.com/crozynski/comicneue/archive/v${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free Comic Sans alternative
@@ -12,10 +12,14 @@ COMMENT=	Free Comic Sans alternative
 LICENSE=	OFL11
 LICENSE_FILE=	${WRKDIR}/comicneue-${PORTVERSION}/SIL-License.txt
 
-USES=		fonts zip
+USES=		fonts
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	crozynski
+GH_PROJECT=	comicneue
+
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/comicneue-${PORTVERSION}/OTF
+WRKSRC_SUBDIR=		OTF
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}

Modified: head/x11-fonts/comic-neue/distinfo
==============================================================================
--- head/x11-fonts/comic-neue/distinfo	Sat May 11 19:37:04 2019	(r501297)
+++ head/x11-fonts/comic-neue/distinfo	Sat May 11 19:52:08 2019	(r501298)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549004515
-SHA256 (comic-neue-2.4.zip) = d97ecd8b4e00cce7c857a8b94c1e4f068ae01275ead3a8a3297051cf99c3389e
-SIZE (comic-neue-2.4.zip) = 4711599
+TIMESTAMP = 1557602791
+SHA256 (crozynski-comicneue-v2.4_GH0.tar.gz) = 9e1153e1bc08d76e7d5418ac707278b687204b2eb6c59f387f1c310edb165be6
+SIZE (crozynski-comicneue-v2.4_GH0.tar.gz) = 2896409



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