- Update to 1.6.0. This requires a C++11 compiler and library.

PR:		198060
Submitted by:	Matthew Connelly <freebsd-bugs@maff.im>
Approved by:	maintainer timeout

4 files changed, 28 insertions, 12 deletions

diff --git a/irc/znc/Makefile b/irc/znc/Makefile
index 5827bdaa140..0cfd921e9ff 100644
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	znc
-PORTVERSION=	1.4
+PORTVERSION=	1.6.0
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://znc.in/releases/
 
@@ -13,11 +13,11 @@ LICENSE=	APACHE20
 
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	znc
-USES=		pkgconfig iconv gmake
+USES=		pkgconfig iconv gmake compiler:c++11-lib
 
 NO_OPTIONS_SORT=	yes
 
-OPTIONS_DEFINE=	DEBUG IPV6 OPENSSL CYRUS PERL PYTHON TCL DOCS
+OPTIONS_DEFINE=	DEBUG IPV6 OPENSSL CYRUS PERL PYTHON TCL CHARSET DOCS
 OPTIONS_DEFAULT=	OPENSSL PERL
 OPTIONS_SUB=	yes
 
@@ -25,6 +25,7 @@ CYRUS_DESC=	Cyrus SASL module
 DEBUG_DESC=	Debugging support
 PERL_DESC=	Perl scripting module
 PYTHON_DESC=	Python scripting module
+CHARSET_DESC=	Character encoding support via ICU
 TCL_DESC=	Tcl scripting module
 
 CYRUS_CONFIGURE_ON=	--enable-cyrus
@@ -32,18 +33,25 @@ CYRUS_LDFLAGS=	-L${LOCALBASE}/lib
 CYRUS_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 DEBUG_CONFIGURE_ON=	--enable-debug
 IPV6_CONFIGURE_OFF=	--disable-ipv6
-PERL_BUILD_DEPENDS=	swig>=2.0.11:${PORTSDIR}/devel/swig20
+PERL_BUILD_DEPENDS=	swig30>=3.0.0:${PORTSDIR}/devel/swig30
 PERL_CONFIGURE_ENABLE=	perl
 PERL_CONFIGURE_ON=	--enable-swig
 PERL_USES=	perl5
-PYTHON_BUILD_DEPENDS=	swig>=2.0.11:${PORTSDIR}/devel/swig20
+PYTHON_BUILD_DEPENDS=	swig30>=3.0.0:${PORTSDIR}/devel/swig30
 PYTHON_CONFIGURE_ON=	--enable-python=python-${PYTHON_VER} --enable-swig
 PYTHON_USES=	perl5 python:3
 OPENSSL_CONFIGURE_OFF=	--disable-openssl
+CHARSET_CONFIGURE_OFF=	--disable-charset
+CHARSET_LIB_DEPENDS=	libicuuc.so.53:${PORTSDIR}/devel/icu \
+			libicudata.so.53:${PORTSDIR}/devel/icu
 TCL_CONFIGURE_ENABLE=	tcl
 
 .include <bsd.port.options.mk>
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900014
+CXXFLAGS+=	-D__LONG_LONG_SUPPORTED
+.endif
+
 .if ${PORT_OPTIONS:MOPENSSL}
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
diff --git a/irc/znc/distinfo b/irc/znc/distinfo
index 6bd8f5cc987..a98d86e3c84 100644
--- a/irc/znc/distinfo
+++ b/irc/znc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (znc-1.4.tar.gz) = 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52
-SIZE (znc-1.4.tar.gz) = 1239648
+SHA256 (znc-1.6.0.tar.gz) = df622aeae34d26193c738dff6499e56ad669ec654484e19623738d84cc80aba7
+SIZE (znc-1.6.0.tar.gz) = 1367962
diff --git a/irc/znc/files/patch-modules-modperl-Makefile_inc b/irc/znc/files/patch-modules-modperl-Makefile_inc
index 377fdc46d89..3c4c6045de5 100644
--- a/irc/znc/files/patch-modules-modperl-Makefile_inc
+++ b/irc/znc/files/patch-modules-modperl-Makefile_inc
@@ -1,11 +1,11 @@
---- modules/modperl/Makefile.inc.orig	2012-11-28 11:59:30.509460980 +0000
-+++ modules/modperl/Makefile.inc	2012-11-28 12:00:07.142992057 +0000
+--- modules/modperl/Makefile.inc.orig	2015-02-12 20:51:46.000000000 +0000
++++ modules/modperl/Makefile.inc	2015-02-26 02:56:35.000000000 +0000
 @@ -6,7 +6,7 @@
  PERL_LD    := $(shell $(PERL) -MExtUtils::Embed -e ldopts)
  # Perl API is ugly, casting string literals to char* and redeclaring functions :(
  PERL_CXX   += -Wno-write-strings -Wno-redundant-decls -Wno-missing-declarations
 -PERL_CXX   += -Wno-type-limits -Wno-sign-compare -Wno-strict-overflow -Wno-unused-value
 +PERL_CXX   += -Wno-sign-compare -Wno-strict-overflow -Wno-unused-value
