Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Aug 2019 18:32:00 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r509041 - head/net/clash
Message-ID:  <201908151832.x7FIW0hp082924@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Thu Aug 15 18:32:00 2019
New Revision: 509041
URL: https://svnweb.freebsd.org/changeset/ports/509041

Log:
  net/clash: Switch to USES=go:modules, fix build with go1.13
  
  PR:		239863
  Submitted by:	Dmitri Goutnik <dg@syrec.org>

Modified:
  head/net/clash/Makefile
  head/net/clash/distinfo

Modified: head/net/clash/Makefile
==============================================================================
--- head/net/clash/Makefile	Thu Aug 15 18:28:17 2019	(r509040)
+++ head/net/clash/Makefile	Thu Aug 15 18:32:00 2019	(r509041)
@@ -11,40 +11,50 @@ COMMENT=	Rule-based tunnel in Go
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go
+USES=		go:modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Dreamacro
-GH_SUBDIR=	src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
-GH_TUPLE=	aead:chacha20:8b13a72:chacha20/src/github.com/aead/chacha20 \
-		eapache:channels:v1.1.0:channels/src/gopkg.in/eapache/channels.v1 \
-		eapache:queue:v1.1.0:queue/src/github.com/eapache/queue \
-		Dreamacro:go-shadowsocks2:v0.1.2:shadowsocks/src/github.com/Dreamacro/go-shadowsocks2 \
-		go-chi:chi:v3.3.3:chi/src/github.com/go-chi/chi \
-		go-chi:cors:07727c8:cors/src/github.com/go-chi/cors \
-		go-chi:render:v1.0.1:render/src/github.com/go-chi/render \
-		go-yaml:yaml:v2.2.1:yaml/src/gopkg.in/yaml.v2 \
-		gofrs:uuid:v3.1.2:uuid/src/github.com/gofrs/uuid \
-		gorilla:websocket:v1.4.0:websocket/src/github.com/gorilla/websocket \
-		miekg:dns:v1.1.1:dns/src/github.com/miekg/dns \
-		oschwald:geoip2-golang:v1.2.1:geoip2_golang/src/github.com/oschwald/geoip2-golang \
-		oschwald:maxminddb-golang:v1.3.0:maxminddb_golang/src/github.com/oschwald/maxminddb-golang \
-		sirupsen:logrus:v1.2.0:logrus/src/github.com/sirupsen/logrus \
-		stretchr:testify:v1.2.2:testify/src/github.com/stretchr/testify \
-		golang:crypto:505ab14:golang_crypto/src/golang.org/x/crypto \
-		golang:net:adae6a3:golang_net/src/golang.org/x/net \
-		golang:sys:70b957f:golang_sys/src/golang.org/x/sys
+GH_TUPLE=	\
+		Dreamacro:go-shadowsocks2:v0.1.3:dreamacro_go_shadowsocks2/vendor/github.com/Dreamacro/go-shadowsocks2 \
+		aead:chacha20:8b13a72661da:aead_chacha20/vendor/github.com/aead/chacha20 \
+		census-instrumentation:opencensus-go:v0.21.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
+		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		eapache:channels:v1.1.0:eapache_channels/vendor/gopkg.in/eapache/channels.v1 \
+		eapache:queue:v1.1.0:eapache_queue/vendor/github.com/eapache/queue \
+		go-chi:chi:v4.0.2:go_chi_chi/vendor/github.com/go-chi/chi \
+		go-chi:cors:v1.0.0:go_chi_cors/vendor/github.com/go-chi/cors \
+		go-chi:render:v1.0.1:go_chi_render/vendor/github.com/go-chi/render \
+		go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		go4org:go4:94abd6928b1d:go4org_go4/vendor/go4.org \
+		gofrs:uuid:v3.2.0:gofrs_uuid/vendor/github.com/gofrs/uuid \
+		golang:appengine:v1.5.0:golang_appengine/vendor/google.golang.org/appengine \
+		golang:build:54405f243e45:golang_build/vendor/golang.org/x/build \
+		golang:crypto:a29dc8fdc734:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:f4e77d36d62c:golang_net/vendor/golang.org/x/net \
+		golang:oauth2:0f29369cfe45:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:ecd444e8653b:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
+		google:go-genproto:fb225487d101:google_go_genproto/vendor/google.golang.org/genproto \
+		googleapis:gax-go:v2.0.4:googleapis_gax_go/vendor/github.com/googleapis/gax-go/v2 \
+		googleapis:google-api-go-client:v0.6.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
+		googleapis:google-cloud-go:v0.40.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
+		gorilla:websocket:v1.4.0:gorilla_websocket/vendor/github.com/gorilla/websocket \
+		grpc:grpc-go:v1.20.1:grpc_grpc_go/vendor/google.golang.org/grpc \
+		hashicorp:golang-lru:v0.5.1:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
+		konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
+		miekg:dns:v1.1.9:miekg_dns/vendor/github.com/miekg/dns \
+		oschwald:geoip2-golang:v1.2.1:oschwald_geoip2_golang/vendor/github.com/oschwald/geoip2-golang \
+		oschwald:maxminddb-golang:v1.3.0:oschwald_maxminddb_golang/vendor/github.com/oschwald/maxminddb-golang \
+		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
+		sirupsen:logrus:v1.4.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
+		stretchr:objx:v0.1.1:stretchr_objx/vendor/github.com/stretchr/objx
 
 PLIST_FILES=	bin/${PORTNAME}
 
 pre-patch:
 	@cd ${WRKSRC} && ${CP} proxy/redir/tcp_linux.go proxy/redir/tcp_freebsd.go
