Index: net/go-bapu/Makefile
===================================================================
--- net/go-bapu/Makefile	(revision 541888)
+++ net/go-bapu/Makefile	(working copy)
@@ -7,6 +7,7 @@
 MASTER_SITES=	https://bitbucket.org/carlostrub/bapu/get/
 PKGNAMEPREFIX=	go-
 DISTNAME=	v${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	go-bapu
 
 MAINTAINER=	cs@FreeBSD.org
@@ -14,8 +15,38 @@
 
 LICENSE=	BSD3CLAUSE
 
-USES=		go tar:bzip2
-GO_PKGNAME=	bitbucket.org/carlostrub/bapu
+USES=		go:modules tar:bzip2
+
+USE_GITHUB=	nodefault
+GH_TUPLE=	\
+		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
+		gizak:termui:f63e0cdd3f66:gizak_termui/vendor/github.com/gizak/termui \
+		go-check:check:8fa46927fb4f:go_check_check/vendor/gopkg.in/check.v1 \
+		go-ini:ini:v1.51.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
+		go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		golang:sys:226ff32320da:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
+		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
+		kolo:xmlrpc:0826b98aaa29:kolo_xmlrpc/vendor/github.com/kolo/xmlrpc \
+		magiconair:properties:v1.8.1:magiconair_properties/vendor/github.com/magiconair/properties \
+		maruel:panicparse:ad661195ed0e:maruel_panicparse/vendor/github.com/maruel/panicparse \
+		maruel:ut:v1.0.1:maruel_ut/vendor/github.com/maruel/ut \
+		mattn:go-runewidth:737072b4e32b:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+		mitchellh:go-wordwrap:ad45545899c7:mitchellh_go_wordwrap/vendor/github.com/mitchellh/go-wordwrap \
+		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
+		niemeyer:pretty:a10e7caefd8e:niemeyer_pretty/vendor/github.com/niemeyer/pretty \
+		nsf:termbox-go:abe82ce5fb7a:nsf_termbox_go/vendor/github.com/nsf/termbox-go \
+		pelletier:go-buffruneio:v0.1.0:pelletier_go_buffruneio/vendor/github.com/pelletier/go-buffruneio \
+		pelletier:go-toml:v1.8.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
+		spf13:afero:v1.2.2:spf13_afero/vendor/github.com/spf13/afero \
+		spf13:cast:v1.3.1:spf13_cast/vendor/github.com/spf13/cast \
+		spf13:jwalterweatherman:v1.0.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
+		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
+		spf13:viper:v1.7.0:spf13_viper/vendor/github.com/spf13/viper \
+		stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify \
+		subosito:gotenv:v1.2.0:subosito_gotenv/vendor/github.com/subosito/gotenv
+
 WRKSRC=		${WRKDIR}/carlostrub-bapu-23ca6b019fbc
 
 post-install:
Index: net/go-bapu/distinfo
===================================================================
--- net/go-bapu/distinfo	(revision 541888)
+++ net/go-bapu/distinfo	(working copy)
@@ -1,3 +1,57 @@
-TIMESTAMP = 1592249106
+TIMESTAMP = 1594423636
 SHA256 (go-bapu/v0.3.0.tar.bz2) = e70a901f9cd1db04cdb6d00961bdf49194f22aa5e6eb215ae51b262d5409dcc1
 SIZE (go-bapu/v0.3.0.tar.bz2) = 101340
+SHA256 (go-bapu/davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
+SIZE (go-bapu/davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
+SHA256 (go-bapu/fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd
+SIZE (go-bapu/fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139
+SHA256 (go-bapu/gizak-termui-f63e0cdd3f66_GH0.tar.gz) = 1df200f53599fea14b3832d43dce2e0fb23293f045284f945903edbd165f0c38
+SIZE (go-bapu/gizak-termui-f63e0cdd3f66_GH0.tar.gz) = 1704814
+SHA256 (go-bapu/go-check-check-8fa46927fb4f_GH0.tar.gz) = 7e433178d7b915d0df0eb99300cee70d5b23c543414366f03649325b44a1076c
+SIZE (go-bapu/go-check-check-8fa46927fb4f_GH0.tar.gz) = 31611
+SHA256 (go-bapu/go-ini-ini-v1.51.0_GH0.tar.gz) = 6c98311d375afbe36a246c5d29acb5cb428634a4186e591ce9b7fe2fa4f2a471
+SIZE (go-bapu/go-ini-ini-v1.51.0_GH0.tar.gz) = 43536
+SHA256 (go-bapu/go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
+SIZE (go-bapu/go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
+SHA256 (go-bapu/golang-sys-226ff32320da_GH0.tar.gz) = 3d19d1a291ede93a53edb14252d0ee046baa730be31825c7daa5dd33f994c184
+SIZE (go-bapu/golang-sys-226ff32320da_GH0.tar.gz) = 1054370
+SHA256 (go-bapu/golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
+SIZE (go-bapu/golang-text-v0.3.2_GH0.tar.gz) = 7168069
+SHA256 (go-bapu/hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2
+SIZE (go-bapu/hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658
+SHA256 (go-bapu/kolo-xmlrpc-0826b98aaa29_GH0.tar.gz) = fea00c49f59606d653a4a25effed9c1fdfbb3b1f6bc8602495e7608c9fc32f9e
+SIZE (go-bapu/kolo-xmlrpc-0826b98aaa29_GH0.tar.gz) = 9542
+SHA256 (go-bapu/magiconair-properties-v1.8.1_GH0.tar.gz) = 4449df3d2be86608bfc997228f66f1cff57bf620cc5bf9ba44339c7e4c5612dd
+SIZE (go-bapu/magiconair-properties-v1.8.1_GH0.tar.gz) = 29735
+SHA256 (go-bapu/maruel-panicparse-ad661195ed0e_GH0.tar.gz) = 98dad1c6fec5df0edc20a7d707c7046217eeca91b91a3959b8e82814611a80d0
+SIZE (go-bapu/maruel-panicparse-ad661195ed0e_GH0.tar.gz) = 57456
+SHA256 (go-bapu/maruel-ut-v1.0.1_GH0.tar.gz) = 65e40c55e66ca573a8eeee7f2c9e12c0ebc9cc997d0ea60a6f6afc912a053ae3
+SIZE (go-bapu/maruel-ut-v1.0.1_GH0.tar.gz) = 9324
+SHA256 (go-bapu/mattn-go-runewidth-737072b4e32b_GH0.tar.gz) = a81873d1ae42243b3e4c2ebd9442c50e3f1523d8062a6e0c4a2348b13fdde48d
+SIZE (go-bapu/mattn-go-runewidth-737072b4e32b_GH0.tar.gz) = 6866
+SHA256 (go-bapu/mitchellh-go-wordwrap-ad45545899c7_GH0.tar.gz) = 917005b52e496fda7f702a88fb65a90cc5f2c8d5a569cf39aeaf1b536dd582d9
+SIZE (go-bapu/mitchellh-go-wordwrap-ad45545899c7_GH0.tar.gz) = 2740
+SHA256 (go-bapu/mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b
+SIZE (go-bapu/mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 20980
+SHA256 (go-bapu/niemeyer-pretty-a10e7caefd8e_GH0.tar.gz) = 2a81e75bdd5341bd0fac76a90bb024ed2ac6c8a5d31d70cd715eef75224601e1
+SIZE (go-bapu/niemeyer-pretty-a10e7caefd8e_GH0.tar.gz) = 9399
+SHA256 (go-bapu/nsf-termbox-go-abe82ce5fb7a_GH0.tar.gz) = 59100f16b311096810b6b81a2bfce24c7d73984b59808a4980c821e22f2e42fa
+SIZE (go-bapu/nsf-termbox-go-abe82ce5fb7a_GH0.tar.gz) = 30259
+SHA256 (go-bapu/pelletier-go-buffruneio-v0.1.0_GH0.tar.gz) = 5abad8460a7677f6cd0003ffaf1154e383fa6b6d8a8105b451a9dde10130017c
+SIZE (go-bapu/pelletier-go-buffruneio-v0.1.0_GH0.tar.gz) = 2894
+SHA256 (go-bapu/pelletier-go-toml-v1.8.0_GH0.tar.gz) = 535241212044f52bc40c8eb08d15342c75cef8e6c887ceb1e18d25aad4ab3633
+SIZE (go-bapu/pelletier-go-toml-v1.8.0_GH0.tar.gz) = 96286
+SHA256 (go-bapu/spf13-afero-v1.2.2_GH0.tar.gz) = b577afca7e9839aa7cf0ddd712af553aec671b74f97fe0c88c63f911d1020570
+SIZE (go-bapu/spf13-afero-v1.2.2_GH0.tar.gz) = 46157
+SHA256 (go-bapu/spf13-cast-v1.3.1_GH0.tar.gz) = 4fa8d06903b490ae6f1316e55c5446d5648eea2b450671ebc54d4bbe79bc46b1
+SIZE (go-bapu/spf13-cast-v1.3.1_GH0.tar.gz) = 11102
+SHA256 (go-bapu/spf13-jwalterweatherman-v1.0.0_GH0.tar.gz) = 2ece12b964e0d230b10851555185d42d3c81b401efda044265ae716eb1d0bc2d
+SIZE (go-bapu/spf13-jwalterweatherman-v1.0.0_GH0.tar.gz) = 6392
+SHA256 (go-bapu/spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
+SIZE (go-bapu/spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
+SHA256 (go-bapu/spf13-viper-v1.7.0_GH0.tar.gz) = 95ce28f25d50b0a484479d46ec1576e786b92c70efdc2ad58089505c4ee0850d
+SIZE (go-bapu/spf13-viper-v1.7.0_GH0.tar.gz) = 82340
+SHA256 (go-bapu/stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f
+SIZE (go-bapu/stretchr-testify-v1.6.1_GH0.tar.gz) = 84215
+SHA256 (go-bapu/subosito-gotenv-v1.2.0_GH0.tar.gz) = 5f6826992c11981018c77377f33dbc56d0be932e0d38a2f51e795c99725e7ba5
+SIZE (go-bapu/subosito-gotenv-v1.2.0_GH0.tar.gz) = 7359