27 files changed, 50 insertions, 48 deletions

diff --git a/devel/cherivis-devel/Makefile b/devel/cherivis-devel/Makefile
index e94b74944b08..c45f0c66080f 100644
--- a/devel/cherivis-devel/Makefile
+++ b/devel/cherivis-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cherivis-devel
 PORTVERSION=	0.4
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel gnustep
 
 MAINTAINER=	theraven@FreeBSD.org
@@ -15,7 +16,6 @@ USES=		gnustep
 USE_GITHUB=	yes
 GH_ACCOUNT=	CTSRD-CHERI
 GH_PROJECT=	CheriVis
-GH_TAGNAME=	98c6c04
 
 LIB_DEPENDS+=	libcheritrace.so:devel/cheritrace-devel
 
diff --git a/devel/cherivis-devel/distinfo b/devel/cherivis-devel/distinfo
index bc0509e7d6df..b5f3b76e295f 100644
--- a/devel/cherivis-devel/distinfo
+++ b/devel/cherivis-devel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (CTSRD-CHERI-CheriVis-0.4-98c6c04_GH0.tar.gz) = 3afb838b16c968eab98b3e7b2c2f00678d5d4f7b1087431273dc92a6a568cd38
-SIZE (CTSRD-CHERI-CheriVis-0.4-98c6c04_GH0.tar.gz) = 519466
+TIMESTAMP = 1464769956
+SHA256 (CTSRD-CHERI-CheriVis-v0.4_GH0.tar.gz) = 507539f335e8ec7f4fb4127ad179cb200c50e28664d0d4d27991431cee5f9ebe
+SIZE (CTSRD-CHERI-CheriVis-v0.4_GH0.tar.gz) = 519445
diff --git a/devel/go-btree/Makefile b/devel/go-btree/Makefile
index d03235663a76..28890111d2f9 100644
--- a/devel/go-btree/Makefile
+++ b/devel/go-btree/Makefile
@@ -14,9 +14,8 @@ LICENSE=	APACHE20
 USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
-GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	cc6329d
 
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/go-flags/Makefile b/devel/go-flags/Makefile
index 80c928abce55..59d8965215e4 100644
--- a/devel/go-flags/Makefile
+++ b/devel/go-flags/Makefile
@@ -1,10 +1,9 @@
 # Created by: Akinori MUSHA aka knu <knu@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	flags
+PORTNAME=	go-flags
 PORTVERSION=	1.0.0.20160227
 CATEGORIES=	devel
-PKGNAMEPREFIX=	go-
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Go command line option parser
@@ -14,9 +13,8 @@ LICENSE=	BSD3CLAUSE
 USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	jessevdk
-GH_PROJECT=	${PKGNAMEPREFIX}${PORTNAME}
 GH_TAGNAME=	6b9493b3
 
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/go-hashicorp-logutils/Makefile b/devel/go-hashicorp-logutils/Makefile
index 576e85df46bf..5330c1a5dae2 100644
--- a/devel/go-hashicorp-logutils/Makefile
+++ b/devel/go-hashicorp-logutils/Makefile
@@ -1,8 +1,9 @@
 # Created by: Thomas Bartelmess <thomas@bartelmess.io>
 # $FreeBSD$
 
-PORTNAME=	go-hachicorp-logutils
+PORTNAME=	logutils
 PORTVERSION=	0.1
+PKGNAMEPREFIX=	go-${GH_ACCOUNT}-
 CATEGORIES=	devel
 
 MAINTAINER=	thomas@bartelmess.io
@@ -13,9 +14,8 @@ LICENSE=	BSD2CLAUSE
 USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
-GH_PROJECT=	logutils
 GH_TAGNAME=	8e0820f
 
-GO_PKGNAME=	github.com/hashicorp/logutils
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/go-runewidth/Makefile b/devel/go-runewidth/Makefile
index 587de89e6386..8782ef97b73b 100644
--- a/devel/go-runewidth/Makefile
+++ b/devel/go-runewidth/Makefile
@@ -1,10 +1,9 @@
 # Created by: Akinori MUSHA aka knu <knu@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	runewidth
+PORTNAME=	go-runewidth
 PORTVERSION=	0.0.1
 CATEGORIES=	devel
-PKGNAMEPREFIX=	go-
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Go library to get the fixed width of a character or string
@@ -14,9 +13,8 @@ LICENSE=	MIT
 USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	mattn
-GH_PROJECT=	${PKGNAMEPREFIX}${PORTNAME}
 GH_TAGNAME=	d6bea18f
 
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/gpm/Makefile b/devel/gpm/Makefile
index 4cc92069db1a..ebc542190a75 100644
--- a/devel/gpm/Makefile
+++ b/devel/gpm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gpm
 PORTVERSION=	1.4.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	lukejee@gmail.com
