be smarter about GH_TAGNAME; when generating the default DISTNAME, only

strip a leading "v" when it's followed by what looks like a version number,
also have it handle a few other common names seen in ports. likewise when
stripping 'v' from the default WRKDIST, also allow 'V', but only if
followed by digits (which seems a better match to what github are doing).

update the few ports which _require_ updates to match this change.

been through a bulk on i386 (plus I've diffed "make dump-vars" run in
in all ports having GH_TAGNAME before+after applying the patch), ok jca
This commit is contained in:
sthen 2020-02-13 22:19:35 +00:00
parent bfe21617b0
commit f69d1135ed
12 changed files with 23 additions and 34 deletions

View File

@ -1,2 +1,2 @@
SHA256 (googletest-release-1.8.0.tar.gz) = WKb0J3yivIVlIis7vVihd2CenEiOinJkk1m6UUUNt9g=
SIZE (googletest-release-1.8.0.tar.gz) = 1281617
SHA256 (googletest-1.8.0.tar.gz) = WKb0J3yivIVlIis7vVihd2CenEiOinJkk1m6UUUNt9g=
SIZE (googletest-1.8.0.tar.gz) = 1281617

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2020/01/13 19:31:41 bcallah Exp $
# $OpenBSD: Makefile,v 1.12 2020/02/13 22:19:35 sthen Exp $
COMMENT = lightweight Qt5 plain-text editor
PKGNAME = featherpad-${GH_TAGNAME:S/^V//}
@ -32,6 +32,4 @@ CONFIGURE_ARGS = -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
NO_TEST = Yes
WRKDIST = ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:S/^V//}
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (FeatherPad-V0.12.1.tar.gz) = wy1mIANZHWEnMefHCGpcfYxZCTFBxBTslw1oYFCZx08=
SIZE (FeatherPad-V0.12.1.tar.gz) = 791670
SHA256 (FeatherPad-0.12.1.tar.gz) = wy1mIANZHWEnMefHCGpcfYxZCTFBxBTslw1oYFCZx08=
SIZE (FeatherPad-0.12.1.tar.gz) = 791670

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.49 2019/07/12 20:46:06 sthen Exp $
# $OpenBSD: Makefile,v 1.50 2020/02/13 22:19:35 sthen Exp $
COMMENT-main = easy to use LaTeX and ConTeXt editor
COMMENT-python = Python scripting for TeXworks
@ -18,8 +18,6 @@ REVISION-main = 3
EPOCH = 0
WRKDIST = ${WRKDIR}/texworks-release-${V}
CATEGORIES = editors print
HOMEPAGE = http://www.tug.org/texworks/
MAINTAINER = Edd Barrett <edd@openbsd.org>

View File

@ -1,2 +1,2 @@
SHA256 (texworks-release-0.6.2.tar.gz) = IohcEdkmVLDLofSAj8mqPC/dPlQ1/Ynf+aoeZ2WKYzk=
SIZE (texworks-release-0.6.2.tar.gz) = 11508277
SHA256 (texworks-0.6.2.tar.gz) = IohcEdkmVLDLofSAj8mqPC/dPlQ1/Ynf+aoeZ2WKYzk=
SIZE (texworks-0.6.2.tar.gz) = 11508277

View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1515 2020/01/26 12:51:47 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1516 2020/02/13 22:19:35 sthen Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@ -609,7 +609,7 @@ GH_ACCOUNT ?=
GH_PROJECT ?=
.if !empty(GH_PROJECT) && !empty(GH_TAGNAME)
DISTNAME ?= ${GH_PROJECT}-${GH_TAGNAME:C/^v//}
DISTNAME ?= ${GH_PROJECT}-${GH_TAGNAME:C/^(v|V|ver|[Rr]el|[Rr]elease)[-._]?([0-9])/\2/}
.endif
PKGNAME ?= ${DISTNAME}
@ -873,7 +873,7 @@ _WRKDIRS += ${WRKOBJDIR}/${_WRKDIR_STEM}
_WRKDIRS += ${WRKOBJDIR_MFS}/${_WRKDIR_STEM}
.if !empty(GH_TAGNAME)
WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^[vV]([0-9])/\1/}
.elif !empty(GH_COMMIT)
WRKDIST ?= ${WRKDIR}/${GH_PROJECT}-${GH_COMMIT}
.else

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2020/01/10 15:01:15 bcallah Exp $
# $OpenBSD: Makefile,v 1.7 2020/02/13 22:19:35 sthen Exp $
COMMENT = lightweight Qt5 notes manager
PKGNAME = feathernotes-${GH_TAGNAME:S/^V//}
@ -28,6 +28,4 @@ RUN_DEPENDS = devel/desktop-file-utils \
NO_TEST = Yes
WRKDIST = ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:S/^V//}
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (FeatherNotes-V0.5.1.tar.gz) = aCZucohsJyWiDg5ulBkkb8wmr4+JonNgMaCw+XiA7GA=
SIZE (FeatherNotes-V0.5.1.tar.gz) = 335890
SHA256 (FeatherNotes-0.5.1.tar.gz) = aCZucohsJyWiDg5ulBkkb8wmr4+JonNgMaCw+XiA7GA=
SIZE (FeatherNotes-0.5.1.tar.gz) = 335890

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2020/02/13 13:26:20 bluhm Exp $
# $OpenBSD: Makefile,v 1.3 2020/02/13 22:19:35 sthen Exp $
COMMENT = library implementation of OPC UA
@ -47,8 +47,6 @@ CONFIGURE_ARGS = -DCMAKE_BUILD_TYPE=RelWithDebInfo \
DEBUG_PACKAGES = ${BUILD_PACKAGES}
WRKDIST = ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}
ALL_TARGET = all doc_pdf
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (open62541-.1.0.1.tar.gz) = dIGlEOhXIB903FEq2Tqhcu4aMO1HEOWWXObUcXmil2Q=
SIZE (open62541-.1.0.1.tar.gz) = 2689479
SHA256 (open62541-1.0.1.tar.gz) = dIGlEOhXIB903FEq2Tqhcu4aMO1HEOWWXObUcXmil2Q=
SIZE (open62541-1.0.1.tar.gz) = 2689479

View File

@ -1,15 +1,12 @@
# $OpenBSD: Makefile,v 1.6 2019/07/12 20:51:19 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2020/02/13 22:19:35 sthen Exp $
COMMENT= modern freedesktop flat icon theme
V= 1.5.0
WRKDIST= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}
PKGNAME= ${GH_PROJECT}-${V}
REVISION= 1
GH_ACCOUNT= snwh
GH_PROJECT= paper-icon-theme
GH_TAGNAME= v.${V}
GH_TAGNAME= v.1.5.0
REVISION= 1
CATEGORIES= x11
HOMEPAGE= https://snwh.org/paper

View File

@ -1,2 +1,2 @@
SHA256 (paper-icon-theme-.1.5.0.tar.gz) = YvId/pXs5IHlxjVIDzI0fxrSfqZrLvBSb+eZCQspjs4=
SIZE (paper-icon-theme-.1.5.0.tar.gz) = 48464220
SHA256 (paper-icon-theme-1.5.0.tar.gz) = YvId/pXs5IHlxjVIDzI0fxrSfqZrLvBSb+eZCQspjs4=
SIZE (paper-icon-theme-1.5.0.tar.gz) = 48464220