Update to 1.0.p1 for KDE4

PR:		ports/143655
Submitted by:	Rusty Nejdl (maintainer)
Feature safe:	yes

3 files changed, 25 insertions, 65 deletions

diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile
index 589c125bca5c..5114618ed294 100644
--- a/sysutils/knutclient-kde4/Makefile
+++ b/sysutils/knutclient-kde4/Makefile
@@ -6,30 +6,25 @@
 #
 
 PORTNAME=	knutclient
-PORTVERSION=	0.9.4
-PORTREVISION=	2
+PORTVERSION=	1.0.p1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/ \
 		http://www.vg.kernel.org/pub/mirrors/gentoo/source/distfiles/
+DISTNAME=	${PORTNAME}-${DIST_VER}
 
 MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	A visual client for UPS system NUT
 
-MAKE_JOBS_UNSAFE=	yes
+LIB_DEPENDS=	qimageblitz.4:${PORTSDIR}/x11/qimageblitz
 
-BUILD_DEPENDS=	automake>=0:${PORTSDIR}/devel/automake19
+USE_CMAKE=	yes
+USE_KDE4=	kdehier kdeprefix kdelibs automoc4
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib gui qmake_build moc_build rcc_build uic_build
+MAKE_JOBS_SAFE=	yes
+LATEST_LINK=	knutclient-kde4
 
-USE_KDELIBS_VER=3
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
-CONFIGURE_ARGS=	--disable-fast-perl --enable-mt --program-transform-name=''
-
-post-patch:
-	@${REINPLACE_CMD} -E \
-		-e 's|-O2||' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-		-e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-		${WRKSRC}/admin/libtool.m4.in
+DIST_VER=	${PORTVERSION:S/.0.p1/_0_KDE4_pre1/}
+WRKSRC=		${WRKDIR}/${PORTNAME}_${DIST_VER}
 
 .include <bsd.port.mk>
diff --git a/sysutils/knutclient-kde4/distinfo b/sysutils/knutclient-kde4/distinfo
index 953c11f7c762..aaa2ab59fc6e 100644
--- a/sysutils/knutclient-kde4/distinfo
+++ b/sysutils/knutclient-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (knutclient-0.9.4.tar.gz) = c2f99e390f1fee470de2cab8c3a5fddd
-SHA256 (knutclient-0.9.4.tar.gz) = ca117a3701a01f952131e40663874dcd8ef7e57d3ff3d73eb5a83c7191118f44
-SIZE (knutclient-0.9.4.tar.gz) = 1234272
+MD5 (knutclient-1_0_KDE4_pre1.tar.gz) = a6293f96bafef868b4e8116e6f1fe9e9
+SHA256 (knutclient-1_0_KDE4_pre1.tar.gz) = 3163566efdfe026d86863dd3bb911d6e2ca1458d829933fce9f330b4bb679685
+SIZE (knutclient-1_0_KDE4_pre1.tar.gz) = 166301
diff --git a/sysutils/knutclient-kde4/pkg-plist b/sysutils/knutclient-kde4/pkg-plist
index 9c90562168f6..758abb305d99 100644
--- a/sysutils/knutclient-kde4/pkg-plist
+++ b/sysutils/knutclient-kde4/pkg-plist
@@ -1,42 +1,23 @@
 bin/knutclient
-share/applnk/Utilities/knutclient.desktop
+share/applications/kde4/knutclient.desktop
+share/apps/knutclient/knutclient.notifyrc
 share/apps/knutclient/knutclientui.rc
+share/apps/knutclient/pics/knc_analog.png
 share/apps/knutclient/pics/knc_batt.png
 share/apps/knutclient/pics/knc_conn.png
+share/apps/knutclient/pics/knc_dock.png
 share/apps/knutclient/pics/knc_error.png
 share/apps/knutclient/pics/knc_main.png
+share/apps/knutclient/pics/knc_mpref.png
+share/apps/knutclient/pics/knc_mset.png
+share/apps/knutclient/pics/knc_panel.png
 share/apps/knutclient/pics/knc_ups.png
