irc/oragono: Update 2.6.1 -> 2.7.0; Project renamed into "ergo"

4 files changed, 41 insertions, 26 deletions

diff --git a/irc/Makefile b/irc/Makefile
index 5a5a863fb5fc..94608365bb39 100644
--- a/irc/Makefile
+++ b/irc/Makefile
@@ -24,6 +24,7 @@
     SUBDIR += eggdrop-devel
     SUBDIR += epic4
     SUBDIR += epic5
+    SUBDIR += ergo
     SUBDIR += evangeline
     SUBDIR += ezbounce
     SUBDIR += gruftistats
@@ -60,7 +61,6 @@
     SUBDIR += ngircd
     SUBDIR += ninja
     SUBDIR += onis
-    SUBDIR += oragono
     SUBDIR += p5-AnyEvent-IRC
     SUBDIR += p5-Bot-BasicBot
     SUBDIR += p5-IRC-Bot-Hangman
diff --git a/irc/oragono/Makefile b/irc/ergo/Makefile
index 1481b85805ca..ae84389b88af 100644
--- a/irc/oragono/Makefile
+++ b/irc/ergo/Makefile
@@ -1,6 +1,6 @@
-PORTNAME=	oragono
+PORTNAME=	ergo
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.6.1
+DISTVERSION=	2.7.0
 CATEGORIES=	irc
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -11,23 +11,27 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_GITHUB=	yes
+GH_ACCOUNT=	ergochat
 GH_TUPLE=	\
 		GehirnInc:crypt:bb7000b8a962:gehirninc_crypt/vendor/github.com/GehirnInc/crypt \
 		cloudfoundry:bytefmt:cf55d5288a48:cloudfoundry_bytefmt/vendor/code.cloudfoundry.org/bytefmt \
 		dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
 		docopt:docopt.go:ee0de3bc6815:docopt_docopt_go/vendor/github.com/docopt/docopt-go \
-		go-sql-driver:mysql:v1.5.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
+		ergochat:confusables:4ab98ab61fb1:ergochat_confusables/vendor/github.com/ergochat/confusables \
+		ergochat:go-ident:830550b1d775:ergochat_go_ident/vendor/github.com/ergochat/go-ident \
+		ergochat:websocket:v1.4.2-oragono1:ergochat_websocket/vendor/github.com/gorilla/websocket \
+		go-sql-driver:mysql:v1.6.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
 		go-test:deep:v1.0.6:go_test_deep/vendor/github.com/go-test/deep \
-		go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:crypto:9e8e0b390897:golang_crypto/vendor/golang.org/x/crypto \
-		golang:sys:4d91cf3a1aaf:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.4:golang_text/vendor/golang.org/x/text \
+		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		golang:crypto:4f45737414dc:golang_crypto/vendor/golang.org/x/crypto \
+		golang:sys:f84b799fce68:golang_sys/vendor/golang.org/x/sys \
+		golang:term:7de9c90e9dd1:golang_term/vendor/golang.org/x/term \
+		golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
 		goshuirc:irc-go:bdc2c2cd2fef:goshuirc_irc_go/vendor/github.com/goshuirc/irc-go \
 		onsi:ginkgo:v1.12.0:onsi_ginkgo/vendor/github.com/onsi/ginkgo \
 		onsi:gomega:v1.9.0:onsi_gomega/vendor/github.com/onsi/gomega \
-		oragono:confusables:4ab98ab61fb1:oragono_confusables/vendor/github.com/oragono/confusables \
-		oragono:go-ident:830550b1d775:oragono_go_ident/vendor/github.com/oragono/go-ident \
-		oragono:websocket:v1.4.2-oragono1:oragono_websocket/vendor/github.com/gorilla/websocket \
+		oragono:confusables:4ab98ab61fb1:oragono_confusables \
+		oragono:go-ident:830550b1d775:oragono_go_ident \
 		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		tidwall:btree:v0.4.2:tidwall_btree/vendor/github.com/tidwall/btree \
 		tidwall:buntdb:v1.2.3:tidwall_buntdb/vendor/github.com/tidwall/buntdb \
@@ -44,4 +48,9 @@ GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 
+post-extract:
+	@${MKDIR} ${WRKSRC}/vendor/github.com/oragono
+	@${RLN} ${WRKSRC_ergochat_confusables} ${WRKSRC}/vendor/github.com/oragono/confusables
+	@${RLN} ${WRKSRC_ergochat_go_ident} ${WRKSRC}/vendor/github.com/oragono/go-ident
+
 .include <bsd.port.mk>
diff --git a/irc/oragono/distinfo b/irc/ergo/distinfo
index cc8091cafde1..aa42cf6e8bf8 100644
--- a/irc/oragono/distinfo
+++ b/irc/ergo/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1619458963
-SHA256 (oragono-oragono-v2.6.1_GH0.tar.gz) = d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
-SIZE (oragono-oragono-v2.6.1_GH0.tar.gz) = 3099750
+TIMESTAMP = 1623144253
+SHA256 (ergochat-ergo-v2.7.0_GH0.tar.gz) = c47cb751f960285a7357b8aaf75520f844370d965897385eae4ff0ab849cf0a3
+SIZE (ergochat-ergo-v2.7.0_GH0.tar.gz) = 3115191
 SHA256 (GehirnInc-crypt-bb7000b8a962_GH0.tar.gz) = 1a57049bd9c75e5e3f5679f1786e74181da1d2d69b3ccc1a944820d20d6f2699
 SIZE (GehirnInc-crypt-bb7000b8a962_GH0.tar.gz) = 10251
 SHA256 (cloudfoundry-bytefmt-cf55d5288a48_GH0.tar.gz) = d043b0fd4af393e261d0435a5ba593c42b17931c601c01a0c7d117a25e750deb
