12 files changed, 42 insertions, 130 deletions

diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile
index 12de394d354f..7b332b95db2a 100644
--- a/sysutils/knutclient-kde4/Makefile
+++ b/sysutils/knutclient-kde4/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	knutclient
-PORTVERSION=	0.6.0
-PORTREVISION=	4
+PORTVERSION=	0.8.6
 CATEGORIES=	sysutils kde
-MASTER_SITES=	ftp://ftp.buzuluk.cz/pub/alo/knutclient/
+MASTER_SITES=	ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A visual client for UPS system NUT
diff --git a/sysutils/knutclient-kde4/distinfo b/sysutils/knutclient-kde4/distinfo
index 1fabf4eca1e8..cc8fdee88eea 100644
--- a/sysutils/knutclient-kde4/distinfo
+++ b/sysutils/knutclient-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (knutclient-0.6.0.tar.gz) = 71970a56574c1230bd585be73ff2d86c
-SHA256 (knutclient-0.6.0.tar.gz) = 54e89126f9c586154fb83fb85916e54b789ed7f5931d1be77f11f0550a0559c0
-SIZE (knutclient-0.6.0.tar.gz) = 907773
+MD5 (knutclient-0.8.6.tar.gz) = 08889c7f220ecbe029de7f43182ec3b5
+SHA256 (knutclient-0.8.6.tar.gz) = 7d98987c4fdfe53312ddd8bea56836a61af71508aac45a91fa09d0659a03ff23
+SIZE (knutclient-0.8.6.tar.gz) = 1395983
diff --git a/sysutils/knutclient-kde4/files/patch-configure b/sysutils/knutclient-kde4/files/patch-configure
deleted file mode 100644
index 0c9134f4df0f..000000000000
--- a/sysutils/knutclient-kde4/files/patch-configure
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig	Sun Dec 15 15:33:40 2002
-+++ configure	Sat Feb 18 22:56:35 2006
-@@ -5865,15 +5865,2 @@
- 
--# Actually configure libtool.  ac_aux_dir is where install-sh is found.
--AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
--MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
--LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
--AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
--objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
--deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
--|| { { echo "$as_me:$LINENO: error: libtool configure failed" >&5
--echo "$as_me: error: libtool configure failed" >&2;}
--   { (exit 1); exit 1; }; }
--
- # Reload cache, that may have been modified by ltconfig
-@@ -5910,18 +5897,2 @@
- LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
--lt_save_CC="$CC"
--lt_save_CFLAGS="$CFLAGS"
--AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
--MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
--LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
--AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
--objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
--deplibs_check_method="$deplibs_check_method" \
--file_magic_cmd="$file_magic_cmd" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
----build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
--|| { { echo "$as_me:$LINENO: error: libtool tag configuration failed" >&5
--echo "$as_me: error: libtool tag configuration failed" >&2;}
--   { (exit 1); exit 1; }; }
--CC="$lt_save_CC"
--CFLAGS="$lt_save_CFLAGS"
- 
diff --git a/sysutils/knutclient-kde4/files/patch-knutclient::knutnet.h b/sysutils/knutclient-kde4/files/patch-knutclient::knutnet.h
deleted file mode 100644
index 1a6e39873ae2..000000000000
--- a/sysutils/knutclient-kde4/files/patch-knutclient::knutnet.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- knutclient/knutnet.h.orig	Mon Apr 28 02:07:21 2003
-+++ knutclient/knutnet.h	Mon Apr 28 02:07:28 2003
-@@ -28,8 +28,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/socket.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- #include <sys/time.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/sysutils/knutclient-kde4/pkg-descr b/sysutils/knutclient-kde4/pkg-descr
index c7ba44193271..8c650132fb70 100644
--- a/sysutils/knutclient-kde4/pkg-descr
+++ b/sysutils/knutclient-kde4/pkg-descr
@@ -1,3 +1,3 @@
 KNUTClient is visual client for UPS system NUT
 
-WWW: http://www.alo.cz/knutclient-pop-en.html
+WWW: http://www.alo.cz/knutclient/
diff --git a/sysutils/knutclient-kde4/pkg-plist b/sysutils/knutclient-kde4/pkg-plist
index ca32ff142af4..b2e432e13b52 100644
--- a/sysutils/knutclient-kde4/pkg-plist
+++ b/sysutils/knutclient-kde4/pkg-plist
@@ -7,38 +7,44 @@ share/doc/HTML/cs/knutclient/fsetting-cs.png
 share/doc/HTML/cs/knutclient/index.cache.bz2
 share/doc/HTML/cs/knutclient/index.docbook
 share/doc/HTML/cs/knutclient/knutclient-cs.png
+share/doc/HTML/cs/knutclient/ksetting-cs.png
+share/doc/HTML/cs/knutclient/mkicker-cs.png
 share/doc/HTML/cs/knutclient/msetting-cs.png
 share/doc/HTML/cs/knutclient/new-cs.png
 share/doc/HTML/cs/knutclient/psetting-cs.png
