aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2017-07-27 21:57:30 +0800
committermat <mat@FreeBSD.org>2017-07-27 21:57:30 +0800
commitef761d867a4effe724fc6502e01070707c94b6e4 (patch)
tree733b25142c70c3fa0536fb15cdce4a8b4d25d274
parent0723d7344257f1b8bc02b4989690babd929c1976 (diff)
downloadfreebsd-ports-gnome-ef761d867a4effe724fc6502e01070707c94b6e4.tar.gz
freebsd-ports-gnome-ef761d867a4effe724fc6502e01070707c94b6e4.tar.zst
freebsd-ports-gnome-ef761d867a4effe724fc6502e01070707c94b6e4.zip
Regular USE_GITHUB cleanup.
Sponsored by: Absolight
-rw-r--r--databases/galera/Makefile2
-rw-r--r--databases/galera/distinfo6
-rw-r--r--databases/mysqlwsrep56-server/Makefile2
-rw-r--r--databases/mysqlwsrep56-server/distinfo6
-rw-r--r--databases/mysqlwsrep57-server/Makefile2
-rw-r--r--databases/mysqlwsrep57-server/distinfo6
-rw-r--r--databases/pg_rman/Makefile5
-rw-r--r--devel/colorgcc/Makefile1
-rw-r--r--devel/go-sql-driver/Makefile1
-rw-r--r--devel/grpc/Makefile3
-rw-r--r--devel/libhyve-remote/Makefile2
-rw-r--r--emulators/open-vm-tools/Makefile2
-rw-r--r--emulators/open-vm-tools/distinfo6
-rw-r--r--games/endless-sky-high-dpi/Makefile4
-rw-r--r--graphics/pngwriter/Makefile1
-rw-r--r--japanese/mozc-server/Makefile4
-rw-r--r--lang/mono/Makefile2
-rw-r--r--lang/mono/distinfo6
-rw-r--r--mail/vexim/Makefile1
-rw-r--r--math/moo/Makefile1
-rw-r--r--math/wxMaxima/Makefile4
-rw-r--r--math/wxMaxima/distinfo6
-rw-r--r--net-mgmt/nrpe3/Makefile2
-rw-r--r--net-mgmt/nrpe3/distinfo6
-rw-r--r--net-p2p/btpd/Makefile1
-rw-r--r--net/drive/Makefile4
-rw-r--r--net/madonctl/Makefile4
-rw-r--r--security/proftpd-mod_clamav/Makefile2
28 files changed, 42 insertions, 50 deletions
diff --git a/databases/galera/Makefile b/databases/galera/Makefile
index 68824a74d385..7d2cabb39c92 100644
--- a/databases/galera/Makefile
+++ b/databases/galera/Makefile
@@ -3,6 +3,7 @@
PORTNAME= galera
PORTVERSION?= 25.3.21
+DISTVERSIONPREFIX?= release_
CATEGORIES= databases
MAINTAINER= devel@galeracluster.com
@@ -33,7 +34,6 @@ USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= codership
-GH_TAGNAME?= release_${DISTVERSION}
LDFLAGS+= -lboost_program_options -lboost_system
MAKE_ARGS+= revno=${GH_TAGNAME} system_asio=0 tests=0
diff --git a/databases/galera/distinfo b/databases/galera/distinfo
index 06ada66bc168..a437ee683482 100644
--- a/databases/galera/distinfo
+++ b/databases/galera/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499109333
-SHA256 (codership-galera-25.3.21-release_25.3.21_GH0.tar.gz) = dc0d8e9bcbd16de98c3ee558f7e7e2cf4596670a2e2e38a03d3e45bf5c9ebd5e
-SIZE (codership-galera-25.3.21-release_25.3.21_GH0.tar.gz) = 3276033
+TIMESTAMP = 1501158019
+SHA256 (codership-galera-release_25.3.21_GH0.tar.gz) = dc0d8e9bcbd16de98c3ee558f7e7e2cf4596670a2e2e38a03d3e45bf5c9ebd5e
+SIZE (codership-galera-release_25.3.21_GH0.tar.gz) = 3276033
diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile
index adec8df47d14..53ef95448b84 100644
--- a/databases/mysqlwsrep56-server/Makefile
+++ b/databases/mysqlwsrep56-server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mysqlwsrep
PORTVERSION?= 5.6.36
+DISTVERSIONPREFIX?= wsrep_
DISTVERSIONSUFFIX?= -25.20
PORTREVISION?= 2
CATEGORIES= databases ipv6
@@ -43,7 +44,6 @@ USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= codership
GH_PROJECT?= mysql-wsrep
-GH_TAGNAME?= wsrep_${DISTVERSION}${DISTVERSIONSUFFIX}
MY_DBDIR= /var/db/mysql
MY_SECDIR= /var/db/mysql_secure
diff --git a/databases/mysqlwsrep56-server/distinfo b/databases/mysqlwsrep56-server/distinfo
index 7a9b6bfd36c7..3c371e33af11 100644
--- a/databases/mysqlwsrep56-server/distinfo
+++ b/databases/mysqlwsrep56-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499257665
-SHA256 (codership-mysql-wsrep-5.6.36-25.20-wsrep_5.6.36-25.20_GH0.tar.gz) = b40e01d95d8ccc5c23b9f1bf6c43c93776a7f542d57c14da661191b5a656754b
-SIZE (codership-mysql-wsrep-5.6.36-25.20-wsrep_5.6.36-25.20_GH0.tar.gz) = 32374284
+TIMESTAMP = 1501158237
+SHA256 (codership-mysql-wsrep-wsrep_5.6.36-25.20_GH0.tar.gz) = b40e01d95d8ccc5c23b9f1bf6c43c93776a7f542d57c14da661191b5a656754b
+SIZE (codership-mysql-wsrep-wsrep_5.6.36-25.20_GH0.tar.gz) = 32374284
diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile
index c01773a9c20b..6b9f9762abb1 100644
--- a/databases/mysqlwsrep57-server/Makefile
+++ b/databases/mysqlwsrep57-server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mysqlwsrep
PORTVERSION?= 5.7.18
+DISTVERSIONPREFIX?= wsrep_
DISTVERSIONSUFFIX?= -25.12
PORTREVISION?= 1
CATEGORIES= databases ipv6
@@ -41,7 +42,6 @@ MY_TMPDIR= /var/db/mysql_tmpdir
USE_GITHUB= yes
GH_ACCOUNT= codership
GH_PROJECT?= mysql-wsrep
-GH_TAGNAME?= wsrep_${DISTVERSION}${DISTVERSIONSUFFIX}
DATADIR= ${PREFIX}/share/mysql
ETCDIR= ${PREFIX}/etc/mysql
diff --git a/databases/mysqlwsrep57-server/distinfo b/databases/mysqlwsrep57-server/distinfo
index 33d2185b4f9b..fa40d9670127 100644
--- a/databases/mysqlwsrep57-server/distinfo
+++ b/databases/mysqlwsrep57-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1499970818
+TIMESTAMP = 1501158272
SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
SIZE (boost_1_59_0.tar.gz) = 83709983
-SHA256 (codership-mysql-wsrep-5.7.18-25.12-wsrep_5.7.18-25.12_GH0.tar.gz) = d40457fd71401d1600386482f2bc0d6258d3b853a051ba47d8b64d5a95e5efc8
-SIZE (codership-mysql-wsrep-5.7.18-25.12-wsrep_5.7.18-25.12_GH0.tar.gz) = 51679003
+SHA256 (codership-mysql-wsrep-wsrep_5.7.18-25.12_GH0.tar.gz) = d40457fd71401d1600386482f2bc0d6258d3b853a051ba47d8b64d5a95e5efc8
+SIZE (codership-mysql-wsrep-wsrep_5.7.18-25.12_GH0.tar.gz) = 51679003
diff --git a/databases/pg_rman/Makefile b/databases/pg_rman/Makefile
index 25dfc21b1013..2e50497fe96b 100644
--- a/databases/pg_rman/Makefile
+++ b/databases/pg_rman/Makefile
@@ -9,12 +9,13 @@ COMMENT= Online backup and restore tool for PostgreSQL
LICENSE= BSD3CLAUSE
-BROKEN= checksum and size mismatch
+BROKEN= checksum and size mismatch (using a branch and not a tag or commit hash)
USES= gettext-runtime gmake pgsql
USE_GITHUB= yes
PG_TAG_VERSION= ${PGSQL_DEFAULT:S/./_/}
-GH_TUPLE= ossc-db:pg_rman:REL${PG_TAG_VERSION}_STABLE
+GH_ACCOUNT= ossc-db
+GH_TAGNAME= REL${PG_TAG_VERSION}_STABLE
WANT_PGSQL= client server
WANT_PGSQL_VER= 91+
MAKE_ARGS= USE_PGXS=1
diff --git a/devel/colorgcc/Makefile b/devel/colorgcc/Makefile
index 45237c56a72f..777210317120 100644
--- a/devel/colorgcc/Makefile
+++ b/devel/colorgcc/Makefile
@@ -16,7 +16,6 @@ SHEBANG_FILES= colorgcc.pl
USE_GITHUB= yes
GH_ACCOUNT= olibre
-GH_PROJECT= ${PORTNAME}
GH_TAGNAME= d844212
PLIST_FILES= bin/${PORTNAME} \
diff --git a/devel/go-sql-driver/Makefile b/devel/go-sql-driver/Makefile
index 1b88813dae6d..83ad7293c46b 100644
--- a/devel/go-sql-driver/Makefile
+++ b/devel/go-sql-driver/Makefile
@@ -13,7 +13,6 @@ COMMENT= Lightweight and fast MySQL driver for go
USES= go
USE_GITHUB= yes
-GH_ACCOUNT= ${PORTNAME}
GH_PROJECT= mysql
GO_PKGNAME= github.com/${PORTNAME}/${GH_PROJECT}
diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index 6b4d838c19fa..7af00b662681 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= libgflags.so:devel/gflags \
libcares.so:dns/c-ares
USE_GITHUB= yes
-GH_TUPLE= grpc:grpc:v${PORTVERSION} \
- google:boringssl:a93bc11:boringssl/third_party/boringssl \
+GH_TUPLE= google:boringssl:a93bc11:boringssl/third_party/boringssl \
google:benchmark:v1.1.0:benchmark/third_party/benchmark
USES= cmake perl5 pkgconfig
diff --git a/devel/libhyve-remote/Makefile b/devel/libhyve-remote/Makefile
index 25f6767feed8..951615876c09 100644
--- a/devel/libhyve-remote/Makefile
+++ b/devel/libhyve-remote/Makefile
@@ -31,8 +31,6 @@ PLIST_DIRS= ${LOCALBASE}/include/libhyverem
USE_GITHUB= yes
GH_ACCOUNT= araujobsd
-GH_PROJECT= ${PORTNAME}
-GH_TAGNAME= ${PORTVERSION}
USE_LDCONFIG= yes
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 4531d38723db..36b640fbe82f 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -3,6 +3,7 @@
PORTNAME= open-vm-tools
PORTVERSION= ${RELEASE_VER}
+DISTVERSIONPREFIX= stable-
PORTEPOCH= 2
CATEGORIES= emulators
@@ -47,7 +48,6 @@ USES= autoreconf:-iv fuse gettext-runtime kmod libtool localbase pathfix pkgco
USE_GITHUB= yes
GH_ACCOUNT= vmware
-GH_TAGNAME= stable-${RELEASE_VER}
USE_LDCONFIG= yes
CPPFLAGS+= -Wno-deprecated-declarations
diff --git a/emulators/open-vm-tools/distinfo b/emulators/open-vm-tools/distinfo
index 9deee0d1c2f0..747c1d3899f7 100644
--- a/emulators/open-vm-tools/distinfo
+++ b/emulators/open-vm-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493092065
-SHA256 (vmware-open-vm-tools-10.1.5-stable-10.1.5_GH0.tar.gz) = aba7bf570b8951b61784941460659c204359d98fcbfb164df3c30d468a19fb1c
-SIZE (vmware-open-vm-tools-10.1.5-stable-10.1.5_GH0.tar.gz) = 3540164
+TIMESTAMP = 1501156965
+SHA256 (vmware-open-vm-tools-stable-10.1.5_GH0.tar.gz) = aba7bf570b8951b61784941460659c204359d98fcbfb164df3c30d468a19fb1c
+SIZE (vmware-open-vm-tools-stable-10.1.5_GH0.tar.gz) = 3540164
diff --git a/games/endless-sky-high-dpi/Makefile b/games/endless-sky-high-dpi/Makefile
index 4ccbddfbee56..6015a936fd19 100644
--- a/games/endless-sky-high-dpi/Makefile
+++ b/games/endless-sky-high-dpi/Makefile
@@ -1,11 +1,10 @@
# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
# $FreeBSD$
-PORTNAME= high-dpi
+PORTNAME= endless-sky-high-dpi
PORTVERSION= 0.9.6
DISTVERSIONPREFIX= v
CATEGORIES= games
-PKGNAMEPREFIX= endless-sky-
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= High-DPI graphics for Endless Sky
@@ -17,7 +16,6 @@ RUN_DEPENDS= endless-sky:games/endless-sky
USE_GITHUB= yes
GH_ACCOUNT= endless-sky
-GH_PROJECT= endless-sky-${PORTNAME}
DATADIR= ${PREFIX}/share/endless-sky/plugins/${PORTNAME}
diff --git a/graphics/pngwriter/Makefile b/graphics/pngwriter/Makefile
index b3ae5f7453fb..c7c633532b00 100644
--- a/graphics/pngwriter/Makefile
+++ b/graphics/pngwriter/Makefile
@@ -21,7 +21,6 @@ BROKEN_powerpc64= fails to build: ios_base.h: 'std::ios_base::ios_base(const std
USES= cmake:outsource
USE_GITHUB= yes
USE_LDCONFIG= yes
-GH_ACCOUNT= ${PORTNAME}
PLIST_FILES= include/pngwriter.h \
lib/libpngwriter.a \
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 3405d6ecf212..5e490fa611a8 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -25,8 +25,8 @@ BROKEN_powerpc64= fails to install: gyp: Call to 'which clang' returned exit sta
BROKEN_sparc64= fails to compile: segfault
USE_GITHUB= yes
-GH_TUPLE= hrs-allbsd:${PORTNAME}:${DISTVERSIONPREFIX}${DISTVERSION} \
- hiroyuki-komatsu:japanese-usage-dictionary:e5b3425:udic
+GH_ACCOUNT= hrs-allbsd
+GH_TUPLE= hiroyuki-komatsu:japanese-usage-dictionary:e5b3425:udic
USES= compiler:c++11-lang pkgconfig gmake \
tar:bzip2 python:2.7,build shebangfix
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index dac5baf3de1c..8554f1074eca 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mono
PORTVERSION= 4.8.1.0
+DISTVERSIONPREFIX= mono-
PORTREVISION= 1
CATEGORIES= lang
@@ -34,7 +35,6 @@ MONOLITE_MASTER_SITES= http://download.mono-project.com/monolite/:monolite
MONOLITE_VERSION= 156
USE_GITHUB= yes
-GH_TAGNAME= ${PORTNAME}-${PORTVERSION}
GH_TUPLE= mono:Lucene.Net.Light:85978b7:1/external/Lucene.Net.Light \
mono:Newtonsoft.Json:471c3e0:2/external/Newtonsoft.Json \
mono:NuGet.BuildTasks:04bdab5:3/external/nuget-buildtasks \
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 60808c2181da..27cdbd460edb 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1493632048
+TIMESTAMP = 1501157648
SHA256 (nuget.31.zip) = 727148dcfffdbb13f237e9b99ca4fee56443c7c0e0552c8f7b162e9f484f1e4b
SIZE (nuget.31.zip) = 315117674
SHA256 (monolite-156-latest.tar.gz) = 2cdf6cff1d82d76412461a4c8a3616bb2aa1e835fb55479941662dec3799c924
SIZE (monolite-156-latest.tar.gz) = 4569148
-SHA256 (mono-mono-4.8.1.0-mono-4.8.1.0_GH0.tar.gz) = da32f26922adb29b2cc3341d11e20f754b95f87178578188fd6902c5cfc188e4
-SIZE (mono-mono-4.8.1.0-mono-4.8.1.0_GH0.tar.gz) = 72422583
+SHA256 (mono-mono-mono-4.8.1.0_GH0.tar.gz) = da32f26922adb29b2cc3341d11e20f754b95f87178578188fd6902c5cfc188e4
+SIZE (mono-mono-mono-4.8.1.0_GH0.tar.gz) = 72422583
SHA256 (mono-Lucene.Net.Light-85978b7_GH0.tar.gz) = 6f9cbad4083c8acf214d86a61fd39585f7d82eeec80c96fc696e07c7006e3a4d
SIZE (mono-Lucene.Net.Light-85978b7_GH0.tar.gz) = 640188
SHA256 (mono-Newtonsoft.Json-471c3e0_GH0.tar.gz) = 38b2bc9f2290f780e58fdf1504c0bbdb25a67d7d998c4ec631ecbbf9ddcb3e13
diff --git a/mail/vexim/Makefile b/mail/vexim/Makefile
index 244524e649a6..c4deb1480ac2 100644
--- a/mail/vexim/Makefile
+++ b/mail/vexim/Makefile
@@ -13,7 +13,6 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
-GH_ACCOUNT= ${PORTNAME}
GH_PROJECT= ${PORTNAME}2
SUB_FILES= pkg-message
diff --git a/math/moo/Makefile b/math/moo/Makefile
index b3e2d9e992fa..6b9fba7f4d11 100644
--- a/math/moo/Makefile
+++ b/math/moo/Makefile
@@ -13,7 +13,6 @@ LICENSE= PD
USE_GITHUB= yes
GH_ACCOUNT= raylai
-GH_TAGNAME= ${PORTVERSION}
PLIST_FILES= bin/moo man/man1/moo.1.gz
diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index d4452d45ca63..b29ddad79654 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -3,6 +3,7 @@
PORTNAME= wxMaxima
PORTVERSION= 17.05.1
+DISTVERSIONPREFIX= Version-
PORTREVISION= 0
CATEGORIES= math
@@ -13,7 +14,8 @@ LICENSE= GPLv2
RUN_DEPENDS= maxima:math/maxima
-GH_TUPLE= andrejv:${PORTNAME:tl}:Version-${DISTVERSION}
+GH_ACCOUNT= andrejv
+GH_PROJECT= ${PORTNAME:tl}
PLIST_SUB= DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
diff --git a/math/wxMaxima/distinfo b/math/wxMaxima/distinfo
index b1c86921ef72..a183ea90b00b 100644
--- a/math/wxMaxima/distinfo
+++ b/math/wxMaxima/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500975060
-SHA256 (andrejv-wxmaxima-17.05.1-Version-17.05.1_GH0.tar.gz) = 72394f266a784e433e232e600e7178fdd6362fd33f8ac11703db10c780676037
-SIZE (andrejv-wxmaxima-17.05.1-Version-17.05.1_GH0.tar.gz) = 5890723
+TIMESTAMP = 1501163197
+SHA256 (andrejv-wxmaxima-Version-17.05.1_GH0.tar.gz) = 72394f266a784e433e232e600e7178fdd6362fd33f8ac11703db10c780676037
+SIZE (andrejv-wxmaxima-Version-17.05.1_GH0.tar.gz) = 5890723
diff --git a/net-mgmt/nrpe3/Makefile b/net-mgmt/nrpe3/Makefile
index 11231e3d2dcd..de117818de0f 100644
--- a/net-mgmt/nrpe3/Makefile
+++ b/net-mgmt/nrpe3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= nrpe
PORTVERSION= 3.2.0
+DISTVERSIONPREFIX= nrpe-
PORTREVISION?= 0
CATEGORIES= net-mgmt
PKGNAMESUFFIX= 3
@@ -16,7 +17,6 @@ CONFLICTS= nrpe nrpe-ssl
USE_GITHUB= yes
GH_ACCOUNT= NagiosEnterprises
-GH_TAGNAME= nrpe-${DISTVERSION}
USES= perl5
USE_PERL5= build
diff --git a/net-mgmt/nrpe3/distinfo b/net-mgmt/nrpe3/distinfo
index 22b14250e8e2..cd5f8790a4f3 100644
--- a/net-mgmt/nrpe3/distinfo
+++ b/net-mgmt/nrpe3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499365291
-SHA256 (NagiosEnterprises-nrpe-3.2.0-nrpe-3.2.0_GH0.tar.gz) = 82fd7a112255f6147d2abcc836b9efe74ca85c9915956e1e22966cf159db16cf
-SIZE (NagiosEnterprises-nrpe-3.2.0-nrpe-3.2.0_GH0.tar.gz) = 517774
+TIMESTAMP = 1501163265
+SHA256 (NagiosEnterprises-nrpe-nrpe-3.2.0_GH0.tar.gz) = 82fd7a112255f6147d2abcc836b9efe74ca85c9915956e1e22966cf159db16cf
+SIZE (NagiosEnterprises-nrpe-nrpe-3.2.0_GH0.tar.gz) = 517774
diff --git a/net-p2p/btpd/Makefile b/net-p2p/btpd/Makefile
index 945fff6247ae..c1b1e90a089c 100644
--- a/net-p2p/btpd/Makefile
+++ b/net-p2p/btpd/Makefile
@@ -13,7 +13,6 @@ LICENSE= BSD2CLAUSE BSD3CLAUSE
LICENSE_COMB= multi
USE_GITHUB= yes
-GH_ACCOUNT= ${PORTNAME}
USES= autoreconf ssl
GNU_CONFIGURE= yes
diff --git a/net/drive/Makefile b/net/drive/Makefile
index 4a5898ff15de..3af30070b8f0 100644
--- a/net/drive/Makefile
+++ b/net/drive/Makefile
@@ -18,8 +18,8 @@ USES= go
PLIST_FILES= bin/drive
-GH_TUPLE= odeke-em:drive:v${PORTVERSION} \
- boltdb:bolt:v1.3.1:boltdb_bolt/../src/github.com/boltdb/bolt \
+GH_ACCOUNT= odeke-em
+GH_TUPLE= boltdb:bolt:v1.3.1:boltdb_bolt/../src/github.com/boltdb/bolt \
cheggaaa:pb:v2.0.4:cheggaaa_pb/../src/github.com/cheggaaa/pb \
fatih:color:v1.5.0:fatih_color/../src/github.com/fatih/color \
golang:crypto:6914964:golang_crypto/../src/golang.org/x/crypto \
diff --git a/net/madonctl/Makefile b/net/madonctl/Makefile
index af1452425092..64e2df91dac4 100644
--- a/net/madonctl/Makefile
+++ b/net/madonctl/Makefile
@@ -18,8 +18,8 @@ USES= go
PLIST_FILES= bin/madonctl
-GH_TUPLE= McKael:${PORTNAME}:${DISTVERSIONFULL} \
- McKael:madon:v1.6.0:madon/../src/github.com/McKael/madon \
+GH_ACCOUNT= McKael
+GH_TUPLE= McKael:madon:v1.6.0:madon/../src/github.com/McKael/madon \
fsnotify:fsnotify:v1.4.2:fsnotify/../src/github.com/fsnotify/fsnotify \
ghodss:yaml:v1.0.0:yaml/../src/github.com/ghodss/yaml \
go-yaml:yaml:cd8b52f:yaml2/../src/gopkg.in/yaml.v2 \
diff --git a/security/proftpd-mod_clamav/Makefile b/security/proftpd-mod_clamav/Makefile
index 09ca5430263a..594757150905 100644
--- a/security/proftpd-mod_clamav/Makefile
+++ b/security/proftpd-mod_clamav/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= mod_clamav
+DISTVERSIONPREFIX= v
DISTVERSION= 0.14rc2
PORTREVISION= 0
CATEGORIES= security ftp
@@ -16,7 +17,6 @@ DESCR= ${.CURDIR}/pkg-descr
MASTERDIR= ${.CURDIR}/../../ftp/proftpd
-GH_TAGNAME= v${DISTVERSION}
GIT_REVISION= c8586c7
RUN_DEPENDS+= clamd:security/clamav