2 files changed, 92 insertions, 87 deletions

diff --git a/audio/pms-devel/Makefile b/audio/pms-devel/Makefile
index 625c3ec0d591..062a0210ad43 100644
--- a/audio/pms-devel/Makefile
+++ b/audio/pms-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pms-devel
 PORTVERSION=	0.0.20181123
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	riggs@FreeBSD.org
@@ -11,59 +12,53 @@ COMMENT=	Rewrite of pms, an ncurses-based client for the Music Player Daemon
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go
+USES=		go:modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ambientsound
 GH_PROJECT=	pms
 GH_TAGNAME=	000c5c0
 
-GH_TUPLE=\
-	ambientsound:gompd:b065d40:gompd/src/github.com/ambientsound/gompd \
-	blevesearch:bleve:1a319cd:bleve/src/github.com/blevesearch/bleve \
-	blevesearch:go-porterstemmer:23a2c8e:porterstemmer/src/github.com/blevesearch/go-porterstemmer \
-	blevesearch:segment:762005e:segment/src/github.com/blevesearch/segment \
-	boltdb:bolt:2f1ce7a:boltdb/src/github.com/boltdb/bolt \
-	couchbase:vellum:35d9e73:vellum/src/github.com/couchbase/vellum \
-	edsrzf:mmap-go:0bce6a6:mmap/src/github.com/edsrzf/mmap-go \
-	gdamore:encoding:b23993c:encoding/src/github.com/gdamore/encoding \
-	gdamore:tcell:de7e78e:tcell/src/github.com/gdamore/tcell \
-	glycerine:go-unsnap-stream:9f0cb55:unsnapstream/src/github.com/glycerine/go-unsnap-stream \
-	golang:protobuf:aa810b6:protobuf/src/github.com/golang/protobuf \
-	golang:snappy:2e65f85:snappy/src/github.com/golang/snappy \
-	jessevdk:go-flags:c6ca198:flags/src/github.com/jessevdk/go-flags \
-	lucasb-eyer:go-colorful:c784231:colorful/src/github.com/lucasb-eyer/go-colorful \
-	mattn:go-runewidth:ce7b0b5:runewidth/src/github.com/mattn/go-runewidth \
-	philhofer:fwd:bb6d471:fwd/src/github.com/philhofer/fwd \
-	RoaringBitmap:roaring:3d677d3:roaring/src/github.com/RoaringBitmap/roaring \
-	Smerity:govarint:7265e41:govarint/src/github.com/Smerity/govarint \
-	steveyen:gtreap:0abe01e:gtreap/src/github.com/steveyen/gtreap \
-	stretchr:testify:f35b8ab:testify/src/github.com/stretchr/testify \
-	tinylib:msgp:b2b6a67:msgp/src/github.com/tinylib/msgp \
-	golang:net:161cd47:net/src/golang.org/x/net \
-	golang:text:f21a4df:text/src/golang.org/x/text
+GH_TUPLE=	\
+		RoaringBitmap:roaring:v0.4.16:roaringbitmap_roaring/vendor/github.com/RoaringBitmap/roaring \
+		Smerity:govarint:7265e41f48f1:smerity_govarint/vendor/github.com/Smerity/govarint \
+		ambientsound:gompd:b065d40b8238:ambientsound_gompd/vendor/github.com/ambientsound/gompd \
+		blevesearch:bleve:v0.7.0:blevesearch_bleve/vendor/github.com/blevesearch/bleve \
+		blevesearch:go-porterstemmer:v1.0.1:blevesearch_go_porterstemmer/vendor/github.com/blevesearch/go-porterstemmer \
+		blevesearch:segment:762005e7a34f:blevesearch_segment/vendor/github.com/blevesearch/segment \
+		boltdb:bolt:v1.3.1:boltdb_bolt/vendor/github.com/boltdb/bolt \
+		couchbase:vellum:35d9e7346a69:couchbase_vellum/vendor/github.com/couchbase/vellum \
+		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		edsrzf:mmap-go:0bce6a688712:edsrzf_mmap_go/vendor/github.com/edsrzf/mmap-go \
+		gdamore:encoding:b23993cbb635:gdamore_encoding/vendor/github.com/gdamore/encoding \
+		gdamore:tcell:v1.1.0:gdamore_tcell/vendor/github.com/gdamore/tcell \
+		glycerine:go-unsnap-stream:9f0cb55181dd:glycerine_go_unsnap_stream/vendor/github.com/glycerine/go-unsnap-stream \
+		golang:net:161cd47e91fd:golang_net/vendor/golang.org/x/net \
+		golang:protobuf:v1.2.0:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:snappy:2e65f85255db:golang_snappy/vendor/github.com/golang/snappy \
+		golang:sys:bbd175535a8b:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
+		jessevdk:go-flags:v1.4.0:jessevdk_go_flags/vendor/github.com/jessevdk/go-flags \
+		lucasb-eyer:go-colorful:c7842319cf3a:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
+		mattn:go-runewidth:v0.0.3:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+		mschoch:smat:90eadee771ae:mschoch_smat/vendor/github.com/mschoch/smat \
+		philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \
+		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
+		steveyen:gtreap:0abe01ef9be2:steveyen_gtreap/vendor/github.com/steveyen/gtreap \
+		stretchr:testify:v1.2.2:stretchr_testify/vendor/github.com/stretchr/testify \
+		tinylib:msgp:v1.0.2:tinylib_msgp/vendor/github.com/tinylib/msgp \
+		willf:bitset:v1.1.9:willf_bitset/vendor/github.com/willf/bitset
 
