34 files changed, 34 insertions, 49 deletions

diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index 970223617f89..fd367cd6ac86 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	murmur
 PORTVERSION=	1.2.10
 PORTREVISION=	1
 CATEGORIES=	audio net
-DISTNAME=	mumble-${PORTVERSION}
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Murmur is the server component of Mumble
diff --git a/audio/murmur/distinfo b/audio/murmur/distinfo
index 0d8085829b9a..e88ddd94da19 100644
--- a/audio/murmur/distinfo
+++ b/audio/murmur/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mumble-1.2.10_GH0.tar.gz) = 8eb14d03b67d2f83d894b05f79125fe7a1b1798078d5821744d9a3de38d7d2ef
-SIZE (mumble-1.2.10_GH0.tar.gz) = 3309556
+SHA256 (mumble-voip-mumble-1.2.10_GH0.tar.gz) = 8eb14d03b67d2f83d894b05f79125fe7a1b1798078d5821744d9a3de38d7d2ef
+SIZE (mumble-voip-mumble-1.2.10_GH0.tar.gz) = 3309556
diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile
index bd1c15328405..84d9a52412cd 100644
--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@@ -7,7 +7,6 @@ DISTVERSIONPREFIX=	v
 PORTREVISION=	3
 CATEGORIES=	audio
 PKGNAMEPREFIX=	mythplugin-
-DISTNAME=	mythtv-${PORTVERSION}
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Music playing plugin for MythTV
diff --git a/audio/mythplugin-mythmusic/distinfo b/audio/mythplugin-mythmusic/distinfo
index cbf3c59be95c..dac44ef3af0d 100644
--- a/audio/mythplugin-mythmusic/distinfo
+++ b/audio/mythplugin-mythmusic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mythtv-0.27_GH0.tar.gz) = 494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0
-SIZE (mythtv-0.27_GH0.tar.gz) = 85904162
+SHA256 (MythTV-mythtv-v0.27_GH0.tar.gz) = 494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0
+SIZE (MythTV-mythtv-v0.27_GH0.tar.gz) = 85904162
diff --git a/audio/py-mpd2/Makefile b/audio/py-mpd2/Makefile
index 391b7a912cfd..e53e73e935f0 100644
--- a/audio/py-mpd2/Makefile
+++ b/audio/py-mpd2/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.5.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	audio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rene@FreeBSD.org
 COMMENT=	Fork of the Python MPD client library
diff --git a/audio/py-mpd2/distinfo b/audio/py-mpd2/distinfo
index ae766292c192..3706fe0177b1 100644
--- a/audio/py-mpd2/distinfo
+++ b/audio/py-mpd2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python-mpd2-0.5.4_GH0.tar.gz) = 04dbc3b8d90746298e42852c5b7fb5be5e7af2ca03e812059639b6c060d98c53
-SIZE (python-mpd2-0.5.4_GH0.tar.gz) = 45542
+SHA256 (Mic92-python-mpd2-v0.5.4_GH0.tar.gz) = 04dbc3b8d90746298e42852c5b7fb5be5e7af2ca03e812059639b6c060d98c53
+SIZE (Mic92-python-mpd2-v0.5.4_GH0.tar.gz) = 45542
diff --git a/benchmarks/wrk/Makefile b/benchmarks/wrk/Makefile
index 3e61aad80265..848379226368 100644
--- a/benchmarks/wrk/Makefile
+++ b/benchmarks/wrk/Makefile
@@ -5,8 +5,6 @@ PORTNAME=	wrk
 PORTVERSION=	4.0.1
 PORTREVISION=	3
 CATEGORIES=	benchmarks www
