This replaces the current users of the github MASTER_SITES hack
("archive/${V}.tar.gz?bleh=/") to the new format with DISTFILES=...{...}.
I use some slightly awkward looking ${GH_VER:S/v//} constructs in a
couple of ports, which aren't strictly necessary here, but doing it this
way means we have a common DISTFILES line that can be later unified into
a module or infrastructure/ file (some projects include 'v' in their
tags and others don't).
I've tested 'make clean=dist; make makesum' and checked there are no
changes to distinfo files. (I'll also note that the MASTER_SITE_BACKUP
handling might not handle files using this syntax..)
Comments? OK?
Index: audio/glyr/Makefile
===================================================================
RCS file: /cvs/ports/audio/glyr/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- audio/glyr/Makefile 11 Aug 2013 14:59:54 -0000 1.1.1.1
+++ audio/glyr/Makefile 12 Nov 2013 12:24:44 -0000
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/08/11 14:59:54 landry Exp $
COMMENT = music related metadata searchengine
-V = 1.0.1
-DISTNAME = glyr-${V}
+GH_VER = 1.0.1
+DISTNAME = glyr-${GH_VER}
CATEGORIES = audio net
SHARED_LIBS += glyr 0.0 # 1.1
@@ -11,7 +11,8 @@ HOMEPAGE = https://github.com/sahib/glyr
# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = https://github.com/sahib/glyr/archive/${V}.tar.gz?bleh=/
+MASTER_SITES = https://github.com/sahib/glyr/archive/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}}
MODULES = devel/cmake \
devel/gettext
Index: devel/libgit2/Makefile.inc
===================================================================
RCS file: /cvs/ports/devel/libgit2/Makefile.inc,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.inc
--- devel/libgit2/Makefile.inc 7 Aug 2013 21:57:45 -0000 1.8
+++ devel/libgit2/Makefile.inc 12 Nov 2013 12:24:44 -0000
@@ -9,6 +9,5 @@ HOMEPAGE= http://libgit2.github.com/
# GPLv2 with linking exemption.
PERMIT_PACKAGE_CDROM?= Yes
-MASTER_SITES?=
https://github.com/libgit2/${PROJECT}/archive/v${V}.tar.gz?dummy=/
DIST_SUBDIR= libgit
DISTNAME?= ${PROJECT}-${V}
Index: devel/libgit2/libgit2/Makefile
===================================================================
RCS file: /cvs/ports/devel/libgit2/libgit2/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- devel/libgit2/libgit2/Makefile 9 Jul 2013 10:09:44 -0000 1.10
+++ devel/libgit2/libgit2/Makefile 12 Nov 2013 12:24:44 -0000
@@ -2,10 +2,14 @@
COMMENT= the Git library, take 2
-V= 0.19.0
+GH_VER= v0.19.0
+V= ${GH_VER:S/v//}
PROJECT= libgit2
REVISION= 0
SHARED_LIBS += git2 4.0 # 0.19
+
+MASTER_SITES= https://github.com/libgit2/${PROJECT}/archive/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}}
MODULES= devel/cmake \
lang/python
Index: devel/lua-penlight/Makefile
===================================================================
RCS file: /cvs/ports/devel/lua-penlight/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- devel/lua-penlight/Makefile 30 Sep 2013 13:04:06 -0000 1.5
+++ devel/lua-penlight/Makefile 12 Nov 2013 12:24:44 -0000
@@ -2,9 +2,9 @@
COMMENT = pure Lua libraries focusing on input data handling
-VER = 1.3.1
-DISTNAME = Penlight-${VER}
-PKGNAME = lua-penlight-${VER}
+GH_VER = 1.3.1
+DISTNAME = Penlight-${GH_VER}
+PKGNAME = lua-penlight-${GH_VER}
CATEGORIES = devel
HOMEPAGE = http://stevedonovan.github.io/Penlight/
@@ -16,7 +16,8 @@ PERMIT_PACKAGE_CDROM =Yes
MODULES = lang/lua
-MASTER_SITES =
https://github.com/stevedonovan/Penlight/archive/${VER}.tar.gz?bleh=/
+MASTER_SITES = https://github.com/stevedonovan/Penlight/archive/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}}
MODLUA_RUN_DEPENDS = devel/luafs
Index: devel/lualdoc/Makefile
===================================================================
RCS file: /cvs/ports/devel/lualdoc/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- devel/lualdoc/Makefile 23 Sep 2013 14:11:12 -0000 1.5
+++ devel/lualdoc/Makefile 12 Nov 2013 12:24:44 -0000
@@ -2,9 +2,9 @@
COMMENT = LuaDoc-compatible documentation generation system
-VER = 1.4.0
-DISTNAME = LDoc-${VER}
-PKGNAME = lualdoc-${VER}
+GH_VER = 1.4.0
+DISTNAME = LDoc-${GH_VER}
+PKGNAME = lualdoc-${GH_VER}
CATEGORIES = devel
HOMEPAGE = http://stevedonovan.github.io/ldoc/
@@ -16,7 +16,8 @@ PERMIT_PACKAGE_CDROM =Yes
MODULES = lang/lua
-MASTER_SITES =
https://github.com/stevedonovan/ldoc/archive/${VER}.tar.gz?bleh=/
+MASTER_SITES = https://github.com/stevedonovan/ldoc/archive/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}}
MODLUA_RUN_DEPENDS = devel/lua-penlight
Index: devel/ninja/Makefile
===================================================================
RCS file: /cvs/ports/devel/ninja/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- devel/ninja/Makefile 16 Oct 2013 05:52:46 -0000 1.5
+++ devel/ninja/Makefile 12 Nov 2013 12:24:44 -0000
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2013/10/16 05:52:46 dcoppa Exp $
COMMENT = small build system with a focus on speed
-V = 1.4.0
-DISTNAME = ninja-${V}
+GH_VER = v1.4.0
+DISTNAME = ninja-${GH_VER:S/v//}
CATEGORIES = devel
HOMEPAGE = http://martine.github.io/ninja/
MAINTAINER = Matthew Dempsky <matt...@dempsky.org>
@@ -13,7 +13,8 @@ PERMIT_PACKAGE_CDROM = Yes
# c>=68.1 needed for ppoll
WANTLIB = c>=68.1 m stdc++
-MASTER_SITES =
https://github.com/martine/ninja/archive/v${V}.tar.gz?bleh=/
+MASTER_SITES = https://github.com/martine/ninja/archive/
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}}
MODULES = lang/python
Index: www/tt-rss/Makefile
===================================================================
RCS file: /cvs/ports/www/tt-rss/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- www/tt-rss/Makefile 23 Sep 2013 06:43:11 -0000 1.20
+++ www/tt-rss/Makefile 12 Nov 2013 12:24:44 -0000
@@ -2,9 +2,9 @@
COMMENT= webbased rss reader with standalone look and feel
-V= 1.10
-DISTNAME= Tiny-Tiny-RSS-$V
-PKGNAME= tt-rss-$V
+GH_VER= 1.10
+DISTNAME= Tiny-Tiny-RSS-${GH_VER}
+PKGNAME= tt-rss-${GH_VER}
CATEGORIES= www
HOMEPAGE= http://tt-rss.org/
@@ -12,7 +12,8 @@ HOMEPAGE= http://tt-rss.org/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES=
https://github.com/gothfox/Tiny-Tiny-RSS/archive/${V}.tar.gz?dummy=/
+MASTER_SITES= https://github.com/gothfox/Tiny-Tiny-RSS/archive/
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}}
NO_BUILD= Yes
NO_TEST= Yes
