diff options
38 files changed, 379 insertions, 555 deletions
diff --git a/audio/pms-devel/Makefile b/audio/pms-devel/Makefile index 625c3ec0d591..062a0210ad43 100644 --- a/audio/pms-devel/Makefile +++ b/audio/pms-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= pms-devel PORTVERSION= 0.0.20181123 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= riggs@FreeBSD.org @@ -11,59 +12,53 @@ COMMENT= Rewrite of pms, an ncurses-based client for the Music Player Daemon LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go +USES= go:modules USE_GITHUB= yes GH_ACCOUNT= ambientsound GH_PROJECT= pms GH_TAGNAME= 000c5c0 -GH_TUPLE=\ - ambientsound:gompd:b065d40:gompd/src/github.com/ambientsound/gompd \ - blevesearch:bleve:1a319cd:bleve/src/github.com/blevesearch/bleve \ - blevesearch:go-porterstemmer:23a2c8e:porterstemmer/src/github.com/blevesearch/go-porterstemmer \ - blevesearch:segment:762005e:segment/src/github.com/blevesearch/segment \ - boltdb:bolt:2f1ce7a:boltdb/src/github.com/boltdb/bolt \ - couchbase:vellum:35d9e73:vellum/src/github.com/couchbase/vellum \ - edsrzf:mmap-go:0bce6a6:mmap/src/github.com/edsrzf/mmap-go \ - gdamore:encoding:b23993c:encoding/src/github.com/gdamore/encoding \ - gdamore:tcell:de7e78e:tcell/src/github.com/gdamore/tcell \ - glycerine:go-unsnap-stream:9f0cb55:unsnapstream/src/github.com/glycerine/go-unsnap-stream \ - golang:protobuf:aa810b6:protobuf/src/github.com/golang/protobuf \ - golang:snappy:2e65f85:snappy/src/github.com/golang/snappy \ - jessevdk:go-flags:c6ca198:flags/src/github.com/jessevdk/go-flags \ - lucasb-eyer:go-colorful:c784231:colorful/src/github.com/lucasb-eyer/go-colorful \ - mattn:go-runewidth:ce7b0b5:runewidth/src/github.com/mattn/go-runewidth \ - philhofer:fwd:bb6d471:fwd/src/github.com/philhofer/fwd \ - RoaringBitmap:roaring:3d677d3:roaring/src/github.com/RoaringBitmap/roaring \ - Smerity:govarint:7265e41:govarint/src/github.com/Smerity/govarint \ - steveyen:gtreap:0abe01e:gtreap/src/github.com/steveyen/gtreap \ - stretchr:testify:f35b8ab:testify/src/github.com/stretchr/testify \ - tinylib:msgp:b2b6a67:msgp/src/github.com/tinylib/msgp \ - golang:net:161cd47:net/src/golang.org/x/net \ - golang:text:f21a4df:text/src/golang.org/x/text +GH_TUPLE= \ + RoaringBitmap:roaring:v0.4.16:roaringbitmap_roaring/vendor/github.com/RoaringBitmap/roaring \ + Smerity:govarint:7265e41f48f1:smerity_govarint/vendor/github.com/Smerity/govarint \ + ambientsound:gompd:b065d40b8238:ambientsound_gompd/vendor/github.com/ambientsound/gompd \ + blevesearch:bleve:v0.7.0:blevesearch_bleve/vendor/github.com/blevesearch/bleve \ + blevesearch:go-porterstemmer:v1.0.1:blevesearch_go_porterstemmer/vendor/github.com/blevesearch/go-porterstemmer \ + blevesearch:segment:762005e7a34f:blevesearch_segment/vendor/github.com/blevesearch/segment \ + boltdb:bolt:v1.3.1:boltdb_bolt/vendor/github.com/boltdb/bolt \ + couchbase:vellum:35d9e7346a69:couchbase_vellum/vendor/github.com/couchbase/vellum \ + davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ + edsrzf:mmap-go:0bce6a688712:edsrzf_mmap_go/vendor/github.com/edsrzf/mmap-go \ + gdamore:encoding:b23993cbb635:gdamore_encoding/vendor/github.com/gdamore/encoding \ + gdamore:tcell:v1.1.0:gdamore_tcell/vendor/github.com/gdamore/tcell \ + glycerine:go-unsnap-stream:9f0cb55181dd:glycerine_go_unsnap_stream/vendor/github.com/glycerine/go-unsnap-stream \ + golang:net:161cd47e91fd:golang_net/vendor/golang.org/x/net \ + golang:protobuf:v1.2.0:golang_protobuf/vendor/github.com/golang/protobuf \ + golang:snappy:2e65f85255db:golang_snappy/vendor/github.com/golang/snappy \ + golang:sys:bbd175535a8b:golang_sys/vendor/golang.org/x/sys \ + golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \ + jessevdk:go-flags:v1.4.0:jessevdk_go_flags/vendor/github.com/jessevdk/go-flags \ + lucasb-eyer:go-colorful:c7842319cf3a:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \ + mattn:go-runewidth:v0.0.3:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ + mschoch:smat:90eadee771ae:mschoch_smat/vendor/github.com/mschoch/smat \ + philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \ + pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ + steveyen:gtreap:0abe01ef9be2:steveyen_gtreap/vendor/github.com/steveyen/gtreap \ + stretchr:testify:v1.2.2:stretchr_testify/vendor/github.com/stretchr/testify \ + tinylib:msgp:v1.0.2:tinylib_msgp/vendor/github.com/tinylib/msgp \ + willf:bitset:v1.1.9:willf_bitset/vendor/github.com/willf/bitset -PLIST_FILES= bin/${GO_PKGNAME} +GO_BUILDFLAGS= -ldflags "-X main.buildVersion=${DISTVERSION}" +GO_TARGET= :pms-devel + +PLIST_FILES= bin/${PORTNAME} PORTDOCS= * OPTIONS_DEFINE= DOCS -post-extract: - ${LN} -sf ${WRKSRC} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} - ${RM} ${WRKSRC}/go.mod - -do-build: - @cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-X main.buildVersion=${DISTVERSION}" - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/pms-${GH_TAGNAME} ${STAGEDIR}${PREFIX}/bin/${GO_PKGNAME} - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${GO_PKGNAME} - .include <bsd.port.mk> diff --git a/audio/pms-devel/distinfo b/audio/pms-devel/distinfo index 82aa45f412e6..2ea9cc1074f2 100644 --- a/audio/pms-devel/distinfo +++ b/audio/pms-devel/distinfo @@ -1,49 +1,59 @@ -TIMESTAMP = 1543081675 +TIMESTAMP = 1568205375 SHA256 (ambientsound-pms-0.0.20181123-000c5c0_GH0.tar.gz) = c05041fe19b4d7f64578ce2f6893d1673f5dc00c273c4fac811a4d8e2d35d209 SIZE (ambientsound-pms-0.0.20181123-000c5c0_GH0.tar.gz) = 78943 -SHA256 (ambientsound-gompd-b065d40_GH0.tar.gz) = c776b8997e19b06f414fa8aaaa0088f08669593f6ff43815a9ad8a8988be01fe -SIZE (ambientsound-gompd-b065d40_GH0.tar.gz) = 16634 -SHA256 (blevesearch-bleve-1a319cd_GH0.tar.gz) = c3b7dff30f86b4f944c451e2af8adb942f040f76d101abad0d2e05e52a3cd411 -SIZE (blevesearch-bleve-1a319cd_GH0.tar.gz) = 596436 -SHA256 (blevesearch-go-porterstemmer-23a2c8e_GH0.tar.gz) = 7ad8a35605d31b09c0fd6a2dc283a36cd556dd4e5c2406fa37655c4efdcd5980 -SIZE (blevesearch-go-porterstemmer-23a2c8e_GH0.tar.gz) = 9157 -SHA256 (blevesearch-segment-762005e_GH0.tar.gz) = b0b237347ee6564b901e02ee89b50ab58197b9ce659da7cb9d4f4afc0d9393f4 -SIZE (blevesearch-segment-762005e_GH0.tar.gz) = 478318 -SHA256 (boltdb-bolt-2f1ce7a_GH0.tar.gz) = f3f23f35adefcabc6c11a507a6177b32425751a0a835c6aaceebd13719e2f91e -SIZE (boltdb-bolt-2f1ce7a_GH0.tar.gz) = 83440 -SHA256 (couchbase-vellum-35d9e73_GH0.tar.gz) = 4dd154db46c69b237f94d4b731ab75955f5f6f4752ddf5a7b8e5c27c49d6f1ec -SIZE (couchbase-vellum-35d9e73_GH0.tar.gz) = 296118 -SHA256 (edsrzf-mmap-go-0bce6a6_GH0.tar.gz) = 120d7144798610a8edc8623878cc620013cfc9d07d9a6c915cfc4dba2d325e39 -SIZE (edsrzf-mmap-go-0bce6a6_GH0.tar.gz) = 5492 -SHA256 (gdamore-encoding-b23993c_GH0.tar.gz) = 7fe1ed858143ba259114120a8a736645ee644b22bece7c09240df6113922f01a -SIZE (gdamore-encoding-b23993c_GH0.tar.gz) = 10629 -SHA256 (gdamore-tcell-de7e78e_GH0.tar.gz) = 2cefcbb643fb020082d778c5dc1f66d73f9b393e71d4ccfddc593f3df3a450f7 -SIZE (gdamore-tcell-de7e78e_GH0.tar.gz) = 718969 -SHA256 (glycerine-go-unsnap-stream-9f0cb55_GH0.tar.gz) = 8fbd960f0d5cd310a3617f6b8ffda2d655ab8ff278a6dd9272ded571b97e52c3 -SIZE (glycerine-go-unsnap-stream-9f0cb55_GH0.tar.gz) = 19020 -SHA256 (golang-protobuf-aa810b6_GH0.tar.gz) = e9ce29039e0d470509db8695ebcd5f98b670c52ac1e75932eca0365f4799118a -SIZE (golang-protobuf-aa810b6_GH0.tar.gz) = 332593 -SHA256 (golang-snappy-2e65f85_GH0.tar.gz) = dbbc74e9fbea19d803a6984314286acfb3ba554a693f5bce0c8073e18a180d99 -SIZE (golang-snappy-2e65f85_GH0.tar.gz) = 62575 -SHA256 (jessevdk-go-flags-c6ca198_GH0.tar.gz) = 7985a6a45b8dd2de04a7e295f562a5589801076c265baea39c7ea51410db4489 -SIZE (jessevdk-go-flags-c6ca198_GH0.tar.gz) = 55457 -SHA256 (lucasb-eyer-go-colorful-c784231_GH0.tar.gz) = 88bcc48c95f8d985bf056b20f7840e4dceaea38e4799e781e5aa1af197cc5265 -SIZE (lucasb-eyer-go-colorful-c784231_GH0.tar.gz) = 428455 -SHA256 (mattn-go-runewidth-ce7b0b5_GH0.tar.gz) = e3c7ab1a10c7b35accd18e08e12be4206ee805e44812969a4351199ea5a41b62 -SIZE (mattn-go-runewidth-ce7b0b5_GH0.tar.gz) = 22963 -SHA256 (philhofer-fwd-bb6d471_GH0.tar.gz) = 5203cf8ee43495fdd547af4f9591020779a20cb36d9f2ff83f726aebbccfd8b1 -SIZE (philhofer-fwd-bb6d471_GH0.tar.gz) = 9215 -SHA256 (RoaringBitmap-roaring-3d677d3_GH0.tar.gz) = 241c1cc8fd0970a2048e3e184b1ee2f1719bd3c6508422cc00622b2dca4530c0 -SIZE (RoaringBitmap-roaring-3d677d3_GH0.tar.gz) = 132031 -SHA256 (Smerity-govarint-7265e41_GH0.tar.gz) = e58f7c92dcd70435424ebeb74a44693278c77a274cabd08aab59c7878149ff70 -SIZE (Smerity-govarint-7265e41_GH0.tar.gz) = 5484 -SHA256 (steveyen-gtreap-0abe01e_GH0.tar.gz) = a1c09793db44b55748992ac3a782c9375263da5d5e85c6199bbd745ca4ebd26c -SIZE (steveyen-gtreap-0abe01e_GH0.tar.gz) = 4791 -SHA256 (stretchr-testify-f35b8ab_GH0.tar.gz) = b7a2961d37598e0fc1bf7e9041f717ec770c7ec935d4a79a2d40f5e6722fe6a2 -SIZE (stretchr-testify-f35b8ab_GH0.tar.gz) = 101718 -SHA256 (tinylib-msgp-b2b6a67_GH0.tar.gz) = 9ecece4dcff77dedb6b61a1a9920e9ee74d30c893bcb7e74d0006456032ae28d -SIZE (tinylib-msgp-b2b6a67_GH0.tar.gz) = 68341 -SHA256 (golang-net-161cd47_GH0.tar.gz) = 03a66d67eb211331fb5c3941a4f7fef17483901aed7f6e2ce8e6026a6d77a569 -SIZE (golang-net-161cd47_GH0.tar.gz) = 965339 -SHA256 (golang-text-f21a4df_GH0.tar.gz) = 1964956fab6356e201ace777f0e221334a9023777373768a853efc300df2219c -SIZE (golang-text-f21a4df_GH0.tar.gz) = 6102640 +SHA256 (RoaringBitmap-roaring-v0.4.16_GH0.tar.gz) = 6018c018098229217404878d89d313c92127218926cb5463c2ba0eb5de02a09d +SIZE (RoaringBitmap-roaring-v0.4.16_GH0.tar.gz) = 132016 +SHA256 (Smerity-govarint-7265e41f48f1_GH0.tar.gz) = 7c78365ebe8f5e40b2d0265c4950e66dd8252e4141fbfbd4f2b0a3f3e4dcefbe +SIZE (Smerity-govarint-7265e41f48f1_GH0.tar.gz) = 5489 +SHA256 (ambientsound-gompd-b065d40b8238_GH0.tar.gz) = bcba01976dae3f5df4867be83c27b536987eccad12a519f86ba7759b95d0774a +SIZE (ambientsound-gompd-b065d40b8238_GH0.tar.gz) = 16637 +SHA256 (blevesearch-bleve-v0.7.0_GH0.tar.gz) = d4cfd870d43bfb034a520ff91d55afae13b452e0a7282e5674041e5d1ae78b0c +SIZE (blevesearch-bleve-v0.7.0_GH0.tar.gz) = 596424 +SHA256 (blevesearch-go-porterstemmer-v1.0.1_GH0.tar.gz) = 8eb8d619b3abe4f7cba6cefc9d68f9fc6202862d427bf768bf5d6c6293f50a59 +SIZE (blevesearch-go-porterstemmer-v1.0.1_GH0.tar.gz) = 8388 +SHA256 (blevesearch-segment-762005e7a34f_GH0.tar.gz) = e5a27704af6c64e384c1b7ad9a06690f19b5a9d6838a97357a3e17a3ffcd2099 +SIZE (blevesearch-segment-762005e7a34f_GH0.tar.gz) = 478335 +SHA256 (boltdb-bolt-v1.3.1_GH0.tar.gz) = b5ae498b780f535a5d308c188dee1329b3536275d29ad6758876084c0b8586a8 +SIZE (boltdb-bolt-v1.3.1_GH0.tar.gz) = 83437 +SHA256 (couchbase-vellum-35d9e7346a69_GH0.tar.gz) = 6eac41a30239778456f97a9cf6a495d6d02fee5528858913d25b8840e1b073df +SIZE (couchbase-vellum-35d9e7346a69_GH0.tar.gz) = 296148 +SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e +SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 +SHA256 (edsrzf-mmap-go-0bce6a688712_GH0.tar.gz) = 53c8ab3c8b206a8dd7569238b6bd60dd8be360ca986cb484492aad904ec8eaa6 +SIZE (edsrzf-mmap-go-0bce6a688712_GH0.tar.gz) = 5495 +SHA256 (gdamore-encoding-b23993cbb635_GH0.tar.gz) = 3c607d322b9f585567dd4b6b19a0179a8277de94d44f98b4b42629632c035923 +SIZE (gdamore-encoding-b23993cbb635_GH0.tar.gz) = 10635 +SHA256 (gdamore-tcell-v1.1.0_GH0.tar.gz) = f2c8d63f24ef1f89abd80f6ee86cdb2af562225405644c0e75d0522b04858443 +SIZE (gdamore-tcell-v1.1.0_GH0.tar.gz) = 719426 +SHA256 (glycerine-go-unsnap-stream-9f0cb55181dd_GH0.tar.gz) = fb08e82d914e511955bb4fb8bdfd90da407b723a280280b63ee434532eb46b73 +SIZE (glycerine-go-unsnap-stream-9f0cb55181dd_GH0.tar.gz) = 19019 +SHA256 (golang-net-161cd47e91fd_GH0.tar.gz) = 5cc3ff8b7f5d47898b0073dcdd877ecff070d79a2b721b8ed1f5d87ade1f64b9 +SIZE (golang-net-161cd47e91fd_GH0.tar.gz) = 965145 +SHA256 (golang-protobuf-v1.2.0_GH0.tar.gz) = 157a148ae4e132eb169ec794b6cb43f1002780eeacaea8b0694811d1948fb1ec +SIZE (golang-protobuf-v1.2.0_GH0.tar.gz) = 332565 +SHA256 (golang-snappy-2e65f85255db_GH0.tar.gz) = 3f0d9ed5fbea9b10b33c38321afe9a9e8a45dc3f0dbed9c3c1b640e69da05f76 +SIZE (golang-snappy-2e65f85255db_GH0.tar.gz) = 62580 +SHA256 (golang-sys-bbd175535a8b_GH0.tar.gz) = 2837b7e2bb23dd6492021b6e01b2dfb94aa0d7b0981c2b86027fdbad1df07f56 +SIZE (golang-sys-bbd175535a8b_GH0.tar.gz) = 1468385 +SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb +SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619 +SHA256 (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 3be7e8fb4b63887e8aeb55878244c04b7dcbe5ac77211c73ee35e38ca681e611 +SIZE (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 55452 +SHA256 (lucasb-eyer-go-colorful-c7842319cf3a_GH0.tar.gz) = 109a19fadc0db6958e1daafb13522c866a2c000aeb72db63ec4484d01fa49111 +SIZE (lucasb-eyer-go-colorful-c7842319cf3a_GH0.tar.gz) = 428466 +SHA256 (mattn-go-runewidth-v0.0.3_GH0.tar.gz) = 398ec709b006664e527040770056156cb225233d8b44b5a59ba2f5f5f3fa885e +SIZE (mattn-go-runewidth-v0.0.3_GH0.tar.gz) = 22961 +SHA256 (mschoch-smat-90eadee771ae_GH0.tar.gz) = bd60b71d4289aab986daecc86499122f42fe9c1a3b1af9460d81a27479807b70 +SIZE (mschoch-smat-90eadee771ae_GH0.tar.gz) = 11994 +SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff +SIZE (philhofer-fwd-v1.0.0_GH0.tar.gz) = 9221 +SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda +SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 +SHA256 (steveyen-gtreap-0abe01ef9be2_GH0.tar.gz) = 250018fe4ceb3333ecd1a0e9f93f3699e6203b80c243f092cc1759a6f692528a +SIZE (steveyen-gtreap-0abe01ef9be2_GH0.tar.gz) = 4793 +SHA256 (stretchr-testify-v1.2.2_GH0.tar.gz) = 0728bb470254e8b39deae3e6c1c92a98e737239ae0be484188fb9083250adf5f +SIZE (stretchr-testify-v1.2.2_GH0.tar.gz) = 101698 +SHA256 (tinylib-msgp-v1.0.2_GH0.tar.gz) = 3769a1d074e1e8a1903d26c0cf36ad249848d3a0b2a78c20b8040cfd6ce3811f +SIZE (tinylib-msgp-v1.0.2_GH0.tar.gz) = 68340 +SHA256 (willf-bitset-v1.1.9_GH0.tar.gz) = 0538859161ccc590da58d0107cf864584f22a8c6b167719502afd541a5fba034 +SIZE (willf-bitset-v1.1.9_GH0.tar.gz) = 16296 diff --git a/benchmarks/vegeta/Makefile b/benchmarks/vegeta/Makefile index b66969e71293..c738cd2fa8d7 100644 --- a/benchmarks/vegeta/Makefile +++ b/benchmarks/vegeta/Makefile @@ -15,33 +15,25 @@ USES= go 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> diff --git a/databases/go-carbon/Makefile b/databases/go-carbon/Makefile index 9fd60cbe49c1..f8d8b73c061b 100644 --- a/databases/go-carbon/Makefile +++ b/databases/go-carbon/Makefile @@ -18,18 +18,16 @@ USE_GITHUB= yes 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 diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile index a1fa77ec2937..10eca5522d49 100644 --- a/databases/influxdb/Makefile +++ b/databases/influxdb/Makefile @@ -22,95 +22,103 @@ USE_GITHUB= yes 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 @@ -151,31 +159,21 @@ SUB_LIST+= INFLUXD_LOGCMD="daemon" 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> diff --git a/databases/mongodb40-tools/Makefile b/databases/mongodb40-tools/Makefile index c40d0c1cae40..1bcbf3dbfaa2 100644 --- a/databases/mongodb40-tools/Makefile +++ b/databases/mongodb40-tools/Makefile @@ -22,7 +22,6 @@ GH_PROJECT= mongo-tools 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 @@ MONGODUMP_DESC= BSON data from the contents of a MongoDB instance 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 diff --git a/deskutils/chart/Makefile b/deskutils/chart/Makefile index 803419ebf403..e8fc3a74854c 100644 --- a/deskutils/chart/Makefile +++ b/deskutils/chart/Makefile @@ -14,27 +14,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE 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 ) - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/chart ${STAGEDIR}${PREFIX}/bin/chart +OPTIONS_DEFINE= DOCS post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/deskutils/noti/Makefile b/deskutils/noti/Makefile index 261637ea26c9..e5600cfca950 100644 --- a/deskutils/noti/Makefile +++ b/deskutils/noti/Makefile @@ -13,17 +13,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= notify-send:devel/libnotify USES= go:modules -USE_GITHUB= yes +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 diff --git a/deskutils/pet/Makefile b/deskutils/pet/Makefile index 1fcaa5be22c7..9b8c56f46973 100644 --- a/deskutils/pet/Makefile +++ b/deskutils/pet/Makefile @@ -37,7 +37,6 @@ GH_TUPLE= \ 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} diff --git a/devel/arduino-builder/Makefile b/devel/arduino-builder/Makefile index c0f4b763f3a0..02c13ebfe1cf 100644 --- a/devel/arduino-builder/Makefile +++ b/devel/arduino-builder/Makefile @@ -15,11 +15,13 @@ USES= go 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,20 +36,20 @@ PLIST_FILES= arduino/hardware/platform.keys.rewrite.txt \ 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}|' \ -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 ) - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - (cd ${WRKSRC}/src/arduino.cc/builder && ${COPYTREE_SHARE} "hardware" ${STAGEDIR}${PREFIX}/arduino ${FIND_EXPR}) +post-install: + (cd ${GO_WRKSRC}/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> diff --git a/devel/arduinoOTA/Makefile b/devel/arduinoOTA/Makefile index a6a7b0018ac8..a5612d73ea45 100644 --- a/devel/arduinoOTA/Makefile +++ b/devel/arduinoOTA/Makefile @@ -15,13 +15,9 @@ USE_GITHUB= yes 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> diff --git a/devel/bazel-buildtools/Makefile b/devel/bazel-buildtools/Makefile index b907843617db..4e6541db402c 100644 --- a/devel/bazel-buildtools/Makefile +++ b/devel/bazel-buildtools/Makefile @@ -18,10 +18,11 @@ GH_TUPLE= \ 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\//} - -EXES= buildifier buildifier2 buildozer unused_deps +PLIST_FILES= ${GO_TARGET:S/^./bin/} .include <bsd.port.mk> diff --git a/devel/etcd/Makefile b/devel/etcd/Makefile index c620b6ce6f31..99cd2bc5d86a 100644 --- a/devel/etcd/Makefile +++ b/devel/etcd/Makefile @@ -31,10 +31,6 @@ PORTDOCS= README.md 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} diff --git a/devel/etcd31/Makefile b/devel/etcd31/Makefile index 8b96a02c65c9..7c449c03008e 100644 --- a/devel/etcd31/Makefile +++ b/devel/etcd31/Makefile @@ -17,8 +17,8 @@ CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd-* coreos-etcd32-* coreos-etcd33 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,18 +29,8 @@ PORTDOCS= README.md 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 - -do-install: - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcd ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcdctl ${STAGEDIR}${PREFIX}/bin/ + ${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${WRKSRC}/cmd/vendor/github.com/coreos/pkg/dlopen/dlopen.go do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/etcd32/Makefile b/devel/etcd32/Makefile index 106b216195d3..9a7c6c9bc81a 100644 --- a/devel/etcd32/Makefile +++ b/devel/etcd32/Makefile @@ -17,8 +17,8 @@ CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd-* coreos-etcd31-* coreos-etcd33 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,18 +29,8 @@ PORTDOCS= README.md 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 - -do-install: - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcd ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcdctl ${STAGEDIR}${PREFIX}/bin/ + ${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${WRKSRC}/cmd/vendor/github.com/coreos/pkg/dlopen/dlopen.go do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/etcd33/Makefile b/devel/etcd33/Makefile index e05ebe4465e7..f3b24ba5c215 100644 --- a/devel/etcd33/Makefile +++ b/devel/etcd33/Makefile @@ -17,8 +17,8 @@ CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd-* coreos-etcd31-* coreos-etcd32 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,18 +29,8 @@ PORTDOCS= README.md 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 - -do-install: - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcd ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcdctl ${STAGEDIR}${PREFIX}/bin/ + ${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${WRKSRC}/cmd/vendor/github.com/coreos/pkg/dlopen/dlopen.go do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/etcd33/files/patch-.._src_github.com_coreos_go-systemd_util_util__cgo.go b/devel/etcd33/files/patch-cmd_vendor_github.com_coreos_go-systemd_util_util__cgo.go index 4d2653ffcad0..877d5625a251 100644 --- a/devel/etcd33/files/patch-.._src_github.com_coreos_go-systemd_util_util__cgo.go +++ b/devel/etcd33/files/patch-cmd_vendor_github.com_coreos_go-systemd_util_util__cgo.go @@ -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: diff --git a/devel/git-codereview/Makefile b/devel/git-codereview/Makefile index 9c6b9fc4239b..4956e558c1e9 100644 --- a/devel/git-codereview/Makefile +++ b/devel/git-codereview/Makefile @@ -14,19 +14,9 @@ GH_ACCOUNT= golang GH_PROJECT= review GH_TAGNAME= 77ae237 -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 +GO_PKGNAME= golang.org/x/review +GO_TARGET= ./git-codereview -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} +PLIST_FILES= bin/git-codereview .include <bsd.port.mk> diff --git a/devel/git-lfs/Makefile b/devel/git-lfs/Makefile index ed6ab4570ef1..5c5fb3bd9a41 100644 --- a/devel/git-lfs/Makefile +++ b/devel/git-lfs/Makefile @@ -14,8 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md USES= go:modules USE_GITHUB= yes -GO_PKGNAME= github.com/${PORTNAME}/${PORTNAME} - OPTIONS_DEFINE= GIT_SUBVERSION MANPAGES OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes diff --git a/devel/git-town/Makefile b/devel/git-town/Makefile index 275e94372b8f..dc82bb243664 100644 --- a/devel/git-town/Makefile +++ b/devel/git-town/Makefile @@ -25,12 +25,6 @@ OPTIONS_DEFINE= DOCS 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} diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile index 573869f31c38..357b5f888bec 100644 --- a/devel/gitlab-runner/Makefile +++ b/devel/gitlab-runner/Makefile @@ -35,11 +35,13 @@ GITBRANCH= 12-1-stable # 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 @@ USE_RC_SUBR= gitlab_runner 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 @@ do-build: -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> diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index 74babf8371a8..73394f5d84bf 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -28,7 +28,7 @@ post-patch: ${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 diff --git a/devel/go-bindata/Makefile b/devel/go-bindata/Makefile index a05a4ea5d465..1b2699065886 100644 --- a/devel/go-bindata/Makefile +++ b/devel/go-bindata/Makefile @@ -15,25 +15,18 @@ GH_ACCOUNT= jteeuwen 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 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/ - ${MKDIR} ${STAGEDIR}${DOCSDIR} - do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} .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> diff --git a/devel/go-git/Makefile b/devel/go-git/Makefile index 85884b079c34..6d45fc9aabea 100644 --- a/devel/go-git/Makefile +++ b/devel/go-git/Makefile @@ -11,11 +11,9 @@ COMMENT= Highly extensible git implementation in pure Go 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 @@ GH_TUPLE= golang:crypto:505ab14:crypto/vendor/golang.org/x/crypto \ 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 -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 ) +GO_TARGET= ./cli/go-git -do-install: - ${INSTALL_PROGRAM} ${GO_WRKSRC}/cli/go-git/go-git ${STAGEDIR}${PREFIX}/bin/ +PLIST_FILES= bin/go-git .include <bsd.port.mk> diff --git a/devel/go-protobuf/Makefile b/devel/go-protobuf/Makefile index 46ed20176425..fc846d74c2d3 100644 --- a/devel/go-protobuf/Makefile +++ b/devel/go-protobuf/Makefile @@ -20,25 +20,14 @@ USE_GITHUB= yes 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 - -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 +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 .include <bsd.port.mk> diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile index e2534754c677..8d314985ac63 100644 --- a/devel/go-tools/Makefile +++ b/devel/go-tools/Makefile @@ -15,25 +15,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE 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 - -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 - -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 +GH_TUPLE= golang:tools:bfb5194:DEFAULT \ + golang:crypto:3cb0727:crypto/vendor/golang.org/x/crypto \ + golang:net:b6d7b13:net/vendor/golang.org/x/net + +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 .include <bsd.port.mk> diff --git a/devel/goprotobuf/Makefile b/devel/goprotobuf/Makefile index 98b19808a0e4..6124913952f8 100644 --- a/devel/goprotobuf/Makefile +++ b/devel/goprotobuf/Makefile @@ -23,12 +23,8 @@ GH_PROJECT= protobuf GH_SUBDIR= src/github.com/golang/protobuf GH_TUPLE= google:go-genproto:02b4e95:genproto/src/google.golang.org/genproto -PLIST_FILES= bin/protoc-gen-go - -do-build: - @cd ${WRKSRC}/protoc-gen-go && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build +GO_TARGET= ./protoc-gen-go -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/protoc-gen-go/protoc-gen-go ${STAGEDIR}${PREFIX}/bin +PLIST_FILES= bin/protoc-gen-go .include <bsd.port.mk> diff --git a/devel/jfrog-cli/Makefile b/devel/jfrog-cli/Makefile index 27a026b0a3b0..8680b93f8742 100644 --- a/devel/jfrog-cli/Makefile +++ b/devel/jfrog-cli/Makefile @@ -55,7 +55,7 @@ GH_TUPLE= jfrog:jfrog-cli-go:${PORTVERSION}:DEFAULT \ 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> diff --git a/devel/jiri/Makefile b/devel/jiri/Makefile index f979410400f7..f6b40bfbc3d7 100644 --- a/devel/jiri/Makefile +++ b/devel/jiri/Makefile @@ -11,7 +11,7 @@ MAINTAINER= swills@FreeBSD.org 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 @@ USES= go 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} - -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 +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}" .include <bsd.port.mk> diff --git a/devel/lazygit/Makefile b/devel/lazygit/Makefile index 7ef04137b12b..fcd61f874f79 100644 --- a/devel/lazygit/Makefile +++ b/devel/lazygit/Makefile @@ -16,12 +16,8 @@ USE_GITHUB= yes GH_ACCOUNT= jesseduffield -PLIST_FILES= bin/${PORTNAME} +GO_PKGNAME= github.com/${GH_ACCOUNT}/${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}/ +PLIST_FILES= bin/${PORTNAME} .include <bsd.port.mk> diff --git a/devel/loccount/Makefile b/devel/loccount/Makefile index fb68ddfebc73..6e95e549d313 100644 --- a/devel/loccount/Makefile +++ b/devel/loccount/Makefile @@ -16,13 +16,8 @@ USE_GITLAB= yes GL_ACCOUNT= esr GL_COMMIT= 249ea3d6927fd327086b609857c04bb95eafdd98 -PLIST_FILES= bin/${PORTNAME} - -do-build: - @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${PORTNAME} +GO_PKGNAME= gitlab.com/${GL_ACCOUNT}/${PORTNAME} -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin +PLIST_FILES= bin/${PORTNAME} .include <bsd.port.mk> diff --git a/devel/mage/Makefile b/devel/mage/Makefile index 30e9f5eeb267..7ff2d12e5fde 100644 --- a/devel/mage/Makefile +++ b/devel/mage/Makefile @@ -26,10 +26,7 @@ post-patch: ${WRKSRC}/magefile.go do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} \ - ${LOCALBASE}/bin/go run bootstrap.go - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO_ENV} \ + ${GO_CMD} run bootstrap.go .include <bsd.port.mk> diff --git a/devel/pprof/Makefile b/devel/pprof/Makefile index 3153b8c17188..61e20a74f0b0 100644 --- a/devel/pprof/Makefile +++ b/devel/pprof/Makefile @@ -15,17 +15,10 @@ USES= go 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> diff --git a/dns/cli53/Makefile b/dns/cli53/Makefile index 1d8193c4b7ec..9d4b6d5da1f7 100644 --- a/dns/cli53/Makefile +++ b/dns/cli53/Makefile @@ -9,18 +9,15 @@ MAINTAINER= meta@FreeBSD.org 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 -PLIST_FILES= bin/cli53 +GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} +GO_TARGET= ./cmd/cli53 -post-extract: - @${MKDIR} ${GO_WRKSRC:H:H:H} - @${LN} -sf ${WRKSRC:H:H} ${GO_WRKSRC:H:H} +PLIST_FILES= bin/cli53 .include <bsd.port.mk> diff --git a/dns/dnscrypt-proxy2/Makefile b/dns/dnscrypt-proxy2/Makefile index 7d1b39eb268a..242816fcfec7 100644 --- a/dns/dnscrypt-proxy2/Makefile +++ b/dns/dnscrypt-proxy2/Makefile @@ -13,12 +13,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE 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 @@ CONFLICTS_INSTALL= dnscrypt-proxy 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} diff --git a/editors/micro/Makefile b/editors/micro/Makefile index 7b4f71e01f44..ed65b4f303d6 100644 --- a/editors/micro/Makefile +++ b/editors/micro/Makefile @@ -17,30 +17,37 @@ USE_GITHUB= yes 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 @@ PORTDOCS= README.md 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} diff --git a/finance/fixc/Makefile b/finance/fixc/Makefile index 496484f8d04c..f2ecd200c411 100644 --- a/finance/fixc/Makefile +++ b/finance/fixc/Makefile @@ -14,11 +14,4 @@ PLIST_FILES= bin/fixc 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> diff --git a/mail/mailhog/Makefile b/mail/mailhog/Makefile index 9cde8d06e65e..e6067fce068f 100644 --- a/mail/mailhog/Makefile +++ b/mail/mailhog/Makefile @@ -15,38 +15,32 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md 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> |