FreeBSD Bugzilla – Attachment 207776 Details for
Bug 240771
[exp-run] Go ports: cleanup, finish transition to USES=go
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
D21741_43_44.diff v3
D21741_43_44.diff (text/plain), 251.01 KB, created by
Dmitri Goutnik
on 2019-09-24 19:13:50 UTC
(
hide
)
Description:
D21741_43_44.diff v3
Filename:
MIME Type:
Creator:
Dmitri Goutnik
Created:
2019-09-24 19:13:50 UTC
Size:
251.01 KB
patch
obsolete
>Index: audio/pms-devel/Makefile >=================================================================== >--- audio/pms-devel/Makefile (revision 512745) >+++ audio/pms-devel/Makefile (working copy) >@@ -3,6 +3,7 @@ > > PORTNAME= pms-devel > PORTVERSION= 0.0.20181123 >+PORTREVISION= 1 > CATEGORIES= audio > > MAINTAINER= riggs@FreeBSD.org >@@ -11,7 +12,7 @@ > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-USES= go >+USES= go:modules > > USE_GITHUB= yes > GH_ACCOUNT= ambientsound >@@ -18,52 +19,46 @@ > 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> >Index: audio/pms-devel/distinfo >=================================================================== >--- audio/pms-devel/distinfo (revision 512745) >+++ audio/pms-devel/distinfo (working copy) >@@ -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 >Index: benchmarks/vegeta/Makefile >=================================================================== >--- benchmarks/vegeta/Makefile (revision 512745) >+++ benchmarks/vegeta/Makefile (working copy) >@@ -15,33 +15,25 @@ > USE_GITHUB= yes > > GH_ACCOUNT= tsenart >-GH_TUPLE= alecthomas:jsonschema:f2c9385:jsonschema/github.com/alecthomas/jsonschema \ >- c2h5oh:datasize:4eba002:datasize/github.com/c2h5oh/datasize \ >- bmizerany:perks:d9a9656:perks/github.com/bmizerany/perks \ >- dgryski:go-gk:201884a:gogk/github.com/dgryski/go-gk \ >- dgryski:go-lttb:318fcdf:golttb/github.com/dgryski/go-lttb \ >- google:go-cmp:v0.2.0:gocmp/github.com/google/go-cmp \ >- influxdata:tdigest:a7d76c6:tdigest/github.com/influxdata/tdigest \ >- mailru:easyjson:60711f1:easyjson/github.com/mailru/easyjson \ >- shurcooL:httpfs:809bece:httpfs/github.com/shurcooL/httpfs \ >- shurcooL:vfsgen:62bca83:vfsgen/github.com/shurcooL/vfsgen \ >- streadway:quantile:b0c5887:quantile/github.com/streadway/quantile \ >- tsenart:go-tsz:cdeb9e1:gotsz/github.com/tsenart/go-tsz \ >- golang:net:c394268:net/golang.org/x/net \ >- golang:text:v0.3.0:text/golang.org/x/text >+GH_TUPLE= alecthomas:jsonschema:f2c9385:jsonschema/vendor/github.com/alecthomas/jsonschema \ >+ c2h5oh:datasize:4eba002:datasize/vendor/github.com/c2h5oh/datasize \ >+ bmizerany:perks:d9a9656:perks/vendor/github.com/bmizerany/perks \ >+ dgryski:go-gk:201884a:gogk/vendor/github.com/dgryski/go-gk \ >+ dgryski:go-lttb:318fcdf:golttb/vendor/github.com/dgryski/go-lttb \ >+ google:go-cmp:v0.2.0:gocmp/vendor/github.com/google/go-cmp \ >+ influxdata:tdigest:a7d76c6:tdigest/vendor/github.com/influxdata/tdigest \ >+ mailru:easyjson:60711f1:easyjson/vendor/github.com/mailru/easyjson \ >+ shurcooL:httpfs:809bece:httpfs/vendor/github.com/shurcooL/httpfs \ >+ shurcooL:vfsgen:62bca83:vfsgen/vendor/github.com/shurcooL/vfsgen \ >+ streadway:quantile:b0c5887:quantile/vendor/github.com/streadway/quantile \ >+ tsenart:go-tsz:cdeb9e1:gotsz/vendor/github.com/tsenart/go-tsz \ >+ golang:net:c394268:net/vendor/golang.org/x/net \ >+ golang:text:v0.3.0:text/vendor/golang.org/x/text > >+GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} >+GO_BUILDFLAGS= -tags=netgo \ >+ -ldflags '-s -w -extldflags "-static" -X main.Version=${DISTVERSION}' >+ > PLIST_FILES= bin/${PORTNAME} > >-do-build: >- @${MKDIR} ${WRKSRC}/github.com/${GH_ACCOUNT} >- @${RLN} ${WRKSRC} ${WRKSRC}/github.com/${GH_ACCOUNT}/${PORTNAME} >- @${RLN} ${WRKSRC} ${WRKSRC}/src >- @cd ${WRKSRC} && \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ >- ${GO_CMD} build -v -a -tags=netgo -ldflags \ >- '-s -w -extldflags "-static" -X main.Version=${DISTVERSION}' -o bin/${PORTNAME} >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}/${LOCALBASE}/bin >- > .include <bsd.port.mk> >Index: databases/go-carbon/Makefile >=================================================================== >--- databases/go-carbon/Makefile (revision 512745) >+++ databases/go-carbon/Makefile (working copy) >@@ -18,18 +18,16 @@ > GH_ACCOUNT= lomik > USE_RC_SUBR= ${PORTNAME} > >+GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} >+GO_BUILDFLAGS= -ldflags '-X main.BuildVersion=${DISTVERSION}' >+ > USERS= carbon > GROUPS= carbon > >-do-build: >- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}/_vendor \ >- go build --ldflags '-X main.BuildVersion=${DISTVERSION}' github.com/lomik/go-carbon >- >-do-install: >+post-install: > @${MKDIR} ${STAGEDIR}/var/db/go-carbon > @${MKDIR} ${STAGEDIR}/var/log/go-carbon > @${MKDIR} ${STAGEDIR}/${PREFIX}/etc/go-carbon >- ${INSTALL_PROGRAM} ${WRKSRC}/go-carbon ${STAGEDIR}${PREFIX}/bin/ > ${INSTALL_DATA} ${WRKSRC}/deploy/go-carbon.conf ${STAGEDIR}${PREFIX}/etc/go-carbon/go-carbon.conf.sample > ${INSTALL_DATA} ${WRKSRC}/deploy/storage-aggregation.conf ${STAGEDIR}${PREFIX}/etc/go-carbon/storage-aggregation.conf.sample > ${INSTALL_DATA} ${WRKSRC}/deploy/storage-schemas.conf ${STAGEDIR}${PREFIX}/etc/go-carbon/storage-schemas.conf.sample >Index: databases/influxdb/Makefile >=================================================================== >--- databases/influxdb/Makefile (revision 512745) >+++ databases/influxdb/Makefile (working copy) >@@ -22,96 +22,104 @@ > GH_ACCOUNT= influxdata > GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT_DEFAULT} > >-GH_TUPLE= BurntSushi:toml:a368813:BurntSushi_toml/src/github.com/BurntSushi/toml \ >- Masterminds:semver:v1.4.2:Masterminds_semver/src/github.com/Masterminds/semver \ >- alecthomas:kingpin:v2.2.6:alecthomas_kingpin/src/github.com/alecthomas/kingpin \ >- alecthomas:template:a0175ee:alecthomas_template/src/github.com/alecthomas/template \ >- alecthomas:units:2efee85:alecthomas_units/src/github.com/alecthomas/units \ >- apache:arrow:f5df773:apache_arrow/src/github.com/apache/arrow \ >- apex:log:941dea7:apex_log/src/github.com/apex/log \ >- aws:aws-sdk-go:v1.15.50:aws_aws_sdk_go/src/github.com/aws/aws-sdk-go \ >- beorn7:perks:3a771d9:beorn7_perks/src/github.com/beorn7/perks \ >- blakesmith:ar:8bd4349:blakesmith_ar/src/github.com/blakesmith/ar \ >- bmizerany:pat:6226ea5:bmizerany_pat/src/github.com/bmizerany/pat \ >- boltdb:bolt:v1.3.1:boltdb_bolt/src/github.com/boltdb/bolt \ >- c-bata:go-prompt:v0.2.1:c_bata_go_prompt/src/github.com/c-bata/go-prompt \ >- caarlos0:ctrlc:v1.0.0:caarlos0_ctrlc/src/github.com/caarlos0/ctrlc \ >- campoy:unique:88950e5:campoy_unique/src/github.com/campoy/unique \ >- cespare:xxhash:v1.0.0:cespare_xxhash/src/github.com/cespare/xxhash \ >- collectd:go-collectd:v0.3.0:collectd_go_collectd/src/collectd.org \ >- davecgh:go-spew:v1.1.0:davecgh_go_spew/src/github.com/davecgh/go-spew \ >- dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/src/github.com/dgrijalva/jwt-go \ >- dgryski:go-bitstream:3522498:dgryski_go_bitstream/src/github.com/dgryski/go-bitstream \ >- dominikh:go-tools:2017.2.2:dominikh_go_tools/src/honnef.co/go/tools \ >- fatih:color:v1.5.0:fatih_color/src/github.com/fatih/color \ >- glycerine:go-unsnap-stream:9f0cb55:glycerine_go_unsnap_stream/src/github.com/glycerine/go-unsnap-stream \ >- go-ini:ini:v1.38.3:go_ini_ini/src/github.com/go-ini/ini \ >- go-sql-driver:mysql:v1.4.1:go_sql_driver_mysql/src/github.com/go-sql-driver/mysql \ >- go-yaml:yaml:5420a8b:go_yaml_yaml/src/gopkg.in/yaml.v2 \ >- gogo:protobuf:v1.1.1:gogo_protobuf/src/github.com/gogo/protobuf \ >- golang:appengine:v1.2.0:golang_appengine/src/google.golang.org/appengine \ >- golang:crypto:a214413:golang_crypto/src/golang.org/x/crypto \ >- golang:net:a680a1e:golang_net/src/golang.org/x/net \ >- golang:oauth2:c57b0fa:golang_oauth2/src/golang.org/x/oauth2 \ >- golang:protobuf:v1.1.0:golang_protobuf/src/github.com/golang/protobuf \ >- golang:snappy:d9eb7a3:golang_snappy/src/github.com/golang/snappy \ >- golang:sync:1d60e46:golang_sync/src/golang.org/x/sync \ >- golang:sys:ac767d6:golang_sys/src/golang.org/x/sys \ >- golang:text:v0.3.0:golang_text/src/golang.org/x/text \ >- golang:time:fbb02b2:golang_time/src/golang.org/x/time \ >- golang:tools:45ff765:golang_tools/src/golang.org/x/tools \ >- google:go-cmp:v0.2.0:google_go_cmp/src/github.com/google/go-cmp \ >- google:go-genproto:fedd286:google_go_genproto/src/google.golang.org/genproto \ >- google:go-github:dd29b54:google_go_github/src/github.com/google/go-github \ >- google:go-querystring:v1.0.0:google_go_querystring/src/github.com/google/go-querystring \ >- goreleaser:goreleaser:v0.88.0:goreleaser_goreleaser/src/github.com/goreleaser/goreleaser \ >- goreleaser:nfpm:v0.9.5:goreleaser_nfpm/src/github.com/goreleaser/nfpm \ >- grpc:grpc-go:v1.13.0:grpc_grpc_go/src/google.golang.org/grpc \ >- imdario:mergo:v0.3.6:imdario_mergo/src/github.com/imdario/mergo \ >- influxdata:flux:v0.24.0:influxdata_flux/src/github.com/influxdata/flux \ >- influxdata:influxql:v1.0.0:influxdata_influxql/src/github.com/influxdata/influxql \ >- influxdata:line-protocol:a3afd89:influxdata_line_protocol/src/github.com/influxdata/line-protocol \ >- influxdata:roaring:fc520f4:influxdata_roaring/src/github.com/influxdata/roaring \ >- influxdata:tdigest:bf2b5ad:influxdata_tdigest/src/github.com/influxdata/tdigest \ >- influxdata:usage-client:6d38953:influxdata_usage_client/src/github.com/influxdata/usage-client \ >- jmespath:go-jmespath:0b12d6b:jmespath_go_jmespath/src/github.com/jmespath/go-jmespath \ >- jsternberg:zap-logfmt:v1.0.0:jsternberg_zap_logfmt/src/github.com/jsternberg/zap-logfmt \ >- jwilder:encoding:b4e1701:jwilder_encoding/src/github.com/jwilder/encoding \ >- kisielk:gotool:v1.0.0:kisielk_gotool/src/github.com/kisielk/gotool \ >- klauspost:compress:v1.4.0:klauspost_compress/src/github.com/klauspost/compress \ >- klauspost:cpuid:v1.1:klauspost_cpuid/src/github.com/klauspost/cpuid \ >- klauspost:crc32:v1.1:klauspost_crc32/src/github.com/klauspost/crc32 \ >- klauspost:pgzip:v1.1:klauspost_pgzip/src/github.com/klauspost/pgzip \ >- lib:pq:v1.0.0:lib_pq/src/github.com/lib/pq \ >- mattn:go-colorable:v0.0.9:mattn_go_colorable/src/github.com/mattn/go-colorable \ >- mattn:go-isatty:6ca4dbf:mattn_go_isatty/src/github.com/mattn/go-isatty \ >- mattn:go-runewidth:v0.0.2:mattn_go_runewidth/src/github.com/mattn/go-runewidth \ >- mattn:go-tty:13ff120:mattn_go_tty/src/github.com/mattn/go-tty \ >- mattn:go-zglob:2ea3427:mattn_go_zglob/src/github.com/mattn/go-zglob \ >- matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions \ >- mitchellh:go-homedir:ae18d6b:mitchellh_go_homedir/src/github.com/mitchellh/go-homedir \ >- mschoch:smat:90eadee:mschoch_smat/src/github.com/mschoch/smat \ >- opentracing:opentracing-go:bd9c319:opentracing_opentracing_go/src/github.com/opentracing/opentracing-go \ >- paulbellamy:ratecounter:v0.2.0:paulbellamy_ratecounter/src/github.com/paulbellamy/ratecounter \ >- peterh:liner:8c1271f:peterh_liner/src/github.com/peterh/liner \ >- philhofer:fwd:v1.0.0:philhofer_fwd/src/github.com/philhofer/fwd \ >- pkg:errors:v0.8.0:pkg_errors/src/github.com/pkg/errors \ >- pkg:term:bffc007:pkg_term/src/github.com/pkg/term \ >- prometheus:client_golang:661e31b:prometheus_client_golang/src/github.com/prometheus/client_golang \ >- prometheus:client_model:5c3871d:prometheus_client_model/src/github.com/prometheus/client_model \ >- prometheus:common:7600349:prometheus_common/src/github.com/prometheus/common \ >- prometheus:procfs:ae68e2d:prometheus_procfs/src/github.com/prometheus/procfs \ >- retailnext:hllpp:101a6d2:retailnext_hllpp/src/github.com/retailnext/hllpp \ >- satori:go.uuid:v1.2.0:satori_go_uuid/src/github.com/satori/go.uuid \ >- segmentio:kafka-go:v0.2.2:segmentio_kafka_go/src/github.com/segmentio/kafka-go \ >- spf13:cast:v1.3.0:spf13_cast/src/github.com/spf13/cast \ >- tinylib:msgp:1.0.2:tinylib_msgp/src/github.com/tinylib/msgp \ >- uber-go:atomic:v1.3.2:uber_go_atomic/src/go.uber.org/atomic \ >- uber-go:multierr:v1.1.0:uber_go_multierr/src/go.uber.org/multierr \ >- uber-go:zap:v1.9.0:uber_go_zap/src/go.uber.org/zap \ >- willf:bitset:v1.1.3:willf_bitset/src/github.com/willf/bitset \ >- xlab:treeprint:d6fb674:xlab_treeprint/src/github.com/xlab/treeprint >+GH_TUPLE= BurntSushi:toml:a368813:BurntSushi_toml/vendor/github.com/BurntSushi/toml \ >+ Masterminds:semver:v1.4.2:Masterminds_semver/vendor/github.com/Masterminds/semver \ >+ alecthomas:kingpin:v2.2.6:alecthomas_kingpin/vendor/github.com/alecthomas/kingpin \ >+ alecthomas:template:a0175ee:alecthomas_template/vendor/github.com/alecthomas/template \ >+ alecthomas:units:2efee85:alecthomas_units/vendor/github.com/alecthomas/units \ >+ apache:arrow:f5df773:apache_arrow/vendor/github.com/apache/arrow \ >+ apex:log:941dea7:apex_log/vendor/github.com/apex/log \ >+ aws:aws-sdk-go:v1.15.50:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ >+ beorn7:perks:3a771d9:beorn7_perks/vendor/github.com/beorn7/perks \ >+ blakesmith:ar:8bd4349:blakesmith_ar/vendor/github.com/blakesmith/ar \ >+ bmizerany:pat:6226ea5:bmizerany_pat/vendor/github.com/bmizerany/pat \ >+ boltdb:bolt:v1.3.1:boltdb_bolt/vendor/github.com/boltdb/bolt \ >+ c-bata:go-prompt:v0.2.1:c_bata_go_prompt/vendor/github.com/c-bata/go-prompt \ >+ caarlos0:ctrlc:v1.0.0:caarlos0_ctrlc/vendor/github.com/caarlos0/ctrlc \ >+ campoy:unique:88950e5:campoy_unique/vendor/github.com/campoy/unique \ >+ cespare:xxhash:v1.0.0:cespare_xxhash/vendor/github.com/cespare/xxhash \ >+ collectd:go-collectd:v0.3.0:collectd_go_collectd/vendor/collectd.org \ >+ davecgh:go-spew:v1.1.0:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ >+ dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \ >+ dgryski:go-bitstream:3522498:dgryski_go_bitstream/vendor/github.com/dgryski/go-bitstream \ >+ dominikh:go-tools:2017.2.2:dominikh_go_tools/vendor/honnef.co/go/tools \ >+ fatih:color:v1.5.0:fatih_color/vendor/github.com/fatih/color \ >+ glycerine:go-unsnap-stream:9f0cb55:glycerine_go_unsnap_stream/vendor/github.com/glycerine/go-unsnap-stream \ >+ go-ini:ini:v1.38.3:go_ini_ini/vendor/github.com/go-ini/ini \ >+ go-sql-driver:mysql:v1.4.1:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \ >+ go-yaml:yaml:5420a8b:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ >+ gogo:protobuf:v1.1.1:gogo_protobuf/vendor/github.com/gogo/protobuf \ >+ golang:appengine:v1.2.0:golang_appengine/vendor/google.golang.org/appengine \ >+ golang:crypto:a214413:golang_crypto/vendor/golang.org/x/crypto \ >+ golang:net:a680a1e:golang_net/vendor/golang.org/x/net \ >+ golang:oauth2:c57b0fa:golang_oauth2/vendor/golang.org/x/oauth2 \ >+ golang:protobuf:v1.1.0:golang_protobuf/vendor/github.com/golang/protobuf \ >+ golang:snappy:d9eb7a3:golang_snappy/vendor/github.com/golang/snappy \ >+ golang:sync:1d60e46:golang_sync/vendor/golang.org/x/sync \ >+ golang:sys:ac767d6:golang_sys/vendor/golang.org/x/sys \ >+ golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \ >+ golang:time:fbb02b2:golang_time/vendor/golang.org/x/time \ >+ golang:tools:45ff765:golang_tools/vendor/golang.org/x/tools \ >+ google:go-cmp:v0.2.0:google_go_cmp/vendor/github.com/google/go-cmp \ >+ google:go-genproto:fedd286:google_go_genproto/vendor/google.golang.org/genproto \ >+ google:go-github:dd29b54:google_go_github/vendor/github.com/google/go-github \ >+ google:go-querystring:v1.0.0:google_go_querystring/vendor/github.com/google/go-querystring \ >+ goreleaser:goreleaser:v0.88.0:goreleaser_goreleaser/vendor/github.com/goreleaser/goreleaser \ >+ goreleaser:nfpm:v0.9.5:goreleaser_nfpm/vendor/github.com/goreleaser/nfpm \ >+ grpc:grpc-go:v1.13.0:grpc_grpc_go/vendor/google.golang.org/grpc \ >+ imdario:mergo:v0.3.6:imdario_mergo/vendor/github.com/imdario/mergo \ >+ influxdata:flux:v0.24.0:influxdata_flux/vendor/github.com/influxdata/flux \ >+ influxdata:influxql:v1.0.0:influxdata_influxql/vendor/github.com/influxdata/influxql \ >+ influxdata:line-protocol:a3afd89:influxdata_line_protocol/vendor/github.com/influxdata/line-protocol \ >+ influxdata:roaring:fc520f4:influxdata_roaring/vendor/github.com/influxdata/roaring \ >+ influxdata:tdigest:bf2b5ad:influxdata_tdigest/vendor/github.com/influxdata/tdigest \ >+ influxdata:usage-client:6d38953:influxdata_usage_client/vendor/github.com/influxdata/usage-client \ >+ jmespath:go-jmespath:0b12d6b:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \ >+ jsternberg:zap-logfmt:v1.0.0:jsternberg_zap_logfmt/vendor/github.com/jsternberg/zap-logfmt \ >+ jwilder:encoding:b4e1701:jwilder_encoding/vendor/github.com/jwilder/encoding \ >+ kisielk:gotool:v1.0.0:kisielk_gotool/vendor/github.com/kisielk/gotool \ >+ klauspost:compress:v1.4.0:klauspost_compress/vendor/github.com/klauspost/compress \ >+ klauspost:cpuid:v1.1:klauspost_cpuid/vendor/github.com/klauspost/cpuid \ >+ klauspost:crc32:v1.1:klauspost_crc32/vendor/github.com/klauspost/crc32 \ >+ klauspost:pgzip:v1.1:klauspost_pgzip/vendor/github.com/klauspost/pgzip \ >+ lib:pq:v1.0.0:lib_pq/vendor/github.com/lib/pq \ >+ mattn:go-colorable:v0.0.9:mattn_go_colorable/vendor/github.com/mattn/go-colorable \ >+ mattn:go-isatty:6ca4dbf:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ >+ mattn:go-runewidth:v0.0.2:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ >+ mattn:go-tty:13ff120:mattn_go_tty/vendor/github.com/mattn/go-tty \ >+ mattn:go-zglob:2ea3427:mattn_go_zglob/vendor/github.com/mattn/go-zglob \ >+ matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ >+ mitchellh:go-homedir:ae18d6b:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ >+ mschoch:smat:90eadee:mschoch_smat/vendor/github.com/mschoch/smat \ >+ opentracing:opentracing-go:bd9c319:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \ >+ paulbellamy:ratecounter:v0.2.0:paulbellamy_ratecounter/vendor/github.com/paulbellamy/ratecounter \ >+ peterh:liner:8c1271f:peterh_liner/vendor/github.com/peterh/liner \ >+ philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \ >+ pkg:errors:v0.8.0:pkg_errors/vendor/github.com/pkg/errors \ >+ pkg:term:bffc007:pkg_term/vendor/github.com/pkg/term \ >+ prometheus:client_golang:661e31b:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ >+ prometheus:client_model:5c3871d:prometheus_client_model/vendor/github.com/prometheus/client_model \ >+ prometheus:common:7600349:prometheus_common/vendor/github.com/prometheus/common \ >+ prometheus:procfs:ae68e2d:prometheus_procfs/vendor/github.com/prometheus/procfs \ >+ retailnext:hllpp:101a6d2:retailnext_hllpp/vendor/github.com/retailnext/hllpp \ >+ satori:go.uuid:v1.2.0:satori_go_uuid/vendor/github.com/satori/go.uuid \ >+ segmentio:kafka-go:v0.2.2:segmentio_kafka_go/vendor/github.com/segmentio/kafka-go \ >+ spf13:cast:v1.3.0:spf13_cast/vendor/github.com/spf13/cast \ >+ tinylib:msgp:1.0.2:tinylib_msgp/vendor/github.com/tinylib/msgp \ >+ uber-go:atomic:v1.3.2:uber_go_atomic/vendor/go.uber.org/atomic \ >+ uber-go:multierr:v1.1.0:uber_go_multierr/vendor/go.uber.org/multierr \ >+ uber-go:zap:v1.9.0:uber_go_zap/vendor/go.uber.org/zap \ >+ willf:bitset:v1.1.3:willf_bitset/vendor/github.com/willf/bitset \ >+ xlab:treeprint:d6fb674:xlab_treeprint/vendor/github.com/xlab/treeprint > >+GO_BUILDFLAGS= -ldflags "-X main.version=${DISTVERSION}" >+GO_TARGET= ./cmd/influxd \ >+ ./cmd/influx \ >+ ./cmd/influx_inspect \ >+ ./cmd/influx_tsm \ >+ ./cmd/influx_stress \ >+ ./cmd/store:influx_store >+ > OPTIONS_DEFINE= MANPAGES > OPTIONS_DEFAULT= MANPAGES > OPTIONS_SUB= yes >@@ -151,31 +159,21 @@ > SUB_LIST+= INFLUXD_LOGCMD="logger" > .endif > >-do-build: >- @cd ${WRKSRC}/${GH_SUBDIR} && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/... >- > do-build-MANPAGES-on: >- @cd ${WRKSRC}/${GH_SUBDIR}/man && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} >+ @cd ${WRKSRC}/man && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} > >-do-install: >+post-install: > ${MKDIR} ${STAGEDIR}${INFLUXD_DBDIR} \ > ${STAGEDIR}${INFLUXD_PIDDIR} \ > ${STAGEDIR}${INFLUXD_LOGDIR} >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/influxd ${STAGEDIR}${PREFIX}/bin/influxd >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/influx ${STAGEDIR}${PREFIX}/bin/influx >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/influx_inspect ${STAGEDIR}${PREFIX}/bin/influx_inspect >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/influx_tsm ${STAGEDIR}${PREFIX}/bin/influx_tsm >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/influx_stress ${STAGEDIR}${PREFIX}/bin/influx_stress >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/store ${STAGEDIR}${PREFIX}/bin/influx_store > @${SED} -i .bak -e \ > "s|/var/lib/influxdb|/var/db/influxdb|g" \ >- ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT}/etc/config.sample.toml >+ ${WRKSRC}/etc/config.sample.toml > ${INSTALL_DATA} \ >- ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT}/etc/config.sample.toml \ >+ ${WRKSRC}/etc/config.sample.toml \ > ${STAGEDIR}${PREFIX}/etc/influxd.conf.sample > > do-install-MANPAGES-on: >- ${INSTALL_MAN} ${WRKSRC}/src/github.com/influxdata/influxdb/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 >+ ${INSTALL_MAN} ${WRKSRC}/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 > > .include <bsd.port.post.mk> >Index: databases/mongodb40-tools/Makefile >=================================================================== >--- databases/mongodb40-tools/Makefile (revision 512745) >+++ databases/mongodb40-tools/Makefile (working copy) >@@ -22,7 +22,6 @@ > > GO_BUILDFLAGS= -tags "${USE_MY_TAGS}" > GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} >-GO_TARGET= ${TOOL_BUILD:C,(.*),github.com/${GH_ACCOUNT}/${GH_PROJECT}/\1/\1,} > > CONFLICTS_INSTALL= mongodb3[46] mongodb3[46]-tools > >@@ -45,29 +44,20 @@ > MONGOTOP_DESC= Track the amount of data I/O time > MONGOREPLAY_DESC= Traffic capture and replay tool > >-BSONDUMP_VARS= tool_build+=bsondump >-MONGOSTAT_VARS= tool_build+=mongostat >-MONGOFILES_VARS= tool_build+=mongofiles >-MONGOEXPORT_VARS= tool_build+=mongoexport >-MONGOIMPORT_VARS= tool_build+=mongoimport >-MONGORESTORE_VARS= tool_build+=mongorestore >-MONGODUMP_VARS= tool_build+=mongodump >-MONGOTOP_VARS= tool_build+=mongotop >-MONGOREPLAY_VARS= tool_build+=mongoreplay >+BSONDUMP_VARS= go_target+=./bsondump/main:bsondump >+MONGOSTAT_VARS= go_target+=./mongostat/main:mongostat >+MONGOFILES_VARS= go_target+=./mongofiles/main:mongofiles >+MONGOEXPORT_VARS= go_target+=./mongoexport/main:mongoexport >+MONGOIMPORT_VARS= go_target+=./mongoimport/main:mongoimport >+MONGORESTORE_VARS= go_target+=./mongorestore/main:mongorestore >+MONGODUMP_VARS= go_target+=./mongodump/main:mongodump >+MONGOTOP_VARS= go_target+=./mongotop/main:mongotop >+MONGOREPLAY_VARS= go_target+=./mongoreplay/main:mongoreplay > SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 > SASL_USE= my_tags=sasl > SSL_USES= ssl > SSL_USE= my_tags=ssl > >-.include <bsd.port.options.mk> >- >-# Rename 'main' directories to the tool names so that the binaries >-# are not all named 'main' and we do not have to hack around USES=go. >-post-patch: >-.for tool in ${TOOL_BUILD} >- @${MV} ${WRKSRC}/${tool}/main ${WRKSRC}/${tool}/${tool} >-.endfor >- > post-install-DOCS-on: > @${MKDIR} ${STAGEDIR}${DOCSDIR} > .for doc in README.md CONTRIBUTING.md THIRD-PARTY-NOTICES >Index: deskutils/chart/Makefile >=================================================================== >--- deskutils/chart/Makefile (revision 512745) >+++ deskutils/chart/Makefile (working copy) >@@ -14,28 +14,19 @@ > USES= go > > USE_GITHUB= yes >- >-PORTDOCS= README.md >-OPTIONS_DEFINE= DOCS >- > GH_ACCOUNT= marianogappa > GH_SUBDIR= src/github.com/marianogappa/chart > >-GH_TUPLE= Sirupsen:logrus:v1.0.5:logrus/src/github.com/Sirupsen/logrus \ >- skratchdot:open-golang:75fb7ed:skratchdot/src/github.com/skratchdot/open-golang \ >- golang:crypto:027cca1:crypto/src/golang.org/x/crypto \ >- golang:sys:6c888cc:sys/src/golang.org/x/sys >+GH_TUPLE= Sirupsen:logrus:v1.0.5:logrus/vendor/github.com/Sirupsen/logrus \ >+ skratchdot:open-golang:75fb7ed:skratchdot/vendor/github.com/skratchdot/open-golang \ >+ golang:crypto:027cca1:crypto/vendor/golang.org/x/crypto \ >+ golang:sys:6c888cc:sys/vendor/golang.org/x/sys > >+PORTDOCS= README.md > PLIST_FILES= bin/chart > >-do-build: >- ( cd ${WRKSRC}; \ >- ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} \ >- go build ${BUILD_FLAGS} -o bin/chart ) >+OPTIONS_DEFINE= DOCS > >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/chart ${STAGEDIR}${PREFIX}/bin/chart >- > post-install-DOCS-on: > @${MKDIR} ${STAGEDIR}${DOCSDIR} > ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} >Index: deskutils/noti/Makefile >=================================================================== >--- deskutils/noti/Makefile (revision 512745) >+++ deskutils/noti/Makefile (working copy) >@@ -13,17 +13,15 @@ > RUN_DEPENDS= notify-send:devel/libnotify > > USES= go:modules >+ > USE_GITHUB= yes >- > GH_ACCOUNT= variadico > >-GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} >-GO_TARGET= github.com/${GH_ACCOUNT}/${PORTNAME}/cmd/noti >+GO_TARGET= ./cmd/noti > > PLIST_FILES= bin/noti man/man1/noti.1.gz man/man5/noti.yaml.5.gz > >-do-install: >- ${INSTALL_PROGRAM} ${WRKDIR}/bin/noti ${STAGEDIR}${PREFIX}/bin >+post-install: > ${INSTALL_MAN} ${WRKSRC}/docs/man/noti.1 ${STAGEDIR}${MANPREFIX}/man/man1/noti.1 > ${INSTALL_MAN} ${WRKSRC}/docs/man/noti.yaml.5 ${STAGEDIR}${MANPREFIX}/man/man5/noti.yaml.5 > >Index: deskutils/pet/Makefile >=================================================================== >--- deskutils/pet/Makefile (revision 512745) >+++ deskutils/pet/Makefile (working copy) >@@ -37,7 +37,6 @@ > spf13:cobra:v0.0.3:spf13_cobra/vendor/github.com/spf13/cobra \ > spf13:pflag:v1.0.1:spf13_pflag/vendor/github.com/spf13/pflag \ > xanzy:go-gitlab:v0.10.5:xanzy_go_gitlab/vendor/github.com/xanzy/go-gitlab >-GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} > > PLIST_FILES= bin/${PORTNAME} > >Index: devel/arduino-builder/Makefile >=================================================================== >--- devel/arduino-builder/Makefile (revision 512745) >+++ devel/arduino-builder/Makefile (working copy) >@@ -15,11 +15,13 @@ > > USE_GITHUB= yes > GH_ACCOUNT= arduino >-GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} > GH_TUPLE= go-errors:errors:8fa88b0:goerrors/src/github.com/go-errors/errors \ > stretchr:testify:v1.1.4:stretchr/src/github.com/stretchr/testify \ > jstemmer:go-junit-report:6aeed67:jstemmer/src/github.com/jstemmer/go-junit-report > >+GO_PKGNAME= arduino.cc >+GO_TARGET= ./arduino-builder >+ > OPTIONS_DEFINE= TOOLS > OPTIONS_DEFAULT=TOOLS > >@@ -34,6 +36,10 @@ > arduino/hardware/platform.txt \ > bin/${PORTNAME} > >+# override, upstream expects GOROOT in ${WRKSRC}, not ${WRKDIR} >+post-extract: >+ ${LN} -s ${WRKSRC}/src ${WRKDIR} >+ > do-patch-TOOLS-on: > ${CP} ${FILESDIR}/arduino-builder.options.in ${WRKSRC}/arduino-builder.options > ${REINPLACE_CMD} -e 's|%%IDEVER%%|${_IDE_VER}|' \ >@@ -40,14 +46,10 @@ > -e 's|%%PREFIX%%|${PREFIX}|' \ > ${WRKSRC}/arduino-builder.options > >-do-build: >- @( cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} go build arduino.cc/arduino-builder ) >+post-install: >+ (cd ${GO_WRKSRC}/builder && ${COPYTREE_SHARE} "hardware" ${STAGEDIR}${PREFIX}/arduino ${FIND_EXPR}) > >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >- (cd ${WRKSRC}/src/arduino.cc/builder && ${COPYTREE_SHARE} "hardware" ${STAGEDIR}${PREFIX}/arduino ${FIND_EXPR}) >- >-do-install-TOOLS-on: >+post-install-TOOLS-on: > ${INSTALL_DATA} ${WRKSRC}/arduino-builder.options ${STAGEDIR}${PREFIX}/arduino/arduino-builder.options > > .include <bsd.port.mk> >Index: devel/arduinoOTA/Makefile >=================================================================== >--- devel/arduinoOTA/Makefile (revision 512745) >+++ devel/arduinoOTA/Makefile (working copy) >@@ -15,13 +15,9 @@ > GH_ACCOUNT= arduino > GH_TAGNAME= c2b8306 > >+GO_BUILDFLAGS= -ldflags "-X main.compileInfo=${COMPILEINFO}" >+ > PLIST_FILES= bin/${PORTNAME} > COMPILEINFO= ${OPSYS}${OSREL}-${ARCH}-${GH_TAGNAME} > >-do-build: >- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO_ENV} go build -o ${PORTNAME} -ldflags "-X main.compileInfo=${COMPILEINFO}" main.go >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >- > .include <bsd.port.mk> >Index: devel/bazel-buildtools/Makefile >=================================================================== >--- devel/bazel-buildtools/Makefile (revision 512745) >+++ devel/bazel-buildtools/Makefile (working copy) >@@ -18,10 +18,11 @@ > google:skylark:a5f7082:skylark/vendor/github.com/google/skylark > > GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} >-GO_TARGET= ${EXES:S/^/${GO_PKGNAME}\//} >+GO_TARGET= ./buildifier \ >+ ./buildifier2 \ >+ ./buildozer \ >+ ./unused_deps > >-PLIST_FILES= ${EXES:S/^/bin\//} >+PLIST_FILES= ${GO_TARGET:S/^./bin/} > >-EXES= buildifier buildifier2 buildozer unused_deps >- > .include <bsd.port.mk> >Index: devel/etcd/Makefile >=================================================================== >--- devel/etcd/Makefile (revision 512745) >+++ devel/etcd/Makefile (working copy) >@@ -31,10 +31,6 @@ > OPTIONS_DEFINE= DOCS > DOCS_DESC= Install etcd README file > >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcd ${STAGEDIR}${PREFIX}/bin/ >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcdctl ${STAGEDIR}${PREFIX}/bin/ >- > do-install-DOCS-on: > ${MKDIR} ${STAGEDIR}${DOCSDIR} > ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} >Index: devel/etcd31/Makefile >=================================================================== >--- devel/etcd31/Makefile (revision 512745) >+++ devel/etcd31/Makefile (working copy) >@@ -17,8 +17,8 @@ > > USES= go > GO_PKGNAME= github.com/coreos/etcd >-GO_TARGET= github.com/coreos/etcd \ >- github.com/coreos/etcdctl >+GO_TARGET= ./cmd/etcd \ >+ ./cmd/etcdctl > USE_GITHUB= yes > GH_ACCOUNT= coreos > >@@ -29,19 +29,9 @@ > OPTIONS_DEFINE= DOCS > DOCS_DESC= Install etcd README file > >-post-extract: >- @${MV} ${WRKSRC}/cmd/vendor ${WRKDIR}/src >- @${RM} ${GO_WRKDIR_SRC}/github.com/${GH_ACCOUNT}/${PORTNAME} >- @${LN} -s ${WRKSRC} ${GO_WRKDIR_SRC}/github.com/${GH_ACCOUNT}/etcd >- @${LN} -s ${WRKSRC}/etcdctl ${GO_WRKDIR_SRC}/github.com/${GH_ACCOUNT}/etcdctl >- > post-patch: >- ${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${GO_WRKDIR_SRC}/github.com/coreos/pkg/dlopen/dlopen.go >+ ${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${WRKSRC}/cmd/vendor/github.com/coreos/pkg/dlopen/dlopen.go > >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcd ${STAGEDIR}${PREFIX}/bin/ >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcdctl ${STAGEDIR}${PREFIX}/bin/ >- > do-install-DOCS-on: > ${MKDIR} ${STAGEDIR}${DOCSDIR} > ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} >Index: devel/etcd32/Makefile >=================================================================== >--- devel/etcd32/Makefile (revision 512745) >+++ devel/etcd32/Makefile (working copy) >@@ -17,8 +17,8 @@ > > USES= go > GO_PKGNAME= github.com/coreos/etcd >-GO_TARGET= github.com/coreos/etcd \ >- github.com/coreos/etcdctl >+GO_TARGET= ./cmd/etcd \ >+ ./cmd/etcdctl > USE_GITHUB= yes > GH_ACCOUNT= coreos > >@@ -29,19 +29,9 @@ > OPTIONS_DEFINE= DOCS > DOCS_DESC= Install etcd README file > >-post-extract: >- @${MV} ${WRKSRC}/cmd/vendor ${WRKDIR}/src >- @${RM} ${GO_WRKDIR_SRC}/github.com/${GH_ACCOUNT}/${PORTNAME} >- @${LN} -s ${WRKSRC} ${GO_WRKDIR_SRC}/github.com/${GH_ACCOUNT}/etcd >- @${LN} -s ${WRKSRC}/etcdctl ${GO_WRKDIR_SRC}/github.com/${GH_ACCOUNT}/etcdctl >- > post-patch: >- ${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${GO_WRKDIR_SRC}/github.com/coreos/pkg/dlopen/dlopen.go >+ ${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${WRKSRC}/cmd/vendor/github.com/coreos/pkg/dlopen/dlopen.go > >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcd ${STAGEDIR}${PREFIX}/bin/ >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcdctl ${STAGEDIR}${PREFIX}/bin/ >- > do-install-DOCS-on: > ${MKDIR} ${STAGEDIR}${DOCSDIR} > ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} >Index: devel/etcd33/Makefile >=================================================================== >--- devel/etcd33/Makefile (revision 512745) >+++ devel/etcd33/Makefile (working copy) >@@ -17,8 +17,8 @@ > > USES= go > GO_PKGNAME= github.com/coreos/etcd >-GO_TARGET= github.com/coreos/etcd \ >- github.com/coreos/etcdctl >+GO_TARGET= ./cmd/etcd \ >+ ./cmd/etcdctl > USE_GITHUB= yes > GH_ACCOUNT= coreos > >@@ -29,19 +29,9 @@ > OPTIONS_DEFINE= DOCS > DOCS_DESC= Install etcd README file > >-post-extract: >- @${MV} ${WRKSRC}/cmd/vendor ${WRKDIR}/src >- @${RM} ${GO_WRKDIR_SRC}/github.com/${GH_ACCOUNT}/${PORTNAME} >- @${LN} -s ${WRKSRC} ${GO_WRKDIR_SRC}/github.com/${GH_ACCOUNT}/etcd >- @${LN} -s ${WRKSRC}/etcdctl ${GO_WRKDIR_SRC}/github.com/${GH_ACCOUNT}/etcdctl >- > post-patch: >- ${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${GO_WRKDIR_SRC}/github.com/coreos/pkg/dlopen/dlopen.go >+ ${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${WRKSRC}/cmd/vendor/github.com/coreos/pkg/dlopen/dlopen.go > >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcd ${STAGEDIR}${PREFIX}/bin/ >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcdctl ${STAGEDIR}${PREFIX}/bin/ >- > do-install-DOCS-on: > ${MKDIR} ${STAGEDIR}${DOCSDIR} > ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} >Index: devel/etcd33/files/patch-.._src_github.com_coreos_go-systemd_util_util__cgo.go >=================================================================== >--- devel/etcd33/files/patch-.._src_github.com_coreos_go-systemd_util_util__cgo.go (revision 512745) >+++ devel/etcd33/files/patch-.._src_github.com_coreos_go-systemd_util_util__cgo.go (nonexistent) >@@ -1,11 +0,0 @@ >---- ../src/github.com/coreos/go-systemd/util/util_cgo.go.orig >-+++ ../src/github.com/coreos/go-systemd/util/util_cgo.go >-@@ -127,7 +127,7 @@ >- switch { >- case errno >= 0: >- ret = false >-- case serrno == syscall.ENOENT, serrno == syscall.ENXIO, serrno == syscall.ENODATA: >-+ case serrno == syscall.ENOENT, serrno == syscall.ENXIO: >- // Since the implementation of sessions in systemd relies on >- // the `pam_systemd` module, using the sd_pid_get_owner_uid >- // heuristic alone can result in false positives if that module > >Property changes on: devel/etcd33/files/patch-.._src_github.com_coreos_go-systemd_util_util__cgo.go >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: devel/etcd33/files/patch-cmd_vendor_github.com_coreos_go-systemd_util_util__cgo.go >=================================================================== >--- devel/etcd33/files/patch-cmd_vendor_github.com_coreos_go-systemd_util_util__cgo.go (revision 512745) >+++ devel/etcd33/files/patch-cmd_vendor_github.com_coreos_go-systemd_util_util__cgo.go (working copy) >@@ -1,5 +1,5 @@ >---- ../src/github.com/coreos/go-systemd/util/util_cgo.go.orig >-+++ ../src/github.com/coreos/go-systemd/util/util_cgo.go >+--- cmd/vendor/github.com/coreos/go-systemd/util/util_cgo.go.orig >++++ cmd/vendor/github.com/coreos/go-systemd/util/util_cgo.go > @@ -127,7 +127,7 @@ > switch { > case errno >= 0: >Index: devel/git-codereview/Makefile >=================================================================== >--- devel/git-codereview/Makefile (revision 512745) >+++ devel/git-codereview/Makefile (working copy) >@@ -14,19 +14,9 @@ > GH_PROJECT= review > GH_TAGNAME= 77ae237 > >+GO_PKGNAME= golang.org/x/review >+GO_TARGET= ./git-codereview >+ > PLIST_FILES= bin/git-codereview > >-post-patch: >- @${MKDIR} ${WRKSRC}/src/golang.org/x/review >-.for src in .gitattributes AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE PATENTS \ >- README codereview.cfg git-codereview >- @${MV} ${WRKSRC}/${src} ${WRKSRC}/src/golang.org/x/review >-.endfor >- >-do-build: >- @cd ${WRKSRC}/src/golang.org/x/review ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go install ./... >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >- > .include <bsd.port.mk> >Index: devel/git-lfs/Makefile >=================================================================== >--- devel/git-lfs/Makefile (revision 512745) >+++ devel/git-lfs/Makefile (working copy) >@@ -14,8 +14,6 @@ > USES= go:modules > USE_GITHUB= yes > >-GO_PKGNAME= github.com/${PORTNAME}/${PORTNAME} >- > OPTIONS_DEFINE= GIT_SUBVERSION MANPAGES > OPTIONS_DEFAULT= MANPAGES > OPTIONS_SUB= yes >Index: devel/git-town/Makefile >=================================================================== >--- devel/git-town/Makefile (revision 512745) >+++ devel/git-town/Makefile (working copy) >@@ -25,12 +25,6 @@ > > PORTDOCS= * > >-do-build: >- @cd ${WRKSRC}/${GH_SUBDIR} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ >- > do-install-DOCS-on: > cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} > >Index: devel/gitlab-runner/Makefile >=================================================================== >--- devel/gitlab-runner/Makefile (revision 512745) >+++ devel/gitlab-runner/Makefile (working copy) >@@ -35,11 +35,13 @@ > # https://gitlab-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-runner-freebsd-amd64 > BUILT= 2019-07-19T13:53:05+0000 > >-GO_LDFLAGS= -X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=${PORTVERSION} \ >+GO_PKGNAME= gitlab.com/${GL_ACCOUNT}/${GL_PROJECT} >+GO_BUILDFLAGS= -ldflags="\ >+ -X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=${PORTVERSION} \ > -X gitlab.com/gitlab-org/gitlab-runner/common.REVISION=${GL_COMMIT:C/^(........).*/\1/} \ > -X gitlab.com/gitlab-org/gitlab-runner/common.BUILT=${BUILT} \ > -X gitlab.com/gitlab-org/gitlab-runner/common.BRANCH=${GITBRANCH} \ >- -s -w >+ -s -w" > > PLIST_FILES= bin/gitlab-runner > >@@ -48,13 +50,12 @@ > USERS= gitlab-runner > GROUPS= gitlab-runner > >-post-extract: >+post-patch: > @${MKDIR} ${WRKSRC}/out/docker/ > @${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-x86_64.tar.xz ${WRKSRC}/out/docker/ > @${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-arm.tar.xz ${WRKSRC}/out/docker/ >- @${MV} ${WRKSRC}/vendor ${WRKSRC}/src > >-do-build: >+pre-build: > @cd ${WRKSRC} && go-bindata \ > -pkg docker \ > -nocompress \ >@@ -64,15 +65,5 @@ > -o executors/docker/bindata.go \ > out/docker/prebuilt-x86_64.tar.xz \ > out/docker/prebuilt-arm.tar.xz >- @cd ${WRKSRC} && go fmt executors/docker/bindata.go >- @${MKDIR} ${WRKSRC}/src/gitlab.com/gitlab-org >- @${LN} -s ${WRKSRC} ${WRKSRC}/src/gitlab.com/gitlab-org/gitlab-runner >- @cd ${WRKSRC} && \ >- ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build \ >- -ldflags="${GO_LDFLAGS}" \ >- -o gitlab-runner > >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/gitlab-runner ${STAGEDIR}${PREFIX}/bin/gitlab-runner >- > .include <bsd.port.mk> >Index: devel/gitlab-shell/Makefile >=================================================================== >--- devel/gitlab-shell/Makefile (revision 512745) >+++ devel/gitlab-shell/Makefile (working copy) >@@ -28,7 +28,7 @@ > ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample > > do-build: >- export GOCACHE=${WRKSRC}/go && ${WRKSRC}/bin/compile >+ ${SETENV} ${MAKE_ENV} ${GO_ENV} ${WRKSRC}/bin/compile > > pre-install: > ${RM} -rf ${WRKSRC}/go >Index: devel/go-bindata/Makefile >=================================================================== >--- devel/go-bindata/Makefile (revision 512745) >+++ devel/go-bindata/Makefile (working copy) >@@ -15,6 +15,8 @@ > GH_TAGNAME= a0ff256 > GH_SUBDIR= src/github.com/jteeuwen/go-bindata > >+GO_TARGET= ./go-bindata >+ > PLIST_FILES= bin/go-bindata > > PORTDOCS= CONTRIBUTING.md LICENSE README.md >@@ -21,19 +23,10 @@ > > OPTIONS_DEFINE= DOCS > >-do-build: >- cd ${WRKSRC} ; \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o bin/go-bindata ./go-bindata/ >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} \ >- ${STAGEDIR}${PREFIX}/bin/ >+do-install-DOCS-on: > ${MKDIR} ${STAGEDIR}${DOCSDIR} >- >-do-install-DOCS-on: > .for x in ${PORTDOCS} >- ${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/${x} \ >- ${STAGEDIR}${DOCSDIR} >+ ${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR} > .endfor > > .include <bsd.port.mk> >Index: devel/go-git/Makefile >=================================================================== >--- devel/go-git/Makefile (revision 512745) >+++ devel/go-git/Makefile (working copy) >@@ -11,11 +11,9 @@ > LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > >-USES= go >+USES= go:modules > USE_GITHUB= yes > GH_ACCOUNT= src-d >-GO_PKGNAME= gopkg.in/src-d/go-git.v4 >-GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} > GH_TUPLE= golang:crypto:505ab14:crypto/vendor/golang.org/x/crypto \ > golang:net:04a2e54:net/vendor/golang.org/x/net \ > golang:text:f21a4df:golangtext/vendor/golang.org/x/text \ >@@ -35,14 +33,8 @@ > src-d:gcfg:v1.4.0:gcfg/vendor/github.com/src-d/gcfg \ > go-warnings:warnings:v0.1.2:warnings/vendor/gopkg.in/warnings.v0 > >+GO_TARGET= ./cli/go-git >+ > PLIST_FILES= bin/go-git >-MAKE_ENV+= GOFLAGS=-mod=vendor > >-do-build: >- (cd ${GO_WRKSRC}/cli/go-git/; \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ) >- >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKSRC}/cli/go-git/go-git ${STAGEDIR}${PREFIX}/bin/ >- > .include <bsd.port.mk> >Index: devel/go-protobuf/Makefile >=================================================================== >--- devel/go-protobuf/Makefile (revision 512745) >+++ devel/go-protobuf/Makefile (working copy) >@@ -20,25 +20,14 @@ > GH_ACCOUNT= gogo > GH_SUBDIR= src/github.com/gogo/protobuf > >-TARGETS= protoc-gen-combo \ >- protoc-gen-gofast \ >- protoc-gen-gogo \ >- protoc-gen-gogofast \ >- protoc-gen-gogofaster \ >- protoc-gen-gogoslick \ >- protoc-gen-gogotypes \ >- protoc-gen-gostring \ >- protoc-min-version >+GO_TARGET= ./protoc-gen-combo \ >+ ./protoc-gen-gofast \ >+ ./protoc-gen-gogo \ >+ ./protoc-gen-gogofast \ >+ ./protoc-gen-gogofaster \ >+ ./protoc-gen-gogoslick \ >+ ./protoc-gen-gogotypes \ >+ ./protoc-gen-gostring \ >+ ./protoc-min-version > >-do-build: >-.for TARGET in ${TARGETS} >- @cd ${WRKSRC}/${TARGET} && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build >-.endfor >- >-do-install: >-.for TARGET in ${TARGETS} >- ${INSTALL_PROGRAM} ${WRKSRC}/${TARGET}/${TARGET} ${STAGEDIR}${PREFIX}/bin >-.endfor >- > .include <bsd.port.mk> >Index: devel/go-tools/Makefile >=================================================================== >--- devel/go-tools/Makefile (revision 512745) >+++ devel/go-tools/Makefile (working copy) >@@ -15,25 +15,16 @@ > USES= go > > USE_GITHUB= yes >-GH_TUPLE= golang:tools:bfb5194:DEFAULT/src/golang.org/x/tools \ >- golang:crypto:3cb0727:crypto/src/golang.org/x/crypto \ >- golang:net:b6d7b13:net/src/golang.org/x/net >+GH_TUPLE= golang:tools:bfb5194:DEFAULT \ >+ golang:crypto:3cb0727:crypto/vendor/golang.org/x/crypto \ >+ golang:net:b6d7b13:net/vendor/golang.org/x/net > >-TARGETS= benchcmp bundle callgraph compilebench cover digraph eg fiximports \ >- getgo go-contrib-init godex godoc goimports gomvpkg gorename gotype \ >- goyacc guru heapview html2article present ssadump stress stringer \ >- tip toolstash >+GO_PKGNAME= golang.org/x/tools >+GO_TARGET= ./cmd/benchcmp ./cmd/bundle ./cmd/callgraph ./cmd/compilebench \ >+ ./cmd/cover ./cmd/digraph ./cmd/eg ./cmd/fiximports ./cmd/getgo \ >+ ./cmd/go-contrib-init ./cmd/godex ./cmd/godoc ./cmd/goimports \ >+ ./cmd/gomvpkg ./cmd/gorename ./cmd/gotype ./cmd/goyacc ./cmd/guru \ >+ ./cmd/heapview ./cmd/html2article ./cmd/present ./cmd/ssadump \ >+ ./cmd/stress ./cmd/stringer ./cmd/tip ./cmd/toolstash > >-do-build: >-.for TARGET in ${TARGETS} >- cd ${WRKSRC}/cmd/${TARGET} ; \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build golang.org/x/tools/cmd/${TARGET} >-.endfor >- >-do-install: >-.for TARGET in ${TARGETS} >- ${STRIP_CMD} ${WRKSRC}/cmd/${TARGET}/${TARGET} >- ${INSTALL_PROGRAM} ${WRKSRC}/cmd/${TARGET}/${TARGET} ${STAGEDIR}${PREFIX}/bin/ >-.endfor >- > .include <bsd.port.mk> >Index: devel/goprotobuf/Makefile >=================================================================== >--- devel/goprotobuf/Makefile (revision 512745) >+++ devel/goprotobuf/Makefile (working copy) >@@ -23,12 +23,8 @@ > GH_SUBDIR= src/github.com/golang/protobuf > GH_TUPLE= google:go-genproto:02b4e95:genproto/src/google.golang.org/genproto > >+GO_TARGET= ./protoc-gen-go >+ > PLIST_FILES= bin/protoc-gen-go > >-do-build: >- @cd ${WRKSRC}/protoc-gen-go && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/protoc-gen-go/protoc-gen-go ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: devel/jfrog-cli/Makefile >=================================================================== >--- devel/jfrog-cli/Makefile (revision 512745) >+++ devel/jfrog-cli/Makefile (working copy) >@@ -55,7 +55,7 @@ > ulikunitz:xz:v0.5.4:ulikunitz_xz/vendor/github.com/ulikunitz/xz \ > xanzy:ssh-agent:v0.2.0:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent > >-GO_PKGNAME= github.com/jfrog/jfrog-cli-go/jfrog-cli/jfrog >+GO_TARGET= ./jfrog-cli/jfrog > PLIST_FILES= bin/jfrog > > .include <bsd.port.mk> >Index: devel/jiri/Makefile >=================================================================== >--- devel/jiri/Makefile (revision 512745) >+++ devel/jiri/Makefile (working copy) >@@ -11,7 +11,7 @@ > COMMENT= Tool for multi-repo development > > LICENSE= BSD3CLAUSE >-LICENSE_FILE= ${WRKSRC}/go/src/fuchsia.googlesource.com/jiri/LICENSE >+LICENSE_FILE= ${WRKDIR}/src/fuchsia.googlesource.com/jiri/LICENSE > > BUILD_DEPENDS= cmake:devel/cmake \ > ninja:devel/ninja >@@ -21,18 +21,14 @@ > > GITHASH= 56b2a541f92f3bd9d28b29e1cbcb16f96d6bc6c1 > TIMESTAMP= 2019-01-03T00:00:00.000000 >-EXTRACT_AFTER_ARGS= -s "!^!${DISTNAME}/go/src/fuchsia.googlesource.com/jiri/!" >+EXTRACT_AFTER_ARGS= -s "!^!src/fuchsia.googlesource.com/jiri/!" > PLIST_FILES= bin/jiri > >-pre-extract: >- @${MKDIR} ${WRKSRC} >+GO_PKGNAME= fuchsia.googlesource.com/jiri >+GO_TARGET= ./cmd/jiri >+GO_BUILDFLAGS= -ldflags="\ >+ -s -w \ >+ -X fuchsia.googlesource.com/jiri/version.GitCommit=${GITHASH} \ >+ -X fuchsia.googlesource.com/jiri/version.BuildTime=${TIMESTAMP}" > >-do-build: >- cd ${WRKSRC}/go/src/fuchsia.googlesource.com/jiri && \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC}/go \ >- go build -ldflags "-s -w -X \"fuchsia.googlesource.com/jiri/version.GitCommit=${GITHASH}\" -X \"fuchsia.googlesource.com/jiri/version.BuildTime=${TIMESTAMP}\"" -a -o jiri fuchsia.googlesource.com/jiri/cmd/jiri >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/go/src/fuchsia.googlesource.com/jiri/jiri ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: devel/lazygit/Makefile >=================================================================== >--- devel/lazygit/Makefile (revision 512745) >+++ devel/lazygit/Makefile (working copy) >@@ -16,12 +16,8 @@ > > GH_ACCOUNT= jesseduffield > >+GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} >+ > PLIST_FILES= bin/${PORTNAME} > >-post-extract: >- ${MKDIR} ${GO_WRKSRC:H} >- ${LN} -sf ${WRKSRC} ${GO_WRKSRC:H}/${PORTNAME} >- ${MKDIR} ${GO_WRKSRC}/vendor/github.com/${GH_ACCOUNT}/${PORTNAME}/ >- ${MV} ${GO_WRKSRC}/pkg ${GO_WRKSRC}/vendor/github.com/${GH_ACCOUNT}/${PORTNAME}/ >- > .include <bsd.port.mk> >Index: devel/loccount/Makefile >=================================================================== >--- devel/loccount/Makefile (revision 512745) >+++ devel/loccount/Makefile (working copy) >@@ -16,13 +16,8 @@ > GL_ACCOUNT= esr > GL_COMMIT= 249ea3d6927fd327086b609857c04bb95eafdd98 > >+GO_PKGNAME= gitlab.com/${GL_ACCOUNT}/${PORTNAME} >+ > PLIST_FILES= bin/${PORTNAME} > >-do-build: >- @cd ${WRKSRC} && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${PORTNAME} >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: devel/mage/Makefile >=================================================================== >--- devel/mage/Makefile (revision 512745) >+++ devel/mage/Makefile (working copy) >@@ -26,10 +26,7 @@ > ${WRKSRC}/magefile.go > > do-build: >- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ >- ${LOCALBASE}/bin/go run bootstrap.go >+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO_ENV} \ >+ ${GO_CMD} run bootstrap.go > >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >- > .include <bsd.port.mk> >Index: devel/pprof/Makefile >=================================================================== >--- devel/pprof/Makefile (revision 512745) >+++ devel/pprof/Makefile (working copy) >@@ -15,17 +15,10 @@ > USE_GITHUB= yes > GH_ACCOUNT= google > GH_TAGNAME= 54271f7 >-GH_TUPLE= chzyer:readline:v1.4:readline/src/github.com/chzyer/readline \ >- ianlancetaylor:demangle:5e5cf60:demangle/src/github.com/ianlancetaylor/demangle >+GH_TUPLE= chzyer:readline:v1.4:readline/vendor/github.com/chzyer/readline \ >+ ianlancetaylor:demangle:5e5cf60:demangle/vendor/github.com/ianlancetaylor/demangle > GH_SUBDIR= src/github.com/google/${PORTNAME} > > PLIST_FILES= bin/${PORTNAME} > >-do-build: >- @cd ${WRKSRC}/${GH_SUBDIR} && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${PORTNAME} >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: dns/cli53/Makefile >=================================================================== >--- dns/cli53/Makefile (revision 512745) >+++ dns/cli53/Makefile (working copy) >@@ -9,18 +9,15 @@ > COMMENT= Command line tool for Amazon Route 53 > > LICENSE= MIT >-LICENSE_FILE= ${WRKSRC:H:H}/LICENSE >+LICENSE_FILE= ${WRKSRC}/LICENSE > > USES= go > USE_GITHUB= yes > GH_ACCOUNT= barnybug > >-WRKSRC_SUBDIR= cmd/cli53 >-GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME}/cmd/cli53 >+GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} >+GO_TARGET= ./cmd/cli53 >+ > PLIST_FILES= bin/cli53 > >-post-extract: >- @${MKDIR} ${GO_WRKSRC:H:H:H} >- @${LN} -sf ${WRKSRC:H:H} ${GO_WRKSRC:H:H} >- > .include <bsd.port.mk> >Index: dns/dnscrypt-proxy2/Makefile >=================================================================== >--- dns/dnscrypt-proxy2/Makefile (revision 512745) >+++ dns/dnscrypt-proxy2/Makefile (working copy) >@@ -13,12 +13,14 @@ > > RUN_DEPENDS= ca_root_nss>=3.35:security/ca_root_nss > >-USES= go >+USES= go:modules > USE_RC_SUBR= ${PORTNAME} > USE_GITHUB= yes > > GH_ACCOUNT= jedisct1 > >+GO_TARGET= ./dnscrypt-proxy:${PREFIX}/sbin/dnscrypt-proxy >+ > USERS= _dnscrypt-proxy > GROUPS= _dnscrypt-proxy > >@@ -33,16 +35,6 @@ > > OPTIONS_DEFINE= DOCS EXAMPLES > >-do-build: >- ${RLN} ${WRKSRC}/vendor ${WRKSRC}/src >- ${RM} ${WRKSRC}/go.mod >- cd ${WRKSRC}/${PORTNAME} && \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} \ >- ${GO_CMD} build ${GO_BUILDFLAGS} -o ${WRKDIR}/sbin/${PORTNAME} >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKDIR}/sbin/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin >- > do-install-DOCS-on: > ${MKDIR} ${STAGEDIR}${DOCSDIR} > cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} >Index: editors/micro/Makefile >=================================================================== >--- editors/micro/Makefile (revision 512745) >+++ editors/micro/Makefile (working copy) >@@ -17,31 +17,38 @@ > GH_ACCOUNT= zyedidia > GH_SUBDIR= src/github.com/zyedidia/${PORTNAME} > GH_TUPLE= \ >- blang:semver:4a1e882:semver/src/github.com/blang/semver \ >- dustin:go-humanize:259d2a1:humanize/src/github.com/dustin/go-humanize \ >- flynn:json5:7620272:json5/src/github.com/flynn/json5 \ >- gdamore:encoding:b23993c:encoding/src/github.com/gdamore/encoding \ >- go-errors:errors:8fa88b0:errors/src/github.com/go-errors/errors \ >- jtolds:gls:77f1821:gls/src/github.com/jtolds/gls \ >- lucasb-eyer:go-colorful:c900de9:colorful/src/github.com/lucasb-eyer/go-colorful \ >- mattn:go-isatty:fc9e8d8:isatty/src/github.com/mattn/go-isatty \ >- mattn:go-runewidth:97311d9:runewidth/src/github.com/mattn/go-runewidth \ >- mitchellh:go-homedir:b8bc1bf:homedir/src/github.com/mitchellh/go-homedir \ >- sergi:go-diff:feef008:godiff/src/github.com/sergi/go-diff \ >- smartystreets:assertions:0b37b35:assertions/src/github.com/smartystreets/assertions \ >- smartystreets:goconvey:e5b2b7c:goconvey/src/github.com/smartystreets/goconvey \ >- yuin:gopher-lua:b402f31:gopherlua/src/github.com/yuin/gopher-lua \ >- zyedidia:clipboard:4611e80:clipboard/src/github.com/zyedidia/clipboard \ >- zyedidia:glob:dd4023a:glob/src/github.com/zyedidia/glob \ >- zyedidia:poller:ab09682:poller/src/github.com/zyedidia/poller \ >- zyedidia:pty:3036466:pty/src/github.com/zyedidia/pty \ >- zyedidia:tcell:208b6e8:tcell/src/github.com/zyedidia/tcell \ >- zyedidia:terminal:1760577:terminal/src/github.com/zyedidia/terminal \ >- golang:net:1a68b13:net/src/golang.org/x/net \ >- golang:text:210eee5:text/src/golang.org/x/text \ >- go-yaml:yaml:cd8b52f:yaml/src/gopkg.in/yaml.v2 \ >- layeh:gopher-luar:1628157:luar/src/layeh.com/gopher-luar >+ blang:semver:4a1e882:semver/vendor/github.com/blang/semver \ >+ dustin:go-humanize:259d2a1:humanize/vendor/github.com/dustin/go-humanize \ >+ flynn:json5:7620272:json5/vendor/github.com/flynn/json5 \ >+ gdamore:encoding:b23993c:encoding/vendor/github.com/gdamore/encoding \ >+ go-errors:errors:8fa88b0:errors/vendor/github.com/go-errors/errors \ >+ jtolds:gls:77f1821:gls/vendor/github.com/jtolds/gls \ >+ lucasb-eyer:go-colorful:c900de9:colorful/vendor/github.com/lucasb-eyer/go-colorful \ >+ mattn:go-isatty:fc9e8d8:isatty/vendor/github.com/mattn/go-isatty \ >+ mattn:go-runewidth:97311d9:runewidth/vendor/github.com/mattn/go-runewidth \ >+ mitchellh:go-homedir:b8bc1bf:homedir/vendor/github.com/mitchellh/go-homedir \ >+ sergi:go-diff:feef008:godiff/vendor/github.com/sergi/go-diff \ >+ smartystreets:assertions:0b37b35:assertions/vendor/github.com/smartystreets/assertions \ >+ smartystreets:goconvey:e5b2b7c:goconvey/vendor/github.com/smartystreets/goconvey \ >+ yuin:gopher-lua:b402f31:gopherlua/vendor/github.com/yuin/gopher-lua \ >+ zyedidia:clipboard:4611e80:clipboard/vendor/github.com/zyedidia/clipboard \ >+ zyedidia:glob:dd4023a:glob/vendor/github.com/zyedidia/glob \ >+ zyedidia:poller:ab09682:poller/vendor/github.com/zyedidia/poller \ >+ zyedidia:pty:3036466:pty/vendor/github.com/zyedidia/pty \ >+ zyedidia:tcell:208b6e8:tcell/vendor/github.com/zyedidia/tcell \ >+ zyedidia:terminal:1760577:terminal/vendor/github.com/zyedidia/terminal \ >+ golang:net:1a68b13:net/vendor/golang.org/x/net \ >+ golang:text:210eee5:text/vendor/golang.org/x/text \ >+ go-yaml:yaml:cd8b52f:yaml/vendor/gopkg.in/yaml.v2 \ >+ layeh:gopher-luar:1628157:luar/vendor/layeh.com/gopher-luar > >+GO_TARGET= ./cmd/micro >+GO_BUILDFLAGS= -ldflags "\ >+ -s -w \ >+ -X main.Version=${PORTVERSION} \ >+ -X main.CommitHash=${BUILD_HASH} \ >+ -X 'main.CompileDate=${BUILD_DATE}'" >+ > BUILD_HASH= 1856891 > BUILD_DATE= August 9, 2018 > >@@ -50,13 +57,7 @@ > > OPTIONS_DEFINE= DOCS > >-do-build: >- @(cd ${WRKSRC} ; \ >- ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build -ldflags \ >- "-s -w -X main.Version=${PORTVERSION} -X main.CommitHash=${BUILD_HASH} -X 'main.CompileDate=${BUILD_DATE}' " ./cmd/micro ) >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/micro ${STAGEDIR}${PREFIX}/bin >+post-install: > ${MKDIR} ${STAGEDIR}${DOCSDIR} > ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} > >Index: finance/fixc/Makefile >=================================================================== >--- finance/fixc/Makefile (revision 512745) >+++ finance/fixc/Makefile (working copy) >@@ -14,11 +14,4 @@ > USE_GITHUB= yes > GH_ACCOUNT= blttll > >-do-build: >- @cd ${WRKSRC} && \ >- ${SETENV} ${MAKE_ENV} go build -o fixc main.go >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/fixc ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: mail/mailhog/Makefile >=================================================================== >--- mail/mailhog/Makefile (revision 512745) >+++ mail/mailhog/Makefile (working copy) >@@ -15,38 +15,32 @@ > USES= go > USE_RC_SUBR= mailhog > USE_GITHUB= yes >-GH_ACCOUNT= mailhog > GH_PROJECT= MailHog > GH_SUBDIR= src/github.com/mailhog/MailHog >-GH_TUPLE= gorilla:pat:cf955c3:pat/src/github.com/gorilla/pat \ >- gorilla:context:08b5f42:context/src/github.com/gorilla/context \ >- gorilla:mux:ac112f7:mux/src/github.com/gorilla/mux \ >- gorilla:websocket:a69d9f6:websocket/src/github.com/gorilla/websocket \ >- ian-kent:go-log:5731446:go_log/src/github.com/ian-kent/go-log \ >- ian-kent:goose:c3541ea:goose/src/github.com/ian-kent/goose \ >- ian-kent:envconf:c198099:envconf/src/github.com/ian-kent/envconf \ >- ian-kent:linkio:97566b8:linkio/src/github.com/ian-kent/linkio \ >- mailhog:data:v${DISTVERSION}:data/src/github.com/mailhog/data \ >- mailhog:http:v${DISTVERSION}:http/src/github.com/mailhog/http \ >- mailhog:mhsendmail:9e70164:mhsendmail/src/github.com/mailhog/mhsendmail \ >- mailhog:smtp:v${DISTVERSION}:smtp/src/github.com/mailhog/smtp \ >- mailhog:storage:v${DISTVERSION}:storage/src/github.com/mailhog/storage \ >- mailhog:MailHog-Server:v${DISTVERSION}:mailhog_server/src/github.com/mailhog/MailHog-Server \ >- mailhog:MailHog-UI:v${DISTVERSION}:mailhog_ui/src/github.com/mailhog/MailHog-UI \ >- t-k:fluent-logger-golang:0f8ec08:fluent_logger_golang/src/github.com/t-k/fluent-logger-golang \ >- tinylib:msgp:701aacd:msgp/src/github.com/tinylib/msgp \ >- philhofer:fwd:1612a29:fwd/src/github.com/philhofer/fwd \ >- golang:crypto:eb71ad9:crypto/src/golang.org/x/crypto \ >- go-mgo:mgo:3f83fa5:mgo/src/gopkg.in/mgo.v2 >+GH_TUPLE= gorilla:pat:cf955c3:pat/vendor/github.com/gorilla/pat \ >+ gorilla:context:08b5f42:context/vendor/github.com/gorilla/context \ >+ gorilla:mux:ac112f7:mux/vendor/github.com/gorilla/mux \ >+ gorilla:websocket:a69d9f6:websocket/vendor/github.com/gorilla/websocket \ >+ ian-kent:go-log:5731446:go_log/vendor/github.com/ian-kent/go-log \ >+ ian-kent:goose:c3541ea:goose/vendor/github.com/ian-kent/goose \ >+ ian-kent:envconf:c198099:envconf/vendor/github.com/ian-kent/envconf \ >+ ian-kent:linkio:97566b8:linkio/vendor/github.com/ian-kent/linkio \ >+ mailhog:data:v${DISTVERSION}:data/vendor/github.com/mailhog/data \ >+ mailhog:http:v${DISTVERSION}:http/vendor/github.com/mailhog/http \ >+ mailhog:mhsendmail:9e70164:mhsendmail/vendor/github.com/mailhog/mhsendmail \ >+ mailhog:smtp:v${DISTVERSION}:smtp/vendor/github.com/mailhog/smtp \ >+ mailhog:storage:v${DISTVERSION}:storage/vendor/github.com/mailhog/storage \ >+ mailhog:MailHog-Server:v${DISTVERSION}:mailhog_server/vendor/github.com/mailhog/MailHog-Server \ >+ mailhog:MailHog-UI:v${DISTVERSION}:mailhog_ui/vendor/github.com/mailhog/MailHog-UI \ >+ t-k:fluent-logger-golang:0f8ec08:fluent_logger_golang/vendor/github.com/t-k/fluent-logger-golang \ >+ tinylib:msgp:701aacd:msgp/vendor/github.com/tinylib/msgp \ >+ philhofer:fwd:1612a29:fwd/vendor/github.com/philhofer/fwd \ >+ golang:crypto:eb71ad9:crypto/vendor/golang.org/x/crypto \ >+ go-mgo:mgo:3f83fa5:mgo/vendor/gopkg.in/mgo.v2 > >+GO_TARGET= :mailhog >+ > PLIST_FILES= bin/${PORTNAME} > SUB_FILES= pkg-message > >-post-extract: >- @${LN} -sf ${WRKSRC}/src ${WRKDIR} >- @${LN} -sf ${WRKSRC} ${GO_WRKSRC} >- >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/MailHog ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >- > .include <bsd.port.mk> >Index: misc/cryptoballot/Makefile >=================================================================== >--- misc/cryptoballot/Makefile (revision 512745) >+++ misc/cryptoballot/Makefile (working copy) >@@ -13,35 +13,24 @@ > > USE_GITHUB= yes > GH_TAGNAME= 3753e1b >-GH_TUPLE= ${PORTNAME}:entropychecker:188ae6c:entropychecker/src/github.com/${PORTNAME}/entropychecker \ >- ${PORTNAME}:fdh:5eb31ce:fdh/src/github.com/${PORTNAME}/fdh \ >- ${PORTNAME}:rsablind:14f9913:rsablind/src/github.com/${PORTNAME}/rsablind \ >- urfave:cli:v1.20.0:cli/src/github.com/urfave/cli \ >- phayes:decryptpem:7e4f5bc:decryptpem/src/github.com/phayes/decryptpem \ >- phayes:errors:ad407e6:errors/src/github.com/phayes/errors \ >- dlintw:goconf:dcc0709:goconf/src/github.com/dlintw/goconf \ >- Sam-Izdat:govote:7d55c89:govote/src/github.com/Sam-Izdat/govote \ >- lib:pq:88edab0:pq/src/github.com/lib/pq \ >- golang:crypto:650f4a3:crypto/src/golang.org/x/crypto \ >- golang:sys:37707fd:sys/src/golang.org/x/sys >+GH_TUPLE= ${PORTNAME}:entropychecker:188ae6c:entropychecker/vendor/github.com/${PORTNAME}/entropychecker \ >+ ${PORTNAME}:fdh:5eb31ce:fdh/vendor/github.com/${PORTNAME}/fdh \ >+ ${PORTNAME}:rsablind:14f9913:rsablind/vendor/github.com/${PORTNAME}/rsablind \ >+ urfave:cli:v1.20.0:cli/vendor/github.com/urfave/cli \ >+ phayes:decryptpem:7e4f5bc:decryptpem/vendor/github.com/phayes/decryptpem \ >+ phayes:errors:ad407e6:errors/vendor/github.com/phayes/errors \ >+ dlintw:goconf:dcc0709:goconf/vendor/github.com/dlintw/goconf \ >+ Sam-Izdat:govote:7d55c89:govote/vendor/github.com/Sam-Izdat/govote \ >+ lib:pq:88edab0:pq/vendor/github.com/lib/pq \ >+ golang:crypto:650f4a3:crypto/vendor/golang.org/x/crypto \ >+ golang:sys:37707fd:sys/vendor/golang.org/x/sys > GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} > >-PROGS= servers/ballotbox servers/electionclerk \ >- utils/cryptoballot \ >- utils/cryptoballot-getid utils/cryptoballot-public-key \ >- utils/cryptoballot-sign utils/cryptoballot-signature-request >+GO_TARGET= ./servers/ballotbox ./servers/electionclerk \ >+ ./utils/cryptoballot \ >+ ./utils/cryptoballot-getid ./utils/cryptoballot-public-key \ >+ ./utils/cryptoballot-sign ./utils/cryptoballot-signature-request > >-PLIST_FILES= ${PROGS:C/.*\//bin\//} >+PLIST_FILES= ${GO_TARGET:C/.*\//bin\//} > >-do-build: >-.for p in ${PROGS} >- @cd ${WRKSRC}/${GH_SUBDIR}/${p}/ && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${p:C/.*\///} >-.endfor >- >-do-install: >-.for p in ${PROGS} >- ${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR}/${p}/${p:C/.*\///} ${STAGEDIR}${PREFIX}/bin/${p:C/.*\///} >-.endfor >- > .include <bsd.port.mk> >Index: misc/dive/Makefile >=================================================================== >--- misc/dive/Makefile (revision 512745) >+++ misc/dive/Makefile (working copy) >@@ -43,7 +43,7 @@ > mattn:go-runewidth:v0.0.3:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ > mitchellh:go-homedir:v1.0.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ > mitchellh:mapstructure:v1.0.0:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \ >- moby:moby:0b7cb16dde4a20d024c7be59801d63bcfd18611b:moby_moby/vendor/github.com/moby/moby \ >+ moby:moby:0b7cb16dde4a20d024c7be59801d63bcfd18611b:moby_moby/vendor/github.com/docker/docker \ > nsf:termbox-go:60ab7e3d12ed:nsf_termbox_go/vendor/github.com/nsf/termbox-go \ > opencontainers:go-digest:v1.0.0-rc1:opencontainers_go_digest/vendor/github.com/opencontainers/go-digest \ > opencontainers:image-spec:v1.0.1:opencontainers_image_spec/vendor/github.com/opencontainers/image-spec \ >@@ -62,7 +62,4 @@ > > PLIST_FILES= bin/${PORTNAME} > >-post-patch: >- @${GREP} -rl github.com/docker/docker ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} 's|github.com/docker/docker|github.com/moby/moby|' >- > .include <bsd.port.mk> >Index: misc/exercism/Makefile >=================================================================== >--- misc/exercism/Makefile (revision 512745) >+++ misc/exercism/Makefile (working copy) >@@ -14,61 +14,60 @@ > USES= go > USE_GITHUB= yes > GH_TUPLE= \ >- exercism:cli:v${PORTVERSION}:DEFAULT/src/github.com/exercism/cli \ >- armon:consul-api:eb2c6b5:consulapi/src/github.com/armon/consul-api \ >- blang:semver:v3.5.1:semver/src/github.com/blang/semver \ >- coreos:etcd:v0.2.0:etcd/src/github.com/coreos/etcd \ >- coreos:go-semver:v0.2.0:gosemver/src/github.com/coreos/go-semver \ >- cpuguy83:go-md2man:v1.0.8:md2man/src/github.com/cpuguy83/go-md2man \ >- davecgh:go-spew:v1.1.0:gospew/src/github.com/davecgh/go-spew \ >- fsnotify:fsnotify:v1.4.2:fsnotify/src/github.com/fsnotify/fsnotify \ >- hashicorp:hcl:392dba7:hcl/src/github.com/hashicorp/hcl \ >- golang:protobuf:v1.2.0:protobuf/src/github.com/golang/protobuf \ >- inconshreveable:go-update:8152e7e:goupdate/src/github.com/inconshreveable/go-update \ >- inconshreveable:mousetrap:v1.0:mousetrap/src/github.com/inconshreveable/mousetrap \ >- kr:fs:v0.1.0:fs/src/github.com/kr/fs \ >- kr:pretty:v0.1.0:pretty/src/github.com/kr/pretty \ >- kr:text:v0.1.0:text/src/github.com/kr/text \ >- magiconair:properties:v1.7.3:properties/src/github.com/magiconair/properties \ >- mitchellh:go-homedir:v1.0.0:gohomedir/src/github.com/mitchellh/go-homedir \ >- mitchellh:mapstructure:d0303fe:mapstructure/src/github.com/mitchellh/mapstructure \ >- pelletier:go-buffruneio:v0.2.0:gobuffruneio/src/github.com/pelletier/go-buffruneio \ >- pelletier:go-toml:v1.0.0:gotoml/src/github.com/pelletier/go-toml \ >- pkg:errors:v0.8.0:errors/src/github.com/pkg/errors \ >- pkg:sftp:v1.8.3:sftp/src/github.com/pkg/sftp \ >- pmezard:go-difflib:v1.0.0:godifflib/src/github.com/pmezard/go-difflib \ >- russross:blackfriday:v1.5.1:blackfriday/src/github.com/russross/blackfriday \ >- spf13:afero:9be6508:afero/src/github.com/spf13/afero \ >- spf13:cast:v1.1.0:cast/src/github.com/spf13/cast \ >- spf13:cobra:b26b538:cobra/src/github.com/spf13/cobra \ >- spf13:jWalterWeatherman:0efa520:jww/src/github.com/spf13/jwalterweatherman \ >- spf13:pflag:e57e3ee:pflag/src/github.com/spf13/pflag \ >- spf13:viper:1573881:viper/src/github.com/spf13/viper \ >- stretchr:objx:v0.1.1:objx/src/github.com/stretchr/objx \ >- stretchr:testify:v1.1.4:testify/src/github.com/stretchr/testify \ >- ugorji:go:v1.1.1:ugorji/src/github.com/ugorji/go \ >- xordataexchange:crypt:b2862e3:dataexchange/src/github.com/xordataexchange/crypt \ >- golang:crypto:0e37d00:crypto/src/golang.org/x/crypto \ >- golang:net:f5079bd:net/src/golang.org/x/net \ >- golang:oauth2:d2e6202:oauth2/src/golang.org/x/oauth2 \ >- golang:sys:d8f5ea2:sys/src/golang.org/x/sys \ >- golang:text:3bd178b:text/src/golang.org/x/text \ >- golang:tools:90fa682:tour/src/golang.org/x/tools \ >- golang:appengine:ae0ab99:appengine/src/google.golang.org/appengine \ >- googleapis:google-api-go-client:920bb1b:gapis/src/google.golang.org/api \ >- GoogleCloudPlatform:google-cloud-go:v0.28.0:gcloudgo/src/cloud.google.com/go \ >- go4org:go4:417644f:go4/src/go4.org \ >- go-check:check:788fd78:gocheck/src/gopkg.in/check.v1 \ >- go-yaml:yaml:25c4ec8:yaml/src/gopkg.in/yaml.v2 >-GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} >+ exercism:cli:v${PORTVERSION}:DEFAULT \ >+ armon:consul-api:eb2c6b5:consulapi/vendor/github.com/armon/consul-api \ >+ blang:semver:v3.5.1:semver/vendor/github.com/blang/semver \ >+ coreos:etcd:v0.2.0:etcd/vendor/github.com/coreos/etcd \ >+ coreos:go-semver:v0.2.0:gosemver/vendor/github.com/coreos/go-semver \ >+ cpuguy83:go-md2man:v1.0.8:md2man/vendor/github.com/cpuguy83/go-md2man \ >+ davecgh:go-spew:v1.1.0:gospew/vendor/github.com/davecgh/go-spew \ >+ fsnotify:fsnotify:v1.4.2:fsnotify/vendor/github.com/fsnotify/fsnotify \ >+ hashicorp:hcl:392dba7:hcl/vendor/github.com/hashicorp/hcl \ >+ golang:protobuf:v1.2.0:protobuf/vendor/github.com/golang/protobuf \ >+ inconshreveable:go-update:8152e7e:goupdate/vendor/github.com/inconshreveable/go-update \ >+ inconshreveable:mousetrap:v1.0:mousetrap/vendor/github.com/inconshreveable/mousetrap \ >+ kr:fs:v0.1.0:fs/vendor/github.com/kr/fs \ >+ kr:pretty:v0.1.0:pretty/vendor/github.com/kr/pretty \ >+ kr:text:v0.1.0:text/vendor/github.com/kr/text \ >+ magiconair:properties:v1.7.3:properties/vendor/github.com/magiconair/properties \ >+ mitchellh:go-homedir:v1.0.0:gohomedir/vendor/github.com/mitchellh/go-homedir \ >+ mitchellh:mapstructure:d0303fe:mapstructure/vendor/github.com/mitchellh/mapstructure \ >+ pelletier:go-buffruneio:v0.2.0:gobuffruneio/vendor/github.com/pelletier/go-buffruneio \ >+ pelletier:go-toml:v1.0.0:gotoml/vendor/github.com/pelletier/go-toml \ >+ pkg:errors:v0.8.0:errors/vendor/github.com/pkg/errors \ >+ pkg:sftp:v1.8.3:sftp/vendor/github.com/pkg/sftp \ >+ pmezard:go-difflib:v1.0.0:godifflib/vendor/github.com/pmezard/go-difflib \ >+ russross:blackfriday:v1.5.1:blackfriday/vendor/github.com/russross/blackfriday \ >+ spf13:afero:9be6508:afero/vendor/github.com/spf13/afero \ >+ spf13:cast:v1.1.0:cast/vendor/github.com/spf13/cast \ >+ spf13:cobra:b26b538:cobra/vendor/github.com/spf13/cobra \ >+ spf13:jWalterWeatherman:0efa520:jww/vendor/github.com/spf13/jwalterweatherman \ >+ spf13:pflag:e57e3ee:pflag/vendor/github.com/spf13/pflag \ >+ spf13:viper:1573881:viper/vendor/github.com/spf13/viper \ >+ stretchr:objx:v0.1.1:objx/vendor/github.com/stretchr/objx \ >+ stretchr:testify:v1.1.4:testify/vendor/github.com/stretchr/testify \ >+ ugorji:go:v1.1.1:ugorji/vendor/github.com/ugorji/go \ >+ xordataexchange:crypt:b2862e3:dataexchange/vendor/github.com/xordataexchange/crypt \ >+ golang:crypto:0e37d00:crypto/vendor/golang.org/x/crypto \ >+ golang:net:f5079bd:net/vendor/golang.org/x/net \ >+ golang:oauth2:d2e6202:oauth2/vendor/golang.org/x/oauth2 \ >+ golang:sys:d8f5ea2:sys/vendor/golang.org/x/sys \ >+ golang:text:3bd178b:text/vendor/golang.org/x/text \ >+ golang:tools:90fa682:tour/vendor/golang.org/x/tools \ >+ golang:appengine:ae0ab99:appengine/vendor/google.golang.org/appengine \ >+ googleapis:google-api-go-client:920bb1b:gapis/vendor/google.golang.org/api \ >+ GoogleCloudPlatform:google-cloud-go:v0.28.0:gcloudgo/vendor/cloud.google.com/go \ >+ go4org:go4:417644f:go4/vendor/go4.org \ >+ go-check:check:788fd78:gocheck/vendor/gopkg.in/check.v1 \ >+ go-yaml:yaml:25c4ec8:yaml/vendor/gopkg.in/yaml.v2 > >+GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} >+GO_TARGET= ./exercism >+GO_BUILDFLAGS= -ldflags="\ >+ -s -w \ >+ -X github.com/exercism/cli/cmd.BuildOS=freebsd \ >+ -X github.com/exercism/cli/cmd.BuildARCH=${ARCH}" >+ > PLIST_FILES= bin/exercism > >-do-build: >- @(cd ${WRKSRC} ; \ >- ${SETENV} ${MAKE_ENV} GO15VENDOREXPERIMENT=1 GOPATH=${WRKSRC} go build -ldflags "-s -w -X github.com/exercism/cli/cmd.BuildOS=freebsd -X github.com/exercism/cli/cmd.BuildARCH=${ARCH}" -o out/exercism exercism/main.go) >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/out/exercism ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: net/cf/Makefile >=================================================================== >--- net/cf/Makefile (revision 512745) >+++ net/cf/Makefile (working copy) >@@ -18,7 +18,10 @@ > GH_PROJECT= cli > > USES= go >+ >+GO_BUILDFLAGS= -ldflags="-X code.cloudfoundry.org/cli/version.binaryVersion=${PORTVERSION}" > GO_PKGNAME= code.cloudfoundry.org/cli >+GO_TARGET= :cf > > PLIST_FILES= bin/cf > >@@ -26,11 +29,6 @@ > > OPTIONS_DEFINE= DOCS > >-do-build: >- (cd ${WRKDIR}; \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} \ >- install -v -ldflags="-X code.cloudfoundry.org/cli/version.binaryVersion=${PORTVERSION}" ${GO_TARGET}) >- > do-install-DOCS-on: > ${MKDIR} ${STAGEDIR}${DOCSDIR} > .for x in ${PORTDOCS} >@@ -37,7 +35,4 @@ > ${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR} > .endfor > >-post-install: >- ${MV} ${STAGEDIR}${PREFIX}/bin/cli ${STAGEDIR}${PREFIX}/bin/cf >- > .include <bsd.port.mk> >Index: net/drive/Makefile >=================================================================== >--- net/drive/Makefile (revision 512745) >+++ net/drive/Makefile (working copy) >@@ -22,57 +22,42 @@ > > GH_ACCOUNT= odeke-em > GH_TAGNAME= b868c96 >-GH_TUPLE= boltdb:bolt:v1.3.1:boltdb_bolt/../src/github.com/boltdb/bolt \ >- census-instrumentation:opencensus-go:v0.22.1:census_instrumentation_opencensus/../src/go.opencensus.io \ >- cheggaaa:pb:v1.0.28:cheggaaa_pb/../src/github.com/cheggaaa/pb \ >- fatih:color:v1.7.0:fatih_color/../src/github.com/fatih/color \ >- golang:crypto:71b5226:golang_crypto/../src/golang.org/x/crypto \ >- golang:groupcache:869f871:golang_groupcache/../src/github.com/golang/groupcache \ >- golang:net:ba9fcec:golang_net/../src/golang.org/x/net \ >- golang:oauth2:0f29369:golang_oauth2/../src/golang.org/x/oauth2 \ >- golang:protobuf:v1.3.2:golang_protobuf/../src/github.com/golang/protobuf \ >- golang:sys:749cb33:golang_sys/../src/golang.org/x/sys \ >- golang:text:3d0f797:golang_text/../src/golang.org/x/text \ >- google:go-genproto:92dd089:google_go_genproto/../src/google.golang.org/genproto \ >- google:google-api-go-client:v0.10.0:google_googleapigoclient/../src/google.golang.org/api \ >- googleapis:google-cloud-go:v0.45.1:googleapis_googlecloudgo/../src/cloud.google.com/go \ >- googleapis:gax-go:v2.0.5:googleapis_gaxgo/../src/github.com/googleapis/gax-go \ >- grpc:grpc-go:v1.23.0:grpc_grpc_go/../src/google.golang.org/grpc \ >- hashicorp:golang-lru:v0.5.3:hashicorp_golang_lru/../src/github.com/hashicorp/golang-lru \ >- mattn:go-colorable:v0.1.2:mattn_gocolorable/../src/github.com/mattn/go-colorable \ >- mattn:go-isatty:v0.0.9:mattn_goisatty/../src/github.com/mattn/go-isatty \ >- mattn:go-runewidth:v0.0.4:mattn_gorunewidth/../src/github.com/mattn/go-runewidth \ >- mxk:go-flowrate:cca7078:mxk_goflowrate/../src/github.com/mxk/go-flowrate \ >- odeke-em:cache:baf8e43:odekeem_cache/../src/github.com/odeke-em/cache \ >- odeke-em:cli-spinner:610063b:odekeem_clispinner/../src/github.com/odeke-em/cli-spinner \ >- odeke-em:command:91ca5ec:odekeem_command/../src/github.com/odeke-em/command \ >- odeke-em:exponential-backoff:96e25d3:odekeem_exponential_backoff/../src/github.com/odeke-em/exponential-backoff \ >- odeke-em:extractor:801861a:odekeem_extractor/../src/github.com/odeke-em/extractor \ >- odeke-em:go-utils:e8ebaed:odekeem_go_utils/../src/github.com/odeke-em/go-utils \ >- odeke-em:go-uuid:b211d76:odekeem_gouuid/../src/github.com/odeke-em/go-uuid \ >- odeke-em:log:8d60a69:odekeem_log/../src/github.com/odeke-em/log \ >- odeke-em:meddler:d2b51d2:odekeem_meddler/../src/github.com/odeke-em/meddler \ >- odeke-em:namespace:0ab79ba:odekeem_namespace/../src/github.com/odeke-em/namespace \ >- odeke-em:pretty-words:9d37a7f:odekeem_prettywords/../src/github.com/odeke-em/pretty-words \ >- odeke-em:semalim:9c88bf5:odekeem_semalim/../src/github.com/odeke-em/semalim \ >- odeke-em:statos:292960a:odekeem_statos/../src/github.com/odeke-em/statos \ >- skratchdot:open-golang:79abb63:skratchdot_opengolang/../src/github.com/skratchdot/open-golang \ >- VividCortex:ewma:v1.1.1:VividCortex_ewma/../src/github.com/VividCortex/ewma >+GH_TUPLE= boltdb:bolt:v1.3.1:boltdb_bolt/vendor/github.com/boltdb/bolt \ >+ census-instrumentation:opencensus-go:v0.22.1:census_instrumentation_opencensus/vendor/go.opencensus.io \ >+ cheggaaa:pb:v1.0.28:cheggaaa_pb/vendor/github.com/cheggaaa/pb \ >+ fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \ >+ golang:crypto:71b5226:golang_crypto/vendor/golang.org/x/crypto \ >+ golang:groupcache:869f871:golang_groupcache/vendor/github.com/golang/groupcache \ >+ golang:net:ba9fcec:golang_net/vendor/golang.org/x/net \ >+ golang:oauth2:0f29369:golang_oauth2/vendor/golang.org/x/oauth2 \ >+ golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ >+ golang:sys:749cb33:golang_sys/vendor/golang.org/x/sys \ >+ golang:text:3d0f797:golang_text/vendor/golang.org/x/text \ >+ google:go-genproto:92dd089:google_go_genproto/vendor/google.golang.org/genproto \ >+ google:google-api-go-client:v0.10.0:google_googleapigoclient/vendor/google.golang.org/api \ >+ googleapis:google-cloud-go:v0.45.1:googleapis_googlecloudgo/vendor/cloud.google.com/go \ >+ googleapis:gax-go:v2.0.5:googleapis_gaxgo/vendor/github.com/googleapis/gax-go \ >+ grpc:grpc-go:v1.23.0:grpc_grpc_go/vendor/google.golang.org/grpc \ >+ hashicorp:golang-lru:v0.5.3:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \ >+ mattn:go-colorable:v0.1.2:mattn_gocolorable/vendor/github.com/mattn/go-colorable \ >+ mattn:go-isatty:v0.0.9:mattn_goisatty/vendor/github.com/mattn/go-isatty \ >+ mattn:go-runewidth:v0.0.4:mattn_gorunewidth/vendor/github.com/mattn/go-runewidth \ >+ mxk:go-flowrate:cca7078:mxk_goflowrate/vendor/github.com/mxk/go-flowrate \ >+ odeke-em:cache:baf8e43:odekeem_cache/vendor/github.com/odeke-em/cache \ >+ odeke-em:cli-spinner:610063b:odekeem_clispinner/vendor/github.com/odeke-em/cli-spinner \ >+ odeke-em:command:91ca5ec:odekeem_command/vendor/github.com/odeke-em/command \ >+ odeke-em:exponential-backoff:96e25d3:odekeem_exponential_backoff/vendor/github.com/odeke-em/exponential-backoff \ >+ odeke-em:extractor:801861a:odekeem_extractor/vendor/github.com/odeke-em/extractor \ >+ odeke-em:go-utils:e8ebaed:odekeem_go_utils/vendor/github.com/odeke-em/go-utils \ >+ odeke-em:go-uuid:b211d76:odekeem_gouuid/vendor/github.com/odeke-em/go-uuid \ >+ odeke-em:log:8d60a69:odekeem_log/vendor/github.com/odeke-em/log \ >+ odeke-em:meddler:d2b51d2:odekeem_meddler/vendor/github.com/odeke-em/meddler \ >+ odeke-em:namespace:0ab79ba:odekeem_namespace/vendor/github.com/odeke-em/namespace \ >+ odeke-em:pretty-words:9d37a7f:odekeem_prettywords/vendor/github.com/odeke-em/pretty-words \ >+ odeke-em:semalim:9c88bf5:odekeem_semalim/vendor/github.com/odeke-em/semalim \ >+ odeke-em:statos:292960a:odekeem_statos/vendor/github.com/odeke-em/statos \ >+ skratchdot:open-golang:79abb63:skratchdot_opengolang/vendor/github.com/skratchdot/open-golang \ >+ VividCortex:ewma:v1.1.1:VividCortex_ewma/vendor/github.com/VividCortex/ewma > USE_GITHUB= yes > >-post-patch: >- @${MKDIR} ${GO_WRKDIR_SRC}/gopkg.in/cheggaaa/ >- @${LN} -s ${GO_WRKDIR_SRC}/github.com/cheggaaa/pb ${GO_WRKDIR_SRC}/gopkg.in/cheggaaa/pb.v1 >- @${MKDIR} ${GO_WRKDIR_SRC}/gopkg.in/fatih/ >- @${LN} -s ${GO_WRKDIR_SRC}/github.com/fatih/color ${GO_WRKDIR_SRC}/gopkg.in/fatih/color.v1 >- @${MKDIR} ${GO_WRKDIR_SRC}/gopkg.in/mattn/ >- @${LN} -s ${GO_WRKDIR_SRC}/github.com/mattn/go-colorable ${GO_WRKDIR_SRC}/gopkg.in/mattn/go-colorable.v0 >- @${LN} -s ${GO_WRKDIR_SRC}/github.com/mattn/go-isatty ${GO_WRKDIR_SRC}/gopkg.in/mattn/go-isatty.v0 >- @${LN} -s ${GO_WRKDIR_SRC}/github.com/mattn/go-runewidth ${GO_WRKDIR_SRC}/gopkg.in/mattn/go-runewidth.v0 >- @${MKDIR} ${GO_WRKDIR_SRC}/gopkg.in/VividCortex/ >- @${LN} -s ${GO_WRKDIR_SRC}/github.com/VividCortex/ewma ${GO_WRKDIR_SRC}/gopkg.in/VividCortex/ewma.v1 >- >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/drive ${STAGEDIR}${PREFIX}/bin/drive >- > .include <bsd.port.mk> >Index: net/go-cs/Makefile >=================================================================== >--- net/go-cs/Makefile (revision 512745) >+++ net/go-cs/Makefile (working copy) >@@ -18,7 +18,7 @@ > > PLIST_FILES= bin/cs man/man1/cs.1.gz > >-GO_TARGET= ${GO_PKGNAME}/cs >+GO_TARGET= ./cs > > post-install: > ${INSTALL_MAN} ${WRKSRC}/cs.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 >Index: net/gobgp/Makefile >=================================================================== >--- net/gobgp/Makefile (revision 512745) >+++ net/gobgp/Makefile (working copy) >@@ -17,7 +17,7 @@ > > GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} > GO_TARGET= ./cmd/gobgp \ >- ./cmd/gobgpd >+ ./cmd/gobgpd:${PREFIX}/libexec/gobgpd > GH_ACCOUNT= osrg > PLIST_FILES= bin/gobgp libexec/gobgpd > GH_TUPLE= \ >@@ -69,10 +69,6 @@ > USE_RC_SUBR= gobgpd > SUB_FILES= gobgpd > >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/gobgp ${STAGEDIR}${PREFIX}/bin >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/gobgpd ${STAGEDIR}${PREFIX}/libexec >- > post-install-BASH-on: > ${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d > ${INSTALL_DATA} ${GO_WRKSRC}/tools/completion/gobgp*-completion.bash ${STAGEDIR}${PREFIX}/etc/bash_completion.d/ >Index: net/goreplay/Makefile >=================================================================== >--- net/goreplay/Makefile (revision 512745) >+++ net/goreplay/Makefile (working copy) >@@ -23,11 +23,4 @@ > > PLIST_FILES= bin/${PORTNAME} > >-do-build: >- @cd ${WRKSRC}/${GH_SUBDIR} ; ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/goreplay \ >- ${STAGEDIR}${PREFIX}/bin/ >- > .include <bsd.port.mk> >Index: net/grpcurl/Makefile >=================================================================== >--- net/grpcurl/Makefile (revision 512745) >+++ net/grpcurl/Makefile (working copy) >@@ -17,22 +17,16 @@ > GH_ACCOUNT= fullstorydev > GH_SUBDIR= src/github.com/fullstorydev/grpcurl > GH_TAGNAME= ca5693f >-GH_TUPLE= golang:protobuf:c65a041:jsonpb/src/github.com/golang/protobuf \ >- jhump:protoreflect:5cc2142:protoreflect/src/github.com/jhump/protoreflect \ >- golang:net:5f9ae10:net/src/golang.org/x/net \ >- grpc:grpc-go:4172bfc:grpcgo/src/google.golang.org/grpc \ >- golang:text:7922cc4:text/src/golang.org/x/text \ >- google:go-genproto:7fd901a:gogenproto/src/google.golang.org/genproto >+GH_TUPLE= golang:protobuf:c65a041:jsonpb/vendor/github.com/golang/protobuf \ >+ jhump:protoreflect:5cc2142:protoreflect/vendor/github.com/jhump/protoreflect \ >+ golang:net:5f9ae10:net/vendor/golang.org/x/net \ >+ grpc:grpc-go:4172bfc:grpcgo/vendor/google.golang.org/grpc \ >+ golang:text:7922cc4:text/vendor/golang.org/x/text \ >+ google:go-genproto:7fd901a:gogenproto/vendor/google.golang.org/genproto > >+GO_BUILDFLAGS= -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -s -w" >+GO_TARGET= ./cmd/${PORTNAME} >+ > PLIST_FILES= bin/grpcurl > >-do-build: >- cd ${WRKSRC}/cmd/${PORTNAME} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ >- ${LOCALBASE}/bin/go build -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -s -w" \ >- -o ${PORTNAME} >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/fullstorydev/grpcurl/cmd/${PORTNAME}/${PORTNAME} \ >- ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >- > .include <bsd.port.mk> >Index: net/madonctl/Makefile >=================================================================== >--- net/madonctl/Makefile (revision 512745) >+++ net/madonctl/Makefile (working copy) >@@ -15,8 +15,6 @@ > > USES= go:modules > >-#GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} >- > PLIST_FILES= bin/madonctl > > GH_ACCOUNT= McKael >@@ -49,7 +47,4 @@ > stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify > USE_GITHUB= yes > >-do-install: >- ${INSTALL_PROGRAM} ${WRKDIR}/bin/madonctl ${STAGEDIR}${PREFIX}/bin/madonctl >- > .include <bsd.port.mk> >Index: net/nsq/Makefile >=================================================================== >--- net/nsq/Makefile (revision 512745) >+++ net/nsq/Makefile (working copy) >@@ -12,7 +12,7 @@ > > ONLY_FOR_ARCHS= amd64 > >-USES= compiler go >+USES= go > > USE_RC_SUBR= nsqd nsqlookupd nsqadmin > >@@ -20,41 +20,21 @@ > GH_ACCOUNT= nsqio > GH_SUBDIR= src/github.com/nsqio/nsq > >-GH_TUPLE= BurntSushi:toml:2dff111:toml/src/github.com/BurntSushi/toml \ >- bitly:go-hostpool:a3a6125:go_hostpool/src/github.com/bitly/go-hostpool \ >- bitly:timer_metrics:afad179:timer_metrics/src/github.com/bitly/timer_metrics \ >- blang:semver:9bf7bff:semver/src/github.com/blang/semver \ >- bmizerany:perks:6cb9d9d:perks/src/github.com/bmizerany/perks \ >- golang:snappy:d9eb7a3:snappy/src/github.com/golang/snappy \ >- judwhite:go-svc:63c1240:go_svc/src/github.com/judwhite/go-svc \ >- julienschmidt:httprouter:6aacfd5:httprouter/src/github.com/julienschmidt/httprouter \ >- mreiferson:go-options:77551d2:go_options/src/github.com/mreiferson/go-options \ >- nsqio:go-diskqueue:0681a1a:go_diskqueue/src/github.com/nsqio/go-diskqueue \ >- nsqio:go-nsq:a53d495:go_nsq/src/github.com/nsqio/go-nsq >+GH_TUPLE= BurntSushi:toml:2dff111:toml/vendor/github.com/BurntSushi/toml \ >+ bitly:go-hostpool:a3a6125:go_hostpool/vendor/github.com/bitly/go-hostpool \ >+ bitly:timer_metrics:afad179:timer_metrics/vendor/github.com/bitly/timer_metrics \ >+ blang:semver:9bf7bff:semver/vendor/github.com/blang/semver \ >+ bmizerany:perks:6cb9d9d:perks/vendor/github.com/bmizerany/perks \ >+ golang:snappy:d9eb7a3:snappy/vendor/github.com/golang/snappy \ >+ judwhite:go-svc:63c1240:go_svc/vendor/github.com/judwhite/go-svc \ >+ julienschmidt:httprouter:6aacfd5:httprouter/vendor/github.com/julienschmidt/httprouter \ >+ mreiferson:go-options:77551d2:go_options/vendor/github.com/mreiferson/go-options \ >+ nsqio:go-diskqueue:0681a1a:go_diskqueue/vendor/github.com/nsqio/go-diskqueue \ >+ nsqio:go-nsq:a53d495:go_nsq/vendor/github.com/nsqio/go-nsq > >-TARGETS= nsqd nsqlookupd nsqadmin nsq_to_nsq nsq_to_file \ >- nsq_to_http nsq_tail nsq_stat to_nsq >+GO_BUILDFLAGS= -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" >+GO_TARGET= ./apps/nsqd ./apps/nsqlookupd ./apps/nsqadmin \ >+ ./apps/nsq_to_nsq ./apps/nsq_to_file ./apps/nsq_to_http \ >+ ./apps/nsq_tail ./apps/nsq_stat ./apps/to_nsq > >-.for _t in ${TARGETS} >-build-${_t}: >- cd ${GO_WRKSRC}/apps/${_t}; \ >- ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build \ >- -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/${_t} >-install-${_t}: >- ${INSTALL_PROGRAM} ${GO_WRKSRC}/apps/${_t}/bin/${_t} \ >- ${STAGEDIR}${PREFIX}/bin/${_t} >- >-build_targets+= build-${_t} >-install_targets+= install-${_t} >-.endfor >- >-do-build: ${build_targets} >-do-install: ${install_targets} >- >-.include <bsd.port.pre.mk> >- >-.if ${COMPILER_TYPE} == clang >-BUILD_ENV= CC=clang >-.endif >- >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >Index: net/traefik/Makefile >=================================================================== >--- net/traefik/Makefile (revision 512745) >+++ net/traefik/Makefile (working copy) >@@ -23,6 +23,12 @@ > > USE_RC_SUBR= traefik > >+GO_BUILDFLAGS= -ldflags "-s -w \ >+ -X github.com/containous/traefik/version.Version=${DISTVERSION} \ >+ -X github.com/containous/traefik/version.BuildDate=`date -u '+%Y-%m-%d_%I:%M:%S%p'`" >+GO_TARGET= ./cmd/traefik >+CGO_ENABLED= 0 >+ > USERS= traefik > GROUPS= traefik > >@@ -29,13 +35,6 @@ > PLIST_FILES= bin/traefik \ > "@sample etc/traefik.toml.sample" > >-TRAEFIK_BUILD_ENV= ${MAKE_ENV} \ >- CGO_ENABLED=0 >- >-TRAEFIK_LDARGS= -ldflags "-s -w \ >- -X github.com/containous/traefik/version.Version=${DISTVERSION} \ >- -X github.com/containous/traefik/version.BuildDate=`date -u '+%Y-%m-%d_%I:%M:%S%p'`" >- > # Recipe for building the web UI > # Note this is not done during a standard port build as > # it downloads node modules from the internet during build. >@@ -49,7 +48,7 @@ > # yarn install && \ > # yarn run build > >-post-extract: >+post-patch: > @${MV} ${WRKDIR}/static ${WRKSRC} > # Install a sample configuration file which works by default > # without manual tweaking >@@ -56,13 +55,10 @@ > ${REINPLACE_CMD} -e 's|:80|:8088|' \ > -e 's|\[docker|# \[docker|' ${WRKSRC}/traefik.sample.toml > >-do-build: >- @cd ${WRKSRC}/src/github.com/containous/traefik; \ >- ${SETENV} ${BUILD_ENV} ${TRAEFIK_BUILD_ENV} GOPATH=${WRKSRC} go generate && \ >- ${SETENV} ${BUILD_ENV} ${TRAEFIK_BUILD_ENV} GOPATH=${WRKSRC} go build ${TRAEFIK_LDARGS} -v -x ./cmd/traefik >+pre-build: >+ cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} generate > >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/containous/traefik/traefik ${STAGEDIR}${PREFIX}/bin/traefik >- ${INSTALL_DATA} ${WRKSRC}/src/github.com/containous/traefik/traefik.sample.toml ${STAGEDIR}${PREFIX}/etc/traefik.toml.sample >+post-install: >+ ${INSTALL_DATA} ${WRKSRC}/traefik.sample.toml ${STAGEDIR}${PREFIX}/etc/traefik.toml.sample > > .include <bsd.port.mk> >Index: net/v2ray/Makefile >=================================================================== >--- net/v2ray/Makefile (revision 512745) >+++ net/v2ray/Makefile (working copy) >@@ -32,6 +32,8 @@ > miekg:dns:v1.1.4:miekg_dns/vendor/github.com/miekg/dns > > GO_BUILDFLAGS= -ldflags='-s -w' >+GO_TARGET= ./main:v2ray \ >+ ./infra/control/main:v2ctl > > USERS= v2ray > GROUPS= v2ray >@@ -39,16 +41,9 @@ > SUB_LIST= USER="${USERS}" \ > GROUP="${GROUPS}" > >-do-build: >- cd ${GO_WRKSRC} && \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o ${GO_WRKDIR_BIN}/v2ray v2ray.com/core/main && \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o ${GO_WRKDIR_BIN}/v2ctl v2ray.com/core/infra/control/main >- >-do-install: >+post-install: > ${MKDIR} ${STAGEDIR}${ETCDIR} > ${MKDIR} ${STAGEDIR}${DATADIR} >- ${INSTALL_PROGRAM} ${WRKDIR}/bin/v2ray ${STAGEDIR}${PREFIX}/bin/v2ray >- ${INSTALL_PROGRAM} ${WRKDIR}/bin/v2ctl ${STAGEDIR}${PREFIX}/bin/v2ctl > ${INSTALL_DATA} ${WRKSRC}/release/config/config.json ${STAGEDIR}${ETCDIR}/config.json.sample > ${INSTALL_DATA} ${WRKSRC}/release/config/vpoint_socks_vmess.json ${STAGEDIR}${ETCDIR}/vpoint_socks_vmess.json > ${INSTALL_DATA} ${WRKSRC}/release/config/vpoint_vmess_freedom.json ${STAGEDIR}${ETCDIR}/vpoint_vmess_freedom.json >Index: net-im/xmpp-client/Makefile >=================================================================== >--- net-im/xmpp-client/Makefile (revision 512745) >+++ net-im/xmpp-client/Makefile (working copy) >@@ -14,20 +14,17 @@ > USES= go > > USE_GITHUB= yes >-GH_TUPLE= agl:xmpp-client:3030ad4:DEFAULT/src/github.com/agl/xmpp-client \ >- golang:crypto:c126467:crypto/src/golang.org/x/crypto \ >- golang:net:a680a1e:net/src/golang.org/x/net \ >- golang:sys:ac767d6:sys/src/golang.org/x/sys >+GH_TUPLE= agl:xmpp-client:3030ad4:DEFAULT/vendor/github.com/agl/xmpp-client \ >+ golang:crypto:c126467:crypto/vendor/golang.org/x/crypto \ >+ golang:net:a680a1e:net/vendor/golang.org/x/net \ >+ golang:sys:ac767d6:sys/vendor/golang.org/x/sys > >+GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} >+ > PLIST_FILES= bin/xmpp-client > >-do-build: >- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${PORTNAME} >- > do-test: >- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test . ./xmpp >+ cd ${WRKSRC}; \ >+ ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_BUILDFLAGS} . ./xmpp > >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: net-mgmt/carbon-relay-ng/Makefile >=================================================================== >--- net-mgmt/carbon-relay-ng/Makefile (revision 512745) >+++ net-mgmt/carbon-relay-ng/Makefile (working copy) >@@ -19,19 +19,15 @@ > GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} > USE_RC_SUBR= ${PORTNAME} > >+GO_TARGET= ./cmd/${PORTNAME} >+ > USERS= carbon > GROUPS= carbon > >-do-build: >- @cd ${WRKSRC}/${GH_SUBDIR} && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} VERSION=${DISTVERSION} \ >- ${MAKE_CMD} build >- >-do-install: >+post-install: > @${MKDIR} ${STAGEDIR}/${PREFIX}/etc/carbon-relay-ng > @${MKDIR} ${STAGEDIR}/var/run/carbon-relay-ng > @${MKDIR} ${STAGEDIR}/var/run/carbon-relay-ng/spool >- ${INSTALL_PROGRAM} ${WRKSRC}/carbon-relay-ng ${STAGEDIR}${PREFIX}/bin > ${INSTALL_DATA} ${WRKSRC}/examples/carbon-relay-ng.ini ${STAGEDIR}${PREFIX}/etc/carbon-relay-ng/carbon-relay-ng.ini.sample > > .include <bsd.port.mk> >Index: net-mgmt/carbonzipper/Makefile >=================================================================== >--- net-mgmt/carbonzipper/Makefile (revision 512745) >+++ net-mgmt/carbonzipper/Makefile (working copy) >@@ -15,42 +15,38 @@ > USE_GITHUB= yes > GH_ACCOUNT= go-graphite > GH_SUBDIR= src/github.com/go-graphite/${PORTNAME} >-GH_TUPLE= bradfitz:gomemcache:1952afa:gomemcache/src/github.com/bradfitz/gomemcache \ >- dgryski:httputil:189c2918:httputil/src/github.com/dgryski/httputil \ >- dgryski:go-expirecache:743ef98:goexpirecache/src/github.com/dgryski/go-expirecache \ >- facebookgo:atomicfile:2de1f20:atomicfile/src/github.com/facebookgo/atomicfile \ >- facebookgo:clock:600d898:clock/src/github.com/facebookgo/clock \ >- facebookgo:grace:4afe952:grace/src/github.com/facebookgo/grace \ >- facebookgo:httpdown:a3b1354:httpdown/src/github.com/facebookgo/httpdown \ >- facebookgo:pidfile:f242e299:pidfile/src/github.com/facebookgo/pidfile \ >- facebookgo:stats:1b76add:stats/src/github.com/facebookgo/stats \ >- gogo:protobuf:v0.4:protobuf/src/github.com/gogo/protobuf \ >- go-yaml:yaml:v2.1.1:yaml/src/gopkg.in/yaml.v2 \ >- lestrrat:go-strftime:04ef93e:gostrftime/src/github.com/lestrrat/go-strftime \ >- lestrrat-go:file-rotatelogs:v2.1.0:filerotatelogs/src/github.com/lestrrat/go-file-rotatelogs \ >- lomik:og-rek:628eefe:ogrek/src/github.com/lomik/og-rek \ >- lomik:zapwriter:d4499a3:zapwriter/src/github.com/lomik/zapwriter \ >- peterbourgon:g2g:0c2bab2:g2g/src/github.com/peterbourgon/g2g \ >- pkg:errors:v0.8.0:errors/src/github.com/pkg/errors \ >- satori:go.uuid:v1.1.0:gouuid/src/github.com/satori/go.uuid \ >- uber-go:atomic:v1.2.0:atomic/src/go.uber.org/atomic \ >- uber-go:multierr:v1.1.0:multierr/src/go.uber.org/multierr \ >- uber-go:zap:v1.5.0:zap/src/go.uber.org/zap >+GH_TUPLE= bradfitz:gomemcache:1952afa:gomemcache/vendor/github.com/bradfitz/gomemcache \ >+ dgryski:httputil:189c2918:httputil/vendor/github.com/dgryski/httputil \ >+ dgryski:go-expirecache:743ef98:goexpirecache/vendor/github.com/dgryski/go-expirecache \ >+ facebookgo:atomicfile:2de1f20:atomicfile/vendor/github.com/facebookgo/atomicfile \ >+ facebookgo:clock:600d898:clock/vendor/github.com/facebookgo/clock \ >+ facebookgo:grace:4afe952:grace/vendor/github.com/facebookgo/grace \ >+ facebookgo:httpdown:a3b1354:httpdown/vendor/github.com/facebookgo/httpdown \ >+ facebookgo:pidfile:f242e299:pidfile/vendor/github.com/facebookgo/pidfile \ >+ facebookgo:stats:1b76add:stats/vendor/github.com/facebookgo/stats \ >+ gogo:protobuf:v0.4:protobuf/vendor/github.com/gogo/protobuf \ >+ go-yaml:yaml:v2.1.1:yaml/vendor/gopkg.in/yaml.v2 \ >+ lestrrat:go-strftime:04ef93e:gostrftime/vendor/github.com/lestrrat/go-strftime \ >+ lestrrat-go:file-rotatelogs:v2.1.0:filerotatelogs/vendor/github.com/lestrrat/go-file-rotatelogs \ >+ lomik:og-rek:628eefe:ogrek/vendor/github.com/lomik/og-rek \ >+ lomik:zapwriter:d4499a3:zapwriter/vendor/github.com/lomik/zapwriter \ >+ peterbourgon:g2g:0c2bab2:g2g/vendor/github.com/peterbourgon/g2g \ >+ pkg:errors:v0.8.0:errors/vendor/github.com/pkg/errors \ >+ satori:go.uuid:v1.1.0:gouuid/vendor/github.com/satori/go.uuid \ >+ uber-go:atomic:v1.2.0:atomic/vendor/go.uber.org/atomic \ >+ uber-go:multierr:v1.1.0:multierr/vendor/go.uber.org/multierr \ >+ uber-go:zap:v1.5.0:zap/vendor/go.uber.org/zap > >+GO_BUILDFLAGS= -ldflags='-X main.BuildVersion=${DISTVERSION}' >+ > USE_RC_SUBR= ${PORTNAME} > > USERS= carbon > GROUPS= carbon > >-do-build: >- @cd ${WRKSRC}/ && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} \ >- go build --ldflags '-X main.BuildVersion=${DISTVERSION}' -o carbonzipper >- >-do-install: >+post-install: > @${MKDIR} ${STAGEDIR}/${PREFIX}/etc/carbonzipper > @${MKDIR} ${STAGEDIR}/var/log/carbonzipper >- ${INSTALL_PROGRAM} ${WRKSRC}/carbonzipper ${STAGEDIR}${PREFIX}/bin > ${INSTALL_DATA} ${WRKSRC}/example.conf ${STAGEDIR}${PREFIX}/etc/carbonzipper > > .include <bsd.port.mk> >Index: net-mgmt/grok_exporter/Makefile >=================================================================== >--- net-mgmt/grok_exporter/Makefile (revision 512745) >+++ net-mgmt/grok_exporter/Makefile (working copy) >@@ -28,12 +28,10 @@ > USE_RC_SUBR= grok_exporter > SUB_FILES= config.yml > >-do-build: >+post-patch: > ${LN} -sf ${WRKSRC}/tailer/fileTailer_darwin.go ${WRKSRC}/tailer/fileTailer_freebsd.go >- @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build -o ${PORTNAME} .) > >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >+post-install: > ${MKDIR} ${STAGEDIR}${ETCDIR} > ${INSTALL_DATA} ${WRKDIR}/config.yml ${STAGEDIR}${ETCDIR} > @(cd ${WRKSRC} && ${COPYTREE_SHARE} example ${STAGEDIR}${DATADIR}) >Index: net-mgmt/intel-snap/Makefile >=================================================================== >--- net-mgmt/intel-snap/Makefile (revision 512745) >+++ net-mgmt/intel-snap/Makefile (working copy) >@@ -17,50 +17,38 @@ > GH_PROJECT= snap-freebsd > GH_TAGNAME= ca8016d > >-GH_TUPLE= Sirupsen:logrus:61e43dc:logrus/src/github.com/Sirupsen/logrus \ >- vrischmann:jsonutil:d44b59f:jsonutil/src/github.com/vrischmann/jsonutil \ >- golang:crypto:f18420e:crypto/src/golang.org/x/crypto \ >- appc:spec:e99880c:schema/src/github.com/appc/spec \ >- asaskevich:govalidator:fdf1978:govalidator/src/github.com/asaskevich/govalidator \ >- coreos:go-semver:9474efc:semver/src/github.com/coreos/go-semver \ >- ghodss:yaml:04f3134:yaml/src/github.com/ghodss/yaml \ >- golang:protobuf:8ee7999:protobuf/src/github.com/golang/protobuf \ >- hashicorp:go-msgpack:fa3f638:msgpack/src/github.com/hashicorp/go-msgpack \ >- hashicorp:memberlist:9888dc5:memberlist/src/github.com/hashicorp/memberlist \ >- armon:go-metrics:06b6099:metrics/src/github.com/armon/go-metrics \ >- intelsdi-x:gomit:db68f6f:gomit/src/github.com/intelsdi-x/gomit \ >- julienschmidt:httprouter:8a45e95:httprouter/src/github.com/julienschmidt/httprouter \ >- robfig:cron:9585fd5:cron/src/github.com/robfig/cron \ >- urfave:cli:347a988:cli2/src/github.com/urfave/cli \ >- urfave:negroni:61dbefc:negroni/src/github.com/urfave/negroni \ >- pborman:uuid:1b00554:uuid/src/github.com/pborman/uuid \ >- spf13:pflag:9ff6c69:pflag/src/github.com/spf13/pflag \ >- xeipuuv:gojsonschema:f06f290:gojsonschema/src/github.com/xeipuuv/gojsonschema \ >- xeipuuv:gojsonreference:e02fc20:gojsonreference/src/github.com/xeipuuv/gojsonreference \ >- xeipuuv:gojsonpointer:e0fe6f6:gojsonpointer/src/github.com/xeipuuv/gojsonpointer \ >- golang:net:41bba8d:net/src/golang.org/x/net \ >- abh:errorutil:f9bd360:errorutil/src/go4.org/errorutil \ >- go-yaml:yaml:4c78c97:yaml2/src/gopkg.in/yaml.v2 \ >- go-inf:inf:3887ee9:inf/src/gopkg.in/inf.v0 \ >- grpc:grpc-go:b1efb1e:grpc/src/google.golang.org/grpc \ >- ghodss:yaml:04f3134:yaml/src/github.com/ghodss/yaml >+GH_TUPLE= Sirupsen:logrus:61e43dc:logrus/vendor/github.com/Sirupsen/logrus \ >+ vrischmann:jsonutil:d44b59f:jsonutil/vendor/github.com/vrischmann/jsonutil \ >+ golang:crypto:f18420e:crypto/vendor/golang.org/x/crypto \ >+ appc:spec:e99880c:schema/vendor/github.com/appc/spec \ >+ asaskevich:govalidator:fdf1978:govalidator/vendor/github.com/asaskevich/govalidator \ >+ coreos:go-semver:9474efc:semver/vendor/github.com/coreos/go-semver \ >+ ghodss:yaml:04f3134:yaml/vendor/github.com/ghodss/yaml \ >+ golang:protobuf:8ee7999:protobuf/vendor/github.com/golang/protobuf \ >+ hashicorp:go-msgpack:fa3f638:msgpack/vendor/github.com/hashicorp/go-msgpack \ >+ hashicorp:memberlist:9888dc5:memberlist/vendor/github.com/hashicorp/memberlist \ >+ armon:go-metrics:06b6099:metrics/vendor/github.com/armon/go-metrics \ >+ intelsdi-x:gomit:db68f6f:gomit/vendor/github.com/intelsdi-x/gomit \ >+ julienschmidt:httprouter:8a45e95:httprouter/vendor/github.com/julienschmidt/httprouter \ >+ robfig:cron:9585fd5:cron/vendor/github.com/robfig/cron \ >+ urfave:cli:347a988:cli2/vendor/github.com/urfave/cli \ >+ urfave:negroni:61dbefc:negroni/vendor/github.com/urfave/negroni \ >+ pborman:uuid:1b00554:uuid/vendor/github.com/pborman/uuid \ >+ spf13:pflag:9ff6c69:pflag/vendor/github.com/spf13/pflag \ >+ xeipuuv:gojsonschema:f06f290:gojsonschema/vendor/github.com/xeipuuv/gojsonschema \ >+ xeipuuv:gojsonreference:e02fc20:gojsonreference/vendor/github.com/xeipuuv/gojsonreference \ >+ xeipuuv:gojsonpointer:e0fe6f6:gojsonpointer/vendor/github.com/xeipuuv/gojsonpointer \ >+ golang:net:41bba8d:net/vendor/golang.org/x/net \ >+ abh:errorutil:f9bd360:errorutil/vendor/go4.org/errorutil \ >+ go-yaml:yaml:4c78c97:yaml2/vendor/gopkg.in/yaml.v2 \ >+ go-inf:inf:3887ee9:inf/vendor/gopkg.in/inf.v0 \ >+ grpc:grpc-go:b1efb1e:grpc/vendor/google.golang.org/grpc \ >+ ghodss:yaml:04f3134:yaml/vendor/github.com/ghodss/yaml > >+GO_PKGNAME= github.com/intelsdi-x/snap >+GO_TARGET= .:snapd \ >+ ./cmd/snapctl >+ > PLIST_FILES= bin/snapctl bin/snapd > >-do-build: >- ( cd ${WRKSRC}; ${LN} -s ${WRKSRC} ${WRKSRC}/src/github.com/intelsdi-x/snap ) >- ( cd ${WRKSRC}/src/github.com/appc/spec; \ >- ${SETENV} ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} CC=clang \ >- go build -o bin/actool github.com/appc/spec/actool ) >- ( cd ${WRKSRC}; \ >- ${SETENV} ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} CC=clang \ >- go build ${BUILD_FLAGS} -o bin/snapd ) >- ( cd ${WRKSRC}/cmd/snapctl; \ >- ${SETENV} ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} CC=clang \ >- go build ${BUILD_FLAGS} -o bin/snapctl ) >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/cmd/snapctl/bin/snapctl ${STAGEDIR}${PREFIX}/bin/snapctl >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/snapd ${STAGEDIR}${PREFIX}/bin/snapd >- > .include <bsd.port.mk> >Index: net-mgmt/kapacitor/Makefile >=================================================================== >--- net-mgmt/kapacitor/Makefile (revision 512745) >+++ net-mgmt/kapacitor/Makefile (working copy) >@@ -23,6 +23,10 @@ > GH_ACCOUNT= influxdata > GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} > >+GO_BUILDFLAGS+= -ldflags "-X main.version=${DISTVERSION}" >+GO_TARGET= ./cmd/kapacitor \ >+ ./cmd/kapacitord >+ > SUB_FILES= kapacitord > SUB_LIST+= KAPACITORD_USER=${KAPACITORD_USER} \ > KAPACITORD_GROUP=${KAPACITORD_GROUP} \ >@@ -52,21 +56,14 @@ > KAPACITORD_DBDIR= /var/db/${PORTNAME}/ > KAPACITORD_LOGDIR= /var/log/${PORTNAME}/ > >-do-build: >- @cd ${WRKSRC}/src/github.com/influxdata/${PORTNAME} \ >- && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME} \ >- && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME}d >- >-do-install: >+post-install: > ${MKDIR} ${STAGEDIR}${KAPACITORD_DBDIR} \ > ${STAGEDIR}${KAPACITORD_LOGDIR} >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME}d ${STAGEDIR}${PREFIX}/bin/${PORTNAME}d > @${SED} -i .bak -e \ > "s|/var/lib/kapacitor|/var/db/kapacitor|g" \ >- ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/etc/${PORTNAME}/${PORTNAME}.conf >+ ${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf > ${INSTALL_DATA} \ >- ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/etc/${PORTNAME}/${PORTNAME}.conf \ >+ ${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf \ > ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample > > .include <bsd.port.post.mk> >Index: net-mgmt/mysqld_exporter/Makefile >=================================================================== >--- net-mgmt/mysqld_exporter/Makefile (revision 512745) >+++ net-mgmt/mysqld_exporter/Makefile (working copy) >@@ -17,13 +17,9 @@ > GH_ACCOUNT= prometheus > > GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} >-GO_TARGET= github.com/${GH_ACCOUNT}/${PORTNAME} > > PLIST_FILES= bin/mysqld_exporter > > USE_RC_SUBR= mysqld_exporter > >-do-install: >- ${INSTALL_PROGRAM} ${WRKDIR}/bin/mysqld_exporter ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: net-mgmt/nsd_exporter/Makefile >=================================================================== >--- net-mgmt/nsd_exporter/Makefile (revision 512745) >+++ net-mgmt/nsd_exporter/Makefile (working copy) >@@ -15,18 +15,17 @@ > USE_GITHUB= yes > > GH_ACCOUNT= optix2000 >-GH_TUPLE= prometheus:client_golang:v0.8.0:client_golang \ >- prometheus:client_model:5c3871d:client_model \ >- prometheus:procfs:ae68e2d:procfs \ >- prometheus:common:7600349:common \ >- beorn7:perks:3a771d9:perks \ >- golang:protobuf:70b3af3:protobuf \ >- matttproud:golang_protobuf_extensions:c12348c:golang_protobuf_extensions \ >- optix2000:go-nsdctl:ce14b32:go_nsdctl \ >- go-yaml:yaml:7f97868:go_yaml >+GH_TUPLE= prometheus:client_golang:v0.8.0:client_golang/vendor/github.com/prometheus/client_golang \ >+ prometheus:client_model:5c3871d:client_model/vendor/github.com/prometheus/client_model \ >+ prometheus:procfs:ae68e2d:procfs/vendor/github.com/prometheus/procfs \ >+ prometheus:common:7600349:common/vendor/github.com/prometheus/common \ >+ beorn7:perks:3a771d9:perks/vendor/github.com/beorn7/perks \ >+ golang:protobuf:70b3af3:protobuf/vendor/github.com/golang/protobuf \ >+ matttproud:golang_protobuf_extensions:c12348c:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ >+ optix2000:go-nsdctl:ce14b32:go_nsdctl/vendor/github.com/optix2000/go-nsdctl \ >+ go-yaml:yaml:7f97868:go_yaml/vendor/gopkg.in/yaml.v2 > > GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} >-GO_TARGET= github.com/${GH_ACCOUNT}/${PORTNAME} > > PLIST_FILES= bin/nsd_exporter > >@@ -36,21 +35,4 @@ > ${REINPLACE_CMD} -e 's|"/etc|"${LOCALBASE}/etc|g' ${WRKSRC_go_nsdctl}/nsdctl.go > ${REINPLACE_CMD} -e 's|"/etc|"${LOCALBASE}/etc|g' ${WRKSRC}/nsd_exporter.go > >-pre-build: >- ${MKDIR} ${GO_WRKDIR_SRC}/github.com/prometheus ${GO_WRKDIR_SRC}/gopkg.in \ >- ${GO_WRKDIR_SRC}/github.com/beorn7 ${GO_WRKDIR_SRC}/github.com/golang \ >- ${GO_WRKDIR_SRC}/github.com/matttproud ${GO_WRKDIR_SRC}/github.com/optix2000 >- ${MV} ${WRKSRC_golang_protobuf_extensions} ${GO_WRKDIR_SRC}/github.com/matttproud/golang_protobuf_extensions >- ${MV} ${WRKSRC_go_nsdctl} ${GO_WRKDIR_SRC}/github.com/optix2000/go-nsdctl >- ${MV} ${WRKSRC_client_golang} ${GO_WRKDIR_SRC}/github.com/prometheus/client_golang >- ${MV} ${WRKSRC_client_model} ${GO_WRKDIR_SRC}/github.com/prometheus/client_model >- ${MV} ${WRKSRC_procfs} ${GO_WRKDIR_SRC}/github.com/prometheus/procfs >- ${MV} ${WRKSRC_common} ${GO_WRKDIR_SRC}/github.com/prometheus/common >- ${MV} ${WRKSRC_protobuf} ${GO_WRKDIR_SRC}/github.com/golang/protobuf >- ${MV} ${WRKSRC_go_yaml} ${GO_WRKDIR_SRC}/gopkg.in/yaml.v2 >- ${MV} ${WRKSRC_perks} ${GO_WRKDIR_SRC}/github.com/beorn7/perks >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKDIR}/bin/nsd_exporter ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: net-mgmt/prometheus1/Makefile >=================================================================== >--- net-mgmt/prometheus1/Makefile (revision 512745) >+++ net-mgmt/prometheus1/Makefile (working copy) >@@ -14,7 +14,7 @@ > LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > >-USES= go gmake >+USES= go > USE_GITHUB= yes > > GO_PKGNAME= github.com/${PORTNAME}/${PORTNAME} >@@ -26,24 +26,17 @@ > > BUILD_USER?= ${USER} > LD_FLAG_X_PREFIX= -X ${GO_PKGNAME}/vendor/github.com/prometheus/common/version >-LD_FLAG_STRING= -s \ >- ${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \ >- ${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \ >- ${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \ >- ${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER} >+GO_BUILDFLAGS= -ldflags "\ >+ -s \ >+ ${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \ >+ ${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \ >+ ${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \ >+ ${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER}" >+GO_TARGET= ./cmd/prometheus \ >+ ./cmd/promtool > >-do-build: >- ( cd ${GO_WRKSRC}/cmd/prometheus ; \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) >- >- ( cd ${GO_WRKSRC}/cmd/promtool ; \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) >- >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/prometheus ${STAGEDIR}${PREFIX}/bin >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/promtool ${STAGEDIR}${PREFIX}/bin >+post-install: > ${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml ${STAGEDIR}${LOCALBASE}/etc/prometheus.yml.sample >- > ${MKDIR} ${STAGEDIR}${DESTDIR}/var/db/prometheus > > .include <bsd.port.mk> >Index: net-mgmt/semaphore/Makefile >=================================================================== >--- net-mgmt/semaphore/Makefile (revision 512745) >+++ net-mgmt/semaphore/Makefile (working copy) >@@ -18,50 +18,51 @@ > USE_GITHUB= yes > USE_RC_SUBR= semaphore > >-GO_TARGET= github.com/${GH_ACCOUNT}/${PORTNAME} >+GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} >+GO_TARGET= ./cli:${PORTNAME} > > GH_ACCOUNT= ansible-semaphore >-GH_TUPLE= ansible-semaphore:semaphore-vendor:a44f7be:ansible/github.com/ansible-semaphore/semaphore-vendor \ >- PuerkitoBio:purell:v1.1.0:PuerkitoBio/github.com/PuerkitoBio/purell \ >- PuerkitoBio:urlesc:de5bf2a:PuerkitoBio2/github.com/PuerkitoBio/urlesc \ >- Sirupsen:logrus:v1.0.4:Sirupsen/github.com/Sirupsen/logrus \ >- asaskevich:govalidator:v9:asaskevich/github.com/asaskevich/govalidator \ >- castawaylabs:mulekick:7029fb3:castawaylabs/github.com/castawaylabs/mulekick \ >- go-openapi:analysis:f59a71f:openapi/github.com/go-openapi/analysis \ >- go-openapi:errors:7bcb96a:openapi2/github.com/go-openapi/errors \ >- go-openapi:jsonpointer:3a0015a:openapi3/github.com/go-openapi/jsonpointer \ >- go-openapi:jsonreference:3fb327e:openapi4/github.com/go-openapi/jsonreference \ >- go-openapi:loads:2a2b323:openapi5/github.com/go-openapi/loads \ >- go-openapi:runtime:62281b6:openapi6/github.com/go-openapi/runtime \ >- go-openapi:spec:370d9e0:openapi7/github.com/go-openapi/spec \ >- go-openapi:strfmt:4818084:openapi8/github.com/go-openapi/strfmt \ >- go-openapi:swag:811b108:openapi9/github.com/go-openapi/swag \ >- go-openapi:validate:180bba5:openapi10/github.com/go-openapi/validate \ >- go-sql-driver:mysql:v1.3:sqldriver/github.com/go-sql-driver/mysql \ >- gobuffalo:packr:v1.10.4:buffalo/github.com/gobuffalo/packr \ >- google:go-github:v15.0.0:google/github.com/google/go-github \ >- google:go-querystring:53e6ce1:google2/github.com/google/go-querystring \ >- gorilla:context:v1.1:gorilla/github.com/gorilla/context \ >- gorilla:handlers:v1.3.0:gorilla2/github.com/gorilla/handlers \ >- gorilla:mux:v1.6.1:gorilla3/github.com/gorilla/mux \ >- gorilla:securecookie:v1.1.1:gorilla4/github.com/gorilla/securecookie \ >- gorilla:websocket:v1.2.0:gorilla5/github.com/gorilla/websocket \ >- lann:builder:1b87b36:lann/github.com/lann/builder \ >- lann:ps:62de8c4:lann2/github.com/lann/ps \ >- mailru:easyjson:8b799c4:mailru/github.com/mailru/easyjson \ >- masterminds:squirrel:v1.0:mastermindos/github.com/masterminds/squirrel \ >- mitchellh:mapstructure:00c29f5:mitchellh/github.com/mitchellh/mapstructure \ >- pkg:errors:v0.8.0:pkg/github.com/pkg/errors \ >- russross:blackfriday:v1.5.1:russross/github.com/russross/blackfriday \ >- golang:net:61147c4:golang/golang.org/x/net \ >- golang:sys:7dca6fe:golang2/golang.org/x/sys \ >- golang:text:v0.3.0:golang3/golang.org/x/text \ >- golang:crypto:c7dcf10:golang4/golang.org/x/crypto \ >- go-asn1-ber:asn1-ber:v1.2:pkgin/gopkg.in/asn1-ber.v1 \ >- go-gorp:gorp:v1.7.1:pkgin2/gopkg.in/gorp.v1 \ >- go-ldap:ldap:v2.5.1:pkgin3/gopkg.in/ldap.v2 \ >- go-mgo:mgo:3f83fa5:pkgin4/gopkg.in/mgo.v2 \ >- go-yaml:yaml:v2.2.1:pkgin5/gopkg.in/yaml.v2 >+GH_TUPLE= ansible-semaphore:semaphore-vendor:a44f7be:ansible/vendor/github.com/ansible-semaphore/semaphore-vendor \ >+ PuerkitoBio:purell:v1.1.0:PuerkitoBio/vendor/github.com/PuerkitoBio/purell \ >+ PuerkitoBio:urlesc:de5bf2a:PuerkitoBio2/vendor/github.com/PuerkitoBio/urlesc \ >+ Sirupsen:logrus:v1.0.4:Sirupsen/vendor/github.com/Sirupsen/logrus \ >+ asaskevich:govalidator:v9:asaskevich/vendor/github.com/asaskevich/govalidator \ >+ castawaylabs:mulekick:7029fb3:castawaylabs/vendor/github.com/castawaylabs/mulekick \ >+ go-openapi:analysis:f59a71f:openapi/vendor/github.com/go-openapi/analysis \ >+ go-openapi:errors:7bcb96a:openapi2/vendor/github.com/go-openapi/errors \ >+ go-openapi:jsonpointer:3a0015a:openapi3/vendor/github.com/go-openapi/jsonpointer \ >+ go-openapi:jsonreference:3fb327e:openapi4/vendor/github.com/go-openapi/jsonreference \ >+ go-openapi:loads:2a2b323:openapi5/vendor/github.com/go-openapi/loads \ >+ go-openapi:runtime:62281b6:openapi6/vendor/github.com/go-openapi/runtime \ >+ go-openapi:spec:370d9e0:openapi7/vendor/github.com/go-openapi/spec \ >+ go-openapi:strfmt:4818084:openapi8/vendor/github.com/go-openapi/strfmt \ >+ go-openapi:swag:811b108:openapi9/vendor/github.com/go-openapi/swag \ >+ go-openapi:validate:180bba5:openapi10/vendor/github.com/go-openapi/validate \ >+ go-sql-driver:mysql:v1.3:sqldriver/vendor/github.com/go-sql-driver/mysql \ >+ gobuffalo:packr:v1.10.4:buffalo/vendor/github.com/gobuffalo/packr \ >+ google:go-github:v15.0.0:google/vendor/github.com/google/go-github \ >+ google:go-querystring:53e6ce1:google2/vendor/github.com/google/go-querystring \ >+ gorilla:context:v1.1:gorilla/vendor/github.com/gorilla/context \ >+ gorilla:handlers:v1.3.0:gorilla2/vendor/github.com/gorilla/handlers \ >+ gorilla:mux:v1.6.1:gorilla3/vendor/github.com/gorilla/mux \ >+ gorilla:securecookie:v1.1.1:gorilla4/vendor/github.com/gorilla/securecookie \ >+ gorilla:websocket:v1.2.0:gorilla5/vendor/github.com/gorilla/websocket \ >+ lann:builder:1b87b36:lann/vendor/github.com/lann/builder \ >+ lann:ps:62de8c4:lann2/vendor/github.com/lann/ps \ >+ mailru:easyjson:8b799c4:mailru/vendor/github.com/mailru/easyjson \ >+ masterminds:squirrel:v1.0:mastermindos/vendor/github.com/masterminds/squirrel \ >+ mitchellh:mapstructure:00c29f5:mitchellh/vendor/github.com/mitchellh/mapstructure \ >+ pkg:errors:v0.8.0:pkg/vendor/github.com/pkg/errors \ >+ russross:blackfriday:v1.5.1:russross/vendor/github.com/russross/blackfriday \ >+ golang:net:61147c4:golang/vendor/golang.org/x/net \ >+ golang:sys:7dca6fe:golang2/vendor/golang.org/x/sys \ >+ golang:text:v0.3.0:golang3/vendor/golang.org/x/text \ >+ golang:crypto:c7dcf10:golang4/vendor/golang.org/x/crypto \ >+ go-asn1-ber:asn1-ber:v1.2:pkgin/vendor/gopkg.in/asn1-ber.v1 \ >+ go-gorp:gorp:v1.7.1:pkgin2/vendor/gopkg.in/gorp.v1 \ >+ go-ldap:ldap:v2.5.1:pkgin3/vendor/gopkg.in/ldap.v2 \ >+ go-mgo:mgo:3f83fa5:pkgin4/vendor/gopkg.in/mgo.v2 \ >+ go-yaml:yaml:v2.2.1:pkgin5/vendor/gopkg.in/yaml.v2 > > OPTIONS_DEFINE= MYSQL > MYSQL_USES= mysql >@@ -70,18 +71,7 @@ > ${REINPLACE_CMD} 's/%%PORTVERSION%%/${PORTVERSION}/g' \ > ${WRKSRC}/util/config.go > >-do-build: >- ${MKDIR} ${WRKSRC}/${GO_TARGET:H} >- ${MKDIR} ${WRKSRC}/public >- ${RLN} ${WRKSRC} ${WRKSRC}/${GO_TARGET} >- ${RLN} ${WRKSRC} ${GO_WRKSRC}/src >- ${RLN} ${WRKSRC} ${GO_WRKSRC}/public/vendor >- (cd ${WRKSRC} && \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} ${GO_CMD} \ >- build ${GO_BUILDFLAGS} -o ${WRKSRC}/bin/${PORTNAME} cli) >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin >+post-install: > ${MKDIR} ${STAGEDIR}${PREFIX}/etc/semaphore > ${CP} ${WRKSRC}/config.json ${STAGEDIR}${PREFIX}/etc/semaphore/semaphore_config.json.sample > >Index: net-mgmt/telegraf/Makefile >=================================================================== >--- net-mgmt/telegraf/Makefile (revision 512745) >+++ net-mgmt/telegraf/Makefile (working copy) >@@ -20,151 +20,154 @@ > > GH_ACCOUNT= influxdata > GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT_DEFAULT} >-GH_TUPLE= GoogleCloudPlatform:google-cloud-go:v0.27.0:go/src/cloud.google.com/go \ >- cloudfoundry:clock:02e53af:clock/src/code.cloudfoundry.org/clock \ >- collectd:go-collectd:v0.3.0:collectd_org/src/collectd.org \ >- census-ecosystem:opencensus-go-exporter-stackdriver:v0.6.0:census_ecosystem/src/contrib.go.opencensus.io/exporter/stackdriver \ >- cisco-ie:nx-telemetry-proto:82441e2:nx_telemetry_proto/src/github.com/cisco-ie/nx-telemetry-proto \ >- Azure:go-autorest:v10.12.0:go_autorest/src/github.com/Azure/go-autorest \ >- Microsoft:ApplicationInsights-Go:d2df5d4:application_insights/src/github.com/Microsoft/ApplicationInsights-Go \ >- Microsoft:go-winio:v0.4.9:go_winio/src/github.com/Microsoft/go-winio \ >- influxdata:sarama:b12709e:sarama/src/github.com/Shopify/sarama \ >- StackExchange:wmi:1.0.0:wmi/src/github.com/StackExchange/wmi \ >- aerospike:aerospike-client-go:v1.27.0:aerospike_client_go/src/github.com/aerospike/aerospike-client-go \ >- alecthomas:units:2efee85:units/src/github.com/alecthomas/units \ >- amir:raidman:1ccc43b:raidman/src/github.com/amir/raidman \ >- apache:thrift:f2867c2:thrift/src/github.com/apache/thrift \ >- aws:aws-sdk-go:v1.19.41:aws_sdk_go/src/github.com/aws/aws-sdk-go \ >- beorn7:perks:3a771d9:perks/src/github.com/beorn7/perks \ >- caio:go-tdigest:v2.3.0:go_tdigest/src/github.com/caio/go-tdigest \ >- cenkalti:backoff:v2.0.0:backoff/src/github.com/cenkalti/backoff \ >- couchbase:go-couchbase:16db1f1:go_couchbase/src/github.com/couchbase/go-couchbase \ >- couchbase:gomemcached:0da75df:gomemcached/src/github.com/couchbase/gomemcached \ >- couchbase:goutils:e865a14:goutils/src/github.com/couchbase/goutils \ >- davecgh:go-spew:v1.1.0:go_spew/src/github.com/davecgh/go-spew \ >- denisenkom:go-mssqldb:2be1aa5:go_mssqldb/src/github.com/denisenkom/go-mssqldb \ >- dgrijalva:jwt-go:v3.2.0:jwt_go/src/github.com/dgrijalva/jwt-go \ >- dimchansky:utfbom:6c6132f:utfbom/src/github.com/dimchansky/utfbom \ >- docker:distribution:edc3ab2:distribution/src/github.com/docker/distribution \ >- moby:moby:ed7b642:docker/src/github.com/docker/docker \ >- docker:go-connections:v0.3.0:go_connections/src/github.com/docker/go-connections \ >- docker:go-units:v0.3.3:go_units/src/github.com/docker/go-units \ >- docker:libnetwork:d7b6174:libnetwork/src/github.com/docker/libnetwork \ >- eapache:go-resiliency:v1.1.0:go_resiliency/src/github.com/eapache/go-resiliency \ >- eapache:go-xerial-snappy:040cc1a:go_xerial_snappy/src/github.com/eapache/go-xerial-snappy \ >- eapache:queue:v1.1.0:queue/src/github.com/eapache/queue \ >- eclipse:paho.mqtt.golang:v1.1.1:paho_mqtt_golang/src/github.com/eclipse/paho.mqtt.golang \ >- ericchiang:k8s:v1.2.0:k8s/src/github.com/ericchiang/k8s \ >- ghodss:yaml:25d852a:yaml/src/github.com/ghodss/yaml \ >- go-logfmt:logfmt:v0.4.0:go_logfmt/src/github.com/go-logfmt/logfmt \ >- go-ole:go-ole:v1.2.1:go_ole/src/github.com/go-ole/go-ole \ >- go-redis:redis:v6.12.0:redis/src/github.com/go-redis/redis \ >- go-sql-driver:mysql:v1.4.1:mysql/src/github.com/go-sql-driver/mysql \ >- gobwas:glob:v0.2.3:glob/src/github.com/gobwas/glob \ >- gogo:protobuf:v1.1.1:gogo_protobuf/src/github.com/gogo/protobuf \ >- golang:protobuf:v1.1.0:protobuf/src/github.com/golang/protobuf \ >- golang:snappy:2e65f85:snappy/src/github.com/golang/snappy \ >- google:go-github:v24.0.1:go_github/src/github.com/google/go-github \ >- google:go-cmp:v0.2.0:go_cmp/src/github.com/google/go-cmp \ >- google:go-querystring:v1.0.0:go_querystring/src/github.com/google/go-querystring \ >- google:uuid:0.2:uuid/src/github.com/google/uuid \ >- googleapis:gax-go:v2.0.0:gax_go/src/github.com/googleapis/gax-go \ >- gorilla:context:v1.1.1:context/src/github.com/gorilla/context \ >- gorilla:mux:v1.6.2:mux/src/github.com/gorilla/mux \ >- hailocab:go-hostpool:e80d13c:go_hostpool/src/github.com/hailocab/go-hostpool \ >- harlow:kinesis-consumer:2f58b13:kinesis_consumer/src/github.com/harlow/kinesis-consumer \ >- hashicorp:consul:v1.2.1:consul/src/github.com/hashicorp/consul \ >- hashicorp:go-cleanhttp:d5fe4b5:go_cleanhttp/src/github.com/hashicorp/go-cleanhttp \ >- hashicorp:go-rootcerts:6bb64b3:go_rootcerts/src/github.com/hashicorp/go-rootcerts \ >- hashicorp:go-uuid:v1.0.1:gouuid/src/github.com/hashicorp/go-uuid \ >- hashicorp:serf:v0.8.1:serf/src/github.com/hashicorp/serf \ >- influxdata:go-syslog:v2.0.0:go_syslog/src/github.com/influxdata/go-syslog \ >- influxdata:tail:c434825:tail/src/github.com/influxdata/tail \ >- influxdata:toml:270119a:toml/src/github.com/influxdata/toml \ >- influxdata:wlog:7c63b0a:wlog/src/github.com/influxdata/wlog \ >- jackc:pgx:v3.2.0:pgx/src/github.com/jackc/pgx \ >- jcmturner:aescts:v1.0.1:aescts/src/gopkg.in/jcmturner/aescts.v1 \ >- jcmturner:dnsutils:v1.0.1:dnsutils/src/gopkg.in/jcmturner/dnsutils.v1 \ >- jcmturner:gofork:v1.0.0:gofork/src/github.com/jcmturner/gofork \ >- jcmturner:gokrb5:v7.3.0:gokrb5/src/gopkg.in/jcmturner/gokrb5.v7 \ >- jcmturner:rpc:v1.1.0:rpc/src/gopkg.in/jcmturner/rpc.v1 \ >- jmespath:go-jmespath:c2b33e84:go_jmespath/src/github.com/jmespath/go-jmespath \ >- kardianos:osext:ae77be6:osext/src/github.com/kardianos/osext \ >- kardianos:service:615a14e:service/src/github.com/kardianos/service \ >- karrick:godirwalk:v1.7.5:godirwalk/src/github.com/karrick/godirwalk \ >- kballard:go-shellquote:95032a8:go_shellquote/src/github.com/kballard/go-shellquote \ >- kr:logfmt:b84e30a:logfmt/src/github.com/kr/logfmt \ >- kubernetes:apimachinery:d41becf:apimachinery/src/github.com/kubernetes/apimachinery \ >- leodido:ragel-machinery:299bdde:ragel_machinery/src/github.com/leodido/ragel-machinery \ >- mailru:easyjson:efc7eb8:easyjson/src/github.com/mailru/easyjson \ >- matttproud:golang_protobuf_extensions:v1.0.1:golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions \ >- mdlayher:apcupsd:2fe55d9:apcupsd/src/github.com/mdlayher/apcupsd \ >- miekg:dns:v1.0.8:dns/src/github.com/miekg/dns \ >- mitchellh:go-homedir:3864e76:go_homedir/src/github.com/mitchellh/go-homedir \ >- mitchellh:mapstructure:f15292f:mapstructure/src/github.com/mitchellh/mapstructure \ >- multiplay:go-ts3:v1.0.0:go_ts3/src/github.com/multiplay/go-ts3 \ >- naoina:go-stringutil:v0.1.0:go_stringutil/src/github.com/naoina/go-stringutil \ >- nats-io:gnatsd:v1.2.0:gnatsd/src/github.com/nats-io/gnatsd \ >- nats-io:go-nats:v1.5.0:nats/src/github.com/nats-io/go-nats \ >- nats-io:nuid:v1.0.0:nuid/src/github.com/nats-io/nuid \ >- nsqio:go-nsq:v1.0.7:go_nsq/src/github.com/nsqio/go-nsq \ >- openconfig:gnmi:33a1865:gnmi/src/github.com/openconfig/gnmi \ >- opencontainers:go-digest:v1.0.0-rc1:go_digest/src/github.com/opencontainers/go-digest \ >- opencontainers:image-spec:v1.0.1:image_spec/src/github.com/opencontainers/image-spec \ >- opentracing-contrib:go-observer:a52f234:go_observer/src/github.com/opentracing-contrib/go-observer \ >- opentracing:opentracing-go:v1.0.2:opentracing_go/src/github.com/opentracing/opentracing-go \ >- openzipkin:zipkin-go-opentracing:v0.3.4:zipkin_go_opentracing/src/github.com/openzipkin/zipkin-go-opentracing \ >- glinton:ping:v0.1.1:ping/src/github.com/glinton/ping \ >- pierrec:lz4:v2.0.3:lz4/src/github.com/pierrec/lz4 \ >- pkg:errors:v0.8.0:errors/src/github.com/pkg/errors \ >- pmezard:go-difflib:v1.0.0:go_difflib/src/github.com/pmezard/go-difflib \ >- prometheus:client_golang:v0.9.2:client_golang/src/github.com/prometheus/client_golang \ >- prometheus:client_model:5c3871d:client_model/src/github.com/prometheus/client_model \ >- prometheus:common:7600349:common/src/github.com/prometheus/common \ >- prometheus:procfs:ae68e2d:procfs/src/github.com/prometheus/procfs \ >- rcrowley:go-metrics:e2704e1:go_metrics/src/github.com/rcrowley/go-metrics \ >- samuel:go-zookeeper:c4fab1a:go_zookeeper/src/github.com/samuel/go-zookeeper \ >- satori:go.uuid:v1.2.0:go_uuid/src/github.com/satori/go.uuid \ >- shirou:gopsutil:v2.19.7:gopsutil/src/github.com/shirou/gopsutil \ >- shirou:w32:bb4de01:w32/src/github.com/shirou/w32 \ >- sirupsen:logrus:v1.0.5:logrus/src/github.com/sirupsen/logrus \ >- soniah:gosnmp:96b8622:gosnmp/src/github.com/soniah/gosnmp \ >- streadway:amqp:e5adc2a:amqp/src/github.com/streadway/amqp \ >- stretchr:objx:v0.1.1:objx/src/github.com/stretchr/objx \ >- stretchr:testify:v1.2.2:testify/src/github.com/stretchr/testify \ >- tidwall:gjson:v1.3.0:gjson/src/github.com/tidwall/gjson \ >- tidwall:match:1731857:match/src/github.com/tidwall/match \ >- tidwall:pretty:v1.0.0:pretty/src/github.com/tidwall/pretty \ >- vishvananda:netlink:b2de5d1:netlink/src/github.com/vishvananda/netlink \ >- vishvananda:netns:13995c7:netns/src/github.com/vishvananda/netns \ >- vjeantet:grok:v1.0.0:grok/src/github.com/vjeantet/grok \ >- vmware:govmomi:v0.19.0:govmomi/src/github.com/vmware/govmomi \ >- wavefronthq:wavefront-sdk-go:v0.9.2:wavefront_sdk_go/src/github.com/wavefronthq/wavefront-sdk-go \ >- wvanbergen:kafka:e2edea9:kafka/src/github.com/wvanbergen/kafka \ >- wvanbergen:kazoo-go:f72d861:kazoo_go/src/github.com/wvanbergen/kazoo-go \ >- yuin:gopher-lua:46796da:gopher_lua/src/github.com/yuin/gopher-lua \ >- census-instrumentation:opencensus-go:v0.17.0:opencensus_go/src/go.opencensus.io \ >- golang:crypto:a214413:crypto/src/golang.org/x/crypto \ >- golang:net:a680a1e:net/src/golang.org/x/net \ >- golang:oauth2:d2e6202:oauth2/src/golang.org/x/oauth2 \ >- golang:sync:42b3178:sync/src/golang.org/x/sync \ >- golang:sys:51ab0e2:sys/src/golang.org/x/sys \ >- golang:text:v0.3.0:text/src/golang.org/x/text \ >- googleapis:google-api-go-client:19ff876:googleapis/src/google.golang.org/api \ >- golang:appengine:v1.1.0:appengine/src/google.golang.org/appengine \ >- google:go-genproto:fedd286:genproto/src/google.golang.org/genproto \ >- grpc:grpc-go:v1.13.0:grpc/src/google.golang.org/grpc \ >- go-asn1-ber:asn1-ber:v1.2:asn1_ber_v1/src/gopkg.in/asn1-ber.v1 \ >- fatih:pool:v2.0.0:pool_v2/src/gopkg.in/fatih/pool.v2 \ >- fsnotify:fsnotify:v1.4.7:fsnotify_v1/src/gopkg.in/fsnotify.v1 \ >- rethinkdb:rethinkdb-go:v3.0.5:gorethink_v3/src/gopkg.in/gorethink/gorethink.v3 \ >- go-inf:inf:v0.9.1:inf_v0/src/gopkg.in/inf.v0 \ >- go-ldap:ldap:v2.5.1:ldap_v2/src/gopkg.in/ldap.v2 \ >- go-mgo:mgo:9856a29:mgo_v2/src/gopkg.in/mgo.v2 \ >- olivere:elastic:v5.0.70:elastic_v5/src/gopkg.in/olivere/elastic.v5 \ >- go-tomb:tomb:dd63297:tomb_v1/src/gopkg.in/tomb.v1 \ >- go-yaml:yaml:v2.2.1:yaml_v2/src/gopkg.in/yaml.v2 >+GH_TUPLE= GoogleCloudPlatform:google-cloud-go:v0.27.0:go/vendor/cloud.google.com/go \ >+ cloudfoundry:clock:02e53af:clock/vendor/code.cloudfoundry.org/clock \ >+ collectd:go-collectd:v0.3.0:collectd_org/vendor/collectd.org \ >+ census-ecosystem:opencensus-go-exporter-stackdriver:v0.6.0:census_ecosystem/vendor/contrib.go.opencensus.io/exporter/stackdriver \ >+ cisco-ie:nx-telemetry-proto:82441e2:nx_telemetry_proto/vendor/github.com/cisco-ie/nx-telemetry-proto \ >+ Azure:go-autorest:v10.12.0:go_autorest/vendor/github.com/Azure/go-autorest \ >+ Microsoft:ApplicationInsights-Go:d2df5d4:application_insights/vendor/github.com/Microsoft/ApplicationInsights-Go \ >+ Microsoft:go-winio:v0.4.9:go_winio/vendor/github.com/Microsoft/go-winio \ >+ influxdata:sarama:b12709e:sarama/vendor/github.com/Shopify/sarama \ >+ StackExchange:wmi:1.0.0:wmi/vendor/github.com/StackExchange/wmi \ >+ aerospike:aerospike-client-go:v1.27.0:aerospike_client_go/vendor/github.com/aerospike/aerospike-client-go \ >+ alecthomas:units:2efee85:units/vendor/github.com/alecthomas/units \ >+ amir:raidman:1ccc43b:raidman/vendor/github.com/amir/raidman \ >+ apache:thrift:f2867c2:thrift/vendor/github.com/apache/thrift \ >+ aws:aws-sdk-go:v1.19.41:aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ >+ beorn7:perks:3a771d9:perks/vendor/github.com/beorn7/perks \ >+ caio:go-tdigest:v2.3.0:go_tdigest/vendor/github.com/caio/go-tdigest \ >+ cenkalti:backoff:v2.0.0:backoff/vendor/github.com/cenkalti/backoff \ >+ couchbase:go-couchbase:16db1f1:go_couchbase/vendor/github.com/couchbase/go-couchbase \ >+ couchbase:gomemcached:0da75df:gomemcached/vendor/github.com/couchbase/gomemcached \ >+ couchbase:goutils:e865a14:goutils/vendor/github.com/couchbase/goutils \ >+ davecgh:go-spew:v1.1.0:go_spew/vendor/github.com/davecgh/go-spew \ >+ denisenkom:go-mssqldb:2be1aa5:go_mssqldb/vendor/github.com/denisenkom/go-mssqldb \ >+ dgrijalva:jwt-go:v3.2.0:jwt_go/vendor/github.com/dgrijalva/jwt-go \ >+ dimchansky:utfbom:6c6132f:utfbom/vendor/github.com/dimchansky/utfbom \ >+ docker:distribution:edc3ab2:distribution/vendor/github.com/docker/distribution \ >+ moby:moby:ed7b642:docker/vendor/github.com/docker/docker \ >+ docker:go-connections:v0.3.0:go_connections/vendor/github.com/docker/go-connections \ >+ docker:go-units:v0.3.3:go_units/vendor/github.com/docker/go-units \ >+ docker:libnetwork:d7b6174:libnetwork/vendor/github.com/docker/libnetwork \ >+ eapache:go-resiliency:v1.1.0:go_resiliency/vendor/github.com/eapache/go-resiliency \ >+ eapache:go-xerial-snappy:040cc1a:go_xerial_snappy/vendor/github.com/eapache/go-xerial-snappy \ >+ eapache:queue:v1.1.0:queue/vendor/github.com/eapache/queue \ >+ eclipse:paho.mqtt.golang:v1.1.1:paho_mqtt_golang/vendor/github.com/eclipse/paho.mqtt.golang \ >+ ericchiang:k8s:v1.2.0:k8s/vendor/github.com/ericchiang/k8s \ >+ ghodss:yaml:25d852a:yaml/vendor/github.com/ghodss/yaml \ >+ go-logfmt:logfmt:v0.4.0:go_logfmt/vendor/github.com/go-logfmt/logfmt \ >+ go-ole:go-ole:v1.2.1:go_ole/vendor/github.com/go-ole/go-ole \ >+ go-redis:redis:v6.12.0:redis/vendor/github.com/go-redis/redis \ >+ go-sql-driver:mysql:v1.4.1:mysql/vendor/github.com/go-sql-driver/mysql \ >+ gobwas:glob:v0.2.3:glob/vendor/github.com/gobwas/glob \ >+ gogo:protobuf:v1.1.1:gogo_protobuf/vendor/github.com/gogo/protobuf \ >+ golang:protobuf:v1.1.0:protobuf/vendor/github.com/golang/protobuf \ >+ golang:snappy:2e65f85:snappy/vendor/github.com/golang/snappy \ >+ google:go-github:v24.0.1:go_github/vendor/github.com/google/go-github \ >+ google:go-cmp:v0.2.0:go_cmp/vendor/github.com/google/go-cmp \ >+ google:go-querystring:v1.0.0:go_querystring/vendor/github.com/google/go-querystring \ >+ google:uuid:0.2:uuid/vendor/github.com/google/uuid \ >+ googleapis:gax-go:v2.0.0:gax_go/vendor/github.com/googleapis/gax-go \ >+ gorilla:context:v1.1.1:context/vendor/github.com/gorilla/context \ >+ gorilla:mux:v1.6.2:mux/vendor/github.com/gorilla/mux \ >+ hailocab:go-hostpool:e80d13c:go_hostpool/vendor/github.com/hailocab/go-hostpool \ >+ harlow:kinesis-consumer:2f58b13:kinesis_consumer/vendor/github.com/harlow/kinesis-consumer \ >+ hashicorp:consul:v1.2.1:consul/vendor/github.com/hashicorp/consul \ >+ hashicorp:go-cleanhttp:d5fe4b5:go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \ >+ hashicorp:go-rootcerts:6bb64b3:go_rootcerts/vendor/github.com/hashicorp/go-rootcerts \ >+ hashicorp:go-uuid:v1.0.1:gouuid/vendor/github.com/hashicorp/go-uuid \ >+ hashicorp:serf:v0.8.1:serf/vendor/github.com/hashicorp/serf \ >+ influxdata:go-syslog:v2.0.0:go_syslog/vendor/github.com/influxdata/go-syslog \ >+ influxdata:tail:c434825:tail/vendor/github.com/influxdata/tail \ >+ influxdata:toml:270119a:toml/vendor/github.com/influxdata/toml \ >+ influxdata:wlog:7c63b0a:wlog/vendor/github.com/influxdata/wlog \ >+ jackc:pgx:v3.2.0:pgx/vendor/github.com/jackc/pgx \ >+ jcmturner:aescts:v1.0.1:aescts/vendor/gopkg.in/jcmturner/aescts.v1 \ >+ jcmturner:dnsutils:v1.0.1:dnsutils/vendor/gopkg.in/jcmturner/dnsutils.v1 \ >+ jcmturner:gofork:v1.0.0:gofork/vendor/github.com/jcmturner/gofork \ >+ jcmturner:gokrb5:v7.3.0:gokrb5/vendor/gopkg.in/jcmturner/gokrb5.v7 \ >+ jcmturner:rpc:v1.1.0:rpc/vendor/gopkg.in/jcmturner/rpc.v1 \ >+ jmespath:go-jmespath:c2b33e84:go_jmespath/vendor/github.com/jmespath/go-jmespath \ >+ kardianos:osext:ae77be6:osext/vendor/github.com/kardianos/osext \ >+ kardianos:service:615a14e:service/vendor/github.com/kardianos/service \ >+ karrick:godirwalk:v1.7.5:godirwalk/vendor/github.com/karrick/godirwalk \ >+ kballard:go-shellquote:95032a8:go_shellquote/vendor/github.com/kballard/go-shellquote \ >+ kr:logfmt:b84e30a:logfmt/vendor/github.com/kr/logfmt \ >+ kubernetes:apimachinery:d41becf:apimachinery/vendor/github.com/kubernetes/apimachinery \ >+ leodido:ragel-machinery:299bdde:ragel_machinery/vendor/github.com/leodido/ragel-machinery \ >+ mailru:easyjson:efc7eb8:easyjson/vendor/github.com/mailru/easyjson \ >+ matttproud:golang_protobuf_extensions:v1.0.1:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ >+ mdlayher:apcupsd:2fe55d9:apcupsd/vendor/github.com/mdlayher/apcupsd \ >+ miekg:dns:v1.0.8:dns/vendor/github.com/miekg/dns \ >+ mitchellh:go-homedir:3864e76:go_homedir/vendor/github.com/mitchellh/go-homedir \ >+ mitchellh:mapstructure:f15292f:mapstructure/vendor/github.com/mitchellh/mapstructure \ >+ multiplay:go-ts3:v1.0.0:go_ts3/vendor/github.com/multiplay/go-ts3 \ >+ naoina:go-stringutil:v0.1.0:go_stringutil/vendor/github.com/naoina/go-stringutil \ >+ nats-io:gnatsd:v1.2.0:gnatsd/vendor/github.com/nats-io/gnatsd \ >+ nats-io:go-nats:v1.5.0:nats/vendor/github.com/nats-io/go-nats \ >+ nats-io:nuid:v1.0.0:nuid/vendor/github.com/nats-io/nuid \ >+ nsqio:go-nsq:v1.0.7:go_nsq/vendor/github.com/nsqio/go-nsq \ >+ openconfig:gnmi:33a1865:gnmi/vendor/github.com/openconfig/gnmi \ >+ opencontainers:go-digest:v1.0.0-rc1:go_digest/vendor/github.com/opencontainers/go-digest \ >+ opencontainers:image-spec:v1.0.1:image_spec/vendor/github.com/opencontainers/image-spec \ >+ opentracing-contrib:go-observer:a52f234:go_observer/vendor/github.com/opentracing-contrib/go-observer \ >+ opentracing:opentracing-go:v1.0.2:opentracing_go/vendor/github.com/opentracing/opentracing-go \ >+ openzipkin:zipkin-go-opentracing:v0.3.4:zipkin_go_opentracing/vendor/github.com/openzipkin/zipkin-go-opentracing \ >+ glinton:ping:v0.1.1:ping/vendor/github.com/glinton/ping \ >+ pierrec:lz4:v2.0.3:lz4/vendor/github.com/pierrec/lz4 \ >+ pkg:errors:v0.8.0:errors/vendor/github.com/pkg/errors \ >+ pmezard:go-difflib:v1.0.0:go_difflib/vendor/github.com/pmezard/go-difflib \ >+ prometheus:client_golang:v0.9.2:client_golang/vendor/github.com/prometheus/client_golang \ >+ prometheus:client_model:5c3871d:client_model/vendor/github.com/prometheus/client_model \ >+ prometheus:common:7600349:common/vendor/github.com/prometheus/common \ >+ prometheus:procfs:ae68e2d:procfs/vendor/github.com/prometheus/procfs \ >+ rcrowley:go-metrics:e2704e1:go_metrics/vendor/github.com/rcrowley/go-metrics \ >+ samuel:go-zookeeper:c4fab1a:go_zookeeper/vendor/github.com/samuel/go-zookeeper \ >+ satori:go.uuid:v1.2.0:go_uuid/vendor/github.com/satori/go.uuid \ >+ shirou:gopsutil:v2.19.7:gopsutil/vendor/github.com/shirou/gopsutil \ >+ shirou:w32:bb4de01:w32/vendor/github.com/shirou/w32 \ >+ sirupsen:logrus:v1.0.5:logrus/vendor/github.com/sirupsen/logrus \ >+ soniah:gosnmp:96b8622:gosnmp/vendor/github.com/soniah/gosnmp \ >+ streadway:amqp:e5adc2a:amqp/vendor/github.com/streadway/amqp \ >+ stretchr:objx:v0.1.1:objx/vendor/github.com/stretchr/objx \ >+ stretchr:testify:v1.2.2:testify/vendor/github.com/stretchr/testify \ >+ tidwall:gjson:v1.3.0:gjson/vendor/github.com/tidwall/gjson \ >+ tidwall:match:1731857:match/vendor/github.com/tidwall/match \ >+ tidwall:pretty:v1.0.0:pretty/vendor/github.com/tidwall/pretty \ >+ vishvananda:netlink:b2de5d1:netlink/vendor/github.com/vishvananda/netlink \ >+ vishvananda:netns:13995c7:netns/vendor/github.com/vishvananda/netns \ >+ vjeantet:grok:v1.0.0:grok/vendor/github.com/vjeantet/grok \ >+ vmware:govmomi:v0.19.0:govmomi/vendor/github.com/vmware/govmomi \ >+ wavefronthq:wavefront-sdk-go:v0.9.2:wavefront_sdk_go/vendor/github.com/wavefronthq/wavefront-sdk-go \ >+ wvanbergen:kafka:e2edea9:kafka/vendor/github.com/wvanbergen/kafka \ >+ wvanbergen:kazoo-go:f72d861:kazoo_go/vendor/github.com/wvanbergen/kazoo-go \ >+ yuin:gopher-lua:46796da:gopher_lua/vendor/github.com/yuin/gopher-lua \ >+ census-instrumentation:opencensus-go:v0.17.0:opencensus_go/vendor/go.opencensus.io \ >+ golang:crypto:a214413:crypto/vendor/golang.org/x/crypto \ >+ golang:net:a680a1e:net/vendor/golang.org/x/net \ >+ golang:oauth2:d2e6202:oauth2/vendor/golang.org/x/oauth2 \ >+ golang:sync:42b3178:sync/vendor/golang.org/x/sync \ >+ golang:sys:51ab0e2:sys/vendor/golang.org/x/sys \ >+ golang:text:v0.3.0:text/vendor/golang.org/x/text \ >+ googleapis:google-api-go-client:19ff876:googleapis/vendor/google.golang.org/api \ >+ golang:appengine:v1.1.0:appengine/vendor/google.golang.org/appengine \ >+ google:go-genproto:fedd286:genproto/vendor/google.golang.org/genproto \ >+ grpc:grpc-go:v1.13.0:grpc/vendor/google.golang.org/grpc \ >+ go-asn1-ber:asn1-ber:v1.2:asn1_ber_v1/vendor/gopkg.in/asn1-ber.v1 \ >+ fatih:pool:v2.0.0:pool_v2/vendor/gopkg.in/fatih/pool.v2 \ >+ fsnotify:fsnotify:v1.4.7:fsnotify_v1/vendor/gopkg.in/fsnotify.v1 \ >+ rethinkdb:rethinkdb-go:v3.0.5:gorethink_v3/vendor/gopkg.in/gorethink/gorethink.v3 \ >+ go-inf:inf:v0.9.1:inf_v0/vendor/gopkg.in/inf.v0 \ >+ go-ldap:ldap:v2.5.1:ldap_v2/vendor/gopkg.in/ldap.v2 \ >+ go-mgo:mgo:9856a29:mgo_v2/vendor/gopkg.in/mgo.v2 \ >+ olivere:elastic:v5.0.70:elastic_v5/vendor/gopkg.in/olivere/elastic.v5 \ >+ go-tomb:tomb:dd63297:tomb_v1/vendor/gopkg.in/tomb.v1 \ >+ go-yaml:yaml:v2.2.1:yaml_v2/vendor/gopkg.in/yaml.v2 > >+GO_BUILDFLAGS= -ldflags "-X main.version=${DISTVERSION}" >+GO_TARGET= ./cmd/telegraf >+ > SUB_FILES= telegraf > SUB_LIST= TELEGRAF_USER=${TELEGRAF_USER} \ > TELEGRAF_GROUP=${TELEGRAF_GROUP} \ >@@ -181,15 +184,12 @@ > > TELEGRAF_LOGDIR=/var/log/${PORTNAME} > >-do-build: >- @cd ${WRKSRC}/${GH_SUBDIR} && \ >- ${CP} src/github.com/shirou/gopsutil/disk/disk_freebsd_386.go src/github.com/shirou/gopsutil/disk/disk_freebsd_arm.go && \ >- ${CP} src/github.com/shirou/gopsutil/cpu/cpu_freebsd_386.go src/github.com/shirou/gopsutil/cpu/cpu_freebsd_arm.go && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/telegraf >+post-patch: >+ ${CP} ${WRKSRC_gopsutil}/disk/disk_freebsd_386.go ${WRKSRC_gopsutil}/disk/disk_freebsd_arm.go >+ ${CP} ${WRKSRC_gopsutil}/cpu/cpu_freebsd_386.go ${WRKSRC_gopsutil}/cpu/cpu_freebsd_arm.go > >-do-install: >+post-install: > ${MKDIR} ${STAGEDIR}${TELEGRAF_LOGDIR} >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} > ${INSTALL_DATA} \ > ${WRKSRC}/${GH_SUBDIR}/etc/${PORTNAME}.conf \ > ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample >Index: net-mgmt/unbound_exporter/Makefile >=================================================================== >--- net-mgmt/unbound_exporter/Makefile (revision 512745) >+++ net-mgmt/unbound_exporter/Makefile (working copy) >@@ -18,16 +18,16 @@ > > GH_ACCOUNT= kumina > GH_TAGNAME= b7e842d893d29200a5108eab717f5ab01d783c0c >-GH_TUPLE= prometheus:client_golang:3fb53d:client_golang \ >- prometheus:client_model:6f38060:client_model \ >- prometheus:common:49fee29:common \ >- prometheus:procfs:a1dba9c:procfs \ >- beorn7:perks:4c0e845:perks \ >- golang:protobuf:2bba060:protobuf \ >- matttproud:golang_protobuf_extensions:c12348c:extensions \ >- sirupsen:logrus:91da99d:logrus \ >- golang:crypto:3d3f9f41:crypto \ >- golang:sys:93218def:sys >+GH_TUPLE= prometheus:client_golang:3fb53d:client_golang/vendor/github.com/prometheus/client_golang \ >+ prometheus:client_model:6f38060:client_model/vendor/github.com/prometheus/client_model \ >+ prometheus:common:49fee29:common/vendor/github.com/prometheus/common \ >+ prometheus:procfs:a1dba9c:procfs/vendor/github.com/prometheus/procfs \ >+ beorn7:perks:4c0e845:perks/vendor/github.com/beorn7/perks \ >+ golang:protobuf:2bba060:protobuf/vendor/github.com/golang/protobuf \ >+ matttproud:golang_protobuf_extensions:c12348c:extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ >+ sirupsen:logrus:91da99d:logrus/vendor/github.com/Sirupsen/logrus \ >+ golang:crypto:3d3f9f41:crypto/vendor/golang.org/x/crypto \ >+ golang:sys:93218def:sys/vendor/golang.org/x/sys > > GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} > >@@ -36,26 +36,4 @@ > > PLIST_FILES= bin/unbound_exporter > >-pre-build: >- ${ECHO_CMD} ${WRKSRC_client_golang} >- ${MKDIR} ${GO_WRKDIR_SRC}/github.com/prometheus >- ${MKDIR} ${GO_WRKDIR_SRC}/github.com/beorn7 >- ${MKDIR} ${GO_WRKDIR_SRC}/github.com/golang >- ${MKDIR} ${GO_WRKDIR_SRC}/golang.org/x >- ${MKDIR} ${GO_WRKDIR_SRC}/github.com/matttproud >- ${MKDIR} ${GO_WRKDIR_SRC}/github.com/Sirupsen >- ${MV} ${WRKSRC_client_golang} ${GO_WRKDIR_SRC}/github.com/prometheus/client_golang >- ${MV} ${WRKSRC_client_model} ${GO_WRKDIR_SRC}/github.com/prometheus/client_model >- ${MV} ${WRKSRC_common} ${GO_WRKDIR_SRC}/github.com/prometheus/common >- ${MV} ${WRKSRC_procfs} ${GO_WRKDIR_SRC}/github.com/prometheus/procfs >- ${MV} ${WRKSRC_perks} ${GO_WRKDIR_SRC}/github.com/beorn7/perks >- ${MV} ${WRKSRC_protobuf} ${GO_WRKDIR_SRC}/github.com/golang/protobuf >- ${MV} ${WRKSRC_extensions} ${GO_WRKDIR_SRC}/github.com/matttproud/golang_protobuf_extensions >- ${MV} ${WRKSRC_logrus} ${GO_WRKDIR_SRC}/github.com/Sirupsen/logrus >- ${MV} ${WRKSRC_crypto} ${GO_WRKDIR_SRC}/golang.org/x/crypto >- ${MV} ${WRKSRC_sys} ${GO_WRKDIR_SRC}/golang.org/x/sys >- >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/unbound_exporter ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: science/molgif/Makefile >=================================================================== >--- science/molgif/Makefile (revision 512745) >+++ science/molgif/Makefile (working copy) >@@ -19,11 +19,4 @@ > > PLIST_FILES= bin/${PORTNAME} > >-do-build: >- @cd ${WRKSRC}/${GH_SUBDIR} && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: security/acmetool/Makefile >=================================================================== >--- security/acmetool/Makefile (revision 512745) >+++ security/acmetool/Makefile (working copy) >@@ -16,49 +16,46 @@ > GH_ACCOUNT= hlandau > GH_PROJECT= acme > GH_SUBDIR= src/github.com/hlandau/acme >-GH_TUPLE= alecthomas:template:a0175ee:template/src/github.com/alecthomas/template \ >- alecthomas:units:2efee85:units/src/github.com/alecthomas/units \ >- coreos:go-systemd:749ef98:go_systemd/src/github.com/coreos/go-systemd \ >- hlandau:acme:221ea15:acme/src/github.com/hlandau/acme \ >- hlandau:buildinfo:337a29b:buildinfo/src/github.com/hlandau/buildinfo \ >- hlandau:dexlogconfig:244f29b:dexlogconfig/src/github.com/hlandau/dexlogconfig \ >- hlandau:goutils:0cdb66a:goutils/src/github.com/hlandau/goutils \ >- hlandau:xlog:197ef79:xlog/src/github.com/hlandau/xlog \ >- jmhodges:clock:880ee4c:clock/src/github.com/jmhodges/clock \ >- mattn:go-isatty:6ca4dbf:go_isatty/src/github.com/mattn/go-isatty \ >- mattn:go-runewidth:a9d6d1e:go_runewidth/src/github.com/mattn/go-runewidth \ >- mitchellh:go-wordwrap:ad45545:go_wordwrap/src/github.com/mitchellh/go-wordwrap \ >- ogier:pflag:45c278a:pflag/src/github.com/ogier/pflag \ >- peterhellberg:link:6d32b8d:link/src/github.com/peterhellberg/link \ >- satori:go.uuid:36e9d2e:go_uuid/src/github.com/satori/go.uuid \ >- shiena:ansicolor:a422bbe:ansicolor/src/github.com/shiena/ansicolor \ >- golang:crypto:91a49db:crypto/src/golang.org/x/crypto \ >- golang:net:22ae77b:net/src/golang.org/x/net \ >- golang:sys:dd2ff4a:sys/src/golang.org/x/sys \ >- golang:text:b7ef84a:text/src/golang.org/x/text \ >- alecthomas:kingpin:947dcec:kingpin/src/gopkg.in/alecthomas/kingpin.v2 \ >- cheggaaa:pb:72b9643:pb/src/gopkg.in/cheggaaa/pb.v1 \ >- hlandau:configurable:4149686:configurable/src/gopkg.in/hlandau/configurable.v1 \ >- hlandau:easyconfig:7589cb9:easyconfig/src/gopkg.in/hlandau/easyconfig.v1 \ >- hlandau:service:b64b346:service/src/gopkg.in/hlandau/service.v2 \ >- hlandau:svcutils:c25dac4:svcutils/src/gopkg.in/hlandau/svcutils.v1 \ >- square:go-jose:aa2e30f:go_jose/src/gopkg.in/square/go-jose.v1 \ >- tylerb:graceful:4654dfb:graceful/src/gopkg.in/tylerb/graceful.v1 \ >- go-yaml:yaml:7f97868:go_yaml/src/gopkg.in/yaml.v2 >+GH_TUPLE= alecthomas:template:a0175ee:template/vendor/github.com/alecthomas/template \ >+ alecthomas:units:2efee85:units/vendor/github.com/alecthomas/units \ >+ coreos:go-systemd:749ef98:go_systemd/vendor/github.com/coreos/go-systemd \ >+ hlandau:acme:221ea15:acme/vendor/github.com/hlandau/acme \ >+ hlandau:buildinfo:337a29b:buildinfo/vendor/github.com/hlandau/buildinfo \ >+ hlandau:dexlogconfig:244f29b:dexlogconfig/vendor/github.com/hlandau/dexlogconfig \ >+ hlandau:goutils:0cdb66a:goutils/vendor/github.com/hlandau/goutils \ >+ hlandau:xlog:197ef79:xlog/vendor/github.com/hlandau/xlog \ >+ jmhodges:clock:880ee4c:clock/vendor/github.com/jmhodges/clock \ >+ mattn:go-isatty:6ca4dbf:go_isatty/vendor/github.com/mattn/go-isatty \ >+ mattn:go-runewidth:a9d6d1e:go_runewidth/vendor/github.com/mattn/go-runewidth \ >+ mitchellh:go-wordwrap:ad45545:go_wordwrap/vendor/github.com/mitchellh/go-wordwrap \ >+ ogier:pflag:45c278a:pflag/vendor/github.com/ogier/pflag \ >+ peterhellberg:link:6d32b8d:link/vendor/github.com/peterhellberg/link \ >+ satori:go.uuid:36e9d2e:go_uuid/vendor/github.com/satori/go.uuid \ >+ shiena:ansicolor:a422bbe:ansicolor/vendor/github.com/shiena/ansicolor \ >+ golang:crypto:91a49db:crypto/vendor/golang.org/x/crypto \ >+ golang:net:22ae77b:net/vendor/golang.org/x/net \ >+ golang:sys:dd2ff4a:sys/vendor/golang.org/x/sys \ >+ golang:text:b7ef84a:text/vendor/golang.org/x/text \ >+ alecthomas:kingpin:947dcec:kingpin/vendor/gopkg.in/alecthomas/kingpin.v2 \ >+ cheggaaa:pb:72b9643:pb/vendor/gopkg.in/cheggaaa/pb.v1 \ >+ hlandau:configurable:4149686:configurable/vendor/gopkg.in/hlandau/configurable.v1 \ >+ hlandau:easyconfig:7589cb9:easyconfig/vendor/gopkg.in/hlandau/easyconfig.v1 \ >+ hlandau:service:b64b346:service/vendor/gopkg.in/hlandau/service.v2 \ >+ hlandau:svcutils:c25dac4:svcutils/vendor/gopkg.in/hlandau/svcutils.v1 \ >+ square:go-jose:aa2e30f:go_jose/vendor/gopkg.in/square/go-jose.v1 \ >+ tylerb:graceful:4654dfb:graceful/vendor/gopkg.in/tylerb/graceful.v1 \ >+ go-yaml:yaml:7f97868:go_yaml/vendor/gopkg.in/yaml.v2 > >-do-build: >- @cd ${WRKSRC}/src/github.com/hlandau/acme && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} \ >- go build -o ${WRKSRC}/bin/${PORTNAME} -ldflags "\ >+GO_BUILDFLAGS= -ldflags "\ > -X github.com/hlandau/acme/hooks.DefaultPath=${PREFIX}/libexec/acme/hooks \ > -X github.com/hlandau/acme/storage.RecommendedPath=/var/db/acme \ >- -X github.com/hlandau/buildinfo.BuildInfo=${PORTNAME}-v${PORTVERSION}-freebsd-ports \ >- "\ >- github.com/hlandau/acme/cmd/acmetool >- @${WRKSRC}/bin/${PORTNAME} --help-man > ${WRKSRC}/${PORTNAME}.8 >+ -X github.com/hlandau/buildinfo.BuildInfo=${PORTNAME}-v${PORTVERSION}-freebsd-ports" >+GO_TARGET= ./cmd/acmetool > >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >+post-build: >+ ${GO_WRKDIR_BIN}/${PORTNAME} --help-man > ${WRKSRC}/${PORTNAME}.8 >+ >+post-install: > ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8 > ${MKDIR} ${STAGEDIR}/var/db/acme > ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/acme/hooks >Index: security/go-cve-dictionary/Makefile >=================================================================== >--- security/go-cve-dictionary/Makefile (revision 512745) >+++ security/go-cve-dictionary/Makefile (working copy) >@@ -20,35 +20,37 @@ > GH_ACCOUNT= kotakanbe > GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} > >-GH_TUPLE+= VividCortex:ewma:v1.1.1:ewma/src/gopkg.in/VividCortex/ewma.v1 >-GH_TUPLE+= asaskevich:govalidator:v9:govalidator/src/github.com/asaskevich/govalidator >-GH_TUPLE+= cheggaaa:pb:v2.0.6:pb/src/gopkg.in/cheggaaa/pb.v2 >-GH_TUPLE+= dgrijalva:jwt-go:v3.2.0:jwtgo/src/github.com/dgrijalva/jwt-go >-GH_TUPLE+= fatih:color:v1.7.0:colorv1/src/github.com/fatih/color >-GH_TUPLE+= go-redis:redis:v6.13.2:redis/src/github.com/go-redis/redis >-GH_TUPLE+= go-sql-driver:mysql:v1.4.0:mysql/src/github.com/go-sql-driver/mysql >-GH_TUPLE+= go-stack:stack:v1.7.0:gostack/src/github.com/go-stack/stack >-GH_TUPLE+= golang:crypto:f027049:golangcrypto/src/golang.org/x/crypto >-GH_TUPLE+= golang:sys:acbc56f:golangsys/src/golang.org/x/sys >-GH_TUPLE+= google:subcommands:5bae204:subcommands/src/github.com/google/subcommands >-GH_TUPLE+= hashicorp:go-version:270f2f7:goversion/src/github.com/hashicorp/go-version >-GH_TUPLE+= inconshreveable:log15:v2.13:log15/src/github.com/inconshreveable/log15 >-GH_TUPLE+= jinzhu:gorm:v1.9.1:gorm/src/github.com/jinzhu/gorm >-GH_TUPLE+= jinzhu:inflection:0414036:inflection/src/github.com/jinzhu/inflection >-GH_TUPLE+= k0kubun:pp:v2.3.0:pp/src/github.com/k0kubun/pp >-GH_TUPLE+= knqyf263:go-cpe:659663f:gocpe/src/github.com/knqyf263/go-cpe >-GH_TUPLE+= htcat:htcat:v1.0.2:htcat/src/github.com/htcat/htcat >-GH_TUPLE+= labstack:echo:6d227df:echo/src/github.com/labstack/echo >-GH_TUPLE+= labstack:gommon:0.2.6:gommon/src/github.com/labstack/gommon >-GH_TUPLE+= lib:pq:90697d6:pq/src/github.com/lib/pq >-GH_TUPLE+= mattn:go-colorable:v0.0.9:gocolorable/src/github.com/mattn/go-colorable >-GH_TUPLE+= mattn:go-isatty:v0.0.3:goisatty/src/github.com/mattn/go-isatty >-GH_TUPLE+= mattn:go-runewidth:v0.0.2:gorunewidth/src/github.com/mattn/go-runewidth >-GH_TUPLE+= mattn:go-sqlite3:v1.9.0:gosqlite3/src/github.com/mattn/go-sqlite3 >-GH_TUPLE+= olekukonko:tablewriter:d4647c9:tablewriter/src/github.com/olekukonko/tablewriter >-GH_TUPLE+= pkg:errors:v0.8.0:pkgerrors/src/github.com/pkg/errors >-GH_TUPLE+= valyala:fasttemplate:dcecefd:fasttemplate/src/github.com/valyala/fasttemplate >+GH_TUPLE+= VividCortex:ewma:v1.1.1:ewma/vendor/gopkg.in/VividCortex/ewma.v1 >+GH_TUPLE+= asaskevich:govalidator:v9:govalidator/vendor/github.com/asaskevich/govalidator >+GH_TUPLE+= cheggaaa:pb:v2.0.6:pb/vendor/gopkg.in/cheggaaa/pb.v2 >+GH_TUPLE+= dgrijalva:jwt-go:v3.2.0:jwtgo/vendor/github.com/dgrijalva/jwt-go >+GH_TUPLE+= fatih:color:v1.7.0:colorv1/vendor/github.com/fatih/color >+GH_TUPLE+= go-redis:redis:v6.13.2:redis/vendor/github.com/go-redis/redis >+GH_TUPLE+= go-sql-driver:mysql:v1.4.0:mysql/vendor/github.com/go-sql-driver/mysql >+GH_TUPLE+= go-stack:stack:v1.7.0:gostack/vendor/github.com/go-stack/stack >+GH_TUPLE+= golang:crypto:f027049:golangcrypto/vendor/golang.org/x/crypto >+GH_TUPLE+= golang:sys:acbc56f:golangsys/vendor/golang.org/x/sys >+GH_TUPLE+= google:subcommands:5bae204:subcommands/vendor/github.com/google/subcommands >+GH_TUPLE+= hashicorp:go-version:270f2f7:goversion/vendor/github.com/hashicorp/go-version >+GH_TUPLE+= inconshreveable:log15:v2.13:log15/vendor/github.com/inconshreveable/log15 >+GH_TUPLE+= jinzhu:gorm:v1.9.1:gorm/vendor/github.com/jinzhu/gorm >+GH_TUPLE+= jinzhu:inflection:0414036:inflection/vendor/github.com/jinzhu/inflection >+GH_TUPLE+= k0kubun:pp:v2.3.0:pp/vendor/github.com/k0kubun/pp >+GH_TUPLE+= knqyf263:go-cpe:659663f:gocpe/vendor/github.com/knqyf263/go-cpe >+GH_TUPLE+= htcat:htcat:v1.0.2:htcat/vendor/github.com/htcat/htcat >+GH_TUPLE+= labstack:echo:6d227df:echo/vendor/github.com/labstack/echo >+GH_TUPLE+= labstack:gommon:0.2.6:gommon/vendor/github.com/labstack/gommon >+GH_TUPLE+= lib:pq:90697d6:pq/vendor/github.com/lib/pq >+GH_TUPLE+= mattn:go-colorable:v0.0.9:gocolorable/vendor/github.com/mattn/go-colorable >+GH_TUPLE+= mattn:go-isatty:v0.0.3:goisatty/vendor/github.com/mattn/go-isatty >+GH_TUPLE+= mattn:go-runewidth:v0.0.2:gorunewidth/vendor/github.com/mattn/go-runewidth >+GH_TUPLE+= mattn:go-sqlite3:v1.9.0:gosqlite3/vendor/github.com/mattn/go-sqlite3 >+GH_TUPLE+= olekukonko:tablewriter:d4647c9:tablewriter/vendor/github.com/olekukonko/tablewriter >+GH_TUPLE+= pkg:errors:v0.8.0:pkgerrors/vendor/github.com/pkg/errors >+GH_TUPLE+= valyala:fasttemplate:dcecefd:fasttemplate/vendor/github.com/valyala/fasttemplate > >+GO_BUILDFLAGS= -ldflags "-X main.version=${PORTVERSION}" >+ > USERS= vuls > GROUPS= vuls > >@@ -60,22 +62,15 @@ > ${WRKSRC}/db/rdb.go \ > ${WRKSRC}/db/redis.go > @${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-runewidth.v0|github.com/mattn/go-runewidth|' \ >- ${WRKSRC}/src/gopkg.in/cheggaaa/pb.v2/util.go >+ ${WRKSRC}/vendor/gopkg.in/cheggaaa/pb.v2/util.go > @${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-colorable.v0|github.com/mattn/go-colorable|' \ >- ${WRKSRC}/src/gopkg.in/cheggaaa/pb.v2/pb.go >+ ${WRKSRC}/vendor/gopkg.in/cheggaaa/pb.v2/pb.go > @${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-isatty.v0|github.com/mattn/go-isatty|' \ >- ${WRKSRC}/src/gopkg.in/cheggaaa/pb.v2/pb.go >+ ${WRKSRC}/vendor/gopkg.in/cheggaaa/pb.v2/pb.go > @${REINPLACE_CMD} -e 's|gopkg.in/fatih/color.v1|github.com/fatih/color|' \ >- ${WRKSRC}/src/gopkg.in/cheggaaa/pb.v2/template.go >+ ${WRKSRC}/vendor/gopkg.in/cheggaaa/pb.v2/template.go > >-do-build: >- @cd ${GO_WRKSRC} && \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} \ >- ${GO_CMD} build -v -x -ldflags "-X main.version=${PORTVERSION}" \ >- -o ${WRKSRC}/${PORTNAME} >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >+post-install: > ${MKDIR} ${STAGEDIR}/var/db/vuls > ${MKDIR} ${STAGEDIR}/var/log/vuls > >Index: security/meek/Makefile >=================================================================== >--- security/meek/Makefile (revision 512745) >+++ security/meek/Makefile (working copy) >@@ -17,10 +17,13 @@ > USES= go > > USE_GITHUB= nodefault >-GH_TUPLE= golang:crypto:c126467:crypto/src/golang.org/x/crypto \ >- golang:net:a680a1e:net/src/golang.org/x/net \ >- golang:text:0605a83:text/src/golang.org/x/text >+GH_TUPLE= golang:crypto:c126467:crypto/vendor/golang.org/x/crypto \ >+ golang:net:a680a1e:net/vendor/golang.org/x/net \ >+ golang:text:0605a83:text/vendor/golang.org/x/text > >+GO_TARGET= ./meek-client \ >+ ./meek-server >+ > GOPTLIBVERSION= 0.7 > > PLIST_FILES= bin/meek-client \ >@@ -30,22 +33,18 @@ > > SUB_FILES= pkg-message > >-post-extract: >- @${MKDIR} ${WRKSRC}/src/git.torproject.org/pluggable-transports >- @${LN} -s ${WRKDIR}/${PORTNAME}-${PORTVERSION} ${WRKSRC}/src/git.torproject.org/pluggable-transports/${PORTNAME} >- @${LN} -s ${WRKDIR}/goptlib-${GOPTLIBVERSION} ${WRKSRC}/src/git.torproject.org/pluggable-transports/goptlib.git >+post-patch: >+ @${MKDIR} ${WRKDIR}/src/git.torproject.org/pluggable-transports >+ @${LN} -s ${WRKSRC} ${WRKDIR}/src/git.torproject.org/pluggable-transports/${PORTNAME} >+ @${LN} -s ${WRKDIR}/goptlib-${GOPTLIBVERSION} ${WRKDIR}/src/git.torproject.org/pluggable-transports/goptlib.git > >-do-build: >- @cd ${WRKSRC}/meek-client && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build >- @cd ${WRKSRC}/meek-server && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build >- > do-test: >- @cd ${WRKSRC}/meek-client && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test >- @cd ${WRKSRC}/meek-server && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test >+.for t in ${GO_TARGET} >+ cd ${GO_WRKSRC}; \ >+ ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_BUILDFLAGS} ${t} >+.endfor > >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/meek-client/meek-client ${STAGEDIR}${PREFIX}/bin >- ${INSTALL_PROGRAM} ${WRKSRC}/meek-server/meek-server ${STAGEDIR}${PREFIX}/bin >+post-install: > ${INSTALL_MAN} ${WRKSRC}/doc/meek-server.1 ${STAGEDIR}${PREFIX}/man/man1 > ${INSTALL_MAN} ${WRKSRC}/doc/meek-client.1 ${STAGEDIR}${PREFIX}/man/man1 > >Index: security/obfs4proxy-tor/Makefile >=================================================================== >--- security/obfs4proxy-tor/Makefile (revision 512745) >+++ security/obfs4proxy-tor/Makefile (working copy) >@@ -13,42 +13,35 @@ > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKDIR}/LICENSE > >-USES= cpe go tar:xz >+USES= cpe go:modules tar:xz > > CPE_VENDOR= torproject > >-GO_TARGET= gitlab.com/yawning/obfs4.git >- > USE_GITHUB= nodefault >-GH_TUPLE= ahf:goptlib:7d56ec4:goptlib/src/git.torproject.org/pluggable-transports/goptlib.git \ >- agl:ed25519:5312a61:ed25519/src/github.com/agl/ed25519 \ >- dchest:siphash:v1.2.1:siphash/src/github.com/dchest/siphash \ >- dsnet:compress:v0.0.1:dsnet_compress/src/github.com/dsnet/compress \ >- golang:crypto:cc06ce4:golang_crypto/src/golang.org/x/crypto \ >- golang:net:3b0461e:golang_net/src/golang.org/x/net \ >- golang:text:v0.3.0:golang_text/src/golang.org/x/text \ >- golang:sys:d432491:golang_sys/src/golang.org/x/sys \ >- Yawning:bsaes:26d1add:Yawning_bsaes/src/git.schwanenlied.me/yawning/bsaes.git >+GH_TUPLE= ahf:goptlib:7d56ec4:goptlib/vendor/git.torproject.org/pluggable-transports/goptlib.git \ >+ agl:ed25519:5312a61:ed25519/vendor/github.com/agl/ed25519 \ >+ dchest:siphash:v1.2.1:siphash/vendor/github.com/dchest/siphash \ >+ dsnet:compress:v0.0.1:dsnet_compress/vendor/github.com/dsnet/compress \ >+ golang:crypto:cc06ce4:golang_crypto/vendor/golang.org/x/crypto \ >+ golang:net:3b0461e:golang_net/vendor/golang.org/x/net \ >+ golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \ >+ golang:sys:d432491:golang_sys/vendor/golang.org/x/sys \ >+ Yawning:bsaes:26d1add:Yawning_bsaes/vendor/git.schwanenlied.me/yawning/bsaes.git > > USE_GITLAB= nodefault >-GL_TUPLE= yawning:utls:dd99191913e03b2cd62655cd260d79187fbf8a9f:yawning_utls/src/gitlab.com/yawning/utls.git >+GL_TUPLE= yawning:utls:dd99191913e03b2cd62655cd260d79187fbf8a9f:yawning_utls/vendor/gitlab.com/yawning/utls.git > >+GO_TARGET= ../obfs4proxy >+ > SUB_FILES= pkg-message > > PLIST_FILES= bin/obfs4proxy \ > man/man1/obfs4proxy.1.gz > >-do-build: >- @${RM} ${WRKDIR}/go.mod >- @${MKDIR} ${GO_WRKSRC}/src/${GO_TARGET:H} >- @${RLN} ${WRKDIR} ${GO_WRKSRC}/src/${GO_TARGET} >- @${RLN} ${WRKDIR}/src ${GO_WRKSRC}/src/${GO_TARGET}/src >- @(cd ${WRKDIR}/${PORTNAME} && \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKDIR}/src/${PORTNAME} ${GO_CMD} \ >- build ${GO_BUILDFLAGS} -o ${WRKDIR}/bin/${PORTNAME}) >+post-patch: >+ ${LN} -s ${WRKSRC}/vendor ${WRKDIR} > >-do-install: >- ${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin >+post-install: > ${INSTALL_MAN} ${WRKDIR}/doc/obfs4proxy.1 ${STAGEDIR}${PREFIX}/man/man1 > > .include <bsd.port.mk> >Index: security/onionscan/Makefile >=================================================================== >--- security/onionscan/Makefile (revision 512745) >+++ security/onionscan/Makefile (working copy) >@@ -15,24 +15,14 @@ > USE_GITHUB= yes > > GH_ACCOUNT= s-rah >-GH_TUPLE= HouzuoGuo:tiedot:3.4:tiedot/github.com/HouzuoGuo/tiedot \ >- rwcarlsen:goexif:8d986c0:goexif/github.com/rwcarlsen/goexif \ >- golang:crypto:0e37d00:crypto/golang.org/x/crypto \ >- golang:net:26e67e7:net/golang.org/x/net \ >- golang:sys:1561086:sys/golang.org/x/sys >+GH_TUPLE= HouzuoGuo:tiedot:3.4:tiedot/vendor/github.com/HouzuoGuo/tiedot \ >+ rwcarlsen:goexif:8d986c0:goexif/vendor/github.com/rwcarlsen/goexif \ >+ golang:crypto:0e37d00:crypto/vendor/golang.org/x/crypto \ >+ golang:net:26e67e7:net/vendor/golang.org/x/net \ >+ golang:sys:1561086:sys/vendor/golang.org/x/sys > >+GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} >+ > PLIST_FILES= bin/onionscan > >-do-build: >- ${MKDIR} ${WRKSRC}/github.com/${GH_ACCOUNT} >- ${RLN} ${WRKSRC} ${WRKSRC}/github.com/${GH_ACCOUNT}/${PORTNAME} >- ${RLN} ${WRKSRC} ${WRKSRC}/src >- cd ${WRKSRC} && \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} \ >- ${GO_CMD} build ${GO_BUILDFLAGS} -o bin/${PORTNAME} >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} \ >- ${STAGEDIR}/${LOCALBASE}/bin >- > .include <bsd.port.mk> >Index: security/ssh-vault/Makefile >=================================================================== >--- security/ssh-vault/Makefile (revision 512745) >+++ security/ssh-vault/Makefile (working copy) >@@ -14,22 +14,15 @@ > USES= go > > USE_GITHUB= yes >-GH_TUPLE= golang:crypto:c126467:gocrypto/src/golang.org/x/crypto \ >- golang:sys:bd9dbc1:gosys/src/golang.org/x/sys \ >- ssh-vault:crypto:ae180e0:crypto/src/github.com/ssh-vault/crypto \ >- ssh-vault:ssh2pem:c1edc64:ssh2pem/src/github.com/ssh-vault/ssh2pem >+GH_TUPLE= golang:crypto:c126467:gocrypto/vendor/golang.org/x/crypto \ >+ golang:sys:bd9dbc1:gosys/vendor/golang.org/x/sys \ >+ ssh-vault:crypto:ae180e0:crypto/vendor/github.com/ssh-vault/crypto \ >+ ssh-vault:ssh2pem:c1edc64:ssh2pem/vendor/github.com/ssh-vault/ssh2pem > > GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} >+GO_BUILDFLAGS= -ldflags "-s -w -X main.version=${PORTVERSION}" >+GO_TARGET= ./cmd/ssh-vault > > PLIST_FILES= bin/ssh-vault > >-do-build: >- @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ >- ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ >- "-s -w -X main.version=${PORTVERSION}" -o ssh-vault cmd/ssh-vault/main.go; >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/ssh-vault/ssh-vault/ssh-vault \ >- ${STAGEDIR}${PREFIX}/bin/ssh-vault >- > .include <bsd.port.mk> >Index: security/ssllabs-scan/Makefile >=================================================================== >--- security/ssllabs-scan/Makefile (revision 512745) >+++ security/ssllabs-scan/Makefile (working copy) >@@ -20,11 +20,4 @@ > > PLIST_FILES= bin/${PORTNAME} > >-do-build: >- @(cd ${GO_WRKSRC} && \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o bin/${PORTNAME}) >- >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: security/vuls/Makefile >=================================================================== >--- security/vuls/Makefile (revision 512745) >+++ security/vuls/Makefile (working copy) >@@ -19,117 +19,112 @@ > GH_ACCOUNT= future-architect > GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} > >-GH_TUPLE+= Azure:azure-sdk-for-go:v22.2.2:azuresdkforgo/src/github.com/Azure/azure-sdk-for-go >-GH_TUPLE+= Azure:go-autorest:v11.2.7:azuregoautorest/src/github.com/Azure/go-autorest >-GH_TUPLE+= BurntSushi:toml:v0.3.1:toml/src/github.com/BurntSushi/toml >-GH_TUPLE+= RackSec:srslog:a4725f0:srslog/src/github.com/RackSec/srslog >-GH_TUPLE+= VividCortex:ewma:v1.1.1:ewma/src/gopkg.in/VividCortex/ewma.v1 >-GH_TUPLE+= asaskevich:govalidator:v9:govalidator/src/github.com/asaskevich/govalidator >-GH_TUPLE+= aws:aws-sdk-go:v1.15.77:awssdkgo/src/github.com/aws/aws-sdk-go >-GH_TUPLE+= boltdb:bolt:v1.3.1:bolt/src/github.com/boltdb/bolt >-GH_TUPLE+= cenkalti:backoff:v2.0.0:backoff/src/github.com/cenkalti/backoff >-GH_TUPLE+= cheggaaa:pb:v1.0.26:pbv1/src/gopkg.in/cheggaaa/pb.v1 >-GH_TUPLE+= cheggaaa:pb:v2.0.6:pb/src/github.com/cheggaaa/pb >-GH_TUPLE+= census-ecosystem:opencensus-go-exporter-ocagent:00af367:ocagent/src/contrib.go.opencensus.io/exporter/ocagent >-GH_TUPLE+= census-instrumentation:opencensus-go:v0.18.0:opencensusgo/src/go.opencensus.io >-GH_TUPLE+= census-instrumentation:opencensus-proto:v0.1.0:opencensusproto/src/github.com/census-instrumentation/opencensus-proto >-GH_TUPLE+= dgrijalva:jwt-go:v3.2.0:jwtgo/src/github.com/dgrijalva/jwt-go >-GH_TUPLE+= fatih:color:v1.7.0:colorv1/src/github.com/fatih/color >-GH_TUPLE+= fsnotify:fsnotify:v1.4.7:fsnotify/src/github.com/fsnotify/fsnotify >-GH_TUPLE+= go-redis:redis:v6.14.2:redis/src/github.com/go-redis/redis >-GH_TUPLE+= go-sql-driver:mysql:v1.4.1:mysql/src/github.com/go-sql-driver/mysql >-GH_TUPLE+= go-stack:stack:v1.8.0:gostack/src/github.com/go-stack/stack >-GH_TUPLE+= go-yaml:yaml:v2.2.1:goyaml/src/gopkg.in/yaml.v2 >-GH_TUPLE+= golang:crypto:3d3f9f4:crypto/src/golang.org/x/crypto >-GH_TUPLE+= golang:net:adae6a3:golangnet/src/golang.org/x/net >-GH_TUPLE+= golang:protobuf:aa810b6:protobuf/src/github.com/golang/protobuf >-GH_TUPLE+= golang:sync:42b3178:sync/src/golang.org/x/sync >-GH_TUPLE+= golang:sys:66b7b13:sys/src/golang.org/x/sys >-GH_TUPLE+= golang:text:f21a4df:golangtext/src/golang.org/x/text >-GH_TUPLE+= google:go-genproto:b5d4398:gogenproto/src/google.golang.org/genproto >-GH_TUPLE+= google:google-api-go-client:83a9d30:googleapigoclient/src/google.golang.org/api >-GH_TUPLE+= google:subcommands:46f0354:subcommands/src/github.com/google/subcommands >-GH_TUPLE+= gorilla:websocket:v1.4.0:websocket/src/github.com/gorilla/websocket >-GH_TUPLE+= gosuri:uitable:36ee7e9:uitable/src/github.com/gosuri/uitable >-GH_TUPLE+= grokify:html-strip-tags-go:e9e4496:htmlstriptagsgo/src/github.com/grokify/html-strip-tags-go >-GH_TUPLE+= grpc:grpc-go:v1.16.0:grpcgo/src/google.golang.org/grpc >-GH_TUPLE+= hashicorp:go-version:v1.0.0:goversion/src/github.com/hashicorp/go-version >-GH_TUPLE+= hashicorp:hcl:v1.0.0:hcl/src/github.com/hashicorp/hcl >-GH_TUPLE+= hashicorp:uuid:ebb0a03:hashicorpuuid/src/github.com/hashicorp/uuid >-GH_TUPLE+= howeyc:gopass:bf9dde6:gopass/src/github.com/howeyc/gopass >-GH_TUPLE+= inconshreveable:log15:v2.14:log15/src/github.com/inconshreveable/log15 >-GH_TUPLE+= jinzhu:gorm:6ed508e:gorm/src/github.com/jinzhu/gorm >-GH_TUPLE+= jinzhu:inflection:0414036:inflection/src/github.com/jinzhu/inflection >-GH_TUPLE+= jroimartin:gocui:c055c87:gocui/src/github.com/jroimartin/gocui >-GH_TUPLE+= k0kubun:pp:v2.3.0:pp/src/github.com/k0kubun/pp >-GH_TUPLE+= knqyf263:go-cpe:659663f:gocpe/src/github.com/knqyf263/go-cpe >-GH_TUPLE+= knqyf263:go-deb-version:9865fe1:godebversion/src/github.com/knqyf263/go-deb-version >-GH_TUPLE+= knqyf263:go-rpm-version:74609b8:gorpmversion/src/github.com/knqyf263/go-rpm-version >-GH_TUPLE+= knqyf263:gost:920046a:gost/src/github.com/knqyf263/gost >-GH_TUPLE+= kotakanbe:go-cve-dictionary:9549cd3:gocvedictionary/src/github.com/kotakanbe/go-cve-dictionary >-GH_TUPLE+= kotakanbe:go-pingscanner:v0.1.0:gopingscanner/src/github.com/kotakanbe/go-pingscanner >-GH_TUPLE+= kotakanbe:goval-dictionary:v0.1.0:govaldictionary/src/github.com/kotakanbe/goval-dictionary >-GH_TUPLE+= kotakanbe:logrus-prefixed-formatter:928f735:logrusprefixedformatter/src/github.com/kotakanbe/logrus-prefixed-formatter >-GH_TUPLE+= labstack:gommon:7fd9f68:gommon/src/github.com/labstack/gommon >-GH_TUPLE+= lib:pq:4ded0e9:pq/src/github.com/lib/pq >-GH_TUPLE+= magiconair:properties:v1.8.0:properties/src/github.com/magiconair/properties >-GH_TUPLE+= marstr:guid:v1.1.0:guid/src/github.com/marstr/guid >-GH_TUPLE+= mattn:go-colorable:v0.0.9:gocolorable/src/github.com/mattn/go-colorable >-GH_TUPLE+= mattn:go-isatty:v0.0.4:goisatty/src/github.com/mattn/go-isatty >-GH_TUPLE+= mattn:go-runewidth:v0.0.3:gorunewidth/src/github.com/mattn/go-runewidth >-GH_TUPLE+= mattn:go-sqlite3:v1.10.0:gosqlite3/src/github.com/mattn/go-sqlite3 >-GH_TUPLE+= mgutz:ansi:9520e82:ansi/src/github.com/mgutz/ansi >-GH_TUPLE+= mitchellh:go-homedir:v1.0.0:gohomedir/src/github.com/mitchellh/go-homedir >-GH_TUPLE+= mitchellh:mapstructure:v1.1.0:mapstructure/src/github.com/mitchellh/mapstructure >-GH_TUPLE+= moul:http2curl:9ac6cf4:http2curl/src/github.com/moul/http2curl >-GH_TUPLE+= mozqnet:go-exploitdb:48cac6d:goexploitdb/src/github.com/mozqnet/go-exploitdb >-GH_TUPLE+= nlopes:slack:v0.4.0:slack/src/github.com/nlopes/slack >-GH_TUPLE+= olekukonko:tablewriter:v0.0.1:tablewriter/src/github.com/olekukonko/tablewriter >-GH_TUPLE+= nsf:termbox-go:60ab7e3:termboxgo/src/github.com/nsf/termbox-go >-GH_TUPLE+= parnurzeal:gorequest:v0.2.15:gorequest/src/github.com/parnurzeal/gorequest >-GH_TUPLE+= pelletier:go-toml:v1.2.0:gotoml/src/github.com/pelletier/go-toml >-GH_TUPLE+= pkg:errors:v0.8.0:pkgerrors/src/github.com/pkg/errors >-GH_TUPLE+= rifflock:lfshook:v2.4:lfshook/src/github.com/rifflock/lfshook >-GH_TUPLE+= satori:go.uuid:v1.2.0:gouuid/src/github.com/satori/go.uuid >-GH_TUPLE+= sirupsen:logrus:44067ab:logrus/src/github.com/sirupsen/logrus >-GH_TUPLE+= spf13:afero:v1.1.2:afero/src/github.com/spf13/afero >-GH_TUPLE+= spf13:cast:v1.3.0:cast/src/github.com/spf13/cast >-GH_TUPLE+= spf13:jwalterweatherman:v1.0.0:jwalterweatherman/src/github.com/spf13/jwalterweatherman >-GH_TUPLE+= spf13:pflag:v1.0.3:pflag/src/github.com/spf13/pflag >-GH_TUPLE+= spf13:viper:v1.2.1:viper/src/github.com/spf13/viper >-GH_TUPLE+= valyala:bytebufferpool:v1.0.0:bytebufferpool/src/github.com/valyala/bytebufferpool >-GH_TUPLE+= valyala:fasttemplate:dcecefd:fasttemplate/src/github.com/valyala/fasttemplate >-GH_TUPLE+= ymomoi:goval-parser:0a0be1d:govalparser/src/github.com/ymomoi/goval-parser >+GH_TUPLE+= Azure:azure-sdk-for-go:v22.2.2:azuresdkforgo/vendor/github.com/Azure/azure-sdk-for-go >+GH_TUPLE+= Azure:go-autorest:v11.2.7:azuregoautorest/vendor/github.com/Azure/go-autorest >+GH_TUPLE+= BurntSushi:toml:v0.3.1:toml/vendor/github.com/BurntSushi/toml >+GH_TUPLE+= RackSec:srslog:a4725f0:srslog/vendor/github.com/RackSec/srslog >+GH_TUPLE+= VividCortex:ewma:v1.1.1:ewma/vendor/gopkg.in/VividCortex/ewma.v1 >+GH_TUPLE+= asaskevich:govalidator:v9:govalidator/vendor/github.com/asaskevich/govalidator >+GH_TUPLE+= aws:aws-sdk-go:v1.15.77:awssdkgo/vendor/github.com/aws/aws-sdk-go >+GH_TUPLE+= boltdb:bolt:v1.3.1:bolt/vendor/github.com/boltdb/bolt >+GH_TUPLE+= cenkalti:backoff:v2.0.0:backoff/vendor/github.com/cenkalti/backoff >+GH_TUPLE+= cheggaaa:pb:v1.0.26:pbv1/vendor/gopkg.in/cheggaaa/pb.v1 >+GH_TUPLE+= cheggaaa:pb:v2.0.6:pb/vendor/github.com/cheggaaa/pb >+GH_TUPLE+= census-ecosystem:opencensus-go-exporter-ocagent:00af367:ocagent/vendor/contrib.go.opencensus.io/exporter/ocagent >+GH_TUPLE+= census-instrumentation:opencensus-go:v0.18.0:opencensusgo/vendor/go.opencensus.io >+GH_TUPLE+= census-instrumentation:opencensus-proto:v0.1.0:opencensusproto/vendor/github.com/census-instrumentation/opencensus-proto >+GH_TUPLE+= dgrijalva:jwt-go:v3.2.0:jwtgo/vendor/github.com/dgrijalva/jwt-go >+GH_TUPLE+= fatih:color:v1.7.0:colorv1/vendor/github.com/fatih/color >+GH_TUPLE+= fsnotify:fsnotify:v1.4.7:fsnotify/vendor/github.com/fsnotify/fsnotify >+GH_TUPLE+= go-redis:redis:v6.14.2:redis/vendor/github.com/go-redis/redis >+GH_TUPLE+= go-sql-driver:mysql:v1.4.1:mysql/vendor/github.com/go-sql-driver/mysql >+GH_TUPLE+= go-stack:stack:v1.8.0:gostack/vendor/github.com/go-stack/stack >+GH_TUPLE+= go-yaml:yaml:v2.2.1:goyaml/vendor/gopkg.in/yaml.v2 >+GH_TUPLE+= golang:crypto:3d3f9f4:crypto/vendor/golang.org/x/crypto >+GH_TUPLE+= golang:net:adae6a3:golangnet/vendor/golang.org/x/net >+GH_TUPLE+= golang:protobuf:aa810b6:protobuf/vendor/github.com/golang/protobuf >+GH_TUPLE+= golang:sync:42b3178:sync/vendor/golang.org/x/sync >+GH_TUPLE+= golang:sys:66b7b13:sys/vendor/golang.org/x/sys >+GH_TUPLE+= golang:text:f21a4df:golangtext/vendor/golang.org/x/text >+GH_TUPLE+= google:go-genproto:b5d4398:gogenproto/vendor/google.golang.org/genproto >+GH_TUPLE+= google:google-api-go-client:83a9d30:googleapigoclient/vendor/google.golang.org/api >+GH_TUPLE+= google:subcommands:46f0354:subcommands/vendor/github.com/google/subcommands >+GH_TUPLE+= gorilla:websocket:v1.4.0:websocket/vendor/github.com/gorilla/websocket >+GH_TUPLE+= gosuri:uitable:36ee7e9:uitable/vendor/github.com/gosuri/uitable >+GH_TUPLE+= grokify:html-strip-tags-go:e9e4496:htmlstriptagsgo/vendor/github.com/grokify/html-strip-tags-go >+GH_TUPLE+= grpc:grpc-go:v1.16.0:grpcgo/vendor/google.golang.org/grpc >+GH_TUPLE+= hashicorp:go-version:v1.0.0:goversion/vendor/github.com/hashicorp/go-version >+GH_TUPLE+= hashicorp:hcl:v1.0.0:hcl/vendor/github.com/hashicorp/hcl >+GH_TUPLE+= hashicorp:uuid:ebb0a03:hashicorpuuid/vendor/github.com/hashicorp/uuid >+GH_TUPLE+= howeyc:gopass:bf9dde6:gopass/vendor/github.com/howeyc/gopass >+GH_TUPLE+= inconshreveable:log15:v2.14:log15/vendor/github.com/inconshreveable/log15 >+GH_TUPLE+= jinzhu:gorm:6ed508e:gorm/vendor/github.com/jinzhu/gorm >+GH_TUPLE+= jinzhu:inflection:0414036:inflection/vendor/github.com/jinzhu/inflection >+GH_TUPLE+= jroimartin:gocui:c055c87:gocui/vendor/github.com/jroimartin/gocui >+GH_TUPLE+= k0kubun:pp:v2.3.0:pp/vendor/github.com/k0kubun/pp >+GH_TUPLE+= knqyf263:go-cpe:659663f:gocpe/vendor/github.com/knqyf263/go-cpe >+GH_TUPLE+= knqyf263:go-deb-version:9865fe1:godebversion/vendor/github.com/knqyf263/go-deb-version >+GH_TUPLE+= knqyf263:go-rpm-version:74609b8:gorpmversion/vendor/github.com/knqyf263/go-rpm-version >+GH_TUPLE+= knqyf263:gost:920046a:gost/vendor/github.com/knqyf263/gost >+GH_TUPLE+= kotakanbe:go-cve-dictionary:9549cd3:gocvedictionary/vendor/github.com/kotakanbe/go-cve-dictionary >+GH_TUPLE+= kotakanbe:go-pingscanner:v0.1.0:gopingscanner/vendor/github.com/kotakanbe/go-pingscanner >+GH_TUPLE+= kotakanbe:goval-dictionary:v0.1.0:govaldictionary/vendor/github.com/kotakanbe/goval-dictionary >+GH_TUPLE+= kotakanbe:logrus-prefixed-formatter:928f735:logrusprefixedformatter/vendor/github.com/kotakanbe/logrus-prefixed-formatter >+GH_TUPLE+= labstack:gommon:7fd9f68:gommon/vendor/github.com/labstack/gommon >+GH_TUPLE+= lib:pq:4ded0e9:pq/vendor/github.com/lib/pq >+GH_TUPLE+= magiconair:properties:v1.8.0:properties/vendor/github.com/magiconair/properties >+GH_TUPLE+= marstr:guid:v1.1.0:guid/vendor/github.com/marstr/guid >+GH_TUPLE+= mattn:go-colorable:v0.0.9:gocolorable/vendor/github.com/mattn/go-colorable >+GH_TUPLE+= mattn:go-isatty:v0.0.4:goisatty/vendor/github.com/mattn/go-isatty >+GH_TUPLE+= mattn:go-runewidth:v0.0.3:gorunewidth/vendor/github.com/mattn/go-runewidth >+GH_TUPLE+= mattn:go-sqlite3:v1.10.0:gosqlite3/vendor/github.com/mattn/go-sqlite3 >+GH_TUPLE+= mgutz:ansi:9520e82:ansi/vendor/github.com/mgutz/ansi >+GH_TUPLE+= mitchellh:go-homedir:v1.0.0:gohomedir/vendor/github.com/mitchellh/go-homedir >+GH_TUPLE+= mitchellh:mapstructure:v1.1.0:mapstructure/vendor/github.com/mitchellh/mapstructure >+GH_TUPLE+= moul:http2curl:9ac6cf4:http2curl/vendor/github.com/moul/http2curl >+GH_TUPLE+= mozqnet:go-exploitdb:48cac6d:goexploitdb/vendor/github.com/mozqnet/go-exploitdb >+GH_TUPLE+= nlopes:slack:v0.4.0:slack/vendor/github.com/nlopes/slack >+GH_TUPLE+= olekukonko:tablewriter:v0.0.1:tablewriter/vendor/github.com/olekukonko/tablewriter >+GH_TUPLE+= nsf:termbox-go:60ab7e3:termboxgo/vendor/github.com/nsf/termbox-go >+GH_TUPLE+= parnurzeal:gorequest:v0.2.15:gorequest/vendor/github.com/parnurzeal/gorequest >+GH_TUPLE+= pelletier:go-toml:v1.2.0:gotoml/vendor/github.com/pelletier/go-toml >+GH_TUPLE+= pkg:errors:v0.8.0:pkgerrors/vendor/github.com/pkg/errors >+GH_TUPLE+= rifflock:lfshook:v2.4:lfshook/vendor/github.com/rifflock/lfshook >+GH_TUPLE+= satori:go.uuid:v1.2.0:gouuid/vendor/github.com/satori/go.uuid >+GH_TUPLE+= sirupsen:logrus:44067ab:logrus/vendor/github.com/sirupsen/logrus >+GH_TUPLE+= spf13:afero:v1.1.2:afero/vendor/github.com/spf13/afero >+GH_TUPLE+= spf13:cast:v1.3.0:cast/vendor/github.com/spf13/cast >+GH_TUPLE+= spf13:jwalterweatherman:v1.0.0:jwalterweatherman/vendor/github.com/spf13/jwalterweatherman >+GH_TUPLE+= spf13:pflag:v1.0.3:pflag/vendor/github.com/spf13/pflag >+GH_TUPLE+= spf13:viper:v1.2.1:viper/vendor/github.com/spf13/viper >+GH_TUPLE+= valyala:bytebufferpool:v1.0.0:bytebufferpool/vendor/github.com/valyala/bytebufferpool >+GH_TUPLE+= valyala:fasttemplate:dcecefd:fasttemplate/vendor/github.com/valyala/fasttemplate >+GH_TUPLE+= ymomoi:goval-parser:0a0be1d:govalparser/vendor/github.com/ymomoi/goval-parser > >+GO_BUILDFLAGS= -ldflags "-X main.version=${PORTVERSION}" >+ > PLIST_FILES= bin/${PORTNAME} \ > "@sample ${ETCDIR}/config.toml.sample" > > post-patch: > @${REINPLACE_CMD} -e 's|Sirupsen|sirupsen|' \ >- ${WRKSRC}/src/github.com/rifflock/lfshook/lfshook.go >+ ${WRKSRC}/vendor/github.com/rifflock/lfshook/lfshook.go > @${REINPLACE_CMD} -e 's|"gopkg.in/cheggaaa/pb.v2/termutil"|"github.com/cheggaaa/pb/termutil"|' \ >- ${WRKSRC}/src/github.com/cheggaaa/pb/pb.go >+ ${WRKSRC}/vendor/github.com/cheggaaa/pb/pb.go > @${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|' \ > ${WRKSRC}/commands/configtest.go \ > ${WRKSRC}/commands/report.go \ > ${WRKSRC}/commands/scan.go > @${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-runewidth.v0|github.com/mattn/go-runewidth|' \ >- ${WRKSRC}/src/github.com/cheggaaa/pb/util.go >+ ${WRKSRC}/vendor/github.com/cheggaaa/pb/util.go > @${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-colorable.v0|github.com/mattn/go-colorable|' \ >- ${WRKSRC}/src/github.com/cheggaaa/pb/pb.go >+ ${WRKSRC}/vendor/github.com/cheggaaa/pb/pb.go > @${REINPLACE_CMD} -e 's|gopkg.in/mattn/go-isatty.v0|github.com/mattn/go-isatty|' \ >- ${WRKSRC}/src/github.com/cheggaaa/pb/pb.go >+ ${WRKSRC}/vendor/github.com/cheggaaa/pb/pb.go > @${REINPLACE_CMD} -e 's|gopkg.in/fatih/color.v1|github.com/fatih/color|' \ >- ${WRKSRC}/src/github.com/cheggaaa/pb/template.go >+ ${WRKSRC}/vendor/github.com/cheggaaa/pb/template.go > >-do-build: >- @cd ${GO_WRKSRC} && \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} \ >- ${GO_CMD} build -v -x -ldflags "-X main.version=${PORTVERSION}" \ >- -o ${WRKSRC}/${PORTNAME} >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >+post-install: > ${MKDIR} ${STAGEDIR}${ETCDIR} > ${INSTALL_DATA} ${FILESDIR}/config.toml.sample ${STAGEDIR}${ETCDIR} > >Index: shells/antibody/Makefile >=================================================================== >--- shells/antibody/Makefile (revision 512745) >+++ shells/antibody/Makefile (working copy) >@@ -15,29 +15,21 @@ > RUN_DEPENDS= git:devel/git \ > zsh:shells/zsh > >-USES= go >+USES= go:modules > > PLIST_FILES= bin/antibody > > USE_GITHUB= yes > GH_ACCOUNT= getantibody >-GH_SUBDIR= src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} > # Not needed: go-spew, go-difflib >-GH_TUPLE= alecthomas:kingpin:a39589:kingpin/src/github.com/alecthomas/kingpin \ >- alecthomas:template:a0175e:tempalte/src/github.com/alecthomas/template \ >- alecthomas:units:2efee8:units/src/github.com/alecthomas/units \ >- caarlos0:gohome:75f08ebc:gohome/src/github.com/caarlos0/gohome \ >- getantibody:folder:v1.0.0:folder/src/github.com/getantibody/folder \ >- golang:crypto:1a580b:crypto/src/golang.org/x/crypto \ >- golang:net:2491c5:net/src/golang.org/x/net \ >- golang:sync:1d60e4:sync/src/golang.org/x/sync \ >- golang:sys:7c87d1:sys/src/golang.org/x/sys >+GH_TUPLE= alecthomas:kingpin:a39589:kingpin/vendor/github.com/alecthomas/kingpin \ >+ alecthomas:template:a0175e:tempalte/vendor/github.com/alecthomas/template \ >+ alecthomas:units:2efee8:units/vendor/github.com/alecthomas/units \ >+ caarlos0:gohome:75f08ebc:gohome/vendor/github.com/caarlos0/gohome \ >+ getantibody:folder:v1.0.0:folder/vendor/github.com/getantibody/folder \ >+ golang:crypto:1a580b:crypto/vendor/golang.org/x/crypto \ >+ golang:net:2491c5:net/vendor/golang.org/x/net \ >+ golang:sync:1d60e4:sync/vendor/golang.org/x/sync \ >+ golang:sys:7c87d1:sys/vendor/golang.org/x/sys > >-do-build: >- ${RM} ${WRKSRC}/go.mod >- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/antibody-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/antibody >- > .include <bsd.port.mk> >Index: sysutils/amazon-ssm-agent/Makefile >=================================================================== >--- sysutils/amazon-ssm-agent/Makefile (revision 512745) >+++ sysutils/amazon-ssm-agent/Makefile (working copy) >@@ -18,6 +18,13 @@ > GH_ACCOUNT= aws > GH_SUBDIR= src/github.com/aws/amazon-ssm-agent > >+GO_BUILDLAGS= -ldflags "-s -w" >+GO_TARGET= ./agent:${PREFIX}/sbin/amazon-ssm-agent \ >+ ./agent/framework/processor/executer/outofproc/worker:${PREFIX}/sbin/ssm-document-worker \ >+ ./agent/framework/processor/executer/outofproc/sessionworker:${PREFIX}/sbin/ssm-session-worker \ >+ ./agent/session/logging:${PREFIX}/sbin/ssm-session-logger \ >+ ./agent/cli-main:${PREFIX}/sbin/ssm-cli >+ > PLIST_FILES= etc/amazon/ssm/amazon-ssm-agent.json.template \ > etc/amazon/ssm/seelog_unix.xml.template \ > sbin/amazon-ssm-agent \ >@@ -28,33 +35,10 @@ > > USE_RC_SUBR= amazon-ssm-agent > >-do-build: >- @cd ${WRKSRC}; \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0 \ >- go build -ldflags "-s -w" -o amazon-ssm-agent -v \ >- agent/agent.go agent/agent_unix.go agent/agent_parser.go >- @cd ${WRKSRC}; \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0 \ >- go build -ldflags "-s -w" -o ssm-document-worker -v \ >- agent/framework/processor/executer/outofproc/worker/main.go >- @cd ${WRKSRC}; \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0 \ >- go build -ldflags "-s -w" -o ssm-session-worker -v \ >- agent/framework/processor/executer/outofproc/sessionworker/main.go >- @cd ${WRKSRC}; \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0 \ >- go build -ldflags "-s -w" -o ssm-session-logger -v \ >- agent/session/logging/main.go >- @cd ${WRKSRC}; \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0 \ >- go build -ldflags "-s -w" -o ssm-cli -v agent/cli-main/cli-main.go >+post-patch: >+ ${LN} -s ${WRKSRC}/vendor/src/* ${WRKSRC}/vendor/ > >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/amazon-ssm-agent ${STAGEDIR}${PREFIX}/sbin >- ${INSTALL_PROGRAM} ${WRKSRC}/ssm-document-worker ${STAGEDIR}${PREFIX}/sbin >- ${INSTALL_PROGRAM} ${WRKSRC}/ssm-session-worker ${STAGEDIR}${PREFIX}/sbin >- ${INSTALL_PROGRAM} ${WRKSRC}/ssm-session-logger ${STAGEDIR}${PREFIX}/sbin >- ${INSTALL_PROGRAM} ${WRKSRC}/ssm-cli ${STAGEDIR}${PREFIX}/sbin >+post-install: > ${MKDIR} ${STAGEDIR}${PREFIX}/etc/amazon/ssm > ${INSTALL_DATA} ${WRKSRC}/amazon-ssm-agent.json.template ${STAGEDIR}${PREFIX}/etc/amazon/ssm > ${INSTALL_DATA} ${WRKSRC}/seelog_unix.xml ${STAGEDIR}${PREFIX}/etc/amazon/ssm/seelog_unix.xml.template >Index: sysutils/circonus-agent/Makefile >=================================================================== >--- sysutils/circonus-agent/Makefile (revision 512745) >+++ sysutils/circonus-agent/Makefile (working copy) >@@ -17,47 +17,43 @@ > > GH_ACCOUNT= circonus-labs > GH_SUBDIR= src/github.com/circonus-labs/circonus-agent >-GH_TUPLE= alecthomas:units:2efee85:units/src/github.com/alecthomas/units \ >- pkg:errors:645ef00:errors/src/github.com/pkg/errors \ >- rs:zerolog:56a970de:zerolog/src/github.com/rs/zerolog \ >- spf13:cobra:c439c4fa:cobra/src/github.com/spf13/cobra \ >- spf13:viper:b5e8006c:viper/src/github.com/spf13/viper \ >- golang:sys:7ceb54c8:sys/src/golang.org/x/sys \ >- xi2:httpgzip:2d8bcdd:httpgzip/src/xi2.org/x/httpgzip \ >- pelletier:go-toml:acdc4509:go_toml/src/github.com/pelletier/go-toml \ >- maier:go-appstats:812a586:go_appstats/src/github.com/maier/go-appstats \ >- circonus-labs:circonus-gometrics:b25d14e:circonus_gometrics/src/github.com/circonus-labs/circonus-gometrics \ >- go-tomb:tomb:d5d1b58:tomb2/src/gopkg.in/tomb.v2 \ >- go-yaml:yaml:7f97868e:yaml2/src/gopkg.in/yaml.v2 \ >- go-ole:go-ole:a41e3c4:go_ole/src/github.com/go-ole/go-ole \ >- circonus-labs:circonusllhist:1e65893c:circonusllhist/src/github.com/circonus-labs/circonusllhist \ >- fsnotify:fsnotify:c2828203:fsnotify/src/github.com/fsnotify/fsnotify \ >- hashicorp:go-retryablehttp:794af36:go_retryablehttp/src/github.com/hashicorp/go-retryablehttp \ >- spf13:pflag:e57e3ee:pflag/src/github.com/spf13/pflag \ >- hashicorp:go-cleanhttp:d5fe4b57:go_cleanhttp/src/github.com/hashicorp/go-cleanhttp \ >- hashicorp:hcl:23c074d:hcl/src/github.com/hashicorp/hcl \ >- magiconair:properties:c3beff4c:properties/src/github.com/magiconair/properties \ >- mitchellh:mapstructure:00c29f56:mapstructure/src/github.com/mitchellh/mapstructure \ >- spf13:afero:bb8f1927:afero/src/github.com/spf13/afero \ >- spf13:cast:8965335b:cast/src/github.com/spf13/cast \ >- spf13:jWalterWeatherman:7c0cea34:jWalterWeatherman/src/github.com/spf13/jwalterweatherman \ >- golang:text:f21a4dfb:text/src/golang.org/x/text \ >- tv42:httpunix:b75d861:httpunix/src/github.com/tv42/httpunix \ >- prometheus:client_model:99fa1f4:client_model/src/github.com/prometheus/client_model \ >- golang:protobuf:8ee7999:protobuf/src/github.com/golang/protobuf \ >- prometheus:common:e4aa40a9:common/src/github.com/prometheus/common \ >- matttproud:golang_protobuf_extensions:3247c845:golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions >+GH_TUPLE= alecthomas:units:2efee85:units/vendor/github.com/alecthomas/units \ >+ pkg:errors:645ef00:errors/vendor/github.com/pkg/errors \ >+ rs:zerolog:56a970de:zerolog/vendor/github.com/rs/zerolog \ >+ spf13:cobra:c439c4fa:cobra/vendor/github.com/spf13/cobra \ >+ spf13:viper:b5e8006c:viper/vendor/github.com/spf13/viper \ >+ golang:sys:7ceb54c8:sys/vendor/golang.org/x/sys \ >+ xi2:httpgzip:2d8bcdd:httpgzip/vendor/xi2.org/x/httpgzip \ >+ pelletier:go-toml:acdc4509:go_toml/vendor/github.com/pelletier/go-toml \ >+ maier:go-appstats:812a586:go_appstats/vendor/github.com/maier/go-appstats \ >+ circonus-labs:circonus-gometrics:b25d14e:circonus_gometrics/vendor/github.com/circonus-labs/circonus-gometrics \ >+ go-tomb:tomb:d5d1b58:tomb2/vendor/gopkg.in/tomb.v2 \ >+ go-yaml:yaml:7f97868e:yaml2/vendor/gopkg.in/yaml.v2 \ >+ go-ole:go-ole:a41e3c4:go_ole/vendor/github.com/go-ole/go-ole \ >+ circonus-labs:circonusllhist:1e65893c:circonusllhist/vendor/github.com/circonus-labs/circonusllhist \ >+ fsnotify:fsnotify:c2828203:fsnotify/vendor/github.com/fsnotify/fsnotify \ >+ hashicorp:go-retryablehttp:794af36:go_retryablehttp/vendor/github.com/hashicorp/go-retryablehttp \ >+ spf13:pflag:e57e3ee:pflag/vendor/github.com/spf13/pflag \ >+ hashicorp:go-cleanhttp:d5fe4b57:go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \ >+ hashicorp:hcl:23c074d:hcl/vendor/github.com/hashicorp/hcl \ >+ magiconair:properties:c3beff4c:properties/vendor/github.com/magiconair/properties \ >+ mitchellh:mapstructure:00c29f56:mapstructure/vendor/github.com/mitchellh/mapstructure \ >+ spf13:afero:bb8f1927:afero/vendor/github.com/spf13/afero \ >+ spf13:cast:8965335b:cast/vendor/github.com/spf13/cast \ >+ spf13:jWalterWeatherman:7c0cea34:jWalterWeatherman/vendor/github.com/spf13/jwalterweatherman \ >+ golang:text:f21a4dfb:text/vendor/golang.org/x/text \ >+ tv42:httpunix:b75d861:httpunix/vendor/github.com/tv42/httpunix \ >+ prometheus:client_model:99fa1f4:client_model/vendor/github.com/prometheus/client_model \ >+ golang:protobuf:8ee7999:protobuf/vendor/github.com/golang/protobuf \ >+ prometheus:common:e4aa40a9:common/vendor/github.com/prometheus/common \ >+ matttproud:golang_protobuf_extensions:3247c845:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions > >+GO_TARGET= :circonus-agentd >+ > ETCDIR= ${PREFIX}/etc/circonus-agentd > PLIST_FILES= bin/circonus-agentd "@dir ${ETCDIR}" > >-do-build: >- ( cd ${WRKSRC}; \ >- ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} \ >- go build ${BUILD_FLAGS} -o bin/circonus-agentd ) >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/circonus-agentd ${STAGEDIR}${PREFIX}/bin/circonus-agentd >+post-install: > @${MKDIR} ${STAGEDIR}${ETCDIR} > > .include <bsd.port.mk> >Index: sysutils/consul-alerts/Makefile >=================================================================== >--- sysutils/consul-alerts/Makefile (revision 512745) >+++ sysutils/consul-alerts/Makefile (working copy) >@@ -10,32 +10,19 @@ > > LICENSE= GPLv2+ > >-USES= compiler go >+USES= go > > USE_GITHUB= yes > GH_ACCOUNT= AcalephStorage > GH_SUBDIR= src/github.com/AcalephStorage/consul-alerts >-GH_TUPLE= aws:aws-sdk-go:v1.8.30:aws_sdk_go/src/github.com/aws/aws-sdk-go \ >- imdario:mergo:0.2.2:mergo/src/github.com/imdario/mergo \ >- mitchellh:hashstructure:9204ce5:hashstructure/src/github.com/mitchellh/hashstructure >+GH_TUPLE= aws:aws-sdk-go:v1.8.30:aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ >+ imdario:mergo:0.2.2:mergo/vendor/github.com/imdario/mergo \ >+ mitchellh:hashstructure:9204ce5:hashstructure/vendor/github.com/mitchellh/hashstructure > >+GO_BUILDFLAGS= -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" >+ > PLIST_FILES= ${PREFIX}/bin/${PORTNAME} > > USE_RC_SUBR= ${PORTNAME} > >-do-build: >- cd ${GO_WRKSRC} && \ >- ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \ >- -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/${PORTNAME} >- >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKSRC}/bin/${PORTNAME} \ >- ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >- >-.include <bsd.port.pre.mk> >- >-.if ${COMPILER_TYPE} == clang >-BUILD_ENV= CC=clang >-.endif >- >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >Index: sysutils/consul_exporter/Makefile >=================================================================== >--- sysutils/consul_exporter/Makefile (revision 512745) >+++ sysutils/consul_exporter/Makefile (working copy) >@@ -10,37 +10,19 @@ > > LICENSE= APACHE20 > >-USES= compiler go >+USES= go > > USE_GITHUB= yes > GH_ACCOUNT= prometheus > GH_SUBDIR= src/github.com/${GH_ACCOUNT}/consul_exporter > >-USE_RC_SUBR= consul_exporter >- >-PLIST_FILES= bin/consul_exporter >- >-post-extract: >- @${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/ >- >-do-build: >- @cd ${WRKSRC}/src/github.com/prometheus/consul_exporter; ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \ >- -ldflags "\ >+GO_BUILDFLAGS= -ldflags "\ > -X github.com/prometheus/consul_exporter/version.Version=${PORTVERSION} \ > -X github.com/prometheus/consul_exporter/version.VersionPrerelease= \ >- -X github.com/prometheus/consul_exporter/version.GitDescribe=v${PORTVERSION} \ >- " \ >- -o bin/consul_exporter >+ -X github.com/prometheus/consul_exporter/version.GitDescribe=v${PORTVERSION}" > >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/prometheus/consul_exporter/bin/consul_exporter ${STAGEDIR}${PREFIX}/bin/consul_exporter >+USE_RC_SUBR= consul_exporter > >-.include <bsd.port.pre.mk> >+PLIST_FILES= bin/consul_exporter > >-# golang assumes that if clang is in use, it is called "clang" and not "cc". If >-# it's called "cc", go fails. >-.if ${COMPILER_TYPE} == clang >-BUILD_ENV= CC=clang >-.endif >- >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >Index: sysutils/container-diff/Makefile >=================================================================== >--- sysutils/container-diff/Makefile (revision 512745) >+++ sysutils/container-diff/Makefile (working copy) >@@ -21,7 +21,4 @@ > GH_ACCOUNT= GoogleContainerTools > USE_GITHUB= yes > >-do-install: >- ${INSTALL_PROGRAM} ${WRKDIR}/bin/container-diff ${STAGEDIR}${PREFIX}/bin/container-diff >- > .include <bsd.port.mk> >Index: sysutils/coreos-ct/Makefile >=================================================================== >--- sysutils/coreos-ct/Makefile (revision 512745) >+++ sysutils/coreos-ct/Makefile (working copy) >@@ -18,18 +18,13 @@ > GH_PROJECT= container-linux-config-transpiler > > GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} >-GO_LDFLAGS= -w -X github.com/${GH_ACCOUNT}/${GH_PROJECT}/internal/version.Raw=${PORTVERSION} >+GO_BUILDFLAGS= -ldflags "-w -X github.com/${GH_ACCOUNT}/${GH_PROJECT}/internal/version.Raw=${PORTVERSION}" >+GO_TARGET= ./internal:ct > > OPTIONS_DEFINE= DOCS > > PORTDOCS= README.md NEWS doc/* > >-do-build: >- @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build -o ${WRKDIR}/bin/ct -ldflags "${GO_LDFLAGS}" ./internal) >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKDIR}/bin/ct ${STAGEDIR}${PREFIX}/bin >- > post-install-DOCS-on: > @${MKDIR} ${STAGEDIR}${DOCSDIR} > cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} >Index: sysutils/envconsul/Makefile >=================================================================== >--- sysutils/envconsul/Makefile (revision 512745) >+++ sysutils/envconsul/Makefile (working copy) >@@ -23,20 +23,11 @@ > > PORTDOCS= README.md > COMMIT= 7ece735 >-GO_LDFLAGS= -ldflags="-s -w \ >+GO_BUILDFLAGS= -ldflags="-s -w \ > -X main.Name=${PORTNAME} \ > -X main.Version=${PORTVERSION} \ > -X main.GitCommit=${COMMIT}" > >-do-build: >- @cd ${WRKSRC}/src/github.com/hashicorp/envconsul; \ >- ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} \ >- go build ${GO_LDFLAGS}\ >- -o bin/envconsul >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/envconsul/bin/envconsul ${STAGEDIR}${PREFIX}/bin/envconsul >- > post-install-DOCS-on: > ${MKDIR} ${STAGEDIR}${DOCSDIR} > .for doc in ${PORTDOCS} >Index: sysutils/epazote/Makefile >=================================================================== >--- sysutils/epazote/Makefile (revision 512745) >+++ sysutils/epazote/Makefile (working copy) >@@ -10,21 +10,16 @@ > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/LICENSE > >-USES= compiler go >+USES= go > > USE_GITHUB= yes >-GH_TUPLE= epazote:scheduler:0.1.0:scheduler/src/github.com/epazote/scheduler \ >- go-yaml:yaml:cd8b52f:yaml/src/github.com/go-yaml/yaml >+GH_TUPLE= epazote:scheduler:0.1.0:scheduler/vendor/github.com/epazote/scheduler \ >+ go-yaml:yaml:cd8b52f:yaml/vendor/github.com/go-yaml/yaml > GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} > >+GO_BUILDFLAGS= -ldflags "-X main.version=${PORTVERSION}" >+GO_TARGET= ./cmd/epazote >+ > PLIST_FILES= bin/epazote > >-do-build: >- @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ >- ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ >- "-X main.version=${PORTVERSION}" -o epazote cmd/epazote/main.go; >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/epazote ${STAGEDIR}${PREFIX}/bin/epazote >- > .include <bsd.port.mk> >Index: sysutils/fusefs-webdavfs/Makefile >=================================================================== >--- sysutils/fusefs-webdavfs/Makefile (revision 512745) >+++ sysutils/fusefs-webdavfs/Makefile (working copy) >@@ -41,6 +41,8 @@ > GH_PROJECT+= ${GETOPT_GH_PROJECT}:getopt ${FUSE_GH_PROJECT}:fuse > GH_TAGNAME+= ${GETOPT_GH_TAGNAME}:getopt ${FUSE_GH_TAGNAME}:fuse > >+GO_TARGET= :${PREFIX}/sbin/mount.webdavfs >+ > PLIST_FILES= sbin/mount.webdavfs sbin/mount_webdavfs > > SUB_FILES= pkg-message mount_webdavfs >@@ -53,8 +55,7 @@ > ${LN} -s ${WRKDIR}/getopt-${GETOPT_GH_TAGNAME}/v2 ${GETOPT_WRKSRCDIR} > ${LN} -s ${WRKDIR}/fuse-${FUSE_GH_TAGNAME} ${FUSE_WRKSRCDIR}/fuse > >-do-install: >- ${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin/mount.webdavfs >+post-install: > ${INSTALL_SCRIPT} ${WRKDIR}/mount_webdavfs ${STAGEDIR}${PREFIX}/sbin > > .include <bsd.port.mk> >Index: sysutils/goawk/Makefile >=================================================================== >--- sysutils/goawk/Makefile (revision 512745) >+++ sysutils/goawk/Makefile (working copy) >@@ -9,22 +9,14 @@ > COMMENT= AWK interpreter written in Go > > LICENSE= MIT >-LICENSE_FILE= ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/LICENSE.txt >+LICENSE_FILE= ${WRKSRC}/LICENSE.txt > > USES= go > >-USE_GITHUB= nodefault # the main code is in GH_TUPLE >+USE_GITHUB= yes > GH_ACCOUNT= benhoyt >-GH_TUPLE= benhoyt:goawk:${DISTVERSIONFULL}:main/src/github.com/benhoyt/goawk > GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} > > PLIST_FILES= bin/${PORTNAME} > >-do-build: >- @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install ./... >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: sysutils/gomplate/Makefile >=================================================================== >--- sysutils/gomplate/Makefile (revision 512745) >+++ sysutils/gomplate/Makefile (working copy) >@@ -18,19 +18,12 @@ > GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} > GH_TAG_COMMIT= ce4b3e3 > >+GO_BUILDFLAGS= -ldflags "\ >+ -w -s \ >+ -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=${GH_TAG_COMMIT} \ >+ -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${DISTVERSION}" >+GO_TARGET= ./cmd/gomplate >+ > PLIST_FILES= bin/gomplate > >-post-extract: >- @${CP} -RpP ${WRKSRC}/vendor/* ${WRKSRC}/src/ >- >-do-build: >- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ >- ${LOCALBASE}/bin/go build \ >- -ldflags "-w -s -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.GitCommit=${GH_TAG_COMMIT} -X github.com/${GH_ACCOUNT}/${PORTNAME}/version.Version=${DISTVERSION}" \ >- -o ${PORTNAME} \ >- ./cmd/gomplate >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >- > .include <bsd.port.mk> >Index: sysutils/goss/Makefile >=================================================================== >--- sysutils/goss/Makefile (revision 512745) >+++ sysutils/goss/Makefile (working copy) >@@ -22,34 +22,30 @@ > USE_GITHUB= yes > GH_ACCOUNT= aelsabbahy > GH_SUBDIR= src/github.com/aelsabbahy/${PORTNAME} >-GH_TUPLE= achanda:go-sysctl:6be7678:achanda/src/github.com/achanda/go-sysctl \ >- aelsabbahy:go-ps:4433868:gops/src/github.com/aelsabbahy/go-ps \ >- aelsabbahy:GOnetstat:edf89f7:GOnetstat/src/github.com/aelsabbahy/GOnetstat \ >- cheekybits:genny:e8e29e6:cheekybits/src/github.com/cheekybits/genny \ >- fatih:color:bf82308:fatih/src/github.com/fatih/color \ >- go-yaml:yaml:a5b47d3:yaml/src/gopkg.in/yaml.v2 \ >- golang:sys:9a2e24c:sys/src/golang.org/x/sys \ >- mattn:go-colorable:d228849:mattn/src/github.com/mattn/go-colorable \ >- mattn:go-isatty:66b8e73:mattnisatty/src/github.com/mattn/go-isatty \ >- miekg:dns:58f52c5:miekg/src/github.com/miekg/dns \ >- moby:moby:383a2f0:docker/src/github.com/docker/docker \ >- oleiade:reflections:0e86b3c:oleiade/src/github.com/oleiade/reflections \ >- onsi:gomega:ff4bc6b:onsi/src/github.com/onsi/gomega \ >- opencontainers:runc:8779fa5:opencontainers/src/github.com/opencontainers/runc \ >- patrickmn:go-cache:1881a9b:patrickmn/src/github.com/patrickmn/go-cache \ >- urfave:cli:d86a009:urfave/src/github.com/urfave/cli >+GH_TUPLE= achanda:go-sysctl:6be7678:achanda/vendor/github.com/achanda/go-sysctl \ >+ aelsabbahy:go-ps:4433868:gops/vendor/github.com/aelsabbahy/go-ps \ >+ aelsabbahy:GOnetstat:edf89f7:GOnetstat/vendor/github.com/aelsabbahy/GOnetstat \ >+ cheekybits:genny:e8e29e6:cheekybits/vendor/github.com/cheekybits/genny \ >+ fatih:color:bf82308:fatih/vendor/github.com/fatih/color \ >+ go-yaml:yaml:a5b47d3:yaml/vendor/gopkg.in/yaml.v2 \ >+ golang:sys:9a2e24c:sys/vendor/golang.org/x/sys \ >+ mattn:go-colorable:d228849:mattn/vendor/github.com/mattn/go-colorable \ >+ mattn:go-isatty:66b8e73:mattnisatty/vendor/github.com/mattn/go-isatty \ >+ miekg:dns:58f52c5:miekg/vendor/github.com/miekg/dns \ >+ moby:moby:383a2f0:docker/vendor/github.com/docker/docker \ >+ oleiade:reflections:0e86b3c:oleiade/vendor/github.com/oleiade/reflections \ >+ onsi:gomega:ff4bc6b:onsi/vendor/github.com/onsi/gomega \ >+ opencontainers:runc:8779fa5:opencontainers/vendor/github.com/opencontainers/runc \ >+ patrickmn:go-cache:1881a9b:patrickmn/vendor/github.com/patrickmn/go-cache \ >+ urfave:cli:d86a009:urfave/vendor/github.com/urfave/cli > >+GO_BUILDFLAGS= -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -s -w" >+GO_TARGET= ./cmd/${PORTNAME} >+ > post-patch: > ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/extras/goss.yaml.sample > >-do-build: >- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ >- go build -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -s -w" -o \ >- bin/${PORTNAME} ./cmd/${PORTNAME} >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/bin/${PORTNAME} \ >- ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >+post-install: > ${INSTALL_DATA} ${WRKSRC}/extras/goss.yaml.sample ${STAGEDIR}${PREFIX}/etc/goss.yaml.sample > ${MKDIR} ${STAGEDIR}${PREFIX}/etc/goss.d > ${INSTALL_DATA} ${WRKSRC}/extras/process_goss.yaml.sample \ >Index: sysutils/hared/Makefile >=================================================================== >--- sysutils/hared/Makefile (revision 512745) >+++ sysutils/hared/Makefile (working copy) >@@ -16,12 +16,14 @@ > GH_ACCOUNT= jpmens > GH_PROJECT= hared-hare > >-GH_TUPLE= go-gcfg:gcfg:f02745a:gcfg/src/gopkg.in/gcfg.v1 \ >- go-warnings:warnings:27b9fab:warnings/src/gopkg.in/warnings.v0 \ >- eclipse:paho.mqtt.golang:d4f545e:paho/src/github.com/eclipse/paho.mqtt.golang \ >- golang:net:9dfe398:net/src/golang.org/x/net \ >- gorilla:websocket:7a8dacf:websocket/src/github.com/gorilla/websocket >+GH_TUPLE= go-gcfg:gcfg:f02745a:gcfg/vendor/gopkg.in/gcfg.v1 \ >+ go-warnings:warnings:27b9fab:warnings/vendor/gopkg.in/warnings.v0 \ >+ eclipse:paho.mqtt.golang:d4f545e:paho/vendor/github.com/eclipse/paho.mqtt.golang \ >+ golang:net:9dfe398:net/vendor/golang.org/x/net \ >+ gorilla:websocket:7a8dacf:websocket/vendor/github.com/gorilla/websocket > >+GO_TARGET= ./daemon:${PORTNAME} >+ > CONFLICTS_INSTALL= sysutils/py-hared > > OPTIONS_DEFINE= DOCS >@@ -28,13 +30,7 @@ > > ETCDIR= ${PREFIX}/etc > >-do-build: >- (cd ${GO_WRKSRC}; \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ >- ${GO_CMD} build -o ${GO_PKGNAME} ./daemon/hared.go) >- >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKSRC}/${GO_PKGNAME} ${STAGEDIR}${PREFIX}/bin >+post-install: > ${INSTALL_DATA} ${WRKSRC}/daemon/hared.ini.sample ${STAGEDIR}${ETCDIR} > > post-install-DOCS-on: >Index: sysutils/helm/Makefile >=================================================================== >--- sysutils/helm/Makefile (revision 512745) >+++ sysutils/helm/Makefile (working copy) >@@ -15,29 +15,15 @@ > > USES= go tar:xz > >-PLIST_FILES= bin/${PORTNAME} \ >- bin/tiller \ >- bin/rudder >- >-post-patch: >- ${MV} ${WRKSRC}/vendor/* ${WRKDIR}/src/ >- ${LN} -s ${WRKSRC} ${WRKDIR}/src/k8s.io/helm >- >-do-build: >-.for cmd in helm tiller rudder >- cd ${WRKDIR}/src/k8s.io/helm/cmd/${cmd} ; \ >- GOPATH=${WRKDIR} GOCACHE=${WRKDIR}/.gocache go build \ >- -ldflags="-X k8s.io/helm/pkg/version.Version=v${PORTVERSION} \ >+GO_PKGNAME= k8s.io/helm >+GO_BUILDFLAGS= -ldflags="-X k8s.io/helm/pkg/version.Version=v${PORTVERSION} \ > -X k8s.io/helm/pkg/version.GitCommit=5270352a09c7e8b6e8c9593002a73535276507c0 \ > -X k8s.io/helm/pkg/version.BuildMetadata=" >-.endfor >+GO_TARGET= ./cmd/${PORTNAME} \ >+ ./cmd/tiller \ >+ ./cmd/rudder > >-do-install: >-.for cmd in helm tiller rudder >- ${INSTALL_PROGRAM} \ >- ${WRKSRC}/cmd/${cmd}/${cmd} \ >- ${STAGEDIR}${PREFIX}/bin/${cmd} >-.endfor >+PLIST_FILES= ${GO_TARGET:C/.\/cmd/bin/} > > maintainer-distfile: > (cd /tmp; fetch https://github.com/helm/helm/archive/v${PORTVERSION}.tar.gz; \ >Index: sysutils/immortal/Makefile >=================================================================== >--- sysutils/immortal/Makefile (revision 512745) >+++ sysutils/immortal/Makefile (working copy) >@@ -13,34 +13,23 @@ > USES= go > USE_RC_SUBR= immortaldir > USE_GITHUB= yes >-GH_TUPLE= immortal:logrotate:6f52ae7:logrotate/src/github.com/immortal/logrotate \ >- immortal:multiwriter:2e0dd11:multiwriter/src/github.com/immortal/multiwriter \ >- immortal:natcasesort:162328b:natcasesort/src/github.com/immortal/natcasesort \ >- immortal:xtime:fb1aca1:xtime/src/github.com/immortal/xtime \ >- nbari:violetear:5c7cdfe:nbari/src/github.com/nbari/violetear \ >- go-yaml:yaml:51d6538:yaml/src/github.com/go-yaml/yaml >+GH_TUPLE= immortal:logrotate:6f52ae7:logrotate/vendor/github.com/immortal/logrotate \ >+ immortal:multiwriter:2e0dd11:multiwriter/vendor/github.com/immortal/multiwriter \ >+ immortal:natcasesort:162328b:natcasesort/vendor/github.com/immortal/natcasesort \ >+ immortal:xtime:fb1aca1:xtime/vendor/github.com/immortal/xtime \ >+ nbari:violetear:5c7cdfe:nbari/vendor/github.com/nbari/violetear \ >+ go-yaml:yaml:51d6538:yaml/vendor/github.com/go-yaml/yaml > GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} > >+GO_BUILDFLAGS= -ldflags "-s -w -X main.version=${PORTVERSION}" >+GO_TARGET= ./cmd/immortal \ >+ ./cmd/immortalctl \ >+ ./cmd/immortaldir >+ > OPTIONS_DEFINE= EXAMPLES > >-do-build: >- @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ >- ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ >- "-s -w -X main.version=${PORTVERSION}" -o immortal cmd/immortal/main.go; >- @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ >- ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ >- "-s -w -X main.version=${PORTVERSION}" -o immortalctl cmd/immortalctl/main.go; >- @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ >- ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ >- "-s -w -X main.version=${PORTVERSION}" -o immortaldir cmd/immortaldir/main.go; >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/immortal/immortal/immortal ${STAGEDIR}${PREFIX}/bin/immortal >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/immortal/immortal/immortalctl ${STAGEDIR}${PREFIX}/bin/immortalctl >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/immortal/immortal/immortaldir ${STAGEDIR}${PREFIX}/bin/immortaldir >+post-install: > ${INSTALL_MAN} ${WRKSRC}/src/github.com/immortal/immortal/man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/ >- >-post-install: > @${MKDIR} ${STAGEDIR}${ETCDIR} > @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} > ${INSTALL_DATA} ${FILESDIR}/www.yml ${STAGEDIR}${EXAMPLESDIR}/www.yml.sample >Index: sysutils/ipfs-go/Makefile >=================================================================== >--- sysutils/ipfs-go/Makefile (revision 512745) >+++ sysutils/ipfs-go/Makefile (working copy) >@@ -20,7 +20,7 @@ > > USES= go:modules > >-GO_TARGET= ./cmd/ipfs >+GO_TARGET= ./cmd/ipfs:ipfs-go > > NO_WRKSUBDIR= yes > >@@ -52,8 +52,7 @@ > @${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/format_go1_12.go > @${REINPLACE_CMD} '/build !go1.13/d' ${WRKSRC}/vendor/golang.org/x/xerrors/frame_go1_12.go > >-do-install: >+post-install: > @${MKDIR} ${STAGEDIR}${IPFS_HOME} >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/ipfs ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} > > .include <bsd.port.mk> >Index: sysutils/nomad/Makefile >=================================================================== >--- sysutils/nomad/Makefile (revision 512745) >+++ sysutils/nomad/Makefile (working copy) >@@ -14,32 +14,21 @@ > ONLY_FOR_ARCHS= amd64 > ONLY_FOR_ARCHS_REASON= On i386: go compiler crashes: https://github.com/golang/go/issues/23763 > >-USES= compiler go >+USES= go > USE_GITHUB= yes > GH_ACCOUNT= hashicorp > GH_SUBDIR= src/github.com/hashicorp/nomad > USE_RC_SUBR= nomad > >+GO_BUILDFLAGS= -tags ui \ >+ -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" >+ > USERS= nomad > GROUPS= nomad > >-do-build: >- @cd ${WRKSRC}/src/github.com/hashicorp/nomad && \ >- ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x -tags ui \ >- -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/nomad >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/nomad/bin/nomad ${STAGEDIR}${PREFIX}/bin/nomad >+post-install: > @${MKDIR} ${STAGEDIR}${PREFIX}/etc/nomad >- ${INSTALL_DATA} ${WRKSRC}/src/github.com/hashicorp/nomad/dist/client.hcl \ >- ${STAGEDIR}${PREFIX}/etc/nomad/client.hcl.sample >- ${INSTALL_DATA} ${WRKSRC}/src/github.com/hashicorp/nomad/dist/server.hcl \ >- ${STAGEDIR}${PREFIX}/etc/nomad/server.hcl.sample >+ ${INSTALL_DATA} ${WRKSRC}/dist/client.hcl ${STAGEDIR}${PREFIX}/etc/nomad/client.hcl.sample >+ ${INSTALL_DATA} ${WRKSRC}/dist/server.hcl ${STAGEDIR}${PREFIX}/etc/nomad/server.hcl.sample > >-.include <bsd.port.pre.mk> >- >-.if ${COMPILER_TYPE} == clang >-BUILD_ENV= CC=clang >-.endif >- >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >Index: sysutils/paladin/Makefile >=================================================================== >--- sysutils/paladin/Makefile (revision 512745) >+++ sysutils/paladin/Makefile (working copy) >@@ -12,15 +12,11 @@ > > USES= go > GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} >+GO_BUILDFLAGS= -ldflags="-X main.localbase=/usr/local" > > USE_GITHUB= yes > GH_ACCOUNT= rwestlund > >-# Override default build command to pass ldflags. >-do-build: >- @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install \ >- -ldflags="-X main.localbase=/usr/local" -v ${GO_TARGET}) >- > post-install: > @${CP} ${WRKSRC}/etc/paladin.conf.sample ${STAGEDIR}/${LOCALBASE}/etc/ > @${CP} ${WRKSRC}/etc/rc.d/paladin ${STAGEDIR}/${LOCALBASE}/etc/rc.d/ >Index: sysutils/phpfpm_exporter/Makefile >=================================================================== >--- sysutils/phpfpm_exporter/Makefile (revision 512745) >+++ sysutils/phpfpm_exporter/Makefile (working copy) >@@ -17,13 +17,9 @@ > GH_PROJECT= php-fpm-exporter > > GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} >+GO_TARGET= ./cmd/${GH_PROJECT}:${PORTNAME} >+ > PLIST_FILES= bin/${PORTNAME} > USE_RC_SUBR= phpfpm_exporter > >-do-build: >- @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 ${GO_CMD} build -o ${PORTNAME} ./cmd/${GH_PROJECT}) >- >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >- > .include <bsd.port.mk> >Index: sysutils/rest-server/Makefile >=================================================================== >--- sysutils/rest-server/Makefile (revision 512745) >+++ sysutils/rest-server/Makefile (working copy) >@@ -25,7 +25,4 @@ > > PLIST_FILES= bin/${PORTNAME} > >-do-install: >- ${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >- > .include <bsd.port.mk> >Index: sysutils/snmp_exporter/Makefile >=================================================================== >--- sysutils/snmp_exporter/Makefile (revision 512745) >+++ sysutils/snmp_exporter/Makefile (working copy) >@@ -18,7 +18,8 @@ > > GH_ACCOUNT= prometheus > >-GO_TARGET= . ./generator >+GO_TARGET= . \ >+ ./generator:snmp_exporter_generator > > post-patch: > @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${GO_WRKSRC}/generator/main.go >@@ -26,6 +27,5 @@ > post-install: > ${MKDIR} ${STAGEDIR}${PREFIX}/etc/snmp_exporter/ > ${INSTALL_DATA} ${FILESDIR}/generator.yml ${STAGEDIR}${PREFIX}/etc/snmp_exporter/generator.yml >- ${MV} ${STAGEDIR}${PREFIX}/bin/generator ${STAGEDIR}${PREFIX}/bin/snmp_exporter_generator > > .include <bsd.port.mk> >Index: sysutils/sockaddr/Makefile >=================================================================== >--- sysutils/sockaddr/Makefile (revision 512745) >+++ sysutils/sockaddr/Makefile (working copy) >@@ -18,19 +18,12 @@ > GH_PROJECT= go-sockaddr > GH_TAGNAME= 7165ee1 > >+GO_BUILDFLAGS= -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -w -s" >+GO_TARGET= ./cmd/${PORTNAME} >+ > PLIST_FILES= bin/sockaddr > >-post-extract: >- @${CP} -rp ${WRKSRC}/cmd/${PORTNAME}/vendor/* ${WRKSRC}/src/ >+post-patch: >+ @${LN} -s ${WRKSRC}/cmd/${PORTNAME}/vendor ${WRKSRC} > >-do-build: >- @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd/${PORTNAME}/ && \ >- ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ >- ${LOCALBASE}/bin/go build -ldflags "-X main.version=${DISTVERSIONPREFIX}${PORTVERSION} -w -s" \ >- -o ${PORTNAME} >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/go-sockaddr/cmd/${PORTNAME}/${PORTNAME} \ >- ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >- > .include <bsd.port.mk> >Index: sysutils/zrepl/Makefile >=================================================================== >--- sysutils/zrepl/Makefile (revision 512745) >+++ sysutils/zrepl/Makefile (working copy) >@@ -19,39 +19,39 @@ > GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} > USE_GITHUB= yes > GH_SUBDIR= src/github.com/zrepl/zrepl >-GH_TUPLE= beorn7:perks:3a771d9:perks/src/github.com/beorn7/perks \ >- fatih:color:v1.7.0:color/src/github.com/fatih/color \ >- ftrvxmtrx:fd:c6d8003:fd/src/github.com/ftrvxmtrx/fd \ >- gdamore:encoding:b23993c:encoding/src/github.com/gdamore/encoding \ >- gdamore:tcell:v1.1.0:tcell/src/github.com/gdamore/tcell \ >- go-logfmt:logfmt:v0.4.0:logfmt/src/github.com/go-logfmt/logfmt \ >- golang:net:351d144:net/src/golang.org/x/net \ >- golang:protobuf:v1.3.1:protobuf/src/github.com/golang/protobuf \ >- golang:sync:e225da7:sync/src/golang.org/x/sync \ >- golang:sys:4ed8d59:sys/src/golang.org/x/sys \ >- golang:text:v0.3.0:go_text/src/golang.org/x/text \ >- google:go-genproto:bd91e49:genproto/src/google.golang.org/genproto \ >- google:uuid:v1.1.1:uuid/src/github.com/google/uuid \ >- grpc:grpc-go:v1.17.0:grpc/src/google.golang.org/grpc \ >- jinzhu:copier:db4671f:copier/src/github.com/jinzhu/copier \ >- kr:pretty:cfb55aa:pretty/src/github.com/kr/pretty \ >- kr:text:7cafcd8:text/src/github.com/kr/text \ >- lucasb-eyer:go-colorful:v1.0:go_colorful/src/github.com/lucasb-eyer/go-colorful \ >- mattn:go-isatty:v0.0.3:go_isatty/src/github.com/mattn/go-isatty \ >- mattn:go-runewidth:v0.0.3:go_runewidth/src/github.com/mattn/go-runewidth \ >- matttproud:golang_protobuf_extensions:v1.0.0:golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions \ >- pkg:errors:v0.8.1:errors/src/github.com/pkg/errors \ >- problame:go-netssh:09d6bc4:go_netssh/src/github.com/problame/go-netssh \ >- problame:go-rwccmd:391d2c7:go_rwccmd/src/github.com/problame/go-rwccmd \ >- prometheus:client_golang:e11c6ff:client_golang/src/github.com/prometheus/client_golang \ >- prometheus:client_model:99fa1f4:client_model/src/github.com/prometheus/client_model \ >- prometheus:common:d0f7cd6:common/src/github.com/prometheus/common \ >- prometheus:procfs:8b1c2da:procfs/src/github.com/prometheus/procfs \ >- spf13:cobra:b787445:cobra/src/github.com/spf13/cobra \ >- spf13:pflag:v1.0.0:pflag/src/github.com/spf13/pflag \ >- stretchr:testify:v1.1.4:testify/src/github.com/stretchr/testify \ >- theckman:goconstraint:v1.11.0:goconstraint/src/github.com/theckman/goconstraint \ >- zrepl:yaml-config:08227ad:yaml_config/src/github.com/zrepl/yaml-config >+GH_TUPLE= beorn7:perks:3a771d9:perks/vendor/github.com/beorn7/perks \ >+ fatih:color:v1.7.0:color/vendor/github.com/fatih/color \ >+ ftrvxmtrx:fd:c6d8003:fd/vendor/github.com/ftrvxmtrx/fd \ >+ gdamore:encoding:b23993c:encoding/vendor/github.com/gdamore/encoding \ >+ gdamore:tcell:v1.1.0:tcell/vendor/github.com/gdamore/tcell \ >+ go-logfmt:logfmt:v0.4.0:logfmt/vendor/github.com/go-logfmt/logfmt \ >+ golang:net:351d144:net/vendor/golang.org/x/net \ >+ golang:protobuf:v1.3.1:protobuf/vendor/github.com/golang/protobuf \ >+ golang:sync:e225da7:sync/vendor/golang.org/x/sync \ >+ golang:sys:4ed8d59:sys/vendor/golang.org/x/sys \ >+ golang:text:v0.3.0:go_text/vendor/golang.org/x/text \ >+ google:go-genproto:bd91e49:genproto/vendor/google.golang.org/genproto \ >+ google:uuid:v1.1.1:uuid/vendor/github.com/google/uuid \ >+ grpc:grpc-go:v1.17.0:grpc/vendor/google.golang.org/grpc \ >+ jinzhu:copier:db4671f:copier/vendor/github.com/jinzhu/copier \ >+ kr:pretty:cfb55aa:pretty/vendor/github.com/kr/pretty \ >+ kr:text:7cafcd8:text/vendor/github.com/kr/text \ >+ lucasb-eyer:go-colorful:v1.0:go_colorful/vendor/github.com/lucasb-eyer/go-colorful \ >+ mattn:go-isatty:v0.0.3:go_isatty/vendor/github.com/mattn/go-isatty \ >+ mattn:go-runewidth:v0.0.3:go_runewidth/vendor/github.com/mattn/go-runewidth \ >+ matttproud:golang_protobuf_extensions:v1.0.0:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ >+ pkg:errors:v0.8.1:errors/vendor/github.com/pkg/errors \ >+ problame:go-netssh:09d6bc4:go_netssh/vendor/github.com/problame/go-netssh \ >+ problame:go-rwccmd:391d2c7:go_rwccmd/vendor/github.com/problame/go-rwccmd \ >+ prometheus:client_golang:e11c6ff:client_golang/vendor/github.com/prometheus/client_golang \ >+ prometheus:client_model:99fa1f4:client_model/vendor/github.com/prometheus/client_model \ >+ prometheus:common:d0f7cd6:common/vendor/github.com/prometheus/common \ >+ prometheus:procfs:8b1c2da:procfs/vendor/github.com/prometheus/procfs \ >+ spf13:cobra:b787445:cobra/vendor/github.com/spf13/cobra \ >+ spf13:pflag:v1.0.0:pflag/vendor/github.com/spf13/pflag \ >+ stretchr:testify:v1.1.4:testify/vendor/github.com/stretchr/testify \ >+ theckman:goconstraint:v1.11.0:goconstraint/vendor/github.com/theckman/goconstraint \ >+ zrepl:yaml-config:08227ad:yaml_config/vendor/github.com/zrepl/yaml-config > > SUB_FILES= pkg-message > >@@ -70,19 +70,13 @@ > SUB_LIST+= DAEMON_LOGGING="" > .endif > >-post-extract: >- ${LN} -sf ${WRKSRC}/src ${WRKDIR} >- > post-build-MANPAGES-on: > @${MAKE_CMD} -C ${WRKSRC}/docs SPHINXBUILD=sphinx-build-${PYTHON_VER} man > >-do-install: >- ${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin >+post-install: > @${MKDIR} ${STAGEDIR}${PREFIX}/share/zrepl/samples > ${INSTALL_DATA} ${WRKSRC}/dist/grafana/grafana-prometheus-zrepl-0.1.json ${STAGEDIR}${PREFIX}/share/zrepl/samples/ > ${INSTALL_DATA} ${WRKSRC}/config/samples/* ${STAGEDIR}${PREFIX}/share/zrepl/samples/ >- >-post-install: > @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d \ > ${STAGEDIR}${PREFIX}/etc/syslog.d \ > ${STAGEDIR}${PREFIX}/etc/zrepl \ >Index: textproc/consul-template/Makefile >=================================================================== >--- textproc/consul-template/Makefile (revision 512745) >+++ textproc/consul-template/Makefile (working copy) >@@ -21,13 +21,4 @@ > > USE_RC_SUBR= consul-template > >-do-build: >- @cd ${WRKSRC}/src/github.com/hashicorp/consul-template ; \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build >- >-do-install: >- ${INSTALL_PROGRAM} \ >- ${WRKSRC}/src/github.com/hashicorp/consul-template/consul-template \ >- ${STAGEDIR}${PREFIX}/bin/consul-template >- > .include <bsd.port.mk> >Index: textproc/gron/Makefile >=================================================================== >--- textproc/gron/Makefile (revision 512745) >+++ textproc/gron/Makefile (working copy) >@@ -15,24 +15,13 @@ > USES= go > USE_GITHUB= yes > GH_ACCOUNT= tomnomnom >-GH_TUPLE= fatih:color:v1.7.0:color \ >- mattn:go-colorable:v0.1.1:colorable \ >- mattn:go-isatty:v0.0.6:isatty \ >- nwidger:jsoncolor:75a6de4:jsoncolor \ >- pkg:errors:v0.8.1:pkg_errors >+GH_TUPLE= fatih:color:v1.7.0:color/vendor/github.com/fatih/color \ >+ mattn:go-colorable:v0.1.1:colorable/vendor/github.com/mattn/go-colorable \ >+ mattn:go-isatty:v0.0.6:isatty/vendor/github.com/mattn/go-isatty \ >+ nwidger:jsoncolor:75a6de4:jsoncolor/vendor/github.com/nwidger/jsoncolor \ >+ pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors > GO_BUILDFLAGS= -ldflags="-X main.gronVersion=${PORTVERSION}" > > PLIST_FILES= bin/${PORTNAME} > >-pre-build: >- ${MKDIR} ${GO_WRKDIR_SRC}/github.com/fatih \ >- ${GO_WRKDIR_SRC}/github.com/mattn \ >- ${GO_WRKDIR_SRC}/github.com/pkg \ >- ${GO_WRKDIR_SRC}/github.com/nwidger >- ${MV} ${WRKSRC_color} ${GO_WRKDIR_SRC}/github.com/fatih/color >- ${MV} ${WRKSRC_colorable} ${GO_WRKDIR_SRC}/github.com/mattn/go-colorable >- ${MV} ${WRKSRC_isatty} ${GO_WRKDIR_SRC}/github.com/mattn/go-isatty >- ${MV} ${WRKSRC_jsoncolor} ${GO_WRKDIR_SRC}/github.com/nwidger/jsoncolor >- ${MV} ${WRKSRC_pkg_errors} ${GO_WRKDIR_SRC}/github.com/pkg/errors >- > .include <bsd.port.mk> >Index: textproc/jid/Makefile >=================================================================== >--- textproc/jid/Makefile (revision 512745) >+++ textproc/jid/Makefile (working copy) >@@ -14,19 +14,17 @@ > USE_GITHUB= yes > GH_ACCOUNT= simeji > GH_SUBDIR= src/github.com/simeji/jid >-GH_TUPLE= bitly:go-simplejson:aabad6e:simplejson/src/github.com/bitly/go-simplejson \ >- fatih:color:7824417:color/src/github.com/fatih/color \ >- mattn:go-runewidth:9e777a8:runewidth/src/github.com/mattn/go-runewidth \ >- nsf:termbox-go:3540b76:termbox/src/github.com/nsf/termbox-go \ >- nwidger:jsoncolor:75a6de4:jsoncolor/src/github.com/nwidger/jsoncolor \ >- pkg:errors:645ef00:errors/src/github.com/pkg/errors >+GH_TUPLE= bitly:go-simplejson:aabad6e:simplejson/vendor/github.com/bitly/go-simplejson \ >+ fatih:color:7824417:color/vendor/github.com/fatih/color \ >+ mattn:go-runewidth:9e777a8:runewidth/vendor/github.com/mattn/go-runewidth \ >+ nsf:termbox-go:3540b76:termbox/vendor/github.com/nsf/termbox-go \ >+ nwidger:jsoncolor:75a6de4:jsoncolor/vendor/github.com/nwidger/jsoncolor \ >+ pkg:errors:645ef00:errors/vendor/github.com/pkg/errors > > USES= go > >+GO_TARGET= ./cmd/jid >+ > PLIST_FILES= bin/jid > >-do-build: >- @(cd ${WRKSRC}; \ >- ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} ${GO_CMD} build -v -o ${GO_WRKDIR_BIN}/jid cmd/jid/jid.go) >- > .include <bsd.port.mk> >Index: textproc/minify/Makefile >=================================================================== >--- textproc/minify/Makefile (revision 512745) >+++ textproc/minify/Makefile (working copy) >@@ -28,7 +28,4 @@ > tdewolff:test:v1.0.4:tdewolff_test/vendor/github.com/tdewolff/test > USE_GITHUB= yes > >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/minify ${STAGEDIR}${PREFIX}/bin/minify >- > .include <bsd.port.mk> >Index: textproc/sift/Makefile >=================================================================== >--- textproc/sift/Makefile (revision 512745) >+++ textproc/sift/Makefile (working copy) >@@ -20,13 +20,10 @@ > PLIST_FILES= bin/sift > > GH_ACCOUNT= svent >-GH_TUPLE= golang:crypto:71b5226:golang_crypto/../src/golang.org/x/crypto \ >- golang:sys:749cb33:golang_sys/../src/golang.org/x/sys \ >- svent:go-flags:4bcbad3:svent_goflags/../src/github.com/svent/go-flags \ >- svent:go-nbreader:7cef48d:svent_gonbreader/../src/github.com/svent/go-nbreader >+GH_TUPLE= golang:crypto:71b5226:golang_crypto/vendor/golang.org/x/crypto \ >+ golang:sys:749cb33:golang_sys/vendor/golang.org/x/sys \ >+ svent:go-flags:4bcbad3:svent_goflags/vendor/github.com/svent/go-flags \ >+ svent:go-nbreader:7cef48d:svent_gonbreader/vendor/github.com/svent/go-nbreader > USE_GITHUB= yes > >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/sift ${STAGEDIR}${PREFIX}/bin/sift >- > .include <bsd.port.mk> >Index: textproc/spiff/Makefile >=================================================================== >--- textproc/spiff/Makefile (revision 512745) >+++ textproc/spiff/Makefile (working copy) >@@ -13,6 +13,8 @@ > USE_GITHUB= yes > GH_ACCOUNT= cloudfoundry-incubator > >+GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} >+ > PLIST_FILES= bin/spiff > > PORTDOCS= LICENSE README.md examples/cf-aws.yml \ >@@ -20,28 +22,10 @@ > > OPTIONS_DEFINE= DOCS > >-post-patch: >- @cd ${WRKSRC} ; ${MV} ${WRKSRC}/vendor ${WRKSRC}/src >- @cd ${WRKSRC} ; ${MKDIR} src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \ >- ${MV} .gitignore LICENSE Makefile README.md \ >- compare dynaml examples flow init_test.go scripts spiff.go \ >- spiff_test.go yaml \ >- src/github.com/${GH_ACCOUNT}/${GH_PROJECT} >- >-do-build: >- @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build spiff.go >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/${PORTNAME} \ >- ${STAGEDIR}${PREFIX}/bin/ >- > do-install-DOCS-on: > ${MKDIR} ${STAGEDIR}${DOCSDIR} >- ${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/LICENSE \ >- ${STAGEDIR}${DOCSDIR} >- ${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/README.md \ >- ${STAGEDIR}${DOCSDIR} >- cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} && ${COPYTREE_SHARE} examples ${STAGEDIR}${DOCSDIR} >+ ${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR} >+ ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} >+ cd ${WRKSRC} && ${COPYTREE_SHARE} examples ${STAGEDIR}${DOCSDIR} > > .include <bsd.port.mk> >Index: www/caddy/Makefile >=================================================================== >--- www/caddy/Makefile (revision 512745) >+++ www/caddy/Makefile (working copy) >@@ -20,6 +20,7 @@ > GH_ACCOUNT= mholt > > GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} >+GO_TARGET= ./caddy > > SUB_FILES= pkg-message > PLIST_FILES= bin/caddy etc/rc.d/caddy >@@ -29,12 +30,7 @@ > TELEMETRY_DESC= Enable telemetry support > TELEMETRY_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-disable-telemetry > >-do-build: >- @cd ${GO_WRKSRC}/${PORTNAME} && ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build >- >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKSRC}/${PORTNAME}/${PORTNAME} \ >- ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} >+post-install: > ${INSTALL_SCRIPT} ${GO_WRKSRC}/dist/init/freebsd/${PORTNAME} \ > ${STAGEDIR}/${PREFIX}/etc/rc.d/${PORTNAME} > >Index: www/fabio/Makefile >=================================================================== >--- www/fabio/Makefile (revision 512745) >+++ www/fabio/Makefile (working copy) >@@ -14,20 +14,14 @@ > USES= go > USE_GITHUB= yes > GH_ACCOUNT= fabiolb >-GH_PROJECT= fabio > GH_SUBDIR= src/github.com/fabiolb/fabio > >+GO_BUILDFLAGS= -ldflags "-X main.GitDescribe=v${PORTVERSION}" >+GO_TARGET= :${PREFIX}/sbin/fabio >+ > USE_RC_SUBR= fabio > >-do-build: >- @cd ${WRKSRC}/src/github.com/fabiolb/fabio; \ >- ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \ >- -ldflags "-X main.GitDescribe=v${PORTVERSION}" -o bin/fabio >+post-install: >+ ${INSTALL_DATA} ${GO_WRKSRC}/fabio.properties ${STAGEDIR}${PREFIX}/etc/fabio.properties.sample > >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/fabiolb/fabio/bin/fabio \ >- ${STAGEDIR}${PREFIX}/sbin/fabio >- ${INSTALL_DATA} ${WRKSRC}/src/github.com/fabiolb/fabio/fabio.properties \ >- ${STAGEDIR}${PREFIX}/etc/fabio.properties.sample >- > .include <bsd.port.mk> >Index: www/gitea/Makefile >=================================================================== >--- www/gitea/Makefile (revision 512745) >+++ www/gitea/Makefile (working copy) >@@ -21,6 +21,7 @@ > USE_RC_SUBR= gitea > > GO_BUILDFLAGS= -tags "${GO_TAGS}" -ldflags '-X "main.Version=${PORTVERSION}"' >+GO_TARGET= :${PREFIX}/sbin/${PORTNAME} > > SUB_FILES+= app.ini.sample > SUB_LIST+= GITUSER=${USERS} >@@ -48,8 +49,7 @@ > > SUB_LIST+= DAEMONARGS="${DAEMONARGS}" > >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin >+post-install: > @${MKDIR} ${STAGEDIR}${ETCDIR}/conf > ${INSTALL_DATA} ${WRKDIR}/app.ini.sample ${STAGEDIR}${ETCDIR}/conf/app.ini.sample > ${INSTALL_DATA} ${GO_WRKSRC}/custom/conf/app.ini.sample ${STAGEDIR}${ETCDIR}/conf/app.ini.defaults >Index: www/gitlab-pages/Makefile >=================================================================== >--- www/gitlab-pages/Makefile (revision 512745) >+++ www/gitlab-pages/Makefile (working copy) >@@ -17,6 +17,9 @@ > # Find the here: https://gitlab.com/gitlab-org/gitlab-pages/tags > GL_COMMIT= 520398c7154a50f7768ee52da71afd52efff85b1 > >+GO_BUILDFLAGS= -ldflags="-X main.VERSION=${PORTVERSION} -X main.REVISION=${GITHASH}" >+GO_PKGNAME= gitlab.com/gitlab-org/gitlab-pages >+ > PLIST_FILES= bin/gitlab-pages > > USE_RC_SUBR= gitlab_pages >@@ -24,17 +27,4 @@ > USERS= gitlab-pages > GROUPS= gitlab-pages > >-post-patch: >- @${MV} ${WRKSRC}/vendor ${WRKSRC}/src >- @${MKDIR} ${WRKSRC}/src/gitlab.com/gitlab-org >- @${LN} -s ${WRKSRC} ${WRKSRC}/src/gitlab.com/gitlab-org/gitlab-pages >- >-do-build: >- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ >- go build -o gitlab-pages \ >- --ldflags="-X main.VERSION=${PORTVERSION} -X main.REVISION=${GITHASH}" >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/gitlab-pages ${STAGEDIR}${PREFIX}/bin/gitlab-pages >- > .include <bsd.port.mk> >Index: www/go-www/Makefile >=================================================================== >--- www/go-www/Makefile (revision 512745) >+++ www/go-www/Makefile (working copy) >@@ -16,21 +16,11 @@ > > USE_GITHUB= yes > GH_ACCOUNT= nbari >-GH_TUPLE= golang:crypto:505ab14:crypto/src/golang.org/x/crypto >+GH_TUPLE= golang:crypto:505ab14:crypto/vendor/golang.org/x/crypto > GH_SUBDIR= src/github.com/nbari/${PORTNAME} > >+GO_BUILDFLAGS= -ldflags "-s -w" >+ > PLIST_FILES= bin/www > >-post-patch: >- @${MKDIR} ${WRKSRC}/src/golang.org >- @${LN} -sf ${LOCALBASE}/share/go/src/golang.org/x ${WRKSRC}/src/golang.org/x >- >-do-build: >- @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ >- ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ >- "-s -w" -o www; >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/www ${STAGEDIR}${PREFIX}/bin/www >- > .include <bsd.port.mk> >Index: www/grafana4/Makefile >=================================================================== >--- www/grafana4/Makefile (revision 512745) >+++ www/grafana4/Makefile (working copy) >@@ -18,12 +18,16 @@ > > USE_RC_SUBR= grafana > >-USES= compiler go >+USES= go > > USE_GITHUB= yes > GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} > TAG= fdb5b1f > >+GO_BUILDFLAGS= -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" >+GO_TARGET= ./pkg/cmd/grafana-server \ >+ ./pkg/cmd/grafana-cli >+ > GRAFANA_USER?= grafana > GRAFANA_GROUP?= grafana > >@@ -49,21 +53,12 @@ > > PLIST_SUB+= GRAFANAHOMEDIR=${GRAFANAHOMEDIR} > >-post-extract: >- @${RM} -r ${WRKSRC}/src/github.com/grafana/grafana/public >+post-patch: >+ @${RM} -r ${WRKSRC}/public > @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/grafana-${PORTVERSION}.linux-x64${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS} grafana-${PORTVERSION}/public) > >-do-build: >- @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-server ./pkg/cmd/grafana-server >- @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-cli ./pkg/cmd/grafana-cli >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-server \ >- ${STAGEDIR}${PREFIX}/bin/grafana-server >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-cli \ >- ${STAGEDIR}${PREFIX}/bin/grafana-cli >- cd ${WRKSRC}/src/github.com/grafana/grafana && \ >- ${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/grafana >+post-install: >+ cd ${WRKSRC} && ${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/grafana > ${MKDIR} ${STAGEDIR}${GRAFANAPIDDIR} > ${MKDIR} ${STAGEDIR}${GRAFANALOGDIR} > ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR} >@@ -73,14 +68,7 @@ > ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/conf > ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data > ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data/log >- ${INSTALL_DATA} ${WRKSRC}/src/github.com/grafana/grafana/conf/defaults.ini \ >- ${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini >+ ${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini > ${INSTALL_DATA} ${WRKDIR}/grafana.conf ${STAGEDIR}${PREFIX}/etc/grafana.conf.sample > >-.include <bsd.port.pre.mk> >- >-.if ${COMPILER_TYPE} == clang >-BUILD_ENV= CC=clang >-.endif >- >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >Index: www/grafana5/Makefile >=================================================================== >--- www/grafana5/Makefile (revision 512745) >+++ www/grafana5/Makefile (working copy) >@@ -17,7 +17,7 @@ > > ONLY_FOR_ARCHS= amd64 i386 > >-USES= compiler go >+USES= go > USE_RC_SUBR= grafana > > USE_GITHUB= yes >@@ -24,6 +24,10 @@ > GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} > TAG= 69c5191 > >+GO_BUILDFLAGS= -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" >+GO_TARGET= ./pkg/cmd/grafana-server \ >+ ./pkg/cmd/grafana-cli >+ > GRAFANA_USER?= grafana > GRAFANA_GROUP?= grafana > >@@ -49,21 +53,12 @@ > > PLIST_SUB+= GRAFANAHOMEDIR=${GRAFANAHOMEDIR} > >-post-extract: >- @${RM} -r ${WRKSRC}/src/github.com/grafana/grafana/public >+post-patch: >+ @${RM} -r ${WRKSRC}/public > @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/grafana-${PORTVERSION}.linux-amd64${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS} grafana-${PORTVERSION}/public) > >-do-build: >- @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-server ./pkg/cmd/grafana-server >- @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-cli ./pkg/cmd/grafana-cli >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-server \ >- ${STAGEDIR}${PREFIX}/bin/grafana-server >- ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-cli \ >- ${STAGEDIR}${PREFIX}/bin/grafana-cli >- cd ${WRKSRC}/src/github.com/grafana/grafana && \ >- ${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/grafana >+post-install: >+ cd ${WRKSRC} && ${COPYTREE_SHARE} public ${STAGEDIR}${PREFIX}/share/grafana > ${MKDIR} ${STAGEDIR}${GRAFANAPIDDIR} > ${MKDIR} ${STAGEDIR}${GRAFANALOGDIR} > ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR} >@@ -73,14 +68,7 @@ > ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/conf > ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data > ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data/log >- ${INSTALL_DATA} ${WRKSRC}/src/github.com/grafana/grafana/conf/defaults.ini \ >- ${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini >+ ${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini > ${INSTALL_DATA} ${WRKDIR}/grafana.conf ${STAGEDIR}${PREFIX}/etc/grafana.conf.sample > >-.include <bsd.port.pre.mk> >- >-.if ${COMPILER_TYPE} == clang >-BUILD_ENV= CC=clang >-.endif >- >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >Index: www/kurly/Makefile >=================================================================== >--- www/kurly/Makefile (revision 512745) >+++ www/kurly/Makefile (working copy) >@@ -9,25 +9,21 @@ > COMMENT= Alternative implementation of curl written in Golang > > LICENSE= APACHE20 >-LICENSE_FILE= ${WRKSRC_kurly}/LICENSE >+LICENSE_FILE= ${WRKSRC}/LICENSE > > USES= go > >-USE_GITLAB= nodefault >-GL_TUPLE= davidjpeacock:kurly:369c1998dfbfca7043f8c995c8ef8714496530ea:kurly/src/gitlab.com/davidjpeacock/kurly >+USE_GITLAB= yes >+GL_ACCOUNT= davidjpeacock >+GL_COMMIT= 369c1998dfbfca7043f8c995c8ef8714496530ea > > USE_GITHUB= nodefault >-GH_TUPLE= aki237:nscjar:e2df936:nscjar/src/github.com/aki237/nscjar \ >- alsm:ioprogress:063c372:ioprogress/src/github.com/alsm/ioprogress \ >- urfave:cli:8e01ec4:ucli/src/github.com/urfave/cli >+GH_TUPLE= aki237:nscjar:e2df936:nscjar/vendor/github.com/aki237/nscjar \ >+ alsm:ioprogress:063c372:ioprogress/vendor/github.com/alsm/ioprogress \ >+ urfave:cli:8e01ec4:ucli/vendor/github.com/urfave/cli > >+GO_PKGNAME= gitlab.com/davidjpeacock/kurly >+ > PLIST_FILES= bin/kurly > >-do-build: >- cd ${WRKSRC_kurly} && \ >- ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build -o ${PORTNAME} >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC_kurly}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} >- > .include <bsd.port.mk> >Index: www/miniflux/Makefile >=================================================================== >--- www/miniflux/Makefile (revision 512745) >+++ www/miniflux/Makefile (working copy) >@@ -25,7 +25,7 @@ > GH_ACCOUNT= miniflux > > GO_PKGNAME= miniflux.app >-GO_TARGET= ${GO_PKGNAME} >+GO_TARGET= :${PORTNAME} > GO_BUILDFLAGS= -ldflags="-X miniflux.app/version.Version=${DISTVERSION} \ > -X miniflux.app/version.BuildDate=$$(date +'%Y-%m-%dT%H:%M:%SZ')" > >@@ -33,11 +33,8 @@ > PGSQL_SERVER_DESC= Install the PostgreSQL Server Component > PGSQL_SERVER_VARS= WANT_PGSQL=server,contrib > >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/miniflux.app ${STAGEDIR}${PREFIX}/bin/miniflux >+post-install: > ${INSTALL_MAN} ${WRKSRC}/miniflux.1 ${STAGEDIR}${PREFIX}/man/man1/ >- >-post-install: > ${INSTALL_DATA} ${FILESDIR}/miniflux.env.sample \ > ${STAGEDIR}${PREFIX}/etc > >Index: www/minio-client/Makefile >=================================================================== >--- www/minio-client/Makefile (revision 512745) >+++ www/minio-client/Makefile (working copy) >@@ -78,8 +78,6 @@ > -X github.com/minio/mc/cmd.ReleaseTag=${GH_TAGNAME} \ > -X github.com/minio/mc/cmd.CommitID=${COMMIT_ID} \ > -X github.com/minio/mc/cmd.GOPATH=${WRKSRC} -s -w' >+GO_TARGET= :${MC} > >-do-install: >- ${INSTALL_PROGRAM} ${WRKDIR}/bin/minio-client ${STAGEDIR}${PREFIX}/bin/${MC} >- > .include <bsd.port.mk> >Index: www/s/Makefile >=================================================================== >--- www/s/Makefile (revision 512745) >+++ www/s/Makefile (working copy) >@@ -15,21 +15,15 @@ > > USE_GITHUB= yes > GH_ACCOUNT= zquestz >-GH_TUPLE= zquestz:go-ucl:ec59c7a:goucl/src/github.com/zquestz/go-ucl \ >- mitchellh:go-homedir:v1.0.0:gohomedir/src/github.com/mitchellh/go-homedir \ >- NYTimes:gziphandler:v1.0.1:gziphandler/src/github.com/NYTimes/gziphandler \ >- spf13:cobra:v0.0.3:cobra/src/github.com/spf13/cobra \ >- spf13:pflag:v1.0.3:pflag/src/github.com/spf13/pflag \ >- golang:text:4d1c5fb:sys/src/golang.org/x/text >-GH_SUBDIR:= src/github.com/${GH_ACCOUNT}/${PORTNAME} >+GH_TUPLE= zquestz:go-ucl:ec59c7a:goucl/vendor/github.com/zquestz/go-ucl \ >+ mitchellh:go-homedir:v1.0.0:gohomedir/vendor/github.com/mitchellh/go-homedir \ >+ NYTimes:gziphandler:v1.0.1:gziphandler/vendor/github.com/NYTimes/gziphandler \ >+ spf13:cobra:v0.0.3:cobra/vendor/github.com/spf13/cobra \ >+ spf13:pflag:v1.0.3:pflag/vendor/github.com/spf13/pflag \ >+ golang:text:4d1c5fb:sys/vendor/golang.org/x/text > >+GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} >+ > PLIST_FILES= bin/${PORTNAME} > >-do-build: >- @cd ${WRKSRC}/${GH_SUBDIR} && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: www/uchiwa/Makefile >=================================================================== >--- www/uchiwa/Makefile (revision 512745) >+++ www/uchiwa/Makefile (working copy) >@@ -19,12 +19,12 @@ > USE_RC_SUBR= ${PORTNAME} > USE_GITHUB= yes > GH_ACCOUNT= sensu >-GH_TUPLE= dgrijalva:jwt-go:61124b62ad244d655f87d944aefaa2ae5a0d2f16:jwtgo/src/github.com/dgrijalva/jwt-go >-GH_TUPLE+= gorilla:context:215affda49addc4c8ef7e2534915df2c8c35c6cd:context/src/github.com/gorilla/context >-GH_TUPLE+= mitchellh:mapstructure:f7d28d5aeab42b9b95d2e6d6b956f73a290077fc:mapstructure/src/github.com/mitchellh/mapstructure >-GH_TUPLE+= palourde:mergo:d931ffd2c07cb4caf7194e0f6af9ac6771c26d54:mergo/src/github.com/palourde/mergo >-GH_TUPLE+= stretchr:objx:cbeaeb16a013161a98496fad62933b1d21786672:objx/src/github.com/stretchr/objx >-GH_TUPLE+= stretchr:testify:e4ec8152c15fc46bd5056ce65997a07c7d415325:testify/src/github.com/stretchr/testify >+GH_TUPLE= dgrijalva:jwt-go:61124b62ad244d655f87d944aefaa2ae5a0d2f16:jwtgo/vendor/github.com/dgrijalva/jwt-go >+GH_TUPLE+= gorilla:context:215affda49addc4c8ef7e2534915df2c8c35c6cd:context/vendor/github.com/gorilla/context >+GH_TUPLE+= mitchellh:mapstructure:f7d28d5aeab42b9b95d2e6d6b956f73a290077fc:mapstructure/vendor/github.com/mitchellh/mapstructure >+GH_TUPLE+= palourde:mergo:d931ffd2c07cb4caf7194e0f6af9ac6771c26d54:mergo/vendor/github.com/palourde/mergo >+GH_TUPLE+= stretchr:objx:cbeaeb16a013161a98496fad62933b1d21786672:objx/vendor/github.com/stretchr/objx >+GH_TUPLE+= stretchr:testify:e4ec8152c15fc46bd5056ce65997a07c7d415325:testify/vendor/github.com/stretchr/testify > GH_TUPLE+= sensu:uchiwa-web:${PORTVERSION}:uchiwaweb/public/bower_components/uchiwa-web > GH_TUPLE+= angular:bower-angular-cookies:b89821e37d3011ad0bca9a4847a8fcc59f90fabb:bowerangularcookies/public/bower_components/angular-cookies > GH_TUPLE+= urish:angular-moment:0.9.2:urishangularmoment/public/bower_components/angular-moment >@@ -41,31 +41,18 @@ > GH_TUPLE+= moment:moment:2.8.4:momentmoment/public/bower_components/moment > GH_TUPLE+= jquery:jquery-dist:3.0.0:jqueryjquery/public/bower_components/jquery > GH_TUPLE+= jashkenas:underscore:1f4bf626f23a99f7a676f5076dc1b1475554c8f7:jashkenasunderscore/public/bower_components/underscore >-GH_TUPLE+= kless:osutil:3ac994847c4376a4b905fc0a19f450c5a4bec647:klessosutil/src/github.com/kless/osutil >+GH_TUPLE+= kless:osutil:3ac994847c4376a4b905fc0a19f450c5a4bec647:klessosutil/vendor/github.com/kless/osutil > >+GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} >+ > USERS= uchiwa > GROUPS= uchiwa > >-post-extract: >- @${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} >-.for src in .travis.yml Gruntfile.js bower.json package.json uchiwa \ >- Dockerfile LICENSE config.json.example public uchiwa.go .bowerrc \ >- Godeps README.md fixtures >- @${MV} ${WRKSRC}/${src} \ >- ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} >-.endfor >- >-do-build: >- @cd ${WRKSRC}/src/github.com/sensu && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install ./... >- >-do-install: >+post-install: > ${MKDIR} ${STAGEDIR}${UCHIWA_LOGDIR} \ > ${STAGEDIR}${UCHIWA_CONFDIR} \ > ${STAGEDIR}${UCHIWA_SHAREDIR} >+ ${INSTALL_DATA} ${WRKSRC}/config.json.example ${STAGEDIR}${PREFIX}/etc/uchiwa/config.json.sample >+ (cd ${WRKSRC}/public && ${COPYTREE_SHARE} . ${STAGEDIR}${UCHIWA_SHAREDIR}) > >-post-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/uchiwa ${STAGEDIR}${PREFIX}/bin/uchiwa >- ${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/config.json.example ${STAGEDIR}${PREFIX}/etc/uchiwa/config.json.sample >- (cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/public && ${COPYTREE_SHARE} . ${STAGEDIR}${UCHIWA_SHAREDIR}) >- > .include <bsd.port.mk> >Index: www/varnish_exporter/Makefile >=================================================================== >--- www/varnish_exporter/Makefile (revision 512745) >+++ www/varnish_exporter/Makefile (working copy) >@@ -14,15 +14,16 @@ > > GH_ACCOUNT= jonnenauha > GH_PROJECT= prometheus_varnish_exporter >-GH_TUPLE= prometheus:client_golang:v0.8.0:client_golang \ >- beorn7:perks:3a771d9:perks \ >- golang:protobuf:70b3af3:protobuf \ >- matttproud:golang_protobuf_extensions:c12348c:golang_protobuf_extensions \ >- prometheus:client_model:5c3871d:client_model \ >- prometheus:common:7600349:common \ >- prometheus:procfs:ae68e2d:procfs >+GH_TUPLE= prometheus:client_golang:v0.8.0:client_golang/vendor/github.com/prometheus/client_golang \ >+ beorn7:perks:3a771d9:perks/vendor/github.com/beorn7/perks \ >+ golang:protobuf:70b3af3:protobuf/vendor/github.com/golang/protobuf \ >+ matttproud:golang_protobuf_extensions:c12348c:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ >+ prometheus:client_model:5c3871d:client_model/vendor/github.com/prometheus/client_model \ >+ prometheus:common:7600349:common/vendor/github.com/prometheus/common \ >+ prometheus:procfs:ae68e2d:procfs/vendor/github.com/prometheus/procfs > > GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} >+GO_TARGET= :varnish_exporter > > USE_RC_SUBR= ${PORTNAME} > >@@ -31,20 +32,4 @@ > > PLIST_FILES= bin/${PORTNAME} > >-pre-build: >- ${MKDIR} ${GO_WRKDIR_SRC}/github.com/beorn7 >- ${MKDIR} ${GO_WRKDIR_SRC}/github.com/golang >- ${MKDIR} ${GO_WRKDIR_SRC}/github.com/matttproud >- ${MKDIR} ${GO_WRKDIR_SRC}/github.com/prometheus >- ${MV} ${WRKSRC_client_golang} ${GO_WRKDIR_SRC}/github.com/prometheus/client_golang >- ${MV} ${WRKSRC_client_model} ${GO_WRKDIR_SRC}/github.com/prometheus/client_model >- ${MV} ${WRKSRC_common} ${GO_WRKDIR_SRC}/github.com/prometheus/common >- ${MV} ${WRKSRC_perks} ${GO_WRKDIR_SRC}/github.com/beorn7/perks >- ${MV} ${WRKSRC_procfs} ${GO_WRKDIR_SRC}/github.com/prometheus/procfs >- ${MV} ${WRKSRC_protobuf} ${GO_WRKDIR_SRC}/github.com/golang/protobuf >- ${MV} ${WRKSRC_golang_protobuf_extensions} ${GO_WRKDIR_SRC}/github.com/matttproud/golang_protobuf_extensions >- >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/prometheus_varnish_exporter ${STAGEDIR}${PREFIX}/bin/varnish_exporter >- > .include <bsd.port.mk> >Index: www/webhook/Makefile >=================================================================== >--- www/webhook/Makefile (revision 512745) >+++ www/webhook/Makefile (working copy) >@@ -16,6 +16,8 @@ > GH_ACCOUNT= adnanh > USE_RC_SUBR= webhook > >+GO_TARGET= :${PREFIX}/sbin/webhook >+ > PLIST_FILES= "@sample etc/webhook.yaml.sample" sbin/webhook > > .include <bsd.port.options.mk> >@@ -28,8 +30,7 @@ > > SUB_LIST+= DAEMONARGS="${DAEMONARGS}" > >-do-install: >- ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin >+post-install: > ${INSTALL_DATA} ${FILESDIR}/webhook.yaml ${STAGEDIR}${PREFIX}/etc/webhook.yaml.sample > > .include <bsd.port.mk> >Index: www/ytdl/Makefile >=================================================================== >--- www/ytdl/Makefile (revision 512745) >+++ www/ytdl/Makefile (working copy) >@@ -16,22 +16,17 @@ > USE_GITHUB= yes > GH_ACCOUNT= rylio > GH_SUBDIR= src/github.com/rylio/ytdl >-GH_TUPLE= PuerkitoBio:goquery:v1.3.0:goquery/src/github.com/PuerkitoBio/goquery \ >- andybalholm:cascadia:349dd02:cascadia/src/github.com/andybalholm/cascadia \ >- cheggaaa:pb:5d91ad4:pb/src/github.com/cheggaaa/pb \ >- codegangsta:cli:v1.15.0:cli/src/github.com/codegangsta/cli \ >- mattn:go-colorable:v0.0.9:colorable/src/github.com/mattn/go-colorable \ >- mattn:go-isatty:v0.0.3:isatty/src/github.com/mattn/go-isatty \ >- Sirupsen:logrus:v0.8.7:logrus/src/github.com/Sirupsen/logrus \ >- golang:net:0ed95ab:net/src/golang.org/x/net >+GH_TUPLE= PuerkitoBio:goquery:v1.3.0:goquery/vendor/github.com/PuerkitoBio/goquery \ >+ andybalholm:cascadia:349dd02:cascadia/vendor/github.com/andybalholm/cascadia \ >+ cheggaaa:pb:5d91ad4:pb/vendor/github.com/cheggaaa/pb \ >+ codegangsta:cli:v1.15.0:cli/vendor/github.com/codegangsta/cli \ >+ mattn:go-colorable:v0.0.9:colorable/vendor/github.com/mattn/go-colorable \ >+ mattn:go-isatty:v0.0.3:isatty/vendor/github.com/mattn/go-isatty \ >+ Sirupsen:logrus:v0.8.7:logrus/vendor/github.com/Sirupsen/logrus \ >+ golang:net:0ed95ab:net/vendor/golang.org/x/net > >+GO_TARGET= ./cmd/${PORTNAME} >+ > PLIST_FILES= bin/${PORTNAME} > >-do-build: >- @cd ${WRKSRC}/${GH_SUBDIR} && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -p ${MAKE_JOBS_NUMBER} ./cmd/${PORTNAME} >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: x11/aminal/Makefile >=================================================================== >--- x11/aminal/Makefile (revision 512745) >+++ x11/aminal/Makefile (working copy) >@@ -9,19 +9,17 @@ > COMMENT= Golang terminal emulator from scratch > > LICENSE= GPLv3 >-LICENSE_FILE= ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/LICENSE >+LICENSE_FILE= ${WRKSRC}/LICENSE > >-USES= gl go >-USE_GITHUB= nodefault # the main code is in GH_TUPLE >+USES= gl go xorg >+USE_GITHUB= yes > GH_ACCOUNT= liamg >-GH_TUPLE= liamg:aminal:${DISTVERSIONFULL}:main/src/github.com/liamg/aminal \ >- BurntSushi:xgb:27f1227:xgb/src/github.com/BurntSushi/xgb \ >- gen2brain:shm:6c18ff7:shm/src/github.com/gen2brain/shm >-GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} >+GH_TUPLE= BurntSushi:xgb:27f1227:xgb/vendor/github.com/BurntSushi/xgb \ >+ gen2brain:shm:6c18ff7:shm/vendor/github.com/gen2brain/shm > USE_GL= gl > USE_XORG= x11 xcursor xi xinerama xrandr xxf86vm > >-MAKE_ENV= CGO_CFLAGS="-I${LOCALBASE}/include" CGO_LDFLAGS="-L${LOCALBASE}/lib" >+GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} > > PLIST_FILES= bin/${PORTNAME} > >@@ -28,15 +26,8 @@ > PORTSCOUT= limit:^[0-9].* > > post-patch: # https://github.com/liamg/aminal/issues/208 >- @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/platform && \ >+ @cd ${WRKSRC}/platform && \ > ${CP} linuxLaunch.go freebsdLaunch.go && \ > ${REINPLACE_CMD} 's|build linux|build freebsd|' freebsdLaunch.go > >-do-build: >- @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} && \ >- ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install ./... >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin >- > .include <bsd.port.mk> >Index: x11/aminal/files/patch-src_github.com_liamg_aminal_vendor_github.com_riywo_loginshell_loginshell.go >=================================================================== >--- x11/aminal/files/patch-src_github.com_liamg_aminal_vendor_github.com_riywo_loginshell_loginshell.go (revision 512745) >+++ x11/aminal/files/patch-src_github.com_liamg_aminal_vendor_github.com_riywo_loginshell_loginshell.go (nonexistent) >@@ -1,11 +0,0 @@ >---- src/github.com/liamg/aminal/vendor/github.com/riywo/loginshell/loginshell.go.orig 2018-12-15 01:47:38 UTC >-+++ src/github.com/liamg/aminal/vendor/github.com/riywo/loginshell/loginshell.go >-@@ -15,6 +15,8 @@ func Shell() (string, error) { >- switch runtime.GOOS { >- case "linux": >- return LinuxShell() >-+ case "freebsd": >-+ return LinuxShell() >- case "darwin": >- return DarwinShell() >- } > >Property changes on: x11/aminal/files/patch-src_github.com_liamg_aminal_vendor_github.com_riywo_loginshell_loginshell.go >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: x11/aminal/files/patch-vendor_github.com_riywo_loginshell_loginshell.go >=================================================================== >--- x11/aminal/files/patch-vendor_github.com_riywo_loginshell_loginshell.go (revision 512745) >+++ x11/aminal/files/patch-vendor_github.com_riywo_loginshell_loginshell.go (working copy) >@@ -1,5 +1,5 @@ >---- src/github.com/liamg/aminal/vendor/github.com/riywo/loginshell/loginshell.go.orig 2018-12-15 01:47:38 UTC >-+++ src/github.com/liamg/aminal/vendor/github.com/riywo/loginshell/loginshell.go >+--- vendor/github.com/riywo/loginshell/loginshell.go.orig 2018-12-15 01:47:38 UTC >++++ vendor/github.com/riywo/loginshell/loginshell.go > @@ -15,6 +15,8 @@ func Shell() (string, error) { > switch runtime.GOOS { > case "linux":
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 240771
:
207741
|
207745
|
207776
|
207932