-DISTNAME=	${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	Modern HTTP benchmarking tool
diff --git a/benchmarks/wrk/distinfo b/benchmarks/wrk/distinfo
index 4af76b6246f7..a14b22cb0f61 100644
--- a/benchmarks/wrk/distinfo
+++ b/benchmarks/wrk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wrk/4.0.1_GH0.tar.gz) = c03bbc283836cb4b706eb6bfd18e724a8ce475e2c16154c13c6323a845b4327d
-SIZE (wrk/4.0.1_GH0.tar.gz) = 903500
+SHA256 (wg-wrk-4.0.1_GH0.tar.gz) = c03bbc283836cb4b706eb6bfd18e724a8ce475e2c16154c13c6323a845b4327d
+SIZE (wg-wrk-4.0.1_GH0.tar.gz) = 903500
diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile
index 21213f45f950..9ee8d1feffba 100644
--- a/comms/svxlink/Makefile
+++ b/comms/svxlink/Makefile
@@ -4,7 +4,6 @@
 PORTNAME?=	svxlink
 PORTVERSION=	14.08
 CATEGORIES=	comms hamradio
-DISTNAME=	svxlink-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT?=	General purpose ham radio voice services
diff --git a/comms/svxlink/distinfo b/comms/svxlink/distinfo
index ad527c54a26b..805d1729f40a 100644
--- a/comms/svxlink/distinfo
+++ b/comms/svxlink/distinfo
@@ -1,2 +1,2 @@
-SHA256 (svxlink-14.08_GH0.tar.gz) = c6007f6e71b8df91c6674ed3ce5805437e3c56c40c00a82a937d9658b0819124
-SIZE (svxlink-14.08_GH0.tar.gz) = 1506526
+SHA256 (sm0svx-svxlink-14.08_GH0.tar.gz) = c6007f6e71b8df91c6674ed3ce5805437e3c56c40c00a82a937d9658b0819124
+SIZE (sm0svx-svxlink-14.08_GH0.tar.gz) = 1506526
diff --git a/databases/postgresql-plv8js/Makefile b/databases/postgresql-plv8js/Makefile
index 18acb11f5800..25404b0ef341 100644
--- a/databases/postgresql-plv8js/Makefile
+++ b/databases/postgresql-plv8js/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.4.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
-DISTNAME=	plv8-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	PL/v8js procedural language for PostgreSQL database
diff --git a/databases/postgresql-plv8js/distinfo b/databases/postgresql-plv8js/distinfo
index 18da54bd35ac..7d5774c2d425 100644
--- a/databases/postgresql-plv8js/distinfo
+++ b/databases/postgresql-plv8js/distinfo
@@ -1,2 +1,2 @@
-SHA256 (plv8-1.4.4_GH0.tar.gz) = 5eed6438da1208cc9f46fac501e0fd974062185c342805af5d8aada3ab442a1e
-SIZE (plv8-1.4.4_GH0.tar.gz) = 155693
+SHA256 (plv8-plv8js-v1.4.4_GH0.tar.gz) = 5eed6438da1208cc9f46fac501e0fd974062185c342805af5d8aada3ab442a1e
+SIZE (plv8-plv8js-v1.4.4_GH0.tar.gz) = 155693
diff --git a/databases/py-mysql2pgsql/Makefile b/databases/py-mysql2pgsql/Makefile
index 4941f7044829..32a76c6213cd 100644
--- a/databases/py-mysql2pgsql/Makefile
+++ b/databases/py-mysql2pgsql/Makefile
@@ -6,7 +6,6 @@ DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	py-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	c.kworr@gmail.com
 COMMENT=	Tool for migrating/converting from MySQL to PostgreSQL
diff --git a/databases/py-mysql2pgsql/distinfo b/databases/py-mysql2pgsql/distinfo
index 92351db56aa4..0d61952c8893 100644
--- a/databases/py-mysql2pgsql/distinfo
+++ b/databases/py-mysql2pgsql/distinfo
@@ -1,2 +1,2 @@
-SHA256 (py-mysql2pgsql-0.1.6_GH0.tar.gz) = 56b5d2b6a3b51ccf054541e73b292656a35231be2521232af04e5508f29249ae
-SIZE (py-mysql2pgsql-0.1.6_GH0.tar.gz) = 107260
+SHA256 (philipsoutham-py-mysql2pgsql-v0.1.6_GH0.tar.gz) = 56b5d2b6a3b51ccf054541e73b292656a35231be2521232af04e5508f29249ae
+SIZE (philipsoutham-py-mysql2pgsql-v0.1.6_GH0.tar.gz) = 107260
diff --git a/devel/cask/Makefile b/devel/cask/Makefile
index 19d140cece21..787801fa1b65 100644
--- a/devel/cask/Makefile
+++ b/devel/cask/Makefile
@@ -5,7 +5,6 @@ PORTVERSION=	0.7.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	3
 CATEGORIES=	devel elisp
