Date: Fri, 20 Mar 2015 20:07:51 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381777 - in head: Mk biology/p5-bioperl-run dns/bundy irc/eggdrop-devel net-mgmt/lg ports-mgmt/portmaster ports-mgmt/portupgrade-devel ports-mgmt/poudriere-devel sysutils/beadm sysutil... Message-ID: <201503202007.t2KK7pXE030011@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Mar 20 20:07:50 2015 New Revision: 381777 URL: https://svnweb.freebsd.org/changeset/ports/381777 QAT: https://qat.redports.org/buildarchive/r381777/ Log: For the new USE_GITHUB with only GH_TAGNAME set default DISTNAME to include GH_PROJECT/GH_ACCOUNT/GH_TAGNAME. This prevents the distfile having the same name despite changing one of these values and causing a bad checksum. Differential Revision: https://reviews.freebsd.org/D2103 Reviewed by: mat With hat: bdrewery Modified: head/Mk/bsd.port.mk head/biology/p5-bioperl-run/distinfo head/dns/bundy/distinfo head/irc/eggdrop-devel/distinfo head/net-mgmt/lg/distinfo head/ports-mgmt/portmaster/distinfo head/ports-mgmt/portupgrade-devel/Makefile head/ports-mgmt/portupgrade-devel/distinfo head/ports-mgmt/poudriere-devel/Makefile head/sysutils/beadm-devel/distinfo head/sysutils/beadm/distinfo head/sysutils/nfsping/distinfo head/textproc/cdiff/distinfo head/textproc/jshon/distinfo Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Mar 20 20:04:59 2015 (r381776) +++ head/Mk/bsd.port.mk Fri Mar 20 20:07:50 2015 (r381777) @@ -1353,7 +1353,11 @@ _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_TAGNAME) && !defined(GH_COMMIT) +DISTNAME?= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME} +.else DISTNAME?= ${PORTNAME}-${DISTVERSIONFULL} +.endif INDEXFILE?= INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} Modified: head/biology/p5-bioperl-run/distinfo ============================================================================== --- head/biology/p5-bioperl-run/distinfo Fri Mar 20 20:04:59 2015 (r381776) +++ head/biology/p5-bioperl-run/distinfo Fri Mar 20 20:07:50 2015 (r381777) @@ -1,2 +1,2 @@ -SHA256 (bioperl-run-1.6.901_GH0.tar.gz) = 13f6c0b47b70a2bc5e9f633bc011378a85f78a7f0c0d334246acbc1a8f3b343c -SIZE (bioperl-run-1.6.901_GH0.tar.gz) = 13941085 +SHA256 (bioperl-bioperl-run-1.6.901-96ccd93_GH0.tar.gz) = 13f6c0b47b70a2bc5e9f633bc011378a85f78a7f0c0d334246acbc1a8f3b343c +SIZE (bioperl-bioperl-run-1.6.901-96ccd93_GH0.tar.gz) = 13941085 Modified: head/dns/bundy/distinfo ============================================================================== --- head/dns/bundy/distinfo Fri Mar 20 20:04:59 2015 (r381776) +++ head/dns/bundy/distinfo Fri Mar 20 20:07:50 2015 (r381777) @@ -1,2 +1,2 @@ -SHA256 (bundy-0.20150304_GH0.tar.gz) = 34fb3e94935acb50d4afff89e091c6c25d09b8a82d5601ead0e51852232c043d -SIZE (bundy-0.20150304_GH0.tar.gz) = 5311910 +SHA256 (bundy-dns-bundy-0.20150304-97ac840_GH0.tar.gz) = 34fb3e94935acb50d4afff89e091c6c25d09b8a82d5601ead0e51852232c043d +SIZE (bundy-dns-bundy-0.20150304-97ac840_GH0.tar.gz) = 5311910 Modified: head/irc/eggdrop-devel/distinfo ============================================================================== --- head/irc/eggdrop-devel/distinfo Fri Mar 20 20:04:59 2015 (r381776) +++ head/irc/eggdrop-devel/distinfo Fri Mar 20 20:07:50 2015 (r381777) @@ -1,2 +1,2 @@ -SHA256 (eggdrop-1.8.0.20141008_GH0.tar.gz) = 6ebe4df85d71c44f4254e556fc84d2e4b14feabd564486c1762c864bafb0eacf -SIZE (eggdrop-1.8.0.20141008_GH0.tar.gz) = 1275796 +SHA256 (eggheads-eggdrop-1.8-1.8.0.20141008-2bf3950_GH0.tar.gz) = 6ebe4df85d71c44f4254e556fc84d2e4b14feabd564486c1762c864bafb0eacf +SIZE (eggheads-eggdrop-1.8-1.8.0.20141008-2bf3950_GH0.tar.gz) = 1275796 Modified: head/net-mgmt/lg/distinfo ============================================================================== --- head/net-mgmt/lg/distinfo Fri Mar 20 20:04:59 2015 (r381776) +++ head/net-mgmt/lg/distinfo Fri Mar 20 20:07:50 2015 (r381777) @@ -1,2 +1,2 @@ -SHA256 (lg-1.9.s20140622_GH0.tar.gz) = 909b1e70811c84a5a0feb0e6992696ea841a43847bb3deb5dae8c98579e89030 -SIZE (lg-1.9.s20140622_GH0.tar.gz) = 44220 +SHA256 (Cougar-lg-1.9.s20140622-0d53e4b_GH0.tar.gz) = 909b1e70811c84a5a0feb0e6992696ea841a43847bb3deb5dae8c98579e89030 +SIZE (Cougar-lg-1.9.s20140622-0d53e4b_GH0.tar.gz) = 44220 Modified: head/ports-mgmt/portmaster/distinfo ============================================================================== --- head/ports-mgmt/portmaster/distinfo Fri Mar 20 20:04:59 2015 (r381776) +++ head/ports-mgmt/portmaster/distinfo Fri Mar 20 20:07:50 2015 (r381777) @@ -1,2 +1,2 @@ -SHA256 (portmaster-3.17.7_GH0.tar.gz) = 108f27e10d84f29a7930e100d4efc88505a837daa66abf17240f18fe85fa7185 -SIZE (portmaster-3.17.7_GH0.tar.gz) = 44689 +SHA256 (freebsd-portmaster-3.17.7-94ed670_GH0.tar.gz) = 108f27e10d84f29a7930e100d4efc88505a837daa66abf17240f18fe85fa7185 +SIZE (freebsd-portmaster-3.17.7-94ed670_GH0.tar.gz) = 44689 Modified: head/ports-mgmt/portupgrade-devel/Makefile ============================================================================== --- head/ports-mgmt/portupgrade-devel/Makefile Fri Mar 20 20:04:59 2015 (r381776) +++ head/ports-mgmt/portupgrade-devel/Makefile Fri Mar 20 20:07:50 2015 (r381777) @@ -9,7 +9,6 @@ CATEGORIES= ports-mgmt MASTER_SITES= GH \ http://mirror.shatow.net/freebsd/pkgtools/ PKGNAMESUFFIX= -devel -DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-0-g${GH_TAGNAME} MAINTAINER= bdrewery@FreeBSD.org COMMENT= FreeBSD ports/packages management tool (devel version) Modified: head/ports-mgmt/portupgrade-devel/distinfo ============================================================================== --- head/ports-mgmt/portupgrade-devel/distinfo Fri Mar 20 20:04:59 2015 (r381776) +++ head/ports-mgmt/portupgrade-devel/distinfo Fri Mar 20 20:07:50 2015 (r381777) @@ -1,2 +1,2 @@ -SHA256 (portupgrade/freebsd-portupgrade-20141006-0-g2161660_GH0.tar.gz) = e210e804ffec0b4b0392b06eb59b6811f23b02043a380b60bd8af8f8dd211764 -SIZE (portupgrade/freebsd-portupgrade-20141006-0-g2161660_GH0.tar.gz) = 107777 +SHA256 (portupgrade/freebsd-portupgrade-20141006-2161660_GH0.tar.gz) = e210e804ffec0b4b0392b06eb59b6811f23b02043a380b60bd8af8f8dd211764 +SIZE (portupgrade/freebsd-portupgrade-20141006-2161660_GH0.tar.gz) = 107777 Modified: head/ports-mgmt/poudriere-devel/Makefile ============================================================================== --- head/ports-mgmt/poudriere-devel/Makefile Fri Mar 20 20:04:59 2015 (r381776) +++ head/ports-mgmt/poudriere-devel/Makefile Fri Mar 20 20:07:50 2015 (r381777) @@ -8,7 +8,6 @@ MASTER_SITES= LOCAL/bdrewery/${PORTNAME} http://mirror.shatow.net/freebsd/${PORTNAME}/ \ GH PKGNAMESUFFIX= -devel -DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSION}-${GH_TAGNAME} MAINTAINER= bdrewery@FreeBSD.org COMMENT= Port build and test system Modified: head/sysutils/beadm-devel/distinfo ============================================================================== --- head/sysutils/beadm-devel/distinfo Fri Mar 20 20:04:59 2015 (r381776) +++ head/sysutils/beadm-devel/distinfo Fri Mar 20 20:07:50 2015 (r381777) @@ -1,2 +1,2 @@ -SHA256 (beadm-1.1.99.20140315_GH0.tar.gz) = 36d300efcdf48a4ec01364fa7e3de8b532843b9e081938cf0fc734ea6068f140 -SIZE (beadm-1.1.99.20140315_GH0.tar.gz) = 14631 +SHA256 (vermaden-beadm-1.1.99.20140315-748d2f2_GH0.tar.gz) = 36d300efcdf48a4ec01364fa7e3de8b532843b9e081938cf0fc734ea6068f140 +SIZE (vermaden-beadm-1.1.99.20140315-748d2f2_GH0.tar.gz) = 14631 Modified: head/sysutils/beadm/distinfo ============================================================================== --- head/sysutils/beadm/distinfo Fri Mar 20 20:04:59 2015 (r381776) +++ head/sysutils/beadm/distinfo Fri Mar 20 20:07:50 2015 (r381777) @@ -1,2 +1,2 @@ -SHA256 (beadm-1.1_GH0.tar.gz) = 36d300efcdf48a4ec01364fa7e3de8b532843b9e081938cf0fc734ea6068f140 -SIZE (beadm-1.1_GH0.tar.gz) = 14631 +SHA256 (vermaden-beadm-1.1-748d2f2_GH0.tar.gz) = 36d300efcdf48a4ec01364fa7e3de8b532843b9e081938cf0fc734ea6068f140 +SIZE (vermaden-beadm-1.1-748d2f2_GH0.tar.gz) = 14631 Modified: head/sysutils/nfsping/distinfo ============================================================================== --- head/sysutils/nfsping/distinfo Fri Mar 20 20:04:59 2015 (r381776) +++ head/sysutils/nfsping/distinfo Fri Mar 20 20:07:50 2015 (r381777) @@ -1,2 +1,2 @@ -SHA256 (nfsping-0.1.20131017_GH0.tar.gz) = 1339b79ea0a86d4804c4a81c5809c7b192e981408e1aa84f3234def1c791a2e7 -SIZE (nfsping-0.1.20131017_GH0.tar.gz) = 27117 +SHA256 (mprovost-NFSping-0.1.20131017-460c382_GH0.tar.gz) = 1339b79ea0a86d4804c4a81c5809c7b192e981408e1aa84f3234def1c791a2e7 +SIZE (mprovost-NFSping-0.1.20131017-460c382_GH0.tar.gz) = 27117 Modified: head/textproc/cdiff/distinfo ============================================================================== --- head/textproc/cdiff/distinfo Fri Mar 20 20:04:59 2015 (r381776) +++ head/textproc/cdiff/distinfo Fri Mar 20 20:07:50 2015 (r381777) @@ -1,2 +1,2 @@ -SHA256 (cdiff-0.9.6.20140711_GH0.tar.gz) = 4e62c6163644e57986d0868ed9e12baeed4a93975579e7354c68f6adfde62455 -SIZE (cdiff-0.9.6.20140711_GH0.tar.gz) = 30418 +SHA256 (ymattw-cdiff-0.9.6.20140711-67c9831_GH0.tar.gz) = 4e62c6163644e57986d0868ed9e12baeed4a93975579e7354c68f6adfde62455 +SIZE (ymattw-cdiff-0.9.6.20140711-67c9831_GH0.tar.gz) = 30418 Modified: head/textproc/jshon/distinfo ============================================================================== --- head/textproc/jshon/distinfo Fri Mar 20 20:04:59 2015 (r381776) +++ head/textproc/jshon/distinfo Fri Mar 20 20:07:50 2015 (r381777) @@ -1,2 +1,2 @@ -SHA256 (jshon-20121210_GH0.tar.gz) = 38ff964a491937ca3060ea95af682fa3f5a4fd9a440154517afae4784fd3974b -SIZE (jshon-20121210_GH0.tar.gz) = 10708 +SHA256 (keenerd-jshon-20121210-b21bc98_GH0.tar.gz) = 38ff964a491937ca3060ea95af682fa3f5a4fd9a440154517afae4784fd3974b +SIZE (keenerd-jshon-20121210-b21bc98_GH0.tar.gz) = 10708
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503202007.t2KK7pXE030011>