irc/znc: Update to 1.7.0

Remove --with-openssl=/path option from ./configure.
SSL is still supported and is still configurable.

modpython: Require ZNC to be built with encodings support

Changes:	https://wiki.znc.in/ChangeLog/1.7.0

PR:		228078
Reported by:	bdrewery

4 files changed, 65 insertions, 44 deletions

diff --git a/irc/znc/Makefile b/irc/znc/Makefile
index 7420e6936e56..adba26ad146b 100644
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	znc
-PORTVERSION=	1.6.6
-PORTREVISION=	2
+PORTVERSION=	1.7.0
 CATEGORIES=	irc ipv6
 MASTER_SITES=	https://znc.in/releases/ \
 		https://znc.in/releases/archive/
@@ -46,7 +45,6 @@ CYRUS_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 DEBUG_CONFIGURE_ON=	--enable-debug
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 OPENSSL_CONFIGURE_OFF=	--disable-openssl
-OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 OPENSSL_USES=	ssl
 PERL_BUILD_DEPENDS=	swig30>=3.0.0:devel/swig30
 PERL_CONFIGURE_ENABLE=	perl
@@ -55,6 +53,7 @@ PERL_USE=	perl5=build,run
 PERL_USES=	perl5
 PYTHON_BUILD_DEPENDS=	swig30>=3.0.0:devel/swig30
 PYTHON_CONFIGURE_ON=	--enable-python=python-${PYTHON_VER} --enable-swig
+PYTHON_IMPLIES=	CHARSET
 PYTHON_USE=	perl5=build
 PYTHON_USES=	perl5 python:3.4+
 TCL_CONFIGURE_ENABLE=	tcl
diff --git a/irc/znc/distinfo b/irc/znc/distinfo
index ad63c6e54cc1..884463ce1bb3 100644
--- a/irc/znc/distinfo
+++ b/irc/znc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520470828
-SHA256 (znc-1.6.6.tar.gz) = 7fb841bc71dc1749b1dc081e9eaf22ceb56ebb03c6b1d8804a4f9eb8bbd59525
-SIZE (znc-1.6.6.tar.gz) = 1471612
+TIMESTAMP = 1525481030
+SHA256 (znc-1.7.0.tar.gz) = c07e31439ac6b948a577bd61a9d5f61a6d191d387423779b937aa1404051b96f
+SIZE (znc-1.7.0.tar.gz) = 1853666
diff --git a/irc/znc/files/pkg-message.in b/irc/znc/files/pkg-message.in
index 403057f4e6e3..fc46185f00d2 100644
--- a/irc/znc/files/pkg-message.in
+++ b/irc/znc/files/pkg-message.in
@@ -1,19 +1,27 @@
 *****************************************************************************
 
-If you are upgrading znc from a version prior to 1.0, please be aware that
-znc will modify your configuration file to incorporate support for new
-functionality.
+# Configuration
 
-Please visit the following URL for more information:
+ Configs written before ZNC 0.206 can't be read anymore!
+  
+ To generate a basic configuration file, run znc --makeconf after installation.
+ It is NOT a good idea to create a new config file manually.
 
-http://wiki.znc.in/ChangeLog/1.0
+ For generate your config file using znc user, execute:
 
-*****************************************************************************
+   su -m znc -c 'znc -d %%ETCDIR%% --makeconf'
+   or
+   sudo -u znc znc -d %%ETCDIR%% --makeconf
+
+ http://wiki.znc.in/Configuration
+
+# Modules
+
+ If you upgrade your ZNC version you must recompile all your external modules,
+ ZNC ABI is not stable.
 
-For generate your config file using znc user, execute:
+   znc-buildmod <modulename>.cpp
 
-su -m znc -c 'znc -d %%ETCDIR%% --makeconf'
-or
-sudo -u znc znc -d %%ETCDIR%% --makeconf
+ http://wiki.znc.in/Compiling_modules
 
 *****************************************************************************
diff --git a/irc/znc/pkg-plist b/irc/znc/pkg-plist
index e4078f9a76ab..59d6f0e5c3f2 100644
--- a/irc/znc/pkg-plist
+++ b/irc/znc/pkg-plist
@@ -5,32 +5,34 @@ include/znc/Chan.h
 include/znc/Client.h
 include/znc/Config.h
 include/znc/Csocket.h