@@ -16,7 +17,6 @@ RUN_DEPENDS=	bash:shells/bash \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pote
-GH_TAGNAME=	fef7bf2
 
 NO_BUILD=	yes
 
diff --git a/devel/gpm/distinfo b/devel/gpm/distinfo
index 8325a85826d3..e25170bd3651 100644
--- a/devel/gpm/distinfo
+++ b/devel/gpm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pote-gpm-1.4.0-fef7bf2_GH0.tar.gz) = 64446d977e6b9edfecc03d112b2f6133b61380059ee663339c8b27c5cea34893
-SIZE (pote-gpm-1.4.0-fef7bf2_GH0.tar.gz) = 1115874
+TIMESTAMP = 1464771400
+SHA256 (pote-gpm-v1.4.0_GH0.tar.gz) = 2e213abbb1a12ecb895c3f02b74077d3440b7ae3221b4b524659c2ea9065b02a
+SIZE (pote-gpm-v1.4.0_GH0.tar.gz) = 1115858
diff --git a/devel/gvp/Makefile b/devel/gvp/Makefile
index bd657e954843..7efd077e3ae9 100644
--- a/devel/gvp/Makefile
+++ b/devel/gvp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gvp
 PORTVERSION=	0.3.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	lukejee@gmail.com
@@ -20,7 +21,6 @@ SHEBANG_FILES=	bin/gvp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pote
-GH_TAGNAME=	8bcab74
 
 NO_BUILD=	yes
 
diff --git a/devel/gvp/distinfo b/devel/gvp/distinfo
index 82eb666a823f..ebc7d1bda1ae 100644
--- a/devel/gvp/distinfo
+++ b/devel/gvp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pote-gvp-0.3.0-8bcab74_GH0.tar.gz) = 4c211a3c0bd652a589d7135c3f9fbe01aaff750200ca495f67514c613cae96ab
-SIZE (pote-gvp-0.3.0-8bcab74_GH0.tar.gz) = 2273871
+TIMESTAMP = 1464771459
+SHA256 (pote-gvp-v0.3.0_GH0.tar.gz) = e1fccefa76495293350d47d197352a63cae6a014d8d28ebdedb785d4304ee338
+SIZE (pote-gvp-v0.3.0_GH0.tar.gz) = 2273863
diff --git a/devel/libbrotli/Makefile b/devel/libbrotli/Makefile
index f114951e42cd..f8cda081fd63 100644
--- a/devel/libbrotli/Makefile
+++ b/devel/libbrotli/Makefile
@@ -27,7 +27,7 @@ USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}
 
 post-extract:
-	${RMDIR} ${WRKSRC}/brotli && ${MV} ${WRKDIR}/brotli-${BROTLI_VERSION} ${WRKSRC}/brotli
+	${RMDIR} ${WRKSRC}/brotli && ${MV} ${WRKSRC_brotli} ${WRKSRC}/brotli
 
 pre-configure:
 	cd ${WRKSRC} && ./autogen.sh
diff --git a/devel/libeio/Makefile b/devel/libeio/Makefile
index 44709de131df..9850ae9fa821 100644
--- a/devel/libeio/Makefile
+++ b/devel/libeio/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	libeio
-PORTVERSION=	4.18.0
+PORTVERSION=	4.18
+DISTVERSIONPREFIX=	${PORTNAME}-
 PORTREVISION=	2
 CATEGORIES=	devel
 
@@ -11,7 +12,6 @@ COMMENT=	Full-featured asynchronous I/O library for C
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	scunningham
-GH_TAGNAME=	e1a62ab
 USES=		alias autoreconf libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/libeio/distinfo b/devel/libeio/distinfo
index 867db323c196..8297e38ea7b8 100644
--- a/devel/libeio/distinfo
+++ b/devel/libeio/distinfo
@@ -1,2 +1,3 @@
-SHA256 (scunningham-libeio-4.18.0-e1a62ab_GH0.tar.gz) = 94cef0436dd48757a48a498ca020d5fc7eb23dbb8b523fded7bcb23be899748a
-SIZE (scunningham-libeio-4.18.0-e1a62ab_GH0.tar.gz) = 94765
+TIMESTAMP = 1464772071
+SHA256 (scunningham-libeio-libeio-4.18_GH0.tar.gz) = ee5f8300cc211120b568df0aa401560f8de2accb3427d8962b018747687fa4d4
+SIZE (scunningham-libeio-libeio-4.18_GH0.tar.gz) = 94772
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index 16985cb77a5e..03ed1fa0963e 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libical
 PORTVERSION=	1.0.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -12,7 +13,6 @@ LICENSE_COMB=	dual
 LICENSE=	MPL LGPL21
 
 USE_GITHUB=	yes