@@ -9,18 +9,26 @@ SHA256 (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 197465ef53219f3aeb1a6940b70e16d288
 SIZE (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 36960
 SHA256 (docopt-docopt.go-ee0de3bc6815_GH0.tar.gz) = ba02d30f7be6ff0f486c9ea8cacd84255d643cf58397a6926b805c76ed6da43a
 SIZE (docopt-docopt.go-ee0de3bc6815_GH0.tar.gz) = 30673
-SHA256 (go-sql-driver-mysql-v1.5.0_GH0.tar.gz) = 9d98b46623037447a26a51a203540bf605b6e6220d31f2efc7396242fcb660b5
-SIZE (go-sql-driver-mysql-v1.5.0_GH0.tar.gz) = 90474
+SHA256 (ergochat-confusables-4ab98ab61fb1_GH0.tar.gz) = 40f9def24a153a8989fe8806e0c269870c12f93715728a9d9304b8e67c6fc257
+SIZE (ergochat-confusables-4ab98ab61fb1_GH0.tar.gz) = 37104
+SHA256 (ergochat-go-ident-830550b1d775_GH0.tar.gz) = a427b0c9d0e20f1030d31f4eb1af9e5042b3c82f7307d2bc7c9113a4fbcafd96
+SIZE (ergochat-go-ident-830550b1d775_GH0.tar.gz) = 2110
+SHA256 (ergochat-websocket-v1.4.2-oragono1_GH0.tar.gz) = 13e590604cf355c63e1d82f9ac973228a38b9b68606fc7640c7b01807a379093
+SIZE (ergochat-websocket-v1.4.2-oragono1_GH0.tar.gz) = 54123
+SHA256 (go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 25233aea6418ca7e2e8d83f1bf4f498ef7f79c8c0fee1dc2a8ba623372574b28
+SIZE (go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 94168
 SHA256 (go-test-deep-v1.0.6_GH0.tar.gz) = efb077dfe783aeabc04756a5d04b3f16202073a558d8ebdc020b53d28e428a4c
 SIZE (go-test-deep-v1.0.6_GH0.tar.gz) = 9575
-SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
-SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
-SHA256 (golang-crypto-9e8e0b390897_GH0.tar.gz) = 79bd9db71da6ec75f3df7b7e43aeb90983227058ce9b8d0f08405a141768b3c3
-SIZE (golang-crypto-9e8e0b390897_GH0.tar.gz) = 1732662
-SHA256 (golang-sys-4d91cf3a1aaf_GH0.tar.gz) = 3241a648c2280e3d0b5d68d30143a6c4030a88d4839a1a461bb5b79f89235436
-SIZE (golang-sys-4d91cf3a1aaf_GH0.tar.gz) = 1085217
-SHA256 (golang-text-v0.3.4_GH0.tar.gz) = 39eabfef83413361eafd4353ee9d9821707853235f2e55f3d5b1d38ce698fe89
-SIZE (golang-text-v0.3.4_GH0.tar.gz) = 8354508
+SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
+SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
+SHA256 (golang-crypto-4f45737414dc_GH0.tar.gz) = a741e69ef8961b0e4cac39e52b7a6513bc26ebc3648bdf87d62fc0860eeefb24
+SIZE (golang-crypto-4f45737414dc_GH0.tar.gz) = 1727053
+SHA256 (golang-sys-f84b799fce68_GH0.tar.gz) = 460f5326b83bac46e12e1fd6ec1fed7ddba3756cdc9c9de7ba3f3226c588fa81
+SIZE (golang-sys-f84b799fce68_GH0.tar.gz) = 1087830
+SHA256 (golang-term-7de9c90e9dd1_GH0.tar.gz) = 73603eaab2ab2bfe05061d64ad09f8ed7469de6964a672398f7bf82cffb4b1da
+SIZE (golang-term-7de9c90e9dd1_GH0.tar.gz) = 15239
+SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
+SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
 SHA256 (goshuirc-irc-go-bdc2c2cd2fef_GH0.tar.gz) = 79dee2b494893b2061539992689f42e81b7cfeb17c02b4548de66395615cdcc2
 SIZE (goshuirc-irc-go-bdc2c2cd2fef_GH0.tar.gz) = 55206
 SHA256 (onsi-ginkgo-v1.12.0_GH0.tar.gz) = 7df557fed1107ac2b8fcbd990336f3f73152cb171f1f1e611df07504001135ff
@@ -31,8 +39,6 @@ SHA256 (oragono-confusables-4ab98ab61fb1_GH0.tar.gz) = 40f9def24a153a8989fe8806e
 SIZE (oragono-confusables-4ab98ab61fb1_GH0.tar.gz) = 37104
 SHA256 (oragono-go-ident-830550b1d775_GH0.tar.gz) = a427b0c9d0e20f1030d31f4eb1af9e5042b3c82f7307d2bc7c9113a4fbcafd96
 SIZE (oragono-go-ident-830550b1d775_GH0.tar.gz) = 2110
-SHA256 (oragono-websocket-v1.4.2-oragono1_GH0.tar.gz) = 13e590604cf355c63e1d82f9ac973228a38b9b68606fc7640c7b01807a379093
-SIZE (oragono-websocket-v1.4.2-oragono1_GH0.tar.gz) = 54123
 SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
 SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
 SHA256 (tidwall-btree-v0.4.2_GH0.tar.gz) = f9ca5251ed9105d12c58005fea27ef1ebfb23662aa072ae2b4c914123a28d3fd
diff --git a/irc/oragono/pkg-descr b/irc/ergo/pkg-descr
index 78825531b459..78825531b459 100644
--- a/irc/oragono/pkg-descr
+++ b/irc/ergo/pkg-descr