+ # perl 5.20 will fix this warning: https://rt.perl.org/Public/Bug/Display.html?id=120670
+ PERL_CXX   += -Wno-reserved-user-defined-literal -Wno-literal-suffix
  # This is for SWIG
- PERL_CXX   += -DSWIG_TYPE_TABLE=znc
- modperlCXXFLAGS := $(PERL_CXX) -Wno-unused-function
diff --git a/irc/znc/pkg-plist b/irc/znc/pkg-plist
index f564467214e..c96c68ed968 100644
--- a/irc/znc/pkg-plist
+++ b/irc/znc/pkg-plist
@@ -14,7 +14,9 @@ include/znc/Listener.h
 include/znc/MD5.h
 include/znc/Modules.h
 include/znc/Nick.h
+include/znc/Query.h
 include/znc/SHA256.h
+include/znc/SSLVerifyHost.h
 include/znc/Server.h
 include/znc/Socket.h
 include/znc/Template.h
@@ -30,6 +32,7 @@ include/znc/version.h
 include/znc/znc.h
 include/znc/zncconfig.h
 lib/znc/adminlog.so
+lib/znc/alias.so
 lib/znc/autoattach.so
 lib/znc/autocycle.so
 lib/znc/autoop.so
@@ -41,7 +44,7 @@ lib/znc/blockuser.so
 lib/znc/bouncedcc.so
 lib/znc/buffextras.so
 lib/znc/chansaver.so
-lib/znc/charset.so
+%%CHARSET%%lib/znc/charset.so
 lib/znc/clearbufferonmsg.so
 lib/znc/clientnotify.so
 lib/znc/controlpanel.so
@@ -106,23 +109,28 @@ man/man1/znc.1.gz
 %%DATADIR%%/modules/notes/files/trash.gif
 %%DATADIR%%/modules/notes/tmpl/index.tmpl
 %%DATADIR%%/modules/perform/tmpl/index.tmpl
+%%DATADIR%%/modules/q/tmpl/index.tmpl
 %%DATADIR%%/modules/send_raw/files/select.js
 %%DATADIR%%/modules/send_raw/tmpl/index.tmpl
 %%DATADIR%%/modules/stickychan/tmpl/index.tmpl
 %%DATADIR%%/modules/stickychan/tmpl/stickychan_WebadminChan.tmpl
+%%DATADIR%%/modules/webadmin/files/webadmin.css
 %%DATADIR%%/modules/webadmin/files/webadmin.js
 %%DATADIR%%/modules/webadmin/tmpl/add_edit_chan.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/add_edit_network.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/add_edit_user.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/del_network.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/del_user.tmpl
+%%DATADIR%%/modules/webadmin/tmpl/encoding_settings.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/index.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/listusers.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/settings.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/traffic.tmpl
+%%DATADIR%%/webskins/_default_/pub/External.png
 %%DATADIR%%/webskins/_default_/pub/_default_.css
 %%DATADIR%%/webskins/_default_/pub/favicon.ico
 %%DATADIR%%/webskins/_default_/pub/global.css
+%%DATADIR%%/webskins/_default_/pub/jquery-1.11.2.min.js
 %%DATADIR%%/webskins/_default_/pub/robots.txt
 %%DATADIR%%/webskins/_default_/tmpl/Banner.tmpl
 %%DATADIR%%/webskins/_default_/tmpl/BaseHeader.tmpl