Fix USE_GITHUB usage.

For a couple of ports, bump PORTEPOCH as their version were wrong.

Sponsored by:	Absolight

22 files changed, 41 insertions, 44 deletions

diff --git a/devel/go-glide/Makefile b/devel/go-glide/Makefile
index ffa0cc4899fe..d1d840d9d943 100644
--- a/devel/go-glide/Makefile
+++ b/devel/go-glide/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	glide
 PORTVERSION=	0.12.3
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	go-
 
@@ -13,7 +14,6 @@ LICENSE=	MIT
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Masterminds
-GH_TAGNAME=	v0.12.3
 USES=		go
 GO_PKGNAME=	github.com/Masterminds/glide
 PLIST_FILES=	bin/glide
diff --git a/devel/go-glide/distinfo b/devel/go-glide/distinfo
index 9a7584b4ab5b..9951e05c85a2 100644
--- a/devel/go-glide/distinfo
+++ b/devel/go-glide/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481837638
-SHA256 (Masterminds-glide-0.12.3-v0.12.3_GH0.tar.gz) = a304c29267cf7e00b7299b6ac8da0317f2f4f4096acb6cf817d4c745e0dee8b4
-SIZE (Masterminds-glide-0.12.3-v0.12.3_GH0.tar.gz) = 244609
+TIMESTAMP = 1487002785
+SHA256 (Masterminds-glide-v0.12.3_GH0.tar.gz) = a304c29267cf7e00b7299b6ac8da0317f2f4f4096acb6cf817d4c745e0dee8b4
+SIZE (Masterminds-glide-v0.12.3_GH0.tar.gz) = 244609
diff --git a/devel/py-tinyrpc/Makefile b/devel/py-tinyrpc/Makefile
index b7444907d0c4..30f5e17d40d0 100644
--- a/devel/py-tinyrpc/Makefile
+++ b/devel/py-tinyrpc/Makefile
@@ -13,8 +13,6 @@ LICENSE=	MIT
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mbr
-GH_PROJECT=	tinyrpc
-GH_TAGNAME=	0.5
 
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
diff --git a/devel/rlog/Makefile b/devel/rlog/Makefile
index 87ddebbb9669..90d33e056641 100644
--- a/devel/rlog/Makefile
+++ b/devel/rlog/Makefile
@@ -14,8 +14,6 @@ LICENSE_COMB=	dual
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	anastmag
-GH_PROJECT=	rlog
-GH_TAGNAME=	1.4
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index f377a1247b32..32299a550a4d 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	cimg
-DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.9
 PORTREVISION=	2
 PORTEPOCH=	3
@@ -26,7 +25,7 @@ ONLY_FOR_ARCHS_REASON=	invokes i386 asm
 USE_GITHUB=	yes
 GH_ACCOUNT=	dtschump
 GH_PROJECT=	CImg