-GH_TAGNAME=	da69aae
 
 USES=		cmake pathfix perl5
 USE_PERL5=	build
diff --git a/devel/libical/distinfo b/devel/libical/distinfo
index 7f37158a0060..15509a6f9687 100644
--- a/devel/libical/distinfo
+++ b/devel/libical/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libical-libical-1.0.1-da69aae_GH0.tar.gz) = 78d8ea85ac29ca028115e023b604adbec9dd8547138c574709cc85b20ff70e38
-SIZE (libical-libical-1.0.1-da69aae_GH0.tar.gz) = 720639
+TIMESTAMP = 1464772258
+SHA256 (libical-libical-v1.0.1_GH0.tar.gz) = 7d5f613454ec6c7d1bcfb441c919215be53292aa15cd1cb14249d1413d6c610c
+SIZE (libical-libical-v1.0.1_GH0.tar.gz) = 720618
diff --git a/devel/ocaml-camlp4/Makefile b/devel/ocaml-camlp4/Makefile
index 80bbe388140d..38d4fa5f43f8 100644
--- a/devel/ocaml-camlp4/Makefile
+++ b/devel/ocaml-camlp4/Makefile
@@ -14,7 +14,6 @@ LICENSE=	LGPL20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ocaml
-GH_TAGNAME=	bdd88a1
 
 USES=		gmake
 USE_OCAML=	yes
diff --git a/devel/ocaml-camlp4/distinfo b/devel/ocaml-camlp4/distinfo
index 665c44c13f82..dafc83be6c4b 100644
--- a/devel/ocaml-camlp4/distinfo
+++ b/devel/ocaml-camlp4/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ocaml-camlp4-4.02.1+1-bdd88a1_GH0.tar.gz) = 950f55e96ca5acf8c20085c3132e8e2aa40efb792fc4a2aeea3ad1b24b382d94
-SIZE (ocaml-camlp4-4.02.1+1-bdd88a1_GH0.tar.gz) = 645735
+TIMESTAMP = 1464772487
+SHA256 (ocaml-camlp4-4.02.1+1_GH0.tar.gz) = 06ec2c075a3960a757ba133bba468f06622624f9a44e18e3de7d609fa06f62d2
+SIZE (ocaml-camlp4-4.02.1+1_GH0.tar.gz) = 645754
diff --git a/devel/php-maxminddb/Makefile b/devel/php-maxminddb/Makefile
index 057d7e55ee7c..789e4b7db711 100644
--- a/devel/php-maxminddb/Makefile
+++ b/devel/php-maxminddb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	maxminddb
 PORTVERSION=	1.1.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel net
 PKGNAMEPREFIX=	php-
 
@@ -19,7 +20,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
 GH_PROJECT=	MaxMind-DB-Reader-php
-GH_TAGNAME=	1383655
 
 WRKSRC_SUBDIR=	ext
 
diff --git a/devel/php-maxminddb/distinfo b/devel/php-maxminddb/distinfo
index 71c178de8c27..4cef1c7b8a97 100644
--- a/devel/php-maxminddb/distinfo
+++ b/devel/php-maxminddb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (maxmind-MaxMind-DB-Reader-php-1.1.0-1383655_GH0.tar.gz) = a4870204292d89b0701aea62a33d439ff3038133f5247f0a6c5cf47fba5115e4
-SIZE (maxmind-MaxMind-DB-Reader-php-1.1.0-1383655_GH0.tar.gz) = 24797
+TIMESTAMP = 1464772539
+SHA256 (maxmind-MaxMind-DB-Reader-php-v1.1.0_GH0.tar.gz) = 0c80f55bc56dd8f26b04358b5533f78adcb060f721b4347f510cbf43f32848b4
+SIZE (maxmind-MaxMind-DB-Reader-php-v1.1.0_GH0.tar.gz) = 24785
diff --git a/devel/py-appdirs/Makefile b/devel/py-appdirs/Makefile
index 2a3c9c9d059d..403df8e79118 100644
--- a/devel/py-appdirs/Makefile
+++ b/devel/py-appdirs/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ActiveState
-GH_TAGNAME=	57f2bc4
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-appdirs/distinfo b/devel/py-appdirs/distinfo
index f29601a77cd0..38a6e35374df 100644
--- a/devel/py-appdirs/distinfo
+++ b/devel/py-appdirs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ActiveState-appdirs-1.4.0-57f2bc4_GH0.tar.gz) = 01c90e35d5f322b0d5ec6029087daac11c248d554b499609eefa8de0afd12159
-SIZE (ActiveState-appdirs-1.4.0-57f2bc4_GH0.tar.gz) = 12102
+TIMESTAMP = 1464772634
+SHA256 (ActiveState-appdirs-1.4.0_GH0.tar.gz) = cb7dc301b950e9ed061c86aa23febcc9427ec53592085752be3cb560e5b8db17
+SIZE (ActiveState-appdirs-1.4.0_GH0.tar.gz) = 12108
diff --git a/devel/py-kitchen/Makefile b/devel/py-kitchen/Makefile
index 3255c9605558..38eecbf357d3 100644
--- a/devel/py-kitchen/Makefile
+++ b/devel/py-kitchen/Makefile
@@ -13,7 +13,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fedora-infra
-GH_TAGNAME=	6fe82c9
 USES=		python
 USE_PYTHON=	distutils autoplist
 