+include/znc/defines.h
 include/znc/ExecSock.h
 include/znc/FileUtils.h
 include/znc/HTTPSock.h
 include/znc/IRCNetwork.h
 include/znc/IRCSock.h
 include/znc/Listener.h
+include/znc/main.h
 include/znc/MD5.h
+include/znc/Message.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/SHA256.h
 include/znc/Socket.h
+include/znc/SSLVerifyHost.h
 include/znc/Template.h
 include/znc/Threads.h
+include/znc/Translation.h
 include/znc/User.h
 include/znc/Utils.h
-include/znc/WebModules.h
-include/znc/ZNCDebug.h
-include/znc/ZNCString.h
-include/znc/defines.h
-include/znc/main.h
 include/znc/version.h
+include/znc/WebModules.h
 include/znc/znc.h
 include/znc/zncconfig.h
+include/znc/ZNCDebug.h
+include/znc/ZNCString.h
 lib/znc/adminlog.so
 lib/znc/alias.so
 lib/znc/autoattach.so
@@ -70,35 +72,19 @@ lib/znc/q.so
 lib/znc/raw.so
 lib/znc/route_replies.so
 lib/znc/sample.so
+lib/znc/samplewebapi.so
 lib/znc/sasl.so
 lib/znc/send_raw.so
 lib/znc/shell.so
 lib/znc/simple_away.so
 lib/znc/stickychan.so
+lib/znc/stripcontrols.so
 lib/znc/watch.so
 lib/znc/webadmin.so
 libdata/pkgconfig/znc.pc
 man/man1/znc-buildmod.1.gz
 man/man1/znc.1.gz
 %%CYRUS%%lib/znc/cyrusauth.so
-%%OPENSSL%%lib/znc/awaystore.so
-%%OPENSSL%%lib/znc/cert.so
-%%OPENSSL%%lib/znc/certauth.so
-%%OPENSSL%%lib/znc/crypt.so
-%%OPENSSL%%lib/znc/savebuff.so
-%%OPENSSL%%lib/znc/schat.so
-%%PERL%%lib/znc/modperl.so
-%%PERL%%lib/znc/modperl/ZNC.pm
-%%PERL%%lib/znc/modperl/ZNC.so
-%%PERL%%lib/znc/modperl/startup.pl
-%%PERL%%lib/znc/perleval.pm
-%%PYTHON%%lib/znc/modpython.so
-%%PYTHON%%lib/znc/modpython/_znc_core.so
-%%PYTHON%%lib/znc/modpython/znc.py
-%%PYTHON%%lib/znc/modpython/znc_core.py
-%%TCL%%lib/znc/modtcl.so
-%%TCL%%share/znc/modtcl/binds.tcl
-%%TCL%%share/znc/modtcl/modtcl.tcl
 %%DATADIR%%/modules/blockuser/tmpl/blockuser_WebadminUser.tmpl
 %%DATADIR%%/modules/cert/tmpl/index.tmpl
 %%DATADIR%%/modules/certauth/tmpl/index.tmpl
@@ -109,6 +95,8 @@ man/man1/znc.1.gz
 %%DATADIR%%/modules/notes/tmpl/index.tmpl
 %%DATADIR%%/modules/perform/tmpl/index.tmpl
 %%DATADIR%%/modules/q/tmpl/index.tmpl
+%%DATADIR%%/modules/samplewebapi/tmpl/index.tmpl
+%%DATADIR%%/modules/sasl/tmpl/index.tmpl
 %%DATADIR%%/modules/send_raw/files/select.js
 %%DATADIR%%/modules/send_raw/tmpl/index.tmpl
 %%DATADIR%%/modules/stickychan/tmpl/index.tmpl
@@ -125,13 +113,21 @@ man/man1/znc.1.gz
 %%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/External.png
 %%DATADIR%%/webskins/_default_/pub/favicon.ico
 %%DATADIR%%/webskins/_default_/pub/global.css
 %%DATADIR%%/webskins/_default_/pub/jquery-1.11.2.js
 %%DATADIR%%/webskins/_default_/pub/jquery-1.11.2.min.js
