1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

Fix renamed distfiles missed in r381688. Also fix the GHR ports updated in

r381648 which were expecting DISTVERSIONPREFIX/SUFFIX to be used in the
tag fetched from github by defaulting GH_TAGNAME to the same value
as DISTVERSION would get by only when GH_COMMIT is not set (when using the
new scheme).

With hat:	portmgr
This commit is contained in:
Bryan Drewery 2015-03-19 20:45:03 +00:00
parent db55af0fea
commit 965611a692
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=381689
12 changed files with 28 additions and 21 deletions

View File

@ -1352,7 +1352,8 @@ _SUF2= ,${PORTEPOCH}
PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2}
PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION}
DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
DISTVERSIONFULL= ${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
DISTNAME?= ${PORTNAME}-${DISTVERSIONFULL}
INDEXFILE?= INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}

View File

@ -559,7 +559,13 @@ DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV}
. endif
GH_ACCOUNT?= ${PORTNAME}
GH_PROJECT?= ${PORTNAME}
. if defined(DH_COMMIT)
# Use the old style for safety for now.
GH_TAGNAME?= ${DISTVERSION}
. else
# Use full PREFIX/SUFFIX and converted DISTVERSION
GH_TAGNAME?= ${DISTVERSIONFULL}
. endif
.endif
.endif

View File

@ -1,2 +1,2 @@
SHA256 (gpxloggerd-0.2.1.tar.gz) = d93ea0e4b531a4ae12147c2eef4e2f2a013aa12a98decd3169275c12bd35dfe9
SIZE (gpxloggerd-0.2.1.tar.gz) = 6982
SHA256 (gpxloggerd-0.2.1_GH0.tar.gz) = d93ea0e4b531a4ae12147c2eef4e2f2a013aa12a98decd3169275c12bd35dfe9
SIZE (gpxloggerd-0.2.1_GH0.tar.gz) = 6982

View File

@ -1,2 +1,2 @@
SHA256 (gogglesmm-0.14.2.tar.gz) = c074143c18494771e8dc38bdd5ee70f00579247bb8f683f8d5319797aa9cc858
SIZE (gogglesmm-0.14.2.tar.gz) = 1354458
SHA256 (gogglesmm-0.14.2_GH0.tar.gz) = c074143c18494771e8dc38bdd5ee70f00579247bb8f683f8d5319797aa9cc858
SIZE (gogglesmm-0.14.2_GH0.tar.gz) = 1354458

View File

@ -1,2 +1,2 @@
SHA256 (ibus-chewing-1.4.14-Source.tar.gz) = a3f4ad50b3e3216a6074f66f52400d9b9527f799b3449dfdd3143c7e8e4a2691
SIZE (ibus-chewing-1.4.14-Source.tar.gz) = 91669
SHA256 (ibus-chewing-1.4.14-Source_GH0.tar.gz) = a3f4ad50b3e3216a6074f66f52400d9b9527f799b3449dfdd3143c7e8e4a2691
SIZE (ibus-chewing-1.4.14-Source_GH0.tar.gz) = 91669

View File

@ -1,2 +1,2 @@
SHA256 (editline-1.14.2.tar.gz) = a4ee39906c87f843ecac4d95e4d7586429f6ead92cdadc9a3c1e28fe82c3c9da
SIZE (editline-1.14.2.tar.gz) = 338506
SHA256 (editline-1.14.2_GH0.tar.gz) = a4ee39906c87f843ecac4d95e4d7586429f6ead92cdadc9a3c1e28fe82c3c9da
SIZE (editline-1.14.2_GH0.tar.gz) = 338506

View File

@ -1,2 +1,2 @@
SHA256 (google-daemon-1.2.1.tar.gz) = e70805809bd3e1a52f191391bd5a2255dd794169ba6402f0a3c46f2def67e13a
SIZE (google-daemon-1.2.1.tar.gz) = 65967
SHA256 (google-daemon-1.2.1_GH0.tar.gz) = e70805809bd3e1a52f191391bd5a2255dd794169ba6402f0a3c46f2def67e13a
SIZE (google-daemon-1.2.1_GH0.tar.gz) = 65967

View File

@ -1,2 +1,2 @@
SHA256 (google-startup-scripts-1.2.1.tar.gz) = e70805809bd3e1a52f191391bd5a2255dd794169ba6402f0a3c46f2def67e13a
SIZE (google-startup-scripts-1.2.1.tar.gz) = 65967
SHA256 (google-startup-scripts-1.2.1_GH0.tar.gz) = e70805809bd3e1a52f191391bd5a2255dd794169ba6402f0a3c46f2def67e13a
SIZE (google-startup-scripts-1.2.1_GH0.tar.gz) = 65967

View File

@ -1,2 +1,2 @@
SHA256 (libilbc-v2.0.2.tar.gz) = ef5e06f620a1dcc09b73e1abddbd27cfed84a3b7dcf08a72b1327ede11d8e89b
SIZE (libilbc-v2.0.2.tar.gz) = 165401
SHA256 (libilbc-v2.0.2_GH0.tar.gz) = ef5e06f620a1dcc09b73e1abddbd27cfed84a3b7dcf08a72b1327ede11d8e89b
SIZE (libilbc-v2.0.2_GH0.tar.gz) = 165401

View File

@ -1,2 +1,2 @@
SHA256 (libsrtp-v1.5.0.tar.gz) = ecf5e9be5a6ec3c73841977dc2e059c69209849f2e500269fa133d4c654f1b47
SIZE (libsrtp-v1.5.0.tar.gz) = 1687709
SHA256 (libsrtp-v1.5.0_GH0.tar.gz) = ecf5e9be5a6ec3c73841977dc2e059c69209849f2e500269fa133d4c654f1b47
SIZE (libsrtp-v1.5.0_GH0.tar.gz) = 1687709

View File

@ -1,2 +1,2 @@
SHA256 (syncthing-v0.10.23.tar.gz) = c8c829191620e2268209c3da19b4b58b3568aaf859d9be84b161da26454fb54a
SIZE (syncthing-v0.10.23.tar.gz) = 3115266
SHA256 (syncthing-v0.10.23_GH0.tar.gz) = c8c829191620e2268209c3da19b4b58b3568aaf859d9be84b161da26454fb54a
SIZE (syncthing-v0.10.23_GH0.tar.gz) = 3115266

View File

@ -1,2 +1,2 @@
SHA256 (libzrtpcppcore-V4.3.1.tar.gz) = d9cce8ba5946620ce030a6b04f58c4011cbd1deb79ee41a6b8999dc6b689604c
SIZE (libzrtpcppcore-V4.3.1.tar.gz) = 1928961
SHA256 (libzrtpcppcore-V4.3.1_GH0.tar.gz) = d9cce8ba5946620ce030a6b04f58c4011cbd1deb79ee41a6b8999dc6b689604c
SIZE (libzrtpcppcore-V4.3.1_GH0.tar.gz) = 1928961