svn commit: r375010 - head/Mk

[Steve Wills]

Author: swills
Date: Sat Dec 20 15:59:46 2014
New Revision: 375010
URL: https://svnweb.freebsd.org/changeset/ports/375010
QAT: https://qat.redports.org/buildarchive/r375010/

Log:
  Make using GitHub releases easier
  
  Differential Revision:	https://reviews.freebsd.org/D1340
  With hat:	portmgr

Modified:
  head/Mk/bsd.sites.mk

Modified: head/Mk/bsd.sites.mk
==============================================================================
--- head/Mk/bsd.sites.mk	Sat Dec 20 15:55:51 2014	(r375009)
+++ head/Mk/bsd.sites.mk	Sat Dec 20 15:59:46 2014	(r375010)
@@ -544,18 +544,16 @@ IGNORE?=	Using master as GH_TAGNAME is i
 MASTER_SITE_GITHUB+=		https://codeload.github.com/%SUBDIR% \
 				http://codeload.github.com/%SUBDIR%
 MASTER_SITE_GITHUB_CLOUD+=	http://cloud.github.com/downloads/%SUBDIR%
-.if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC}
-MASTER_SITES+=	GH GHC
+MASTER_SITE_GITHUB_RELEASE+=	https://github.com/%SUBDIR%
+
+.if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} && !${MASTER_SITES:MGHR}
+MASTER_SITES+=	GH GHC GHR
 .endif
+GH_ACCOUNT?=	${PORTNAME}
 GH_PROJECT?=	${PORTNAME}
 GH_TAGNAME?=	${DISTVERSION}
 .endif
 .endif
-#
-# GitHub files can also be obtained, without the need for any of the above, by doing:
-#
-# MASTER_SITES=	http://github.com/accountname/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
-#
 
 .if !defined(IGNORE_MASTER_SITE_GNOME)
 MASTER_SITE_GNOME+= \
@@ -1509,6 +1507,7 @@ MASTER_SITE_KERNEL_ORG+= \
 MASTER_SITES_ABBREVS=	CPAN:PERL_CPAN \
 			GH:GITHUB \
 			GHC:GITHUB_CLOUD \
+			GHR:GITHUB_RELEASE \
 			LODEV:LIBREOFFICE_DEV \
 			NL:NETLIB \
 			SF:SOURCEFORGE \
@@ -1523,6 +1522,7 @@ MASTER_SITES_SUBDIRS=	APACHE_JAKARTA:${P
 			GCC:releases/${DISTNAME} \
 			GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/ \
 			GITHUB_CLOUD:${GH_ACCOUNT}/${GH_PROJECT}/ \
+			GITHUB_RELEASE:${GH_ACCOUNT}/${GH_PROJECT}/archive/${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}?dummy=/ \
 			GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
 			GIMP:${PORTNAME}/${PORTVERSION:R}/ \
 			GNU:${PORTNAME} \