3 files changed, 37 insertions, 77 deletions

diff --git a/irc/znc/Makefile b/irc/znc/Makefile
index 3c3618f17cf4..53325cb5cdbe 100644
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	znc
-PORTVERSION=	0.056
+PORTVERSION=	0.058
 CATEGORIES=	irc ipv6
 MASTER_SITES=	SF
 
-MAINTAINER=	elvstone@gmail.com
+MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	An advanced IRC bouncer
 
 GNU_CONFIGURE=	yes
@@ -58,4 +58,7 @@ PLIST_SUB+=		SASL=""
 PLIST_SUB+=		SASL="@comment "
 .endif
 
+MANCOMPREEED=	yes
+MAN1=		znc.1.gz znc-buildmod.1.gz znc-config.1.gz
+
 .include <bsd.port.post.mk>
diff --git a/irc/znc/distinfo b/irc/znc/distinfo
index 5af2356e5a3d..4991443766c3 100644
--- a/irc/znc/distinfo
+++ b/irc/znc/distinfo
@@ -1,3 +1,3 @@
-MD5 (znc-0.056.tar.gz) = e12cba33b46d458cf7cdd2879cbf13a7
-SHA256 (znc-0.056.tar.gz) = bedcb1093c874e8f7048aeddfee273f582c72382e49a6f95fd588eacefc4577f
-SIZE (znc-0.056.tar.gz) = 432499 
+MD5 (znc-0.058.tar.gz) = c02fd740c55d5b3a7912f7584344103e
+SHA256 (znc-0.058.tar.gz) = f25a13e28f40546bf15c50f5a45e81206b8667329540af0a0d427afbef450714
+SIZE (znc-0.058.tar.gz) = 340741
diff --git a/irc/znc/pkg-plist b/irc/znc/pkg-plist
index 95260a80041a..591f545fd2c6 100644
--- a/irc/znc/pkg-plist
+++ b/irc/znc/pkg-plist
@@ -45,92 +45,49 @@ lib/znc/simple_away.so
 lib/znc/stickychan.so
 lib/znc/watch.so
 lib/znc/webadmin.so
-%%DATADIR%%/webadmin/skins/default.de/Channel.tmpl
-%%DATADIR%%/webadmin/skins/default.de/Error.tmpl
-%%DATADIR%%/webadmin/skins/default.de/Footer.tmpl
-%%DATADIR%%/webadmin/skins/default.de/Header.tmpl
-%%DATADIR%%/webadmin/skins/default.de/ListUsers.tmpl
-%%DATADIR%%/webadmin/skins/default.de/Main.tmpl
-%%DATADIR%%/webadmin/skins/default.de/Settings.tmpl
-%%DATADIR%%/webadmin/skins/default.de/UserPage.tmpl
-%%DATADIR%%/webadmin/skins/default.de/css/main.css
-%%DATADIR%%/webadmin/skins/default.de/img/favicon.ico
-%%DATADIR%%/webadmin/skins/default/Channel.tmpl
-%%DATADIR%%/webadmin/skins/default/Error.tmpl
+%%DATADIR%%/webadmin/skins/default/css/main.css
+%%DATADIR%%/webadmin/skins/default/img/favicon.ico
 %%DATADIR%%/webadmin/skins/default/Footer.tmpl
-%%DATADIR%%/webadmin/skins/default/Header.tmpl
 %%DATADIR%%/webadmin/skins/default/ListUsers.tmpl
+%%DATADIR%%/webadmin/skins/default/UserPage.tmpl
+%%DATADIR%%/webadmin/skins/default/Error.tmpl
+%%DATADIR%%/webadmin/skins/default/Header.tmpl
+%%DATADIR%%/webadmin/skins/default/Channel.tmpl
 %%DATADIR%%/webadmin/skins/default/Main.tmpl
 %%DATADIR%%/webadmin/skins/default/Settings.tmpl
-%%DATADIR%%/webadmin/skins/default/UserPage.tmpl
-%%DATADIR%%/webadmin/skins/default/css/main.css
-%%DATADIR%%/webadmin/skins/default/img/favicon.ico
-%%DATADIR%%/webadmin/skins/graphiX.de/Channel.tmpl
-%%DATADIR%%/webadmin/skins/graphiX.de/Error.tmpl
-%%DATADIR%%/webadmin/skins/graphiX.de/Footer.tmpl
-%%DATADIR%%/webadmin/skins/graphiX.de/Header.tmpl
-%%DATADIR%%/webadmin/skins/graphiX.de/ListUsers.tmpl
-%%DATADIR%%/webadmin/skins/graphiX.de/Main.tmpl
-%%DATADIR%%/webadmin/skins/graphiX.de/Settings.tmpl
-%%DATADIR%%/webadmin/skins/graphiX.de/UserPage.tmpl
-%%DATADIR%%/webadmin/skins/graphiX.de/css/main.css
-%%DATADIR%%/webadmin/skins/graphiX.de/img/favicon.ico
-%%DATADIR%%/webadmin/skins/graphiX.de/img/graphix_bg.jpg
-%%DATADIR%%/webadmin/skins/graphiX.de/img/graphix_header.jpg
-%%DATADIR%%/webadmin/skins/graphiX/Channel.tmpl
-%%DATADIR%%/webadmin/skins/graphiX/Error.tmpl
+%%DATADIR%%/webadmin/skins/graphiX/css/main.css
+%%DATADIR%%/webadmin/skins/graphiX/img/favicon.ico
+%%DATADIR%%/webadmin/skins/graphiX/img/graphix_header.jpg
+%%DATADIR%%/webadmin/skins/graphiX/img/graphix_bg.jpg
 %%DATADIR%%/webadmin/skins/graphiX/Footer.tmpl