+share/doc/HTML/cs/knutclient/tkicker-cs.png
 share/doc/HTML/cs/knutclient/usetting-cs.png
+share/doc/HTML/cs/knutclient/variables-cs.png
 share/doc/HTML/en/knutclient/asetting-en.png
 share/doc/HTML/en/knutclient/common
 share/doc/HTML/en/knutclient/fsetting-en.png
 share/doc/HTML/en/knutclient/index.cache.bz2
 share/doc/HTML/en/knutclient/index.docbook
 share/doc/HTML/en/knutclient/knutclient-en.png
+share/doc/HTML/en/knutclient/ksetting-en.png
+share/doc/HTML/en/knutclient/mkicker-en.png
 share/doc/HTML/en/knutclient/msetting-en.png
 share/doc/HTML/en/knutclient/new-en.png
 share/doc/HTML/en/knutclient/psetting-en.png
+share/doc/HTML/en/knutclient/tkicker-en.png
 share/doc/HTML/en/knutclient/usetting-en.png
+share/doc/HTML/en/knutclient/variables-en.png
 share/icons/hicolor/16x16/apps/knutclient.png
+share/icons/hicolor/16x16/apps/knutclienterr.png
 share/icons/hicolor/32x32/apps/knutclient.png
 share/icons/hicolor/48x48/apps/knutclient.png
 share/icons/locolor/16x16/apps/knutclient.png
+share/icons/locolor/16x16/apps/knutclienterr.png
 share/icons/locolor/32x32/apps/knutclient.png
 share/locale/cs/LC_MESSAGES/knutclient.mo
 share/locale/de/LC_MESSAGES/knutclient.mo
 share/locale/fr/LC_MESSAGES/knutclient.mo
 share/locale/it/LC_MESSAGES/knutclient.mo
-@dirrmtry share/locale/it/LC_MESSAGES
-@dirrmtry share/locale/it
-@dirrmtry share/locale/fr/LC_MESSAGES
-@dirrmtry share/locale/fr
-@dirrmtry share/locale/de/LC_MESSAGES
-@dirrmtry share/locale/de
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale
+share/locale/pt_BR/LC_MESSAGES/knutclient.mo
+share/locale/ru/LC_MESSAGES/knutclient.mo
+share/locale/uk/LC_MESSAGES/knutclient.mo
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
 @dirrmtry share/icons/locolor/32x32/apps
 @dirrmtry share/icons/locolor/32x32
 @dirrmtry share/icons/locolor/16x16/apps
diff --git a/sysutils/knutclient/Makefile b/sysutils/knutclient/Makefile
index 12de394d354f..7b332b95db2a 100644
--- a/sysutils/knutclient/Makefile
+++ b/sysutils/knutclient/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	knutclient
-PORTVERSION=	0.6.0
-PORTREVISION=	4
+PORTVERSION=	0.8.6
 CATEGORIES=	sysutils kde
-MASTER_SITES=	ftp://ftp.buzuluk.cz/pub/alo/knutclient/
+MASTER_SITES=	ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A visual client for UPS system NUT
diff --git a/sysutils/knutclient/distinfo b/sysutils/knutclient/distinfo
index 1fabf4eca1e8..cc8fdee88eea 100644
--- a/sysutils/knutclient/distinfo
+++ b/sysutils/knutclient/distinfo
@@ -1,3 +1,3 @@
-MD5 (knutclient-0.6.0.tar.gz) = 71970a56574c1230bd585be73ff2d86c
-SHA256 (knutclient-0.6.0.tar.gz) = 54e89126f9c586154fb83fb85916e54b789ed7f5931d1be77f11f0550a0559c0
-SIZE (knutclient-0.6.0.tar.gz) = 907773
+MD5 (knutclient-0.8.6.tar.gz) = 08889c7f220ecbe029de7f43182ec3b5
+SHA256 (knutclient-0.8.6.tar.gz) = 7d98987c4fdfe53312ddd8bea56836a61af71508aac45a91fa09d0659a03ff23
+SIZE (knutclient-0.8.6.tar.gz) = 1395983
diff --git a/sysutils/knutclient/files/patch-configure b/sysutils/knutclient/files/patch-configure
deleted file mode 100644
index 0c9134f4df0f..000000000000
--- a/sysutils/knutclient/files/patch-configure
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig	Sun Dec 15 15:33:40 2002
-+++ configure	Sat Feb 18 22:56:35 2006
-@@ -5865,15 +5865,2 @@
- 
--# Actually configure libtool.  ac_aux_dir is where install-sh is found.
--AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
--MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
--LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
--AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
--objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
--deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
--|| { { echo "$as_me:$LINENO: error: libtool configure failed" >&5
--echo "$as_me: error: libtool configure failed" >&2;}
--   { (exit 1); exit 1; }; }
--
- # Reload cache, that may have been modified by ltconfig
-@@ -5910,18 +5897,2 @@
- LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
--lt_save_CC="$CC"
--lt_save_CFLAGS="$CFLAGS"
--AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
--MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
--LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
--AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
--objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
--deplibs_check_method="$deplibs_check_method" \
--file_magic_cmd="$file_magic_cmd" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
----build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
--|| { { echo "$as_me:$LINENO: error: libtool tag configuration failed" >&5
--echo "$as_me: error: libtool tag configuration failed" >&2;}
--   { (exit 1); exit 1; }; }
--CC="$lt_save_CC"
--CFLAGS="$lt_save_CFLAGS"
- 
diff --git a/sysutils/knutclient/files/patch-knutclient::knutnet.h b/sysutils/knutclient/files/patch-knutclient::knutnet.h
deleted file mode 100644
index 1a6e39873ae2..000000000000
--- a/sysutils/knutclient/files/patch-knutclient::knutnet.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- knutclient/knutnet.h.orig	Mon Apr 28 02:07:21 2003
-+++ knutclient/knutnet.h	Mon Apr 28 02:07:28 2003
-@@ -28,8 +28,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/socket.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- #include <sys/time.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/sysutils/knutclient/pkg-descr b/sysutils/knutclient/pkg-descr
index c7ba44193271..8c650132fb70 100644
--- a/sysutils/knutclient/pkg-descr
+++ b/sysutils/knutclient/pkg-descr
@@ -1,3 +1,3 @@
 KNUTClient is visual client for UPS system NUT
 