+%%DATADIR%%/webskins/_default_/pub/jquery-ui-sortable.1.11.4.css
+%%DATADIR%%/webskins/_default_/pub/jquery-ui-sortable.1.11.4.js
+%%DATADIR%%/webskins/_default_/pub/jquery-ui-sortable.1.11.4.min.css
+%%DATADIR%%/webskins/_default_/pub/jquery-ui-sortable.1.11.4.min.js
 %%DATADIR%%/webskins/_default_/pub/robots.txt
+%%DATADIR%%/webskins/_default_/pub/selectize-0.12.1.css
+%%DATADIR%%/webskins/_default_/pub/selectize-standalone-0.12.1.js
+%%DATADIR%%/webskins/_default_/pub/selectize-standalone-0.12.1.min.js
+%%DATADIR%%/webskins/_default_/tmpl/_csrf_check.tmpl
 %%DATADIR%%/webskins/_default_/tmpl/Banner.tmpl
 %%DATADIR%%/webskins/_default_/tmpl/BaseHeader.tmpl
 %%DATADIR%%/webskins/_default_/tmpl/BreadCrumbs.tmpl
@@ -141,14 +137,13 @@ man/man1/znc.1.gz
 %%DATADIR%%/webskins/_default_/tmpl/Footer.tmpl
 %%DATADIR%%/webskins/_default_/tmpl/FooterTag.tmpl
 %%DATADIR%%/webskins/_default_/tmpl/Header.tmpl
+%%DATADIR%%/webskins/_default_/tmpl/index.tmpl
 %%DATADIR%%/webskins/_default_/tmpl/InfoBar.tmpl
 %%DATADIR%%/webskins/_default_/tmpl/LoginBar.tmpl
 %%DATADIR%%/webskins/_default_/tmpl/LowerBanner.tmpl
 %%DATADIR%%/webskins/_default_/tmpl/Menu.tmpl
 %%DATADIR%%/webskins/_default_/tmpl/MessageBar.tmpl
 %%DATADIR%%/webskins/_default_/tmpl/Options.tmpl
-%%DATADIR%%/webskins/_default_/tmpl/_csrf_check.tmpl
-%%DATADIR%%/webskins/_default_/tmpl/index.tmpl
 %%DATADIR%%/webskins/dark-clouds/pub/clouds-header.jpg
 %%DATADIR%%/webskins/dark-clouds/pub/dark-clouds.css
 %%DATADIR%%/webskins/dark-clouds/pub/favicon.ico
@@ -169,4 +164,23 @@ man/man1/znc.1.gz
 %%DATADIR%%/webskins/ice/pub/pagebg.gif
 %%DATADIR%%/webskins/ice/tmpl/FooterTag.tmpl
 %%DATADIR%%/webskins/ice/tmpl/Header.tmpl
+%%OPENSSL%%lib/znc/awaystore.so
+%%OPENSSL%%lib/znc/cert.so
+%%OPENSSL%%lib/znc/certauth.so
+%%OPENSSL%%lib/znc/crypt.so
+%%OPENSSL%%lib/znc/savebuff.so
+%%OPENSSL%%lib/znc/schat.so
+%%PERL%%lib/znc/modperl.so
+%%PERL%%lib/znc/modperl/startup.pl
+%%PERL%%lib/znc/modperl/ZNC.pm
+%%PERL%%lib/znc/modperl/ZNC.so
+%%PERL%%lib/znc/perleval.pm
+%%PYTHON%%lib/znc/pyeval.py
+%%PYTHON%%lib/znc/modpython.so
+%%PYTHON%%lib/znc/modpython/_znc_core.so
+%%PYTHON%%lib/znc/modpython/znc_core.py
+%%PYTHON%%lib/znc/modpython/znc.py
+%%TCL%%lib/znc/modtcl.so
+%%TCL%%share/znc/modtcl/binds.tcl
+%%TCL%%share/znc/modtcl/modtcl.tcl
 @dir(znc,znc,755) %%ETCDIR%%