Index: Mk/bsd.options.desc.mk
===================================================================
--- Mk/bsd.options.desc.mk
+++ Mk/bsd.options.desc.mk
@@ -415,6 +415,7 @@
 RAW_DESC?=		RAW format support
 READLINE_DESC?=		Command line editing via libreadline
 REDIS_DESC?=		Redis key-value store database support
+REGEX_DESC?=		Regular expression support
 RESIN3_DESC?=		Resin 3.x support
 RTMP_DESC?=		RTMP protocol support via librtmp
 RUBY_DESC?=		Ruby bindings or support
Index: irc/scrollz/Makefile
===================================================================
--- irc/scrollz/Makefile
+++ irc/scrollz/Makefile
@@ -1,35 +1,37 @@
 # Created by: Will Andrews <andrews@technologist.com>
 # $FreeBSD$
 
-PORTNAME=	scrollz
-PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTNAME=	ScrollZ
+PORTVERSION=	2.3
+DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	irc ipv6
-MASTER_SITES=	http://www.netraam.net/scrollz/download/ \
-		http://BSDforge.com/projects/source/irc/scrollz/
-DISTNAME=	ScrollZ-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd@bitchx.org
 COMMENT=	Enhanced ircII client that supports scripts, colors, and more
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USES=		gmake iconv ncurses
+USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-ipv6 --enable-regexp --enable-utf8
 
+DATADIR=	${PREFIX}/share/${PORTNAME:tl}
 PLIST_SUB=	SCROLLZ_VER="${PORTVERSION}"
 
+OPTIONS_DEFINE=		IPV6 REGEX UTF8
 OPTIONS_RADIO=		SSL
 OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
-OPTIONS_DEFAULT=	OPENSSL
+OPTIONS_DEFAULT=	OPENSSL REGEX UTF8
 
+IPV_CONFIGURE_ENABLE=	ipv6
 GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
 GNUTLS_USES=		pkgconfig
 GNUTLS_CONFIGURE_ON=	--with-ssl
+REGEX_CONFIGURE_ENABLE=	regexp
 OPENSSL_USE=		OPENSSL=yes
 OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
+UTF8_CONFIGURE_ENABLE=	utf8
 
 .include <bsd.port.pre.mk>
 
Index: irc/scrollz/distinfo
===================================================================
--- irc/scrollz/distinfo
+++ irc/scrollz/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ScrollZ-2.2.3.tar.gz) = 7d95d323168d117b6cb6e73fe1de85b863de7c681b5004545b6eceb76c208d03
-SIZE (ScrollZ-2.2.3.tar.gz) = 948958
+SHA256 (ScrollZ-ScrollZ-ScrollZ-2.3_GH0.tar.gz) = 22535bcc54ad752107ab181775d90d9cf1b37648f500d627f428388a9d3710e6
+SIZE (ScrollZ-ScrollZ-ScrollZ-2.3_GH0.tar.gz) = 981707
Index: irc/scrollz/files/patch-Makefile.in
===================================================================
--- irc/scrollz/files/patch-Makefile.in
+++ irc/scrollz/files/patch-Makefile.in
@@ -19,15 +19,16 @@
  #   installflush	- installs ircflush
  #   installscript 	- installs the scripts
  #   installhelp		- installs the help files
-@@ -50,8 +50,8 @@
+@@ -50,9 +50,9 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
  bindir = @bindir@
 -sharedir = @prefix@/share
--mandir = @prefix@/share/man/man1
 +sharedir = @datadir@
+ datarootdir = @datarootdir@
+-mandir = @mandir@
 +mandir = @mandir@/man1
- 
+
  DESTDIR =
  
 @@ -105,7 +105,7 @@
Index: irc/scrollz/pkg-descr
===================================================================
--- irc/scrollz/pkg-descr
+++ irc/scrollz/pkg-descr
@@ -7,3 +7,5 @@
 It also has many unique features, such as three-line status bars, CDCC
 (which has reget/resend ability), and its environment is highly
 customizable.
+
+WWW: http://www.scrollz.info/
Index: irc/scrollz/pkg-plist
===================================================================
--- irc/scrollz/pkg-plist
+++ irc/scrollz/pkg-plist
@@ -517,6 +517,7 @@
 %%DATADIR%%/help/set/input_aliases
 %%DATADIR%%/help/set/input_encoding
 %%DATADIR%%/help/set/input_prompt
+%%DATADIR%%/help/set/input_prompt_shift_new
 %%DATADIR%%/help/set/input_protection
 %%DATADIR%%/help/set/insert_mode
 %%DATADIR%%/help/set/inverse_video
@@ -567,6 +568,9 @@
 %%DATADIR%%/help/set/show_numerics
 %%DATADIR%%/help/set/show_status_all
 %%DATADIR%%/help/set/show_who_hopcount
+%%DATADIR%%/help/set/ssl_ca_file
+%%DATADIR%%/help/set/ssl_priority_string
+%%DATADIR%%/help/set/ssl_verify_certificate
 %%DATADIR%%/help/set/stamp_format
 %%DATADIR%%/help/set/status_away
 %%DATADIR%%/help/set/status_channel
@@ -602,6 +606,7 @@
 %%DATADIR%%/help/set/trace
 %%DATADIR%%/help/set/truncate_public_channel
 %%DATADIR%%/help/set/underline_video
+%%DATADIR%%/help/set/url_buffer_size
 %%DATADIR%%/help/set/user_information
 %%DATADIR%%/help/set/user_wallops
 %%DATADIR%%/help/set/username