-GH_TAGNAME=	${DISTVERSIONPREFIX}.${DISTVERSION:S/.//g}
+GH_TAGNAME=	v.${DISTVERSION:S/.//g}
 
 .if !defined(WITHOUT_LAPACK)
 . if defined(WITH_ATLAS)
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index 40e2f0151de9..1e7014207fae 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479501589
-SHA256 (dtschump-CImg-v1.7.9-v.179_GH0.tar.gz) = adb0d77eded5dceae512d6c03233bdb01fe06121f8fdc661326e20da674caff8
-SIZE (dtschump-CImg-v1.7.9-v.179_GH0.tar.gz) = 17828648
+TIMESTAMP = 1487003066
+SHA256 (dtschump-CImg-1.7.9-v.179_GH0.tar.gz) = adb0d77eded5dceae512d6c03233bdb01fe06121f8fdc661326e20da674caff8
+SIZE (dtschump-CImg-1.7.9-v.179_GH0.tar.gz) = 17828648
diff --git a/japanese/dbskkd-cdb/Makefile b/japanese/dbskkd-cdb/Makefile
index 7a3b6e689482..a3498c37cf6b 100644
--- a/japanese/dbskkd-cdb/Makefile
+++ b/japanese/dbskkd-cdb/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	${SKKJISYOCDB}:japanese/skk-jisyo-cdb
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jj1bdx
-GH_TAGNAME=	3.00
 MAKE_ENV=	LOCALBASE="${LOCALBASE}" \
 		SKKJISYOCDB="${SKKJISYOCDB}"
 PLIST_FILES=	libexec/dbskkd-cdb
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index ddcfe59a8bb6..d367a66d2bc8 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -2,6 +2,8 @@
 
 PORTNAME=	kterm
 PORTVERSION=	6.2.0
+DISTVERSIONPREFIX=	v
+DISTVERSIONSUFFIX=	.fb6
 PORTREVISION=	14
 CATEGORIES=	japanese x11
 MASTER_SITES=	LOCAL/hrs:pcemu
@@ -21,7 +23,6 @@ USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrs-allbsd
-GH_TAGNAME=	v6.2.0.fb6
 VGAFONT_USES=	fonts
 CFLAGS+=	-Wno-return-type
 PORTDOCS=	README.kt README.wallpaper.ja dot.termcap
diff --git a/japanese/kterm/distinfo b/japanese/kterm/distinfo
index 1d63dd2700fd..6ee876300d38 100644
--- a/japanese/kterm/distinfo
+++ b/japanese/kterm/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1478296221
+TIMESTAMP = 1487003137
 SHA256 (kterm/pcemu1.01alpha.tar.gz) = 0936d3e3b8b6ef36078b40983d10b66971206142ab489c096cc29e94b17852ea
 SIZE (kterm/pcemu1.01alpha.tar.gz) = 316257
-SHA256 (kterm/hrs-allbsd-kterm-6.2.0-v6.2.0.fb6_GH0.tar.gz) = 8ebde513d5d765b43c4a8ac44f8e4b8dc452871f661fd7311c20955cf124d487
-SIZE (kterm/hrs-allbsd-kterm-6.2.0-v6.2.0.fb6_GH0.tar.gz) = 276713
+SHA256 (kterm/hrs-allbsd-kterm-v6.2.0.fb6_GH0.tar.gz) = 8ebde513d5d765b43c4a8ac44f8e4b8dc452871f661fd7311c20955cf124d487
+SIZE (kterm/hrs-allbsd-kterm-v6.2.0.fb6_GH0.tar.gz) = 276713
diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
index 30e5ef702a07..addbec315708 100644
--- a/net-im/tox/Makefile
+++ b/net-im/tox/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	toxcore
 PORTVERSION=	0.1.5
+DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	net-im net-p2p
 
@@ -23,7 +24,6 @@ TEST_DEPENDS=	${LOCALBASE}/lib/libmsgpackc.so:devel/msgpack	\
 USE_GITHUB=	yes
 GH_ACCOUNT=	TokTok
 GH_PROJECT=	c-toxcore
-GH_TAGNAME=	v${PORTVERSION}
 
 USES=		cmake compiler:c11 libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
diff --git a/net-im/tox/distinfo b/net-im/tox/distinfo
index 05952fddd9fc..a842cdd18248 100644
--- a/net-im/tox/distinfo
+++ b/net-im/tox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484935862
-SHA256 (TokTok-c-toxcore-0.1.5-v0.1.5_GH0.tar.gz) = 32ee841e91594a95d6193e4a29d61b0935e4e145ffb2ddb9009c7d79ff9efa3b
-SIZE (TokTok-c-toxcore-0.1.5-v0.1.5_GH0.tar.gz) = 431390
+TIMESTAMP = 1487003216
+SHA256 (TokTok-c-toxcore-v0.1.5_GH0.tar.gz) = 32ee841e91594a95d6193e4a29d61b0935e4e145ffb2ddb9009c7d79ff9efa3b
+SIZE (TokTok-c-toxcore-v0.1.5_GH0.tar.gz) = 431390
diff --git a/net-im/toxic/Makefile b/net-im/toxic/Makefile
index 15648e7dba5b..4abaa1db9019 100644
--- a/net-im/toxic/Makefile
+++ b/net-im/toxic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	toxic
 PORTVERSION=	0.7.2
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -25,7 +26,6 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	JFreegman
-GH_TAGNAME=	v${PORTVERSION}
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
diff --git a/net-im/toxic/distinfo b/net-im/toxic/distinfo
index 7e114f84a425..d0ebe5b44121 100644
--- a/net-im/toxic/distinfo
+++ b/net-im/toxic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482090212
-SHA256 (JFreegman-toxic-0.7.2-v0.7.2_GH0.tar.gz) = a2962aca766caf84b52a52e9a5ce2276a9d3906685f565d2a00551e7c2916c59
-SIZE (JFreegman-toxic-0.7.2-v0.7.2_GH0.tar.gz) = 1136947
+TIMESTAMP = 1487003244
+SHA256 (JFreegman-toxic-v0.7.2_GH0.tar.gz) = a2962aca766caf84b52a52e9a5ce2276a9d3906685f565d2a00551e7c2916c59
+SIZE (JFreegman-toxic-v0.7.2_GH0.tar.gz) = 1136947
diff --git a/net/luasocket/Makefile b/net/luasocket/Makefile
index bd4633ba836c..8ebe5d4d8600 100644
--- a/net/luasocket/Makefile
+++ b/net/luasocket/Makefile
@@ -2,8 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	luasocket
-PORTVERSION=	3.0r1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.0-rc1
 PORTREVISION=	2
+PORTEPOCH=	1
 CATEGORIES=	net
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
@@ -15,7 +17,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	diegonehab
-GH_TAGNAME=	v3.0-rc1
 
 MAKE_ARGS=	LUA_VER=${LUA_VER}
 USES=		gmake lua:51 pkgconfig
diff --git a/net/luasocket/distinfo b/net/luasocket/distinfo
index cf2445288ac2..f328bd7e0169 100644
--- a/net/luasocket/distinfo
+++ b/net/luasocket/distinfo
@@ -1,2 +1,3 @@
-SHA256 (diegonehab-luasocket-3.0r1-v3.0-rc1_GH0.tar.gz) = 8b67d9b5b545e1b694753dab7bd6cdbc24c290f2b21ba1e14c77b32817ea1249
-SIZE (diegonehab-luasocket-3.0r1-v3.0-rc1_GH0.tar.gz) = 328598
+TIMESTAMP = 1487003644
+SHA256 (diegonehab-luasocket-v3.0-rc1_GH0.tar.gz) = 8b67d9b5b545e1b694753dab7bd6cdbc24c290f2b21ba1e14c77b32817ea1249
+SIZE (diegonehab-luasocket-v3.0-rc1_GH0.tar.gz) = 328598
diff --git a/sysutils/filewatcherd/Makefile b/sysutils/filewatcherd/Makefile
index 199732434a8b..512d0b8dfdba 100644
--- a/sysutils/filewatcherd/Makefile
+++ b/sysutils/filewatcherd/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	filewatcherd
-PORTVERSION=	1.0b3
+DISTVERSION=	1.0-beta3
+PORTEPOCH=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	natbsd@instinctive.eu
@@ -13,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	faelys
-GH_TAGNAME=	1.0-beta3
 
 USE_RC_SUBR=	filewatcherd
 
diff --git a/sysutils/filewatcherd/distinfo b/sysutils/filewatcherd/distinfo
index 76220a568270..0c535cff9dbd 100644
--- a/sysutils/filewatcherd/distinfo
+++ b/sysutils/filewatcherd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (faelys-filewatcherd-1.0b3-1.0-beta3_GH0.tar.gz) = c15351b1eabf94b8edd598b2b992ab571a15690f8de11d48209468c4e4008aa5
-SIZE (faelys-filewatcherd-1.0b3-1.0-beta3_GH0.tar.gz) = 14301
+TIMESTAMP = 1487003587
+SHA256 (faelys-filewatcherd-1.0-beta3_GH0.tar.gz) = c15351b1eabf94b8edd598b2b992ab571a15690f8de11d48209468c4e4008aa5
+SIZE (faelys-filewatcherd-1.0-beta3_GH0.tar.gz) = 14301
diff --git a/sysutils/pcapfix/Makefile b/sysutils/pcapfix/Makefile
index 2b05dd960891..36d71fda3cec 100644
--- a/sysutils/pcapfix/Makefile
+++ b/sysutils/pcapfix/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pcapfix
 PORTVERSION=	1.1.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
 MAINTAINER=	vidar@karlsen.tech
@@ -13,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Rup0rt
-GH_TAGNAME=	v1.1.0
 
 PLIST_FILES=	bin/pcapfix man/man1/pcapfix.1.gz
 
diff --git a/sysutils/pcapfix/distinfo b/sysutils/pcapfix/distinfo
index 158a117d6788..cbb9422b6b5a 100644
--- a/sysutils/pcapfix/distinfo
+++ b/sysutils/pcapfix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486934418
-SHA256 (Rup0rt-pcapfix-1.1.0-v1.1.0_GH0.tar.gz) = c77cad858e85dd4509aa5a6a8019f8aba389aa95ae1edfbf7d7ea4c02bbfb238
-SIZE (Rup0rt-pcapfix-1.1.0-v1.1.0_GH0.tar.gz) = 40302
+TIMESTAMP = 1487002745
+SHA256 (Rup0rt-pcapfix-v1.1.0_GH0.tar.gz) = c77cad858e85dd4509aa5a6a8019f8aba389aa95ae1edfbf7d7ea4c02bbfb238
+SIZE (Rup0rt-pcapfix-v1.1.0_GH0.tar.gz) = 40302
diff --git a/sysutils/zfsnap2/Makefile b/sysutils/zfsnap2/Makefile
index fbe428ac4f65..dee524ffef40 100644
--- a/sysutils/zfsnap2/Makefile
+++ b/sysutils/zfsnap2/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NO_BUILD=	yes
 USE_GITHUB=	yes
-GH_TAGNAME=	v${DISTVERSION}	
 
 OPTIONS_DEFINE=		BASH ZSH
 OPTIONS_DEFAULT=	BASH ZSH
diff --git a/www/varnish-libvmod-awsrest/Makefile b/www/varnish-libvmod-awsrest/Makefile
index 8935d3e5eae5..c20c53b5a390 100644
--- a/www/varnish-libvmod-awsrest/Makefile
+++ b/www/varnish-libvmod-awsrest/Makefile
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	libvmod-awsrest
-DISTVERSIONPREFIX=${PORTNAME}-
+DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4
+DISTVERSIONSUFFIX=	-varnish40
 CATEGORIES=	www
 PKGNAMEPREFIX=	varnish-
 
@@ -22,6 +23,5 @@ INSTALL_TARGET=	install-strip
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xcir
-GH_TAGNAME=	v${DISTVERSION}-varnish40
 
 .include <bsd.port.mk>
diff --git a/www/varnish-libvmod-awsrest/distinfo b/www/varnish-libvmod-awsrest/distinfo
index db9c16be0423..40ca82dcc5dc 100644
--- a/www/varnish-libvmod-awsrest/distinfo
+++ b/www/varnish-libvmod-awsrest/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477523902
-SHA256 (xcir-libvmod-awsrest-libvmod-awsrest-0.4-v0.4-varnish40_GH0.tar.gz) = d5804479765c8e8be81d87fc48f736ab84aa9c7893b616ad30c2856a279006d7
-SIZE (xcir-libvmod-awsrest-libvmod-awsrest-0.4-v0.4-varnish40_GH0.tar.gz) = 9658
+TIMESTAMP = 1487003798
+SHA256 (xcir-libvmod-awsrest-v0.4-varnish40_GH0.tar.gz) = d5804479765c8e8be81d87fc48f736ab84aa9c7893b616ad30c2856a279006d7
+SIZE (xcir-libvmod-awsrest-v0.4-varnish40_GH0.tar.gz) = 9658