Index: head/net/nats-server/Makefile
===================================================================
--- head/net/nats-server/Makefile	(revision 522294)
+++ head/net/nats-server/Makefile	(revision 522295)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
-PORTNAME=	gnatsd
-PORTVERSION=	1.4.1
+PORTNAME=	nats-server
+PORTVERSION=	2.1.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Messaging system written in Go
 
-BROKEN=		unfetchable
-
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go
+USES=		go:modules
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 USE_GITHUB=	yes
 GH_ACCOUNT=	nats-io
 
-USE_RC_SUBR=	gnatsd.sh
+USE_RC_SUBR=	nats.sh
 
 OPTIONS_DEFINE=	DOCS
 
+post-patch:
+	@${LN} -s ${WRKSRC} ${WRKSRC}/vendor/github.com/nats-io/nats-server
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_DATA} ${FILESDIR}/gnatsd.conf ${STAGEDIR}${PREFIX}/etc/gnatsd.conf.sample
+	${INSTALL_DATA} ${FILESDIR}/nats.conf ${STAGEDIR}${PREFIX}/etc/nats.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/server && ${COPYTREE_SHARE} configs ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/net/nats-server/distinfo
===================================================================
--- head/net/nats-server/distinfo	(revision 522294)
+++ head/net/nats-server/distinfo	(revision 522295)
@@ -1,3 +1,15 @@
-TIMESTAMP = 1549620300
-SHA256 (nats-io-gnatsd-v1.4.1_GH0.tar.gz) = 1d319ec9466d5b4d56b8dc0c059bbb50942a8e988c3dcc155271476c3ae629a1
-SIZE (nats-io-gnatsd-v1.4.1_GH0.tar.gz) = 382999
+TIMESTAMP = 1575223271
+SHA256 (nats-io-nats-server-v2.1.2_GH0.tar.gz) = 2fdbda70191ba02f3e065b0d2d503236865c60e88fa4a7c7e0eae691e7e32b2d
+SIZE (nats-io-nats-server-v2.1.2_GH0.tar.gz) = 907185
+SHA256 (golang-crypto-4def268fd1a4_GH0.tar.gz) = eaf2ba9df95911f41a340478d1fbb540d7bc21939e4688273995dabf58e8c7b0
+SIZE (golang-crypto-4def268fd1a4_GH0.tar.gz) = 1693117
+SHA256 (golang-sys-fc99dfbffb4e_GH0.tar.gz) = 009b8629e6f1369c3b9376d2e5fea53c0ebc8be89895719efb09a8a605d373d5
+SIZE (golang-sys-fc99dfbffb4e_GH0.tar.gz) = 1454968
+SHA256 (nats-io-jwt-v0.3.2_GH0.tar.gz) = e7a3435d52849657f5d1c8126fa0c49720e97ec5ef6e48aa0dd5aee2ccb46355
+SIZE (nats-io-jwt-v0.3.2_GH0.tar.gz) = 34513
+SHA256 (nats-io-nats.go-v1.9.1_GH0.tar.gz) = 86e72ee5683d67379f4980b03c5c208cb8afd152617fb7d8631b850c47ec8a44
+SIZE (nats-io-nats.go-v1.9.1_GH0.tar.gz) = 125116
+SHA256 (nats-io-nkeys-v0.1.3_GH0.tar.gz) = bab14dd153de8ebf58dc051399572c8dc1afaa5b99a9d6cd0744595c03fadaea
+SIZE (nats-io-nkeys-v0.1.3_GH0.tar.gz) = 18536
+SHA256 (nats-io-nuid-v1.0.1_GH0.tar.gz) = a0b4fe5b40781add2a9fdb5d723313be5f5d11c1a79ea1dd2671278826ef078d
+SIZE (nats-io-nuid-v1.0.1_GH0.tar.gz) = 7529
Index: head/net/nats-server/files/gnatsd.conf
===================================================================
--- head/net/nats-server/files/gnatsd.conf	(revision 522294)
+++ head/net/nats-server/files/gnatsd.conf	(nonexistent)
@@ -1,3 +0,0 @@
-listen: localhost:4222	# host/port to listen for client connections
-http: localhost:8222	# HTTP monitoring port
-syslog: true