-
-do-build:
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Modified: head/net/clash/distinfo
==============================================================================
--- head/net/clash/distinfo	Thu Aug 15 18:28:17 2019	(r509040)
+++ head/net/clash/distinfo	Thu Aug 15 18:32:00 2019	(r509041)
@@ -1,39 +1,73 @@
 TIMESTAMP = 1561884219
 SHA256 (Dreamacro-clash-v0.15.0_GH0.tar.gz) = 6ea76c5b00a206c6f78ab8d5e2875172cd319297003d8c8ad4a077c5d2b7c275
 SIZE (Dreamacro-clash-v0.15.0_GH0.tar.gz) = 72386
-SHA256 (aead-chacha20-8b13a72_GH0.tar.gz) = 3ec002c64dc2e6f9c4e3fd06021d16f6834ad011b55fe78375a8689bd8d41344
-SIZE (aead-chacha20-8b13a72_GH0.tar.gz) = 21592
+SHA256 (Dreamacro-go-shadowsocks2-v0.1.3_GH0.tar.gz) = a44010a37f2cb494f7eff5d9d113485383464a633c37b13b830eaf82e12d6a24
+SIZE (Dreamacro-go-shadowsocks2-v0.1.3_GH0.tar.gz) = 19995
+SHA256 (aead-chacha20-8b13a72661da_GH0.tar.gz) = fcb5ec57f75d002ab2c0566af1da4abaf7a1a59b10d1091356d60cc132dabf84
+SIZE (aead-chacha20-8b13a72661da_GH0.tar.gz) = 21591
+SHA256 (census-instrumentation-opencensus-go-v0.21.0_GH0.tar.gz) = e7129aebb9bcb590f01b4fb773b6cf0b10109211cb38cfbaf1f097d191043251
+SIZE (census-instrumentation-opencensus-go-v0.21.0_GH0.tar.gz) = 161522
+SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
+SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (eapache-channels-v1.1.0_GH0.tar.gz) = 443b9361ff7db635b830e84d8eb0830477083efba53fb0c531af04e07cde3a59
 SIZE (eapache-channels-v1.1.0_GH0.tar.gz) = 11705
 SHA256 (eapache-queue-v1.1.0_GH0.tar.gz) = 2be4716ba2bba5f7c125a8fe72ba534f02cf0d7d98d3a372d4ebe54b170f7329
 SIZE (eapache-queue-v1.1.0_GH0.tar.gz) = 3502
