Index: Makefile =================================================================== --- Makefile (revision 517834) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= termshark -PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTVERSION= 2.0.2 DISTVERSIONPREFIX=v CATEGORIES= net @@ -12,48 +11,65 @@ LICENSE= MIT -RUN_DEPENDS= tshark>0:net/tshark - USES= go:modules +OPTIONS_DEFINE= X11 +OPTIONS_DEFAULT= + +X11_RUN_DEPENDS_OFF= tshark>0:net/tshark +X11_RUN_DEPENDS= tshark>0:net/wireshark + USE_GITHUB= yes GH_ACCOUNT= gcla GH_TUPLE= \ + antchfx:xmlquery:v1.0.0:antchfx_xmlquery/vendor/github.com/antchfx/xmlquery \ + antchfx:xpath:v1.0.0:antchfx_xpath/vendor/github.com/antchfx/xpath \ blang:semver:v3.5.1:blang_semver/vendor/github.com/blang/semver \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ - fsnotify:fsnotify:c282820:fsnotify_fsnotify_gh/vendor/github.com/fsnotify/fsnotify \ - fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/gopkg.in/fsnotify.v1 \ + fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \ + fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify_1/vendor/gopkg.in/fsnotify.v1 \ + fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify_2/vendor/gopkg.in/fsnotify/fsnotify.v1 \ gcla:deep:v1.0.2:gcla_deep/vendor/github.com/gcla/deep \ - gcla:gowid:v1.0.0:gcla_gowid/vendor/github.com/gcla/gowid \ + gcla:gowid:2f8dae05ca56:gcla_gowid/vendor/github.com/gcla/gowid \ + gcla:tail:650e90873359:gcla_tail/vendor/github.com/gcla/tail \ + gcla:tcell:bdf184f0c937:gcla_tcell/vendor/github.com/gdamore/tcell \ + gcla:term:31cba2f9f402:gcla_term/vendor/github.com/pkg/term \ gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \ - gdamore:tcell:dcf1bb30770e:gdamore_tcell/vendor/github.com/gdamore/tcell \ + go-tomb:tomb:dd632973f1e7:go_tomb_tomb/vendor/gopkg.in/tomb.v1 \ go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ - golang:sys:12500544f89f:golang_sys/vendor/golang.org/x/sys \ - golang:text:17ff2d5776d2:golang_text/vendor/golang.org/x/text \ - hashicorp:golang-lru:v0.5.1:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \ + golang:net:3b0461eec859:golang_net/vendor/golang.org/x/net \ + golang:sys:b09406accb47:golang_sys/vendor/golang.org/x/sys \ + golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \ + hashicorp:golang-lru:v0.5.3:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \ hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \ jessevdk:go-flags:v1.4.0:jessevdk_go_flags/vendor/github.com/jessevdk/go-flags \ konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \ lucasb-eyer:go-colorful:v1.0.2:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \ magiconair:properties:v1.8.0:magiconair_properties/vendor/github.com/magiconair/properties \ - mattn:go-isatty:v0.0.7:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ + mattn:go-isatty:v0.0.9:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \ + mreiferson:go-snappystream:v0.2.3:mreiferson_go_snappystream/vendor/github.com/mreiferson/go-snappystream \ pelletier:go-toml:v1.2.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \ pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \ pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ shibukawa:configdir:e180dbdc8da0:shibukawa_configdir/vendor/github.com/shibukawa/configdir \ - sirupsen:logrus:v1.4.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ + sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ spf13:afero:v1.1.2:spf13_afero/vendor/github.com/spf13/afero \ spf13:cast:v1.3.0:spf13_cast/vendor/github.com/spf13/cast \ spf13:jwalterweatherman:v1.0.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \ spf13:pflag:v1.0.3:spf13_pflag/vendor/github.com/spf13/pflag \ spf13:viper:v1.3.2:spf13_viper/vendor/github.com/spf13/viper \ - stretchr:testify:v1.3.0:stretchr_testify/vendor/github.com/stretchr/testify + stretchr:testify:v1.3.0:stretchr_testify/vendor/github.com/stretchr/testify \ + tevino:abool:9b9efcf221b5:tevino_abool/vendor/github.com/tevino/abool GO_TARGET= ./cmd/${PORTNAME} PLIST_FILES= bin/${PORTNAME} +post-patch: + cd ${WRKSRC}/vendor/github.com/fsnotify && ${LN} -s -f ../../gopkg.in/fsnotify.v1 fsnotify + cd ${WRKSRC}/vendor/gopkg.in/fsnotify && ${LN} -s -f ../../gopkg.in/fsnotify.v1 fsnotify.v1 + .include Index: distinfo =================================================================== --- distinfo (revision 517834) +++ distinfo (working copy) @@ -1,30 +1,42 @@ -TIMESTAMP = 1561903860 -SHA256 (gcla-termshark-v1.0.0_GH0.tar.gz) = 669bba0e8dd7df54ade6321a5c7d2ec20563ffd777f7b3b0394a11f88da64698 -SIZE (gcla-termshark-v1.0.0_GH0.tar.gz) = 110518 +TIMESTAMP = 1574024101 +SHA256 (gcla-termshark-v2.0.2_GH0.tar.gz) = 36e45dfeb97f89379bda5be6bfe69c46e5c4211674120977e7b0033f5d90321a +SIZE (gcla-termshark-v2.0.2_GH0.tar.gz) = 209705 +SHA256 (fsnotify-fsnotify-c282820_GH0.tar.gz) = 85d31bf25f43a66fbaf0799ce8993a038694e65312bef96441a83556abaff73a +SIZE (fsnotify-fsnotify-c282820_GH0.tar.gz) = 31139 +SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd +SIZE (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139 +SHA256 (antchfx-xmlquery-v1.0.0_GH0.tar.gz) = 389b92bd0b92b0f2a1c33e827847d0e7aa7de38497b52144984513431d0b3956 +SIZE (antchfx-xmlquery-v1.0.0_GH0.tar.gz) = 10379 +SHA256 (antchfx-xpath-v1.0.0_GH0.tar.gz) = 5772fc35984757fcd455aa024bcdb7402f76ca231234547896c5b8af9f9c929a +SIZE (antchfx-xpath-v1.0.0_GH0.tar.gz) = 23845 SHA256 (blang-semver-v3.5.1_GH0.tar.gz) = 3d9da53f4c2d3169bfa9b25f2f36f301a37556a47259c870881524c643c69c57 SIZE (blang-semver-v3.5.1_GH0.tar.gz) = 14831 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 -SHA256 (fsnotify-fsnotify-c282820_GH0.tar.gz) = 85d31bf25f43a66fbaf0799ce8993a038694e65312bef96441a83556abaff73a -SIZE (fsnotify-fsnotify-c282820_GH0.tar.gz) = 31139 -SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd -SIZE (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139 SHA256 (gcla-deep-v1.0.2_GH0.tar.gz) = bfc22031a2325577648af566eafbec7a97110541be3954fc2a6da06386cd6c8b SIZE (gcla-deep-v1.0.2_GH0.tar.gz) = 7938 -SHA256 (gcla-gowid-v1.0.0_GH0.tar.gz) = 8d7bf6bf43cc0ec28ca7da73ebecd73a4c241084986ec368985d334d6f49a9ce -SIZE (gcla-gowid-v1.0.0_GH0.tar.gz) = 249052 +SHA256 (gcla-gowid-2f8dae05ca56_GH0.tar.gz) = 69127839e0038f377165bd69a7b4ca4e37b4bbeafa3b9b0751fea92ef5bd19a0 +SIZE (gcla-gowid-2f8dae05ca56_GH0.tar.gz) = 256687 +SHA256 (gcla-tail-650e90873359_GH0.tar.gz) = e338c330e71fc7aaf4906c2006eaba37f9d95bde771dd049a41d64731609349a +SIZE (gcla-tail-650e90873359_GH0.tar.gz) = 37651 +SHA256 (gcla-tcell-bdf184f0c937_GH0.tar.gz) = ed37f770baada0bf8769ad7576ad387dbe0cca7fe97e4c9a2613f43e9b16c762 +SIZE (gcla-tcell-bdf184f0c937_GH0.tar.gz) = 149121 +SHA256 (gcla-term-31cba2f9f402_GH0.tar.gz) = f4bb857f8a6b19dae581bcf2e838c45c2ca434db3e03636043915e494b6d5adf +SIZE (gcla-term-31cba2f9f402_GH0.tar.gz) = 9937 SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013 SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886 -SHA256 (gdamore-tcell-dcf1bb30770e_GH0.tar.gz) = a75f9871812a8b33cba83c1a444daff6ea5f7bec3eddb3b34298d0942d8e741f -SIZE (gdamore-tcell-dcf1bb30770e_GH0.tar.gz) = 745855 +SHA256 (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = b67f4ee9324a78176bc3196fe262388696aeb3f31d9879d498200219f9c4c554 +SIZE (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = 3631 SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656 -SHA256 (golang-sys-12500544f89f_GH0.tar.gz) = fb6f8e6c9e46c12a494f674acba9e2c8b141261aa31d86b8edd05985110b9ace -SIZE (golang-sys-12500544f89f_GH0.tar.gz) = 1350586 -SHA256 (golang-text-17ff2d5776d2_GH0.tar.gz) = 006a808c7e99aaf7810f82ec5c79e328644ddc76ab9b274ae4347a55eac3ba97 -SIZE (golang-text-17ff2d5776d2_GH0.tar.gz) = 6580388 -SHA256 (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 3bf57512af746dc0338651ba1c35c65fe907ff214ccb22d679539f7ea791511e -SIZE (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 12982 +SHA256 (golang-net-3b0461eec859_GH0.tar.gz) = a22a8864fdc90a79d953afad48ec799386daee4bfe93ecc50ccca4b77c2a9329 +SIZE (golang-net-3b0461eec859_GH0.tar.gz) = 1099281 +SHA256 (golang-sys-b09406accb47_GH0.tar.gz) = 732651ee709d3443e992f716796c5dac7cbc29a345a8ffe3fb80f505c93503d2 +SIZE (golang-sys-b09406accb47_GH0.tar.gz) = 1496780 +SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22 +SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069 +SHA256 (hashicorp-golang-lru-v0.5.3_GH0.tar.gz) = dd98197fc84fbf636b6811ff3c14ef1ea0fe732fe782b8034cf082b3ff274af3 +SIZE (hashicorp-golang-lru-v0.5.3_GH0.tar.gz) = 13348 SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2 SIZE (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658 SHA256 (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 3be7e8fb4b63887e8aeb55878244c04b7dcbe5ac77211c73ee35e38ca681e611 @@ -35,12 +47,14 @@ SIZE (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 430545 SHA256 (magiconair-properties-v1.8.0_GH0.tar.gz) = f6c732fe6031e2cf72c6eb6d6ce50cde8f72d254c3a26f42e373c598870616ed SIZE (magiconair-properties-v1.8.0_GH0.tar.gz) = 29504 -SHA256 (mattn-go-isatty-v0.0.7_GH0.tar.gz) = 80b6b3e4fee3b15864f23d622129c17ba222786f8c93bb01f8805f3cb91dfefe -SIZE (mattn-go-isatty-v0.0.7_GH0.tar.gz) = 3559 +SHA256 (mattn-go-isatty-v0.0.9_GH0.tar.gz) = 71d57a3fb3f990a5a5d1e190ae5112a8aca2fcdda9eb42770bd524076e8f371f +SIZE (mattn-go-isatty-v0.0.9_GH0.tar.gz) = 3904 SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827 SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b SIZE (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 20980 +SHA256 (mreiferson-go-snappystream-v0.2.3_GH0.tar.gz) = 29c0a5bb09ef313680a7cc1ff5be0654426ec1842c829ffdeba767dbc6c80dd5 +SIZE (mreiferson-go-snappystream-v0.2.3_GH0.tar.gz) = 30789 SHA256 (pelletier-go-toml-v1.2.0_GH0.tar.gz) = 1a5a620f680033f17e34148bee8f26d96d8c27ff1d7f56f0fe1c7253595b5244 SIZE (pelletier-go-toml-v1.2.0_GH0.tar.gz) = 57496 SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356 @@ -49,8 +63,8 @@ SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 SHA256 (shibukawa-configdir-e180dbdc8da0_GH0.tar.gz) = a6d5096b118f026d928a895f7bdce0465ee73c433b26abd64c32f77efe9679d6 SIZE (shibukawa-configdir-e180dbdc8da0_GH0.tar.gz) = 3778 -SHA256 (sirupsen-logrus-v1.4.1_GH0.tar.gz) = aecd75cfc00edfc8d8bdb013d2cee2a5da686fce31c5cf2ae314ce4642c8e139 -SIZE (sirupsen-logrus-v1.4.1_GH0.tar.gz) = 40811 +SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9 +SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373 SHA256 (spf13-afero-v1.1.2_GH0.tar.gz) = 66554a6b09b0009340ae77c119d5a14e2460bb3aea56e75e138c87e621f3803b SIZE (spf13-afero-v1.1.2_GH0.tar.gz) = 45309 SHA256 (spf13-cast-v1.3.0_GH0.tar.gz) = e685282ea33f89e9354d148ad1886f532bcebe86b0b60a167988f7c6d081085f @@ -63,3 +77,5 @@ SIZE (spf13-viper-v1.3.2_GH0.tar.gz) = 36932 SHA256 (stretchr-testify-v1.3.0_GH0.tar.gz) = 0cd9c199a72b8d80621624b37c0ed5ac724352d458506a31dfa86710551e7fc5 SIZE (stretchr-testify-v1.3.0_GH0.tar.gz) = 102859 +SHA256 (tevino-abool-9b9efcf221b5_GH0.tar.gz) = 0b0af114e46b86113251fe3dfa3e64b350561520fd3dc15658d7bc3f80ef13cb +SIZE (tevino-abool-9b9efcf221b5_GH0.tar.gz) = 2847