-PLIST_FILES=	bin/${GO_PKGNAME}
+GO_BUILDFLAGS=	-ldflags "-X main.buildVersion=${DISTVERSION}"
+GO_TARGET=	:pms-devel
+
+PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-post-extract:
-	${LN} -sf ${WRKSRC} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
-	${RM} ${WRKSRC}/go.mod
-
-do-build:
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-X main.buildVersion=${DISTVERSION}"
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pms-${GH_TAGNAME} ${STAGEDIR}${PREFIX}/bin/${GO_PKGNAME}
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${GO_PKGNAME}
-
 .include <bsd.port.mk>
diff --git a/audio/pms-devel/distinfo b/audio/pms-devel/distinfo
index 82aa45f412e6..2ea9cc1074f2 100644
--- a/audio/pms-devel/distinfo
+++ b/audio/pms-devel/distinfo
@@ -1,49 +1,59 @@
-TIMESTAMP = 1543081675
+TIMESTAMP = 1568205375
 SHA256 (ambientsound-pms-0.0.20181123-000c5c0_GH0.tar.gz) = c05041fe19b4d7f64578ce2f6893d1673f5dc00c273c4fac811a4d8e2d35d209
 SIZE (ambientsound-pms-0.0.20181123-000c5c0_GH0.tar.gz) = 78943