-DISTNAME=	cask-v${PORTVERSION}
 
 MAINTAINER=	rpaulo@FreeBSD.org
 COMMENT=	Project management tool for Emacs
diff --git a/devel/cask/distinfo b/devel/cask/distinfo
index 1d724c144fc7..6ec558334d8b 100644
--- a/devel/cask/distinfo
+++ b/devel/cask/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cask-v0.7.0_GH0.tar.gz) = 78fd87ae133123ccbdc9626d0e206672a7126c2bf98438de7ffa15c877237990
-SIZE (cask-v0.7.0_GH0.tar.gz) = 234675
+SHA256 (cask-cask-v0.7.0_GH0.tar.gz) = 78fd87ae133123ccbdc9626d0e206672a7126c2bf98438de7ffa15c877237990
+SIZE (cask-cask-v0.7.0_GH0.tar.gz) = 234675
diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile
index 78c59f458b66..af66b7a2e99d 100644
--- a/devel/clojure-cider/Makefile
+++ b/devel/clojure-cider/Makefile
@@ -5,7 +5,6 @@ PORTVERSION=	0.7.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	devel elisp
-DISTNAME=	cider-${PORTVERSION}
 
 MAINTAINER=	rpaulo@FreeBSD.org
 COMMENT=	Clojure IDE and REPL for Emacs
diff --git a/devel/clojure-cider/distinfo b/devel/clojure-cider/distinfo
index f0c18c897e16..8750aa19d5ff 100644
--- a/devel/clojure-cider/distinfo
+++ b/devel/clojure-cider/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cider-0.7.0_GH0.tar.gz) = d68512fe893384cf1b9190d9bf6c57caccfe8986023ddb2e882ba817a32a65de
-SIZE (cider-0.7.0_GH0.tar.gz) = 252844
+SHA256 (clojure-emacs-cider-v0.7.0_GH0.tar.gz) = d68512fe893384cf1b9190d9bf6c57caccfe8986023ddb2e882ba817a32a65de
+SIZE (clojure-emacs-cider-v0.7.0_GH0.tar.gz) = 252844
diff --git a/devel/dash.el/Makefile b/devel/dash.el/Makefile
index 2b7eca5a8fd8..6be0b253ad87 100644
--- a/devel/dash.el/Makefile
+++ b/devel/dash.el/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	dash.el
 PORTVERSION=	2.11.0
 CATEGORIES=	devel elisp
-DISTNAME=	dash-${PORTVERSION}
 
 MAINTAINER=	rpaulo@FreeBSD.org
 COMMENT=	Modern list library for Emacs
diff --git a/devel/dash.el/distinfo b/devel/dash.el/distinfo
index 2699c71e9df8..d1753688fbe3 100644
--- a/devel/dash.el/distinfo
+++ b/devel/dash.el/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dash-2.11.0_GH0.tar.gz) = d888d34b9b86337c5740250f202e7f2efc3bf059b08a817a978bf54923673cde
-SIZE (dash-2.11.0_GH0.tar.gz) = 138461
+SHA256 (magnars-dash.el-2.11.0_GH0.tar.gz) = d888d34b9b86337c5740250f202e7f2efc3bf059b08a817a978bf54923673cde
+SIZE (magnars-dash.el-2.11.0_GH0.tar.gz) = 138461
diff --git a/devel/epl.el/Makefile b/devel/epl.el/Makefile
index d1c28fcbc470..f41c44b59889 100644
--- a/devel/epl.el/Makefile
+++ b/devel/epl.el/Makefile
@@ -4,7 +4,6 @@ PORTNAME=	epl.el
 PORTVERSION=	0.7
 PORTREVISION=	2
 CATEGORIES=	devel elisp
-DISTNAME=	epl-${PORTVERSION}
 
 MAINTAINER=	rpaulo@FreeBSD.org
 COMMENT=	Emacs Package Library
