- Update to 0.9.4

- Remove duplicate USE_GMAKE line
- Add --disable-fast-perl to avoid a warning at configure time. This option
  is used to do faster Makefile generation.
- For unknown reason, at build stage, the Makefile tries to rebuild
  configure script (it happens before, but at this version, it breaks
  build). Add necessary evils (automake dependency and libtool hacks from
  bsd.autotools.mk) to make this port build in a tinderbox env.

PR:		ports/125343
Submitted by:	Rusty Nejdl <rnejdl at ringofsaturn.com> (maintainer)

3 files changed, 46 insertions, 40 deletions

diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile
index 5563a8a55bd3..5a2a9b4db810 100644
--- a/sysutils/knutclient-kde4/Makefile
+++ b/sysutils/knutclient-kde4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	knutclient
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTVERSION=	0.9.4
 CATEGORIES=	sysutils kde
 MASTER_SITES=	ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/ \
 		http://www.vg.kernel.org/pub/mirrors/gentoo/source/distfiles/
@@ -15,15 +14,19 @@ MASTER_SITES=	ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/ \
 MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	A visual client for UPS system NUT
 
+BUILD_DEPENDS=	automake>=0:${PORTSDIR}/devel/automake19
+
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--enable-mt --program-transform-name=''
+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
 
 .include <bsd.port.mk>
diff --git a/sysutils/knutclient-kde4/distinfo b/sysutils/knutclient-kde4/distinfo
index 7de15997dcfd..953c11f7c762 100644
--- a/sysutils/knutclient-kde4/distinfo
+++ b/sysutils/knutclient-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (knutclient-0.9.3.tar.gz) = 543721b6cecd04579f7852d05e03e471
-SHA256 (knutclient-0.9.3.tar.gz) = 649d873700309ba3c31a12288a4baf62b1f09d07579306be53e3d11cb59d933a
-SIZE (knutclient-0.9.3.tar.gz) = 1225692
+MD5 (knutclient-0.9.4.tar.gz) = c2f99e390f1fee470de2cab8c3a5fddd
+SHA256 (knutclient-0.9.4.tar.gz) = ca117a3701a01f952131e40663874dcd8ef7e57d3ff3d73eb5a83c7191118f44
+SIZE (knutclient-0.9.4.tar.gz) = 1234272
diff --git a/sysutils/knutclient-kde4/pkg-plist b/sysutils/knutclient-kde4/pkg-plist
index de066f478e6d..9c90562168f6 100644
--- a/sysutils/knutclient-kde4/pkg-plist
+++ b/sysutils/knutclient-kde4/pkg-plist
@@ -1,37 +1,39 @@
 bin/knutclient
 share/applnk/Utilities/knutclient.desktop
 share/apps/knutclient/knutclientui.rc
+share/apps/knutclient/pics/knc_batt.png
 share/apps/knutclient/pics/knc_conn.png
 share/apps/knutclient/pics/knc_error.png
 share/apps/knutclient/pics/knc_main.png
-share/doc/HTML/cs/knutclient/asetting-cs.png
-share/doc/HTML/cs/knutclient/common
-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/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/icons/hicolor/16x16/apps/knutclient.png
 share/icons/hicolor/16x16/apps/knutclientconn.png
 share/icons/hicolor/16x16/apps/knutclienterr.png
@@ -62,11 +64,12 @@ share/locale/uk/LC_MESSAGES/knutclient.mo
 @dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrm share/doc/HTML/en/knutclient
-@dirrmtry share/doc/HTML/en
-@dirrm share/doc/HTML/cs/knutclient
-@dirrmtry share/doc/HTML/cs
-@dirrmtry share/doc/HTML
+@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