6 files changed, 35 insertions, 85 deletions

diff --git a/net/kdetelnet/Makefile b/net/kdetelnet/Makefile
index 1abbdb8e3b2c..296c560ee2ef 100644
--- a/net/kdetelnet/Makefile
+++ b/net/kdetelnet/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:   ktelnet
+# New ports collection makefile for:	ktelnet
 # Date created:		14 May 1998
 # Whom:			Hans Petter Bieker <hanspb@persbraten.vgs.no>
 #
@@ -6,26 +6,29 @@
 #
 
 PORTNAME=	ktelnet
-PORTVERSION=	0.61
+PORTVERSION=	0.63
 CATEGORIES=	net kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	Attic/old/1.1.2/apps/network
+MASTER_SITES=	http://www.spaghetti-code.de/download/ktelnet/
 EXTRACT_SUFX=	.tgz
 
+MAINTAINER=	ports@FreeBSD.org
+
+BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CXXFLAGS="$(CXXFLAGS)" \
-		INSTALL_SCRIPT="$(INSTALL_SCRIPT)"
 USE_QT=		yes
+USE_GMAKE=	yes
+USE_AUTOMAKE=	yes
+CONFIGURE_ENV=	QTDIR="${X11BASE}" KDEDIR="${LOCALBASE}"
+CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/X11/qt \
+		--with-extra-includes=${X11BASE}/include \
+		--with-extra-libs=${LOCALBASE}/lib \
+		--program-transform-name='s,k,kde,'
+
+post-extract:
+	@find ${WRKSRC} -name '*\.deps*' | xargs ${RM} -rf
 
-post-install:
-.if !defined(NOPORTDOCS)
-.for DIR in en de
-	@${MKDIR} ${PREFIX}/share/doc/HTML/${DIR}/ktelnet
-	@${INSTALL_MAN} ${WRKSRC}/doc/index.${DIR}.html \
-	    ${PREFIX}/share/doc/HTML/${DIR}/ktelnet/index.html
-.endfor
-.endif
+post-patch:
+	@cd ${WRKSRC} && aclocal
 
 .include <bsd.port.mk>
diff --git a/net/kdetelnet/distinfo b/net/kdetelnet/distinfo
index 5b6d4e210b69..3bb40148eeae 100644
--- a/net/kdetelnet/distinfo
+++ b/net/kdetelnet/distinfo
@@ -1 +1 @@
-MD5 (ktelnet-0.61.tgz) = e55a86f7c64279d4c189375cfaa98f38
+MD5 (ktelnet-0.63.tgz) = 4bdc3e89d0fe4987ac6d67f34d1b2c04
diff --git a/net/kdetelnet/files/patch-aa b/net/kdetelnet/files/patch-aa
deleted file mode 100644
index c66dc22079b3..000000000000
--- a/net/kdetelnet/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Makefile.in.orig	Thu Jun 11 15:02:07 1998
-+++ src/Makefile.in	Fri Apr  2 17:29:21 1999
-@@ -130,7 +130,7 @@
- 
- ####### This part is very khexdit specific
- # you can add here more. This one gets installed 
--bin_PROGRAMS = 	ktelnet
-+bin_PROGRAMS = 	kdetelnet
- 
- # Which sources should be compiled for khexdit.
- ktelnet_SOURCES	= mywidget.cc mainwidget.cc configtab.cc startupwidget.cc exitwidget.cc sessiondata.cc panelwindow.cc kcmdlineargs.cc main.cc appearance.cc linkdirselect.cc
-@@ -228,8 +228,8 @@
- 
- maintainer-clean-compile:
- 
--ktelnet: $(ktelnet_OBJECTS) $(ktelnet_DEPENDENCIES)
--	@rm -f ktelnet
-+kdetelnet: $(ktelnet_OBJECTS) $(ktelnet_DEPENDENCIES)
-+	@rm -f kdetelnet
- 	$(CXXLINK) $(ktelnet_LDFLAGS) $(ktelnet_OBJECTS) $(ktelnet_LDADD) $(LIBS)
- .cc.o:
- 	$(CXXCOMPILE) -c $<
diff --git a/net/kdetelnet/files/patch-ab b/net/kdetelnet/files/patch-ab
deleted file mode 100644
index db6c6051cd29..000000000000
--- a/net/kdetelnet/files/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	Fri Jun 12 05:02:13 1998
-+++ configure	Tue Feb 15 19:33:19 2000
-@@ -2379,7 +2379,7 @@
-     fi
-   done
-   IFS="$ac_save_ifs"
--  test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/bin/moc"
-+  test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/X11R6/bin/moc"
-   ;;
- esac
- fi
-@@ -2556,7 +2556,8 @@
- else
-   echo "$ac_t""no" 1>&6
- fi
-- 
-+
-+if false; then 
- echo $ac_n "checking for giflib""... $ac_c" 1>&6
- echo "configure:2562: checking for giflib" >&5
- if eval "test \"`echo '$''{'ac_cv_lib_gif'+set}'`\" = set"; then
-@@ -2603,6 +2604,7 @@
- 
- else
-   { echo "configure: error: You need giflib23. Please install the kdesupport package" 1>&2; exit 1; }
-+fi
- fi
-  echo $ac_n "checking for jpeglib""... $ac_c" 1>&6
- echo "configure:2609: checking for jpeglib" >&5
diff --git a/net/kdetelnet/pkg-descr b/net/kdetelnet/pkg-descr
index 1e25382f77ac..458cd04a199e 100644
--- a/net/kdetelnet/pkg-descr
+++ b/net/kdetelnet/pkg-descr
@@ -1,2 +1,4 @@
 A Frontend for telnet, rlogin, ssh in K Desktop Environment
 on many terminal types: kvt, xterm, color_xterm, rxvt, hpterm..
+
+WWW: http://www.spaghetti-code.de/software/linux/ktelnet/
diff --git a/net/kdetelnet/pkg-plist b/net/kdetelnet/pkg-plist
index 7a07802336be..5cf3891b6f46 100644
--- a/net/kdetelnet/pkg-plist
+++ b/net/kdetelnet/pkg-plist
@@ -1,7 +1,8 @@
 bin/kdetelnet
-share/doc/HTML/en/ktelnet/index.html
-share/doc/HTML/de/ktelnet/index.html
-share/config/ktelnetrc
+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
@@ -10,25 +11,20 @@ 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/apps/ktelnet/pics/ktelnet.xpm
-share/apps/ktelnet/pics/ktname.xpm
-share/apps/ktelnet/pics/kdelogo.gif
+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/fr/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/pt/LC_MESSAGES/ktelnet.mo
 share/locale/no/LC_MESSAGES/ktelnet.mo
-share/locale/hr/LC_MESSAGES/ktelnet.mo
+share/locale/pt/LC_MESSAGES/ktelnet.mo
 share/locale/sk/LC_MESSAGES/ktelnet.mo
-share/icons/mini/ktelnet.xpm
-share/icons/ktelnet.xpm
-share/applnk/Internet/ktelnet.kdelnk
-@dirrm share/apps/ktelnet/pics
+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
-@dirrm share/doc/HTML/de/ktelnet
-@dirrm share/doc/HTML/en/ktelnet
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true