-SHA256 (Dreamacro-go-shadowsocks2-v0.1.2_GH0.tar.gz) = 7c6dde7acdd7c4a460da218467a4be6a83ceb4788609d9f306a1cee5dd604dca
-SIZE (Dreamacro-go-shadowsocks2-v0.1.2_GH0.tar.gz) = 19686
-SHA256 (go-chi-chi-v3.3.3_GH0.tar.gz) = 9c0ee069a5a05cd08ce337c3cef43b4a8ba77f9cd119a841b3238bf7820a4c7d
-SIZE (go-chi-chi-v3.3.3_GH0.tar.gz) = 67041
-SHA256 (go-chi-cors-07727c8_GH0.tar.gz) = d36901cda54dd581eee79a2d2af1d370305c407659973e2bfa6187a2ea6c76a6
-SIZE (go-chi-cors-07727c8_GH0.tar.gz) = 6087
+SHA256 (go-chi-chi-v4.0.2_GH0.tar.gz) = 7713a5afd18c440f38e67f853f5ded4f039f08f239dc6a29ed2788be5caaae99
+SIZE (go-chi-chi-v4.0.2_GH0.tar.gz) = 67748
+SHA256 (go-chi-cors-v1.0.0_GH0.tar.gz) = 01b7389c7efac340695f35e317c593520cbad8278dc0b96b8c11054e9d9766da
+SIZE (go-chi-cors-v1.0.0_GH0.tar.gz) = 5187
 SHA256 (go-chi-render-v1.0.1_GH0.tar.gz) = b7ee66207e869baa271f104d084a38d3d89bb3ebaea1d89169ca26303446422d
 SIZE (go-chi-render-v1.0.1_GH0.tar.gz) = 5571