diff --git a/devel/epl.el/distinfo b/devel/epl.el/distinfo
index abe3ae83e233..212e80302825 100644
--- a/devel/epl.el/distinfo
+++ b/devel/epl.el/distinfo
@@ -1,2 +1,2 @@
-SHA256 (epl-0.7_GH0.tar.gz) = 9cde82f2b1b8243e8eab8146fcdae3e191cf291e734ef7e0ad4c820c7ad9020d
-SIZE (epl-0.7_GH0.tar.gz) = 66515
+SHA256 (cask-epl-0.7_GH0.tar.gz) = 9cde82f2b1b8243e8eab8146fcdae3e191cf291e734ef7e0ad4c820c7ad9020d
+SIZE (cask-epl-0.7_GH0.tar.gz) = 66515
diff --git a/devel/pkg-info.el/Makefile b/devel/pkg-info.el/Makefile
index f43887ccec36..051a142adaec 100644
--- a/devel/pkg-info.el/Makefile
+++ b/devel/pkg-info.el/Makefile
@@ -4,7 +4,6 @@ PORTNAME=	pkg-info.el
 PORTVERSION=	0.5
 PORTREVISION=	2
 CATEGORIES=	devel elisp
-DISTNAME=	pkg-info-${PORTVERSION}
 
 MAINTAINER=	rpaulo@FreeBSD.org
 COMMENT=	Provide information about Emacs packages
diff --git a/devel/pkg-info.el/distinfo b/devel/pkg-info.el/distinfo
index a8e80de4d263..26cf21861d94 100644
--- a/devel/pkg-info.el/distinfo
+++ b/devel/pkg-info.el/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-info-0.5_GH0.tar.gz) = f83d54c780ca5c916f7ff745b96f0db9b2507957ae1d048e91d61f73c17863e6
-SIZE (pkg-info-0.5_GH0.tar.gz) = 62779
+SHA256 (lunaryorn-pkg-info.el-0.5_GH0.tar.gz) = f83d54c780ca5c916f7ff745b96f0db9b2507957ae1d048e91d61f73c17863e6
+SIZE (lunaryorn-pkg-info.el-0.5_GH0.tar.gz) = 62779
diff --git a/devel/py-ua_parser/Makefile b/devel/py-ua_parser/Makefile
index 8b37599f4251..77c4bc43c5e9 100644
--- a/devel/py-ua_parser/Makefile
+++ b/devel/py-ua_parser/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	ua_parser
 PORTVERSION=	0.5.1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME:S/_/-/}-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Python port of Browserscope's user agent parser
diff --git a/devel/py-ua_parser/distinfo b/devel/py-ua_parser/distinfo
index f067bc03244e..26a8778e6a7b 100644
--- a/devel/py-ua_parser/distinfo
+++ b/devel/py-ua_parser/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ua-parser-0.5.1_GH0.tar.gz) = 1dc9f3209ec60d0902b0138c4b23a638648675bf5fee5b5efb89cdd36e40ac41
-SIZE (ua-parser-0.5.1_GH0.tar.gz) = 8572
+SHA256 (ua-parser-uap-python-0.5.1-ef275f5_GH0.tar.gz) = 1dc9f3209ec60d0902b0138c4b23a638648675bf5fee5b5efb89cdd36e40ac41
+SIZE (ua-parser-uap-python-0.5.1-ef275f5_GH0.tar.gz) = 8572
diff --git a/devel/ua_parser-core/Makefile b/devel/ua_parser-core/Makefile
index a787f760b309..113130a90ae6 100644
--- a/devel/ua_parser-core/Makefile
+++ b/devel/ua_parser-core/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	ua_parser
 PORTVERSION=	0.5.0
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-core
-DISTNAME=	${PORTNAME:S/_/-/}-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Regex file for building language ports of Browserscope's UA parser
diff --git a/devel/ua_parser-core/distinfo b/devel/ua_parser-core/distinfo
index 5e206cfb5efa..4b7d0456b3af 100644
--- a/devel/ua_parser-core/distinfo
+++ b/devel/ua_parser-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ua-parser-0.5.0_GH0.tar.gz) = 59ae573d508248f79e53375b841d616f9eafd4100ccadf1a1fdd93cb7dd8f05f
-SIZE (ua-parser-0.5.0_GH0.tar.gz) = 800601
+SHA256 (ua-parser-uap-core-0.5.0-8f44929_GH0.tar.gz) = 59ae573d508248f79e53375b841d616f9eafd4100ccadf1a1fdd93cb7dd8f05f
+SIZE (ua-parser-uap-core-0.5.0-8f44929_GH0.tar.gz) = 800601
diff --git a/lang/lfe/Makefile b/lang/lfe/Makefile
index 17c955fb54dd..78ad702f1b65 100644
--- a/lang/lfe/Makefile
+++ b/lang/lfe/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	lfe
 PORTVERSION=	0.9.2
 CATEGORIES=	lang