diff --git a/devel/py-kitchen/distinfo b/devel/py-kitchen/distinfo
index 5dd625365405..046b2d0e1d8d 100644
--- a/devel/py-kitchen/distinfo
+++ b/devel/py-kitchen/distinfo
@@ -1,2 +1,3 @@
-SHA256 (fedora-infra-kitchen-1.2.4-6fe82c9_GH0.tar.gz) = a83eff9975ea7f17137130413b1aa4c9105067f95f153c096a685d907462e500
-SIZE (fedora-infra-kitchen-1.2.4-6fe82c9_GH0.tar.gz) = 257429
+TIMESTAMP = 1464772761
+SHA256 (fedora-infra-kitchen-1.2.4_GH0.tar.gz) = 8a23652c4f35efc67ecfee47182290145abe66431218d9cd0ed2c0c598457df9
+SIZE (fedora-infra-kitchen-1.2.4_GH0.tar.gz) = 257399
diff --git a/devel/py-usb/Makefile b/devel/py-usb/Makefile
index ffaf73587551..1c4e1c479831 100644
--- a/devel/py-usb/Makefile
+++ b/devel/py-usb/Makefile
@@ -17,7 +17,6 @@ USE_PYTHON=	autoplist concurrent distutils
 USE_GITHUB=	yes
 GH_ACCOUNT=	walac
 GH_PROJECT=	py${PORTNAME}
-GH_TAGNAME=	0546cad
 
 PORTDOCS=	*.rst
 
diff --git a/devel/py-usb/distinfo b/devel/py-usb/distinfo
index ab41376b4c4e..43e4d5946566 100644
--- a/devel/py-usb/distinfo
+++ b/devel/py-usb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (walac-pyusb-1.0.0b1-0546cad_GH0.tar.gz) = 8ae05f20f4a936a2d7e0c7c00b3dca02361314c0f0b368421e24d3623bd382d3
-SIZE (walac-pyusb-1.0.0b1-0546cad_GH0.tar.gz) = 51131
+TIMESTAMP = 1464773009
+SHA256 (walac-pyusb-1.0.0b1_GH0.tar.gz) = 7b66c1444fbe59fff938753363b0a6b567de992f5b670b7a0a6c70cab7701688
+SIZE (walac-pyusb-1.0.0b1_GH0.tar.gz) = 51126
diff --git a/devel/uthash/Makefile b/devel/uthash/Makefile
index 14c9db15c332..36830b56972c 100644
--- a/devel/uthash/Makefile
+++ b/devel/uthash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	uthash
 PORTVERSION=	1.9.9
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	zi@FreeBSD.org
@@ -18,7 +19,6 @@ OPTIONS_DEFINE=	DOCS
 NO_BUILD=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	troydhanson
-GH_TAGNAME=	bac80b2
 
 PORTDOCS=	ChangeLog.txt todo.txt userguide.txt utarray.txt \
 		utlist.txt utstring.txt
diff --git a/devel/uthash/distinfo b/devel/uthash/distinfo
index 71ded8d4a380..3b29a2c44944 100644
--- a/devel/uthash/distinfo
+++ b/devel/uthash/distinfo
@@ -1,2 +1,3 @@
-SHA256 (troydhanson-uthash-1.9.9-bac80b2_GH0.tar.gz) = 24024bf5dc4a26e88f2690e4d56f90b69b48c27422fa62fd2e41474b4022b6fb
-SIZE (troydhanson-uthash-1.9.9-bac80b2_GH0.tar.gz) = 225612
+TIMESTAMP = 1464773346
+SHA256 (troydhanson-uthash-v1.9.9_GH0.tar.gz) = f2f10115f4de03b98d8c2e860e241d165aa15019bd634ee0e3debe58341bbf0c
+SIZE (troydhanson-uthash-v1.9.9_GH0.tar.gz) = 225620