3 files changed, 43 insertions, 42 deletions

diff --git a/net/kdetelnet/Makefile b/net/kdetelnet/Makefile
index d331a451b223..bf7b0a9ec95e 100644
--- a/net/kdetelnet/Makefile
+++ b/net/kdetelnet/Makefile
@@ -6,26 +6,22 @@
 #
 
 PORTNAME=	ktelnet
-PORTVERSION=	0.63
+PORTVERSION=	2.0.43
 CATEGORIES=	net kde
 MASTER_SITES=	http://www.spaghetti-code.de/download/ktelnet/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/./-/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
-USE_KDELIBS_VER=1
+USE_KDELIBS_VER=2
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
-CONFIGURE_ENV=	QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}"
-CONFIGURE_ARGS=	--with-extra-includes=${X11BASE}/include \
-		--program-transform-name='s,k,kde,'
+GNU_CONFIGURE=	yes
 
-post-extract:
-	@find ${WRKSRC} -name '*\.deps*' | xargs ${RM} -rf
-
-post-patch:
-	@cd ${WRKSRC} && aclocal
+pre-patch:
+	@${PERL} -pi -e 's|-lqt|-l${QTNAME}|g ; \
+		 s|qt_libdir=NONE|qt_libdir=|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net/kdetelnet/distinfo b/net/kdetelnet/distinfo
index 3bb40148eeae..17912d37ff00 100644
--- a/net/kdetelnet/distinfo
+++ b/net/kdetelnet/distinfo
@@ -1 +1 @@
-MD5 (ktelnet-0.63.tgz) = 4bdc3e89d0fe4987ac6d67f34d1b2c04
+MD5 (ktelnet2-0.43.tgz) = b6121842536c1a357bab3df3705c2ca7
diff --git a/net/kdetelnet/pkg-plist b/net/kdetelnet/pkg-plist
index 5cf3891b6f46..0b2871c0ccc5 100644
--- a/net/kdetelnet/pkg-plist
+++ b/net/kdetelnet/pkg-plist
@@ -1,30 +1,35 @@
-bin/kdetelnet
-share/applnk/Internet/ktelnet.kdelnk
-share/apps/ktelnet/pics/kdelogo.gif
-share/apps/ktelnet/pics/ktelnet.xpm
-share/apps/ktelnet/pics/ktname.xpm
-share/apps/ktelnet/toolbar/dec.xpm
-share/apps/ktelnet/toolbar/next_ws.xpm
-share/apps/ktelnet/toolbar/panelize.xpm
-share/apps/ktelnet/toolbar/session1.xpm
-share/apps/ktelnet/toolbar/sgi.xpm
-share/apps/ktelnet/toolbar/smalldown.xpm
-share/apps/ktelnet/toolbar/smallup.xpm
-share/apps/ktelnet/toolbar/sun.xpm
-share/config/ktelnetrc
-share/doc/HTML/en/ktelnet/index.html
-share/icons/ktelnet.xpm
-share/icons/mini/ktelnet.xpm
-share/locale/de/LC_MESSAGES/ktelnet.mo
-share/locale/es/LC_MESSAGES/ktelnet.mo
-share/locale/fr/LC_MESSAGES/ktelnet.mo
-share/locale/hr/LC_MESSAGES/ktelnet.mo
-share/locale/it/LC_MESSAGES/ktelnet.mo
-share/locale/no/LC_MESSAGES/ktelnet.mo
-share/locale/pt/LC_MESSAGES/ktelnet.mo
-share/locale/sk/LC_MESSAGES/ktelnet.mo
-share/locale/zh/LC_MESSAGES/ktelnet.mo
-@dirrm share/doc/HTML/en/ktelnet
-@dirrm share/apps/ktelnet/toolbar
-@dirrm share/apps/ktelnet/pics
-@dirrm share/apps/ktelnet
+bin/ktelnet2
+share/applnk/Internet/ktelnet2.desktop
+share/apps/ktelnet2/icons/locolor/22x22/actions/dec.png
+share/apps/ktelnet2/icons/locolor/22x22/actions/next_ws.png
+share/apps/ktelnet2/icons/locolor/22x22/actions/sgi.png
+share/apps/ktelnet2/icons/locolor/22x22/actions/sun.png
+share/apps/ktelnet2/plugins/ssh_proxy.plugin
+share/apps/ktelnet2/plugins/ssh_proxy_pass.plugin
+share/apps/ktelnet2/plugins/telnet_tis.plugin
+share/apps/ktelnet2/plugins/telnet_tis_pass.plugin
+share/doc/HTML/en/ktelnet2/.anchors
+share/doc/HTML/en/ktelnet2/common
+share/doc/HTML/en/ktelnet2/compilation.html
+share/doc/HTML/en/ktelnet2/configuration.html
+share/doc/HTML/en/ktelnet2/credits.html
+share/doc/HTML/en/ktelnet2/faq.html
+share/doc/HTML/en/ktelnet2/index.docbook
+share/doc/HTML/en/ktelnet2/index.docbook.html
+share/doc/HTML/en/ktelnet2/index.html
+share/doc/HTML/en/ktelnet2/installation.html
+share/doc/HTML/en/ktelnet2/introduction.html
+share/doc/HTML/en/ktelnet2/kapp-panel.html
+share/doc/HTML/en/ktelnet2/ktelnet2-passwords.html
+share/doc/HTML/en/ktelnet2/requirements.html
+share/doc/HTML/en/ktelnet2/using-kapp.html
+share/icons/locolor/16x16/apps/ktelnet.png
+share/icons/locolor/32x32/apps/ktelnet.png
+share/locale/fr/LC_MESSAGES/ktelnet2.mo
+@dirrm share/doc/HTML/en/ktelnet2
+@dirrm share/apps/ktelnet2/plugins
+@dirrm share/apps/ktelnet2/icons/locolor/22x22/actions
+@dirrm share/apps/ktelnet2/icons/locolor/22x22
+@dirrm share/apps/ktelnet2/icons/locolor
+@dirrm share/apps/ktelnet2/icons
+@dirrm share/apps/ktelnet2