-DISTNAME=	v${PORTVERSION}
 
 MAINTAINER=	rpaulo@FreeBSD.org
 COMMENT=	Lisp Flavored Erlang
diff --git a/lang/lfe/distinfo b/lang/lfe/distinfo
index 8628c8332747..bafb350ae3ff 100644
--- a/lang/lfe/distinfo
+++ b/lang/lfe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (v0.9.2_GH0.tar.gz) = 9ff9661d03432a5f111266e56dcc24f24ceb633541f560333c3ff1acafc20794
-SIZE (v0.9.2_GH0.tar.gz) = 216777
+SHA256 (rvirding-lfe-0.9.2_GH0.tar.gz) = 9ff9661d03432a5f111266e56dcc24f24ceb633541f560333c3ff1acafc20794
+SIZE (rvirding-lfe-0.9.2_GH0.tar.gz) = 216777
diff --git a/multimedia/py-ffmpeg/Makefile b/multimedia/py-ffmpeg/Makefile
index 606e80e5e779..1473807e2417 100644
--- a/multimedia/py-ffmpeg/Makefile
+++ b/multimedia/py-ffmpeg/Makefile
@@ -7,6 +7,7 @@ PORTREVISION=	2
 CATEGORIES=	multimedia python
 MASTER_SITES=	GH LOCAL/dbn/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+# Should not be setting DISTNAME, USE_GITHUB already sets a very nice and unique distname.
 DISTNAME=	${PORTNAME}-android-${PORTVERSION}
 
 MAINTAINER=	dbn@FreeBSD.org
diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile
index 6fc50c867213..9a58696eb246 100644
--- a/net/zerotier/Makefile
+++ b/net/zerotier/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	zerotier
 DISTVERSION=	1.1.0
 CATEGORIES=	net
 MASTER_SITES=	GH
-DISTNAME=	ZeroTierOne
 
 MAINTAINER=	corsmith@gmail.com
 COMMENT=	Network virtualization everywhere
diff --git a/net/zerotier/distinfo b/net/zerotier/distinfo
index 95d541dfc8f2..3c6966a54842 100644
--- a/net/zerotier/distinfo
+++ b/net/zerotier/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ZeroTierOne_GH0.tar.gz) = 89976f251ed7d8cc3c0dba1ac5a031f2645cb29abc84d5cc2fda48a58c7f5ace
-SIZE (ZeroTierOne_GH0.tar.gz) = 5985459
+SHA256 (zerotier-ZeroTierOne-1.1.0-5db538d_GH0.tar.gz) = 89976f251ed7d8cc3c0dba1ac5a031f2645cb29abc84d5cc2fda48a58c7f5ace
+SIZE (zerotier-ZeroTierOne-1.1.0-5db538d_GH0.tar.gz) = 5985459
diff --git a/www/trac-subtickets/Makefile b/www/trac-subtickets/Makefile
index 4d01c203b286..4c9885c2a20c 100644
--- a/www/trac-subtickets/Makefile
+++ b/www/trac-subtickets/Makefile
@@ -7,6 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	http://distfiles.cse.tw/
 PKGNAMEPREFIX=	trac-
+# Should not be setting DISTNAME, USE_GITHUB already sets a very nice and unique distname.
 DISTNAME=	itota-trac-subtickets-plugin-a0fc153
 
 MAINTAINER=	gaod@hychen.org