Property changes on: head/net/nats-server/files/gnatsd.conf
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/nats-server/files/gnatsd.sh.in
===================================================================
--- head/net/nats-server/files/gnatsd.sh.in	(revision 522294)
+++ head/net/nats-server/files/gnatsd.sh.in	(nonexistent)
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# PROVIDE: gnatsd
-# REQUIRE: DAEMON
-#
-# Add the following lines to /etc/rc.conf to run NATS:
-#
-# gnatsd_enable (bool):		Set it to "YES" to enable gnatsd server.
-#				Default is "NO".
-# gnatsd_user:			User name to run as. default "nobody"
-# gnatsd_options:		Options to pass gnatsd server
-#
-
-. /etc/rc.subr
-
-name="gnatsd"
-rcvar=`set_rcvar`
-
-load_rc_config ${name}
-: ${gnatsd_enable="NO"}
-: ${gnatsd_user="nobody"}
-: ${gnatsd_options="-c %%PREFIX%%/etc/gnatsd.conf"}
-
-command=/usr/sbin/daemon
-procname=%%PREFIX%%/bin/gnatsd
-command_args="${procname} ${gnatsd_options}"
-
-run_rc_command "$1"

Property changes on: head/net/nats-server/files/gnatsd.sh.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/nats-server/files/nats.conf
===================================================================
--- head/net/nats-server/files/nats.conf	(nonexistent)
+++ head/net/nats-server/files/nats.conf	(revision 522295)
@@ -0,0 +1,3 @@
+listen: localhost:4222	# host/port to listen for client connections
+http: localhost:8222	# HTTP monitoring port
+syslog: true

Property changes on: head/net/nats-server/files/nats.conf
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/nats-server/files/nats.sh.in
===================================================================
--- head/net/nats-server/files/nats.sh.in	(nonexistent)
+++ head/net/nats-server/files/nats.sh.in	(revision 522295)
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# PROVIDE: nats
+# REQUIRE: DAEMON
+#
+# Add the following lines to /etc/rc.conf to run NATS:
+#
+# nats_enable (bool):		Set it to "YES" to enable nats server.
+#				Default is "NO".
+# nats_user:			User name to run as. default "nobody"
+# nats_options:			Options to pass nats server
+#
+
+. /etc/rc.subr
+
+name="nats"
+rcvar=`set_rcvar`
+
+load_rc_config ${name}
+: ${nats_enable="NO"}
+: ${nats_user="nobody"}
+: ${nats_options="-c %%PREFIX%%/etc/nats.conf"}
+
+command=/usr/sbin/daemon
+procname=%%PREFIX%%/bin/nats-server
+command_args="${procname} ${nats_options}"
+
+run_rc_command "$1"

Property changes on: head/net/nats-server/files/nats.sh.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/nats-server/pkg-plist
===================================================================
--- head/net/nats-server/pkg-plist	(revision 522294)
+++ head/net/nats-server/pkg-plist	(revision 522295)
@@ -1,57 +1,67 @@
-bin/gnatsd
-@sample etc/gnatsd.conf.sample
+bin/nats-server
+@sample etc/nats.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/configs/accounts.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/authorization.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/certs/cert.new.pem
 %%PORTDOCS%%%%DOCSDIR%%/configs/certs/key.new.pem
 %%PORTDOCS%%%%DOCSDIR%%/configs/certs/key.pem
 %%PORTDOCS%%%%DOCSDIR%%/configs/certs/server.pem
 %%PORTDOCS%%%%DOCSDIR%%/configs/cluster.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/gwa.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/gwb.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/gws.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/include_bad_conf_check_a.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/include_bad_conf_check_b.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/include_conf_check_a.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/include_conf_check_b.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/include_conf_check_c.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/listen-1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/listen.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/listen_port.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/listen_port_with_colon.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/malformed_cluster_address.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/malformed_listen_address.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/multiple_errors.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/multiple_users.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/new_style_authorization.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/authorization_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/authorization_2.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/basic.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/file_rotate.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/file_rotate1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/invalid.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/max_connections.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/max_payload.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/multiple_users_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/multiple_users_2.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/reload.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/reload_unsupported.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/single_user_authentication_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/single_user_authentication_2.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_a_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_a_2.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_a_3.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_a_4.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_b_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_b_2.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_c_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/test.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/tls_test.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/tls_verify_test.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/token_authentication_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/token_authentication_2.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/seed.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/seed_tls.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/srv_a.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/srv_a_bcrypt.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/srv_b.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/srv_b_bcrypt.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/test.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls_bad_cipher.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls_bad_curve_prefs.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls_ciphers.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls_curve_prefs.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls_empty_cipher.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls_empty_curve_prefs.conf