-share/doc/kde/HTML/cs/knutclient/asetting-cs.png
-share/doc/kde/HTML/cs/knutclient/common
-share/doc/kde/HTML/cs/knutclient/fsetting-cs.png
-share/doc/kde/HTML/cs/knutclient/index.cache.bz2
-share/doc/kde/HTML/cs/knutclient/index.docbook
-share/doc/kde/HTML/cs/knutclient/knutclient-cs.png
-share/doc/kde/HTML/cs/knutclient/ksetting-cs.png
-share/doc/kde/HTML/cs/knutclient/mkicker-cs.png
-share/doc/kde/HTML/cs/knutclient/msetting-cs.png
-share/doc/kde/HTML/cs/knutclient/new-cs.png
-share/doc/kde/HTML/cs/knutclient/psetting-cs.png
-share/doc/kde/HTML/cs/knutclient/tkicker-cs.png
-share/doc/kde/HTML/cs/knutclient/usetting-cs.png
-share/doc/kde/HTML/cs/knutclient/variables-cs.png
-share/doc/kde/HTML/en/knutclient/asetting-en.png
-share/doc/kde/HTML/en/knutclient/common
-share/doc/kde/HTML/en/knutclient/fsetting-en.png
-share/doc/kde/HTML/en/knutclient/index.cache.bz2
-share/doc/kde/HTML/en/knutclient/index.docbook
-share/doc/kde/HTML/en/knutclient/knutclient-en.png
-share/doc/kde/HTML/en/knutclient/ksetting-en.png
-share/doc/kde/HTML/en/knutclient/mkicker-en.png
-share/doc/kde/HTML/en/knutclient/msetting-en.png
-share/doc/kde/HTML/en/knutclient/new-en.png
-share/doc/kde/HTML/en/knutclient/psetting-en.png
-share/doc/kde/HTML/en/knutclient/tkicker-en.png
-share/doc/kde/HTML/en/knutclient/usetting-en.png
-share/doc/kde/HTML/en/knutclient/variables-en.png
+share/apps/knutclient/pics/knc_upses.png
+share/config.kcfg/knutclient.kcfg
 share/icons/hicolor/16x16/apps/knutclient.png
 share/icons/hicolor/16x16/apps/knutclientconn.png
 share/icons/hicolor/16x16/apps/knutclienterr.png
+share/icons/hicolor/22x22/apps/knutclient.png
 share/icons/hicolor/32x32/apps/knutclient.png
 share/icons/hicolor/48x48/apps/knutclient.png
 share/icons/locolor/16x16/apps/knutclient.png
@@ -48,6 +29,7 @@ share/locale/de/LC_MESSAGES/knutclient.mo
 share/locale/es/LC_MESSAGES/knutclient.mo
 share/locale/fr/LC_MESSAGES/knutclient.mo
 share/locale/it/LC_MESSAGES/knutclient.mo
+share/locale/pl/LC_MESSAGES/knutclient.mo
 share/locale/pt_BR/LC_MESSAGES/knutclient.mo
 share/locale/ru/LC_MESSAGES/knutclient.mo
 share/locale/uk/LC_MESSAGES/knutclient.mo
@@ -56,22 +38,5 @@ share/locale/uk/LC_MESSAGES/knutclient.mo
 @dirrmtry share/icons/locolor/16x16/apps
 @dirrmtry share/icons/locolor/16x16
 @dirrmtry share/icons/locolor
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrm share/doc/kde/HTML/en/knutclient
-@dirrmtry share/doc/kde/HTML/en
-@dirrm share/doc/kde/HTML/cs/knutclient
-@dirrmtry share/doc/kde/HTML/cs
-@dirrmtry share/doc/kde/HTML
-@dirrmtry share/doc/kde
 @dirrm share/apps/knutclient/pics
 @dirrm share/apps/knutclient
-@dirrmtry share/apps
-@dirrmtry share/applnk/Utilities
-@dirrmtry share/applnk