-SHA256 (go-yaml-yaml-v2.2.1_GH0.tar.gz) = 33218aa3bd60a307fe14e66b970473cb411bb6ca3d4f4a5e30c97b44f9b4e84b
-SIZE (go-yaml-yaml-v2.2.1_GH0.tar.gz) = 70217
-SHA256 (gofrs-uuid-v3.1.2_GH0.tar.gz) = 10c26a0a696a3a71e4b8683aeeb23c32d815e5725c2845bb9eeac8e77afdc299
-SIZE (gofrs-uuid-v3.1.2_GH0.tar.gz) = 16858
+SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
+SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
+SHA256 (go4org-go4-94abd6928b1d_GH0.tar.gz) = be7efd7f6831fcc2022d3f2faf8885c0c85a18909cda2cd538f8106966050fba
+SIZE (go4org-go4-94abd6928b1d_GH0.tar.gz) = 140401
+SHA256 (gofrs-uuid-v3.2.0_GH0.tar.gz) = 77d6e7d793bbc8835e082b590d0512ed177d6eba898bffb202d76ef97db57677
+SIZE (gofrs-uuid-v3.2.0_GH0.tar.gz) = 17064
+SHA256 (golang-appengine-v1.5.0_GH0.tar.gz) = 0de9d0a9882054e319bf7608b6ede31a6d3005ccd3efecd85b936d4b82cbd6b1
+SIZE (golang-appengine-v1.5.0_GH0.tar.gz) = 325873
+SHA256 (golang-build-54405f243e45_GH0.tar.gz) = 1eb7d9d2142685462c60afb1679f47c044df0889d3b57d0c6b0242c89794ee8a
+SIZE (golang-build-54405f243e45_GH0.tar.gz) = 805707
+SHA256 (golang-crypto-a29dc8fdc734_GH0.tar.gz) = 1679d2cf8fa91599635b8a9d6658feefdacfe25d25c968e63328323eb5f55923
+SIZE (golang-crypto-a29dc8fdc734_GH0.tar.gz) = 1679918
+SHA256 (golang-net-f4e77d36d62c_GH0.tar.gz) = 0c60b192575e149c8f29a3ed63ac7ba3c8525d0f700f0843cadc345b31fbab80
+SIZE (golang-net-f4e77d36d62c_GH0.tar.gz) = 1100359
+SHA256 (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 468421ddfe905216454006b309ebda6e97aa6089265b995bce4259d6a9efd141
+SIZE (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 45498
+SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf
+SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884
+SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
+SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832
+SHA256 (golang-sys-ecd444e8653b_GH0.tar.gz) = f3d0e1318b6a87c3ffc822c85e519b6c461322df483daad07e259df22e6190fd
+SIZE (golang-sys-ecd444e8653b_GH0.tar.gz) = 1388929
+SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
+SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
+SHA256 (google-go-genproto-fb225487d101_GH0.tar.gz) = 432d262475a762d4e678fbe5494cbd7088858e4dc74d9531ec2b7cdec4687dd7
+SIZE (google-go-genproto-fb225487d101_GH0.tar.gz) = 4077089
+SHA256 (googleapis-gax-go-v2.0.4_GH0.tar.gz) = 9c02744a9260cb20efd22cad068c521029c2b0cc13adaaf768d1f75b53e2a20d
+SIZE (googleapis-gax-go-v2.0.4_GH0.tar.gz) = 14335
+SHA256 (googleapis-google-api-go-client-v0.6.0_GH0.tar.gz) = 756476273238573016c180b9221a24084c05d30aab933591431cc38118a62a80
+SIZE (googleapis-google-api-go-client-v0.6.0_GH0.tar.gz) = 12064968
+SHA256 (googleapis-google-cloud-go-v0.40.0_GH0.tar.gz) = 0d071f37137e1fdf75ca39cf19ce3fd966a1e2e28091e01c4ecd4e6437c2cd72
+SIZE (googleapis-google-cloud-go-v0.40.0_GH0.tar.gz) = 2090665
 SHA256 (gorilla-websocket-v1.4.0_GH0.tar.gz) = 2b5743c72bd0930c5a80e49c0138b5b7d27fa7c085efd0c86805cccfa7220c9d
 SIZE (gorilla-websocket-v1.4.0_GH0.tar.gz) = 50228
-SHA256 (miekg-dns-v1.1.1_GH0.tar.gz) = 38b31613c6e92a56767755284c214cd575a14dc2b551eca4561c45c43c74420a
-SIZE (miekg-dns-v1.1.1_GH0.tar.gz) = 3880802
+SHA256 (grpc-grpc-go-v1.20.1_GH0.tar.gz) = 109f4389cb22f2293a9640a3dd8d3a6d837985615353025c33c7d2923409c8ac
+SIZE (grpc-grpc-go-v1.20.1_GH0.tar.gz) = 707599
+SHA256 (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 3bf57512af746dc0338651ba1c35c65fe907ff214ccb22d679539f7ea791511e
+SIZE (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 12982
+SHA256 (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = e36c5a5de388bf72db3037b47f025b09e574be8d0bc74b3e44c960cba0880e87
+SIZE (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = 1909
+SHA256 (miekg-dns-v1.1.9_GH0.tar.gz) = f0173cbb64155c4a430131af64d5f8bec4d7f05f146ee34bef09e220c8c291f7
+SIZE (miekg-dns-v1.1.9_GH0.tar.gz) = 3885708
 SHA256 (oschwald-geoip2-golang-v1.2.1_GH0.tar.gz) = ede4f007b09cde767b58042ab712415fbbb7031cc9c35612b2917712e7f84c3a
 SIZE (oschwald-geoip2-golang-v1.2.1_GH0.tar.gz) = 6179
 SHA256 (oschwald-maxminddb-golang-v1.3.0_GH0.tar.gz) = 176a45e9ebfe67d0cf3fa647778857dd2bc96bf112e39f31ce158b0437d6db05
 SIZE (oschwald-maxminddb-golang-v1.3.0_GH0.tar.gz) = 17984
-SHA256 (sirupsen-logrus-v1.2.0_GH0.tar.gz) = 679aa05d23ca81b74f1327e7a25267a322dc9fd807a276e73e781f62ee679c6d
-SIZE (sirupsen-logrus-v1.2.0_GH0.tar.gz) = 37794
-SHA256 (stretchr-testify-v1.2.2_GH0.tar.gz) = 0728bb470254e8b39deae3e6c1c92a98e737239ae0be484188fb9083250adf5f
-SIZE (stretchr-testify-v1.2.2_GH0.tar.gz) = 101698
-SHA256 (golang-crypto-505ab14_GH0.tar.gz) = 66208e5bab6d39db520fb59b79a597ddb38cd6160e7ae7fb3e5c212fe9146125
-SIZE (golang-crypto-505ab14_GH0.tar.gz) = 1644620
-SHA256 (golang-net-adae6a3_GH0.tar.gz) = 73198da598de91875030ad99b73544ec20eca47d890db46a30f1c7e0a11034e3
-SIZE (golang-net-adae6a3_GH0.tar.gz) = 965656
-SHA256 (golang-sys-70b957f_GH0.tar.gz) = 441e259f5e287d6a83794e53a601208e895884828dd2df457da8492e8d635d00
-SIZE (golang-sys-70b957f_GH0.tar.gz) = 1119114
+SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
+SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
+SHA256 (sirupsen-logrus-v1.4.1_GH0.tar.gz) = aecd75cfc00edfc8d8bdb013d2cee2a5da686fce31c5cf2ae314ce4642c8e139
+SIZE (sirupsen-logrus-v1.4.1_GH0.tar.gz) = 40811
+SHA256 (stretchr-objx-v0.1.1_GH0.tar.gz) = 3bb0a581651f4c040435a70167ab60b723c5af04a5b0326af3c8b01ccc6fdcf0
+SIZE (stretchr-objx-v0.1.1_GH0.tar.gz) = 75768



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908151832.x7FIW0hp082924>