From owner-svn-ports-head@FreeBSD.ORG Thu May 21 15:25:41 2015 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 E9E58B5E; Thu, 21 May 2015 15:25:41 +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 CA5EF1C11; Thu, 21 May 2015 15:25:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4LFPf5V059222; Thu, 21 May 2015 15:25:41 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4LFPeaK059217; Thu, 21 May 2015 15:25:40 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201505211525.t4LFPeaK059217@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 21 May 2015 15:25:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386936 - in 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.20 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: Thu, 21 May 2015 15:25:42 -0000 Author: mat Date: Thu May 21 15:25:40 2015 New Revision: 386936 URL: https://svnweb.freebsd.org/changeset/ports/386936 Log: Remove GH_COMMIT support. Differential Revision: https://reviews.freebsd.org/D2606 With hat: portmgr Sponsored by: Absolight Modified: head/CHANGES head/Mk/bsd.port.mk head/Mk/bsd.sanity.mk head/Mk/bsd.sites.mk Modified: head/CHANGES ============================================================================== --- head/CHANGES Thu May 21 14:59:45 2015 (r386935) +++ head/CHANGES Thu May 21 15:25:40 2015 (r386936) @@ -10,6 +10,11 @@ in the release notes and/or placed into All ports committers are allowed to commit to this file. +20150521: +AUTHOR: mat@FreeBSD.org + + GH_COMMIT support has been removed, see the 20150319 for more informations. + 20150419: AUTHOR: tijl@FreeBSD.org Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu May 21 14:59:45 2015 (r386935) +++ head/Mk/bsd.port.mk Thu May 21 15:25:40 2015 (r386936) @@ -1316,7 +1316,7 @@ _SUF2= ,${PORTEPOCH} PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} DISTVERSIONFULL= ${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} -.if defined(USE_GITHUB) && !defined(GH_COMMIT) && empty(MASTER_SITES:MGHC) +.if defined(USE_GITHUB) && empty(MASTER_SITES:MGHC) # Only add in DISTVERSIONFULL if GH_TAGNAME if set by port. Otherwise # GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice. . if defined(GH_TAGNAME) @@ -1555,11 +1555,7 @@ CONFIGURE_ENV+= PKG_CONFIG_SYSROOT_DIR=" WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work .if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB) -. if defined(GH_COMMIT) -WRKSRC?= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT} -. else WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT} -. endif .endif .if defined(NO_WRKSUBDIR) WRKSRC?= ${WRKDIR} Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Thu May 21 14:59:45 2015 (r386935) +++ head/Mk/bsd.sanity.mk Thu May 21 15:25:40 2015 (r386936) @@ -64,7 +64,7 @@ DEV_ERROR+= "USE_ZOPE=yes is unsupported .endif .if defined(USE_GITHUB) && defined(GH_COMMIT) -DEV_WARNING+= "GH_COMMIT is deprecated, please convert GHL-\>GH in MASTER_SITES and set GH_TAGNAME to tag or commit hash and remove GH_COMMIT" +DEV_ERROR+= "GH_COMMIT is unsupported, please convert GHL-\>GH in MASTER_SITES and set GH_TAGNAME to tag or commit hash and remove GH_COMMIT" .endif .if defined(USE_GNOME) && ${USE_GNOME:Mgnomehack} Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Thu May 21 14:59:45 2015 (r386935) +++ head/Mk/bsd.sites.mk Thu May 21 15:25:40 2015 (r386936) @@ -509,13 +509,6 @@ MASTER_SITE_GENTOO+= \ # possible to do GH_TAGNAME= GIT_HASH to do a snapshot. # default: ${DISTVERSION} # -# GH_COMMIT - first 7 digits of the commit that generated GH_TAGNAME -# (man git-describe(1)) -# if this is not set, archive corresponding to tag is fetched -# default: not set -# This is a deprecated option. Just set the hash in GH_TAGNAME -# instead. -# .if defined(USE_GITHUB) . if defined(GH_TAGNAME) && ${GH_TAGNAME} == master IGNORE?= Using master as GH_TAGNAME is invalid. \ @@ -526,32 +519,20 @@ IGNORE?= Using master as GH_TAGNAME is i # comment #15 for explanation as to why and how to deal with it if it breaks. MASTER_SITE_GITHUB+= https://codeload.github.com/%SUBDIR% MASTER_SITE_GITHUB_CLOUD+= http://cloud.github.com/downloads/%SUBDIR% -MASTER_SITE_GITHUB_LEGACY+= https://codeload.github.com/%SUBDIR% -. if defined(GH_COMMIT) -. if !defined(MASTER_SITES) || !${MASTER_SITES:MGHL} -MASTER_SITES+= GHL -. endif -. else -. if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} +. if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} MASTER_SITES+= GH -. endif . endif GH_ACCOUNT?= ${PORTNAME} GH_PROJECT?= ${PORTNAME} -. if defined(GH_COMMIT) -# Use the old style for safety for now. -GH_TAGNAME?= ${DISTVERSION} -. else # Use full PREFIX/SUFFIX and converted DISTVERSION GH_TAGNAME?= ${DISTVERSIONFULL} # This new scheme rerolls distfiles. Also ensure they are renamed to avoid # conflicts. Use _GITHUB_REV in case github changes their zipping or structure # which has happened before. _GITHUB_REV= 0 -. if ${MASTER_SITES:MGH} +. if ${MASTER_SITES:MGH} DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV} -. endif . endif . if defined(GH_TAGNAME) GH_TAGNAME_SANITIZED= ${GH_TAGNAME:S,/,-,} @@ -1301,7 +1282,6 @@ MASTER_SITE_KERNEL_ORG+= \ MASTER_SITES_ABBREVS= CPAN:PERL_CPAN \ GH:GITHUB \ GHC:GITHUB_CLOUD \ - GHL:GITHUB_LEGACY \ LODEV:LIBREOFFICE_DEV \ NL:NETLIB \ RG:RUBYGEMS \ @@ -1320,7 +1300,6 @@ MASTER_SITES_SUBDIRS= APACHE_COMMONS_BIN GIMP:${PORTNAME}/${PORTVERSION:R}/ \ GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/ \ GITHUB_CLOUD:${GH_ACCOUNT}/${GH_PROJECT}/ \ - GITHUB_LEGACY:${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/ \ GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \ GNU:${PORTNAME} \ GNUPG:${PORTNAME} \