-WWW: http://www.alo.cz/knutclient-pop-en.html
+WWW: http://www.alo.cz/knutclient/
diff --git a/sysutils/knutclient/pkg-plist b/sysutils/knutclient/pkg-plist
index ca32ff142af4..b2e432e13b52 100644
--- a/sysutils/knutclient/pkg-plist
+++ b/sysutils/knutclient/pkg-plist
@@ -7,38 +7,44 @@ share/doc/HTML/cs/knutclient/fsetting-cs.png
 share/doc/HTML/cs/knutclient/index.cache.bz2
 share/doc/HTML/cs/knutclient/index.docbook
 share/doc/HTML/cs/knutclient/knutclient-cs.png
+share/doc/HTML/cs/knutclient/ksetting-cs.png
+share/doc/HTML/cs/knutclient/mkicker-cs.png
 share/doc/HTML/cs/knutclient/msetting-cs.png
 share/doc/HTML/cs/knutclient/new-cs.png
 share/doc/HTML/cs/knutclient/psetting-cs.png
+share/doc/HTML/cs/knutclient/tkicker-cs.png
 share/doc/HTML/cs/knutclient/usetting-cs.png
+share/doc/HTML/cs/knutclient/variables-cs.png
 share/doc/HTML/en/knutclient/asetting-en.png
 share/doc/HTML/en/knutclient/common
 share/doc/HTML/en/knutclient/fsetting-en.png
 share/doc/HTML/en/knutclient/index.cache.bz2
 share/doc/HTML/en/knutclient/index.docbook
 share/doc/HTML/en/knutclient/knutclient-en.png
+share/doc/HTML/en/knutclient/ksetting-en.png
+share/doc/HTML/en/knutclient/mkicker-en.png
 share/doc/HTML/en/knutclient/msetting-en.png
 share/doc/HTML/en/knutclient/new-en.png
 share/doc/HTML/en/knutclient/psetting-en.png
+share/doc/HTML/en/knutclient/tkicker-en.png
 share/doc/HTML/en/knutclient/usetting-en.png
+share/doc/HTML/en/knutclient/variables-en.png
 share/icons/hicolor/16x16/apps/knutclient.png
+share/icons/hicolor/16x16/apps/knutclienterr.png
 share/icons/hicolor/32x32/apps/knutclient.png
 share/icons/hicolor/48x48/apps/knutclient.png
 share/icons/locolor/16x16/apps/knutclient.png
+share/icons/locolor/16x16/apps/knutclienterr.png
 share/icons/locolor/32x32/apps/knutclient.png
 share/locale/cs/LC_MESSAGES/knutclient.mo
 share/locale/de/LC_MESSAGES/knutclient.mo
 share/locale/fr/LC_MESSAGES/knutclient.mo
 share/locale/it/LC_MESSAGES/knutclient.mo
-@dirrmtry share/locale/it/LC_MESSAGES
-@dirrmtry share/locale/it
-@dirrmtry share/locale/fr/LC_MESSAGES
-@dirrmtry share/locale/fr
-@dirrmtry share/locale/de/LC_MESSAGES
-@dirrmtry share/locale/de
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale
+share/locale/pt_BR/LC_MESSAGES/knutclient.mo
+share/locale/ru/LC_MESSAGES/knutclient.mo
+share/locale/uk/LC_MESSAGES/knutclient.mo
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
 @dirrmtry share/icons/locolor/32x32/apps
 @dirrmtry share/icons/locolor/32x32
 @dirrmtry share/icons/locolor/16x16/apps