From owner-svn-ports-head@FreeBSD.ORG Sat Dec 20 15:59:48 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16F17145; Sat, 20 Dec 2014 15:59:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DCDAF1FB7; Sat, 20 Dec 2014 15:59:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBKFxlKq088765; Sat, 20 Dec 2014 15:59:47 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBKFxl9d088764; Sat, 20 Dec 2014 15:59:47 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201412201559.sBKFxl9d088764@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 20 Dec 2014 15:59:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375010 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Dec 2014 15:59:48 -0000 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} \