6 files changed, 48 insertions, 55 deletions

diff --git a/ftp/kftpgrabber/Makefile b/ftp/kftpgrabber/Makefile
index 81cab63908f1..0e673fee3208 100644
--- a/ftp/kftpgrabber/Makefile
+++ b/ftp/kftpgrabber/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	kftpgrabber
-PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTVERSION=	0.8.0.b.2
 CATEGORIES=	ftp kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://www.kftp.org/uploads/files/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b.2/-beta2/}
 
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Graphical FTP client for KDE
@@ -20,15 +19,7 @@ USE_GMAKE=	yes
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	libtool:15
 
-OPTIONS=	QSA  "QSA scripting support" on
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_QSA)
-LIB_DEPENDS+=	qsa.1:${PORTSDIR}/devel/qsa
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/ftp/kftpgrabber/distinfo b/ftp/kftpgrabber/distinfo
index 62ef77270532..c9cfe4ce76c6 100644
--- a/ftp/kftpgrabber/distinfo
+++ b/ftp/kftpgrabber/distinfo
@@ -1,3 +1,3 @@
-MD5 (kftpgrabber-0.6.0.tar.bz2) = 549d4575fc0240c3ef9f249a7587d902
-SHA256 (kftpgrabber-0.6.0.tar.bz2) = 6f717053dbf138cccd73041814e5c0865cfd40bfb03402107fa5b3fcf3e43da1
-SIZE (kftpgrabber-0.6.0.tar.bz2) = 1127926
+MD5 (kftpgrabber-0.8.0-beta2.tar.bz2) = c0be2a92bd0550809c5e51a1e050719b
+SHA256 (kftpgrabber-0.8.0-beta2.tar.bz2) = 519cba830c96d1ecd0f97df8334cf892b12abb102d049eb34d1994bb118f0310
+SIZE (kftpgrabber-0.8.0-beta2.tar.bz2) = 1364059
diff --git a/ftp/kftpgrabber/files/patch-kftpgrabber_src_ui-kftpqueueeditorlayout.ui b/ftp/kftpgrabber/files/patch-kftpgrabber_src_ui-kftpqueueeditorlayout.ui
deleted file mode 100644
index 531fa1456e3f..000000000000
--- a/ftp/kftpgrabber/files/patch-kftpgrabber_src_ui-kftpqueueeditorlayout.ui
+++ /dev/null
@@ -1,12 +0,0 @@
---- kftpgrabber/src/ui/kftpqueueeditorlayout.ui.orig	Sun Nov  6 23:51:15 2005
-+++ kftpgrabber/src/ui/kftpqueueeditorlayout.ui	Sun Nov  6 23:51:43 2005
-@@ -322,9 +322,6 @@
- </images>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>kftpserverlineedit.h</includehint>
--    <includehint>kpassdlg.h</includehint>
--    <includehint>kftpserverlineedit.h</includehint>
-     <includehint>kpassdlg.h</includehint>
- </includehints>
- </UI>
diff --git a/ftp/kftpgrabber/files/patch-kftpgrabber_src_ui-kftpsearchlayout.ui b/ftp/kftpgrabber/files/patch-kftpgrabber_src_ui-kftpsearchlayout.ui
deleted file mode 100644
index 7f084b40a202..000000000000
--- a/ftp/kftpgrabber/files/patch-kftpgrabber_src_ui-kftpsearchlayout.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- kftpgrabber/src/ui/kftpsearchlayout.ui.orig	Sun Nov  6 23:55:02 2005
-+++ kftpgrabber/src/ui/kftpsearchlayout.ui	Sun Nov  6 23:55:18 2005
-@@ -240,7 +240,6 @@
- </images>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>kftpserverlineedit.h</includehint>
-     <includehint>kpassdlg.h</includehint>
- </includehints>
- </UI>
diff --git a/ftp/kftpgrabber/pkg-descr b/ftp/kftpgrabber/pkg-descr
index 004168dac6eb..62366144dacd 100644
--- a/ftp/kftpgrabber/pkg-descr
+++ b/ftp/kftpgrabber/pkg-descr
@@ -14,4 +14,4 @@ Features:
   o SSCN and CPSV support 
   o skiplist 
 
-WWW: http://kftpgrabber.sourceforge.net/
+WWW: http://www.kftp.org/
diff --git a/ftp/kftpgrabber/pkg-plist b/ftp/kftpgrabber/pkg-plist
index 150f4f3f8c8c..ed520d9e0d28 100644
--- a/ftp/kftpgrabber/pkg-plist
+++ b/ftp/kftpgrabber/pkg-plist
@@ -1,8 +1,14 @@
 bin/kftpgrabber
 include/kftpgrabber/kftpbookmarkimportplugin.h