-%%DATADIR%%/webadmin/skins/graphiX/Header.tmpl
 %%DATADIR%%/webadmin/skins/graphiX/ListUsers.tmpl
+%%DATADIR%%/webadmin/skins/graphiX/UserPage.tmpl
+%%DATADIR%%/webadmin/skins/graphiX/Error.tmpl
+%%DATADIR%%/webadmin/skins/graphiX/Header.tmpl
+%%DATADIR%%/webadmin/skins/graphiX/Channel.tmpl
 %%DATADIR%%/webadmin/skins/graphiX/Main.tmpl
 %%DATADIR%%/webadmin/skins/graphiX/Settings.tmpl
-%%DATADIR%%/webadmin/skins/graphiX/UserPage.tmpl
-%%DATADIR%%/webadmin/skins/graphiX/css/main.css
-%%DATADIR%%/webadmin/skins/graphiX/img/favicon.ico
-%%DATADIR%%/webadmin/skins/graphiX/img/graphix_bg.jpg
-%%DATADIR%%/webadmin/skins/graphiX/img/graphix_header.jpg
-%%DATADIR%%/webadmin/skins/ice.de/Channel.tmpl
-%%DATADIR%%/webadmin/skins/ice.de/Error.tmpl
-%%DATADIR%%/webadmin/skins/ice.de/Footer.tmpl
-%%DATADIR%%/webadmin/skins/ice.de/Header.tmpl
-%%DATADIR%%/webadmin/skins/ice.de/ListUsers.tmpl
-%%DATADIR%%/webadmin/skins/ice.de/Main.tmpl
-%%DATADIR%%/webadmin/skins/ice.de/Settings.tmpl
-%%DATADIR%%/webadmin/skins/ice.de/UserPage.tmpl
-%%DATADIR%%/webadmin/skins/ice.de/css/main.css
-%%DATADIR%%/webadmin/skins/ice.de/img/favicon.ico
-%%DATADIR%%/webadmin/skins/ice.de/img/linkbg.jpg
-%%DATADIR%%/webadmin/skins/ice.de/img/pagebg.gif
-%%DATADIR%%/webadmin/skins/ice/Channel.tmpl
-%%DATADIR%%/webadmin/skins/ice/Error.tmpl
+%%DATADIR%%/webadmin/skins/ice/css/main.css
+%%DATADIR%%/webadmin/skins/ice/img/favicon.ico
+%%DATADIR%%/webadmin/skins/ice/img/pagebg.gif
+%%DATADIR%%/webadmin/skins/ice/img/linkbg.jpg
 %%DATADIR%%/webadmin/skins/ice/Footer.tmpl
-%%DATADIR%%/webadmin/skins/ice/Header.tmpl
 %%DATADIR%%/webadmin/skins/ice/ListUsers.tmpl
+%%DATADIR%%/webadmin/skins/ice/UserPage.tmpl
+%%DATADIR%%/webadmin/skins/ice/Error.tmpl
+%%DATADIR%%/webadmin/skins/ice/Header.tmpl
+%%DATADIR%%/webadmin/skins/ice/Channel.tmpl
 %%DATADIR%%/webadmin/skins/ice/Main.tmpl
 %%DATADIR%%/webadmin/skins/ice/Settings.tmpl
-%%DATADIR%%/webadmin/skins/ice/UserPage.tmpl
-%%DATADIR%%/webadmin/skins/ice/css/main.css
-%%DATADIR%%/webadmin/skins/ice/img/favicon.ico
-%%DATADIR%%/webadmin/skins/ice/img/linkbg.jpg
-%%DATADIR%%/webadmin/skins/ice/img/pagebg.gif
-@dirrm %%DATADIR%%/webadmin/skins/ice/img
-@dirrm %%DATADIR%%/webadmin/skins/ice/css
-@dirrm %%DATADIR%%/webadmin/skins/ice.de/img
-@dirrm %%DATADIR%%/webadmin/skins/ice.de/css
-@dirrm %%DATADIR%%/webadmin/skins/ice.de
-@dirrm %%DATADIR%%/webadmin/skins/ice
-@dirrm %%DATADIR%%/webadmin/skins/graphiX/img
-@dirrm %%DATADIR%%/webadmin/skins/graphiX/css
-@dirrm %%DATADIR%%/webadmin/skins/graphiX.de/img
-@dirrm %%DATADIR%%/webadmin/skins/graphiX.de/css
-@dirrm %%DATADIR%%/webadmin/skins/graphiX.de
-@dirrm %%DATADIR%%/webadmin/skins/graphiX
-@dirrm %%DATADIR%%/webadmin/skins/default/img
 @dirrm %%DATADIR%%/webadmin/skins/default/css
-@dirrm %%DATADIR%%/webadmin/skins/default.de/img
-@dirrm %%DATADIR%%/webadmin/skins/default.de/css
-@dirrm %%DATADIR%%/webadmin/skins/default.de
+@dirrm %%DATADIR%%/webadmin/skins/default/img
 @dirrm %%DATADIR%%/webadmin/skins/default
+@dirrm %%DATADIR%%/webadmin/skins/graphiX/css
+@dirrm %%DATADIR%%/webadmin/skins/graphiX/img
+@dirrm %%DATADIR%%/webadmin/skins/graphiX
+@dirrm %%DATADIR%%/webadmin/skins/ice/css
+@dirrm %%DATADIR%%/webadmin/skins/ice/img
+@dirrm %%DATADIR%%/webadmin/skins/ice
 @dirrm %%DATADIR%%/webadmin/skins
 @dirrm %%DATADIR%%/webadmin
 @dirrm %%DATADIR%%