-SHA256 (ambientsound-gompd-b065d40_GH0.tar.gz) = c776b8997e19b06f414fa8aaaa0088f08669593f6ff43815a9ad8a8988be01fe
-SIZE (ambientsound-gompd-b065d40_GH0.tar.gz) = 16634
-SHA256 (blevesearch-bleve-1a319cd_GH0.tar.gz) = c3b7dff30f86b4f944c451e2af8adb942f040f76d101abad0d2e05e52a3cd411
-SIZE (blevesearch-bleve-1a319cd_GH0.tar.gz) = 596436
-SHA256 (blevesearch-go-porterstemmer-23a2c8e_GH0.tar.gz) = 7ad8a35605d31b09c0fd6a2dc283a36cd556dd4e5c2406fa37655c4efdcd5980
-SIZE (blevesearch-go-porterstemmer-23a2c8e_GH0.tar.gz) = 9157
-SHA256 (blevesearch-segment-762005e_GH0.tar.gz) = b0b237347ee6564b901e02ee89b50ab58197b9ce659da7cb9d4f4afc0d9393f4
-SIZE (blevesearch-segment-762005e_GH0.tar.gz) = 478318
-SHA256 (boltdb-bolt-2f1ce7a_GH0.tar.gz) = f3f23f35adefcabc6c11a507a6177b32425751a0a835c6aaceebd13719e2f91e
-SIZE (boltdb-bolt-2f1ce7a_GH0.tar.gz) = 83440
-SHA256 (couchbase-vellum-35d9e73_GH0.tar.gz) = 4dd154db46c69b237f94d4b731ab75955f5f6f4752ddf5a7b8e5c27c49d6f1ec
-SIZE (couchbase-vellum-35d9e73_GH0.tar.gz) = 296118
-SHA256 (edsrzf-mmap-go-0bce6a6_GH0.tar.gz) = 120d7144798610a8edc8623878cc620013cfc9d07d9a6c915cfc4dba2d325e39
-SIZE (edsrzf-mmap-go-0bce6a6_GH0.tar.gz) = 5492
-SHA256 (gdamore-encoding-b23993c_GH0.tar.gz) = 7fe1ed858143ba259114120a8a736645ee644b22bece7c09240df6113922f01a
-SIZE (gdamore-encoding-b23993c_GH0.tar.gz) = 10629
-SHA256 (gdamore-tcell-de7e78e_GH0.tar.gz) = 2cefcbb643fb020082d778c5dc1f66d73f9b393e71d4ccfddc593f3df3a450f7
-SIZE (gdamore-tcell-de7e78e_GH0.tar.gz) = 718969
-SHA256 (glycerine-go-unsnap-stream-9f0cb55_GH0.tar.gz) = 8fbd960f0d5cd310a3617f6b8ffda2d655ab8ff278a6dd9272ded571b97e52c3
-SIZE (glycerine-go-unsnap-stream-9f0cb55_GH0.tar.gz) = 19020
-SHA256 (golang-protobuf-aa810b6_GH0.tar.gz) = e9ce29039e0d470509db8695ebcd5f98b670c52ac1e75932eca0365f4799118a
-SIZE (golang-protobuf-aa810b6_GH0.tar.gz) = 332593
-SHA256 (golang-snappy-2e65f85_GH0.tar.gz) = dbbc74e9fbea19d803a6984314286acfb3ba554a693f5bce0c8073e18a180d99
-SIZE (golang-snappy-2e65f85_GH0.tar.gz) = 62575
-SHA256 (jessevdk-go-flags-c6ca198_GH0.tar.gz) = 7985a6a45b8dd2de04a7e295f562a5589801076c265baea39c7ea51410db4489
-SIZE (jessevdk-go-flags-c6ca198_GH0.tar.gz) = 55457
-SHA256 (lucasb-eyer-go-colorful-c784231_GH0.tar.gz) = 88bcc48c95f8d985bf056b20f7840e4dceaea38e4799e781e5aa1af197cc5265
-SIZE (lucasb-eyer-go-colorful-c784231_GH0.tar.gz) = 428455
-SHA256 (mattn-go-runewidth-ce7b0b5_GH0.tar.gz) = e3c7ab1a10c7b35accd18e08e12be4206ee805e44812969a4351199ea5a41b62
-SIZE (mattn-go-runewidth-ce7b0b5_GH0.tar.gz) = 22963
-SHA256 (philhofer-fwd-bb6d471_GH0.tar.gz) = 5203cf8ee43495fdd547af4f9591020779a20cb36d9f2ff83f726aebbccfd8b1
-SIZE (philhofer-fwd-bb6d471_GH0.tar.gz) = 9215
-SHA256 (RoaringBitmap-roaring-3d677d3_GH0.tar.gz) = 241c1cc8fd0970a2048e3e184b1ee2f1719bd3c6508422cc00622b2dca4530c0
-SIZE (RoaringBitmap-roaring-3d677d3_GH0.tar.gz) = 132031
-SHA256 (Smerity-govarint-7265e41_GH0.tar.gz) = e58f7c92dcd70435424ebeb74a44693278c77a274cabd08aab59c7878149ff70
-SIZE (Smerity-govarint-7265e41_GH0.tar.gz) = 5484
-SHA256 (steveyen-gtreap-0abe01e_GH0.tar.gz) = a1c09793db44b55748992ac3a782c9375263da5d5e85c6199bbd745ca4ebd26c
-SIZE (steveyen-gtreap-0abe01e_GH0.tar.gz) = 4791
-SHA256 (stretchr-testify-f35b8ab_GH0.tar.gz) = b7a2961d37598e0fc1bf7e9041f717ec770c7ec935d4a79a2d40f5e6722fe6a2
-SIZE (stretchr-testify-f35b8ab_GH0.tar.gz) = 101718
-SHA256 (tinylib-msgp-b2b6a67_GH0.tar.gz) = 9ecece4dcff77dedb6b61a1a9920e9ee74d30c893bcb7e74d0006456032ae28d
-SIZE (tinylib-msgp-b2b6a67_GH0.tar.gz) = 68341
-SHA256 (golang-net-161cd47_GH0.tar.gz) = 03a66d67eb211331fb5c3941a4f7fef17483901aed7f6e2ce8e6026a6d77a569
-SIZE (golang-net-161cd47_GH0.tar.gz) = 965339
-SHA256 (golang-text-f21a4df_GH0.tar.gz) = 1964956fab6356e201ace777f0e221334a9023777373768a853efc300df2219c
-SIZE (golang-text-f21a4df_GH0.tar.gz) = 6102640
+SHA256 (RoaringBitmap-roaring-v0.4.16_GH0.tar.gz) = 6018c018098229217404878d89d313c92127218926cb5463c2ba0eb5de02a09d
+SIZE (RoaringBitmap-roaring-v0.4.16_GH0.tar.gz) = 132016
+SHA256 (Smerity-govarint-7265e41f48f1_GH0.tar.gz) = 7c78365ebe8f5e40b2d0265c4950e66dd8252e4141fbfbd4f2b0a3f3e4dcefbe
+SIZE (Smerity-govarint-7265e41f48f1_GH0.tar.gz) = 5489
+SHA256 (ambientsound-gompd-b065d40b8238_GH0.tar.gz) = bcba01976dae3f5df4867be83c27b536987eccad12a519f86ba7759b95d0774a
+SIZE (ambientsound-gompd-b065d40b8238_GH0.tar.gz) = 16637
+SHA256 (blevesearch-bleve-v0.7.0_GH0.tar.gz) = d4cfd870d43bfb034a520ff91d55afae13b452e0a7282e5674041e5d1ae78b0c
+SIZE (blevesearch-bleve-v0.7.0_GH0.tar.gz) = 596424
+SHA256 (blevesearch-go-porterstemmer-v1.0.1_GH0.tar.gz) = 8eb8d619b3abe4f7cba6cefc9d68f9fc6202862d427bf768bf5d6c6293f50a59
+SIZE (blevesearch-go-porterstemmer-v1.0.1_GH0.tar.gz) = 8388
+SHA256 (blevesearch-segment-762005e7a34f_GH0.tar.gz) = e5a27704af6c64e384c1b7ad9a06690f19b5a9d6838a97357a3e17a3ffcd2099
+SIZE (blevesearch-segment-762005e7a34f_GH0.tar.gz) = 478335
+SHA256 (boltdb-bolt-v1.3.1_GH0.tar.gz) = b5ae498b780f535a5d308c188dee1329b3536275d29ad6758876084c0b8586a8
+SIZE (boltdb-bolt-v1.3.1_GH0.tar.gz) = 83437
+SHA256 (couchbase-vellum-35d9e7346a69_GH0.tar.gz) = 6eac41a30239778456f97a9cf6a495d6d02fee5528858913d25b8840e1b073df
+SIZE (couchbase-vellum-35d9e7346a69_GH0.tar.gz) = 296148
+SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
+SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
+SHA256 (edsrzf-mmap-go-0bce6a688712_GH0.tar.gz) = 53c8ab3c8b206a8dd7569238b6bd60dd8be360ca986cb484492aad904ec8eaa6
+SIZE (edsrzf-mmap-go-0bce6a688712_GH0.tar.gz) = 5495
+SHA256 (gdamore-encoding-b23993cbb635_GH0.tar.gz) = 3c607d322b9f585567dd4b6b19a0179a8277de94d44f98b4b42629632c035923
+SIZE (gdamore-encoding-b23993cbb635_GH0.tar.gz) = 10635
+SHA256 (gdamore-tcell-v1.1.0_GH0.tar.gz) = f2c8d63f24ef1f89abd80f6ee86cdb2af562225405644c0e75d0522b04858443
+SIZE (gdamore-tcell-v1.1.0_GH0.tar.gz) = 719426
+SHA256 (glycerine-go-unsnap-stream-9f0cb55181dd_GH0.tar.gz) = fb08e82d914e511955bb4fb8bdfd90da407b723a280280b63ee434532eb46b73
+SIZE (glycerine-go-unsnap-stream-9f0cb55181dd_GH0.tar.gz) = 19019
+SHA256 (golang-net-161cd47e91fd_GH0.tar.gz) = 5cc3ff8b7f5d47898b0073dcdd877ecff070d79a2b721b8ed1f5d87ade1f64b9
+SIZE (golang-net-161cd47e91fd_GH0.tar.gz) = 965145
+SHA256 (golang-protobuf-v1.2.0_GH0.tar.gz) = 157a148ae4e132eb169ec794b6cb43f1002780eeacaea8b0694811d1948fb1ec
+SIZE (golang-protobuf-v1.2.0_GH0.tar.gz) = 332565
+SHA256 (golang-snappy-2e65f85255db_GH0.tar.gz) = 3f0d9ed5fbea9b10b33c38321afe9a9e8a45dc3f0dbed9c3c1b640e69da05f76
+SIZE (golang-snappy-2e65f85255db_GH0.tar.gz) = 62580
+SHA256 (golang-sys-bbd175535a8b_GH0.tar.gz) = 2837b7e2bb23dd6492021b6e01b2dfb94aa0d7b0981c2b86027fdbad1df07f56
+SIZE (golang-sys-bbd175535a8b_GH0.tar.gz) = 1468385
+SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
+SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
+SHA256 (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 3be7e8fb4b63887e8aeb55878244c04b7dcbe5ac77211c73ee35e38ca681e611
+SIZE (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 55452
+SHA256 (lucasb-eyer-go-colorful-c7842319cf3a_GH0.tar.gz) = 109a19fadc0db6958e1daafb13522c866a2c000aeb72db63ec4484d01fa49111
+SIZE (lucasb-eyer-go-colorful-c7842319cf3a_GH0.tar.gz) = 428466
+SHA256 (mattn-go-runewidth-v0.0.3_GH0.tar.gz) = 398ec709b006664e527040770056156cb225233d8b44b5a59ba2f5f5f3fa885e
+SIZE (mattn-go-runewidth-v0.0.3_GH0.tar.gz) = 22961
+SHA256 (mschoch-smat-90eadee771ae_GH0.tar.gz) = bd60b71d4289aab986daecc86499122f42fe9c1a3b1af9460d81a27479807b70
+SIZE (mschoch-smat-90eadee771ae_GH0.tar.gz) = 11994
+SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff
+SIZE (philhofer-fwd-v1.0.0_GH0.tar.gz) = 9221
+SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
+SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
+SHA256 (steveyen-gtreap-0abe01ef9be2_GH0.tar.gz) = 250018fe4ceb3333ecd1a0e9f93f3699e6203b80c243f092cc1759a6f692528a
+SIZE (steveyen-gtreap-0abe01ef9be2_GH0.tar.gz) = 4793
+SHA256 (stretchr-testify-v1.2.2_GH0.tar.gz) = 0728bb470254e8b39deae3e6c1c92a98e737239ae0be484188fb9083250adf5f
+SIZE (stretchr-testify-v1.2.2_GH0.tar.gz) = 101698
+SHA256 (tinylib-msgp-v1.0.2_GH0.tar.gz) = 3769a1d074e1e8a1903d26c0cf36ad249848d3a0b2a78c20b8040cfd6ce3811f
+SIZE (tinylib-msgp-v1.0.2_GH0.tar.gz) = 68340
+SHA256 (willf-bitset-v1.1.9_GH0.tar.gz) = 0538859161ccc590da58d0107cf864584f22a8c6b167719502afd541a5fba034
+SIZE (willf-bitset-v1.1.9_GH0.tar.gz) = 16296