+lib/kde3/kftpimportplugin_filezilla3.a
+lib/kde3/kftpimportplugin_filezilla3.la
+lib/kde3/kftpimportplugin_filezilla3.so
 lib/kde3/kftpimportplugin_gftp.a
 lib/kde3/kftpimportplugin_gftp.la
 lib/kde3/kftpimportplugin_gftp.so
+lib/kde3/kftpimportplugin_kftp.a
+lib/kde3/kftpimportplugin_kftp.la
+lib/kde3/kftpimportplugin_kftp.so
 lib/kde3/kftpimportplugin_ncftp.a
 lib/kde3/kftpimportplugin_ncftp.la
 lib/kde3/kftpimportplugin_ncftp.so
@@ -11,49 +17,67 @@ lib/libkftpinterfaces.la
 lib/libkftpinterfaces.so
 lib/libkftpinterfaces.so.0
 share/applications/kde/kftpgrabber.desktop
+share/apps/kftpgrabber/commands.xml
 share/apps/kftpgrabber/kftpgrabber-bi-wizard.png
 share/apps/kftpgrabber/kftpgrabber-logo.png
 share/apps/kftpgrabber/kftpgrabberui.rc
+share/config.kcfg/kftpgrabber.kcfg
 share/icons/hicolor/16x16/apps/kftpgrabber.png
 share/icons/hicolor/22x22/apps/kftpgrabber.png
 share/icons/hicolor/32x32/apps/kftpgrabber.png
 share/icons/hicolor/48x48/apps/kftpgrabber.png
 share/icons/hicolor/64x64/apps/kftpgrabber.png
+share/locale/bg/LC_MESSAGES/kftpgrabber.mo
 share/locale/br/LC_MESSAGES/kftpgrabber.mo
 share/locale/cs/LC_MESSAGES/kftpgrabber.mo
+share/locale/cy/LC_MESSAGES/kftpgrabber.mo
+share/locale/da/LC_MESSAGES/kftpgrabber.mo
 share/locale/de/LC_MESSAGES/kftpgrabber.mo
 share/locale/el/LC_MESSAGES/kftpgrabber.mo
+share/locale/en_GB/LC_MESSAGES/kftpgrabber.mo
 share/locale/es/LC_MESSAGES/kftpgrabber.mo
+share/locale/et/LC_MESSAGES/kftpgrabber.mo
 share/locale/fr/LC_MESSAGES/kftpgrabber.mo
 share/locale/ga/LC_MESSAGES/kftpgrabber.mo
+share/locale/gl/LC_MESSAGES/kftpgrabber.mo
 share/locale/hu/LC_MESSAGES/kftpgrabber.mo
+share/locale/it/LC_MESSAGES/kftpgrabber.mo
+share/locale/ja/LC_MESSAGES/kftpgrabber.mo
+share/locale/ka/LC_MESSAGES/kftpgrabber.mo
+share/locale/lt/LC_MESSAGES/kftpgrabber.mo
+share/locale/nl/LC_MESSAGES/kftpgrabber.mo
+share/locale/pl/LC_MESSAGES/kftpgrabber.mo
+share/locale/pt/LC_MESSAGES/kftpgrabber.mo
+share/locale/rw/LC_MESSAGES/kftpgrabber.mo
+share/locale/sk/LC_MESSAGES/kftpgrabber.mo
+share/locale/sr/LC_MESSAGES/kftpgrabber.mo
+share/locale/sr@Latn/LC_MESSAGES/kftpgrabber.mo
 share/locale/sv/LC_MESSAGES/kftpgrabber.mo
+share/locale/tr/LC_MESSAGES/kftpgrabber.mo
 share/locale/zh_CN/LC_MESSAGES/kftpgrabber.mo
+share/services/kftpimportplugin_filezilla3.desktop
 share/services/kftpimportplugin_gftp.desktop
+share/services/kftpimportplugin_kftp.desktop
 share/services/kftpimportplugin_ncftp.desktop
 share/servicetypes/kftpbookmarkimportplugin.desktop
-@dirrmtry share/servicetypes
-@dirrmtry share/services
 @dirrmtry share/locale/zh_CN/LC_MESSAGES
 @dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@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/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
 @dirrm share/apps/kftpgrabber
-@dirrmtry share/apps
 @dirrmtry share/applications/kde
-@dirrmtry share/applications
 @dirrm include/kftpgrabber