11 files changed, 133 insertions, 140 deletions

diff --git a/net-p2p/kmldonkey/Makefile b/net-p2p/kmldonkey/Makefile
index 94aa7bfa16bb..18383f600f7d 100644
--- a/net-p2p/kmldonkey/Makefile
+++ b/net-p2p/kmldonkey/Makefile
@@ -6,35 +6,24 @@
 #
 
 PORTNAME=	kmldonkey
-PORTVERSION=	0.10.1
-PORTREVISION=	5
+PORTVERSION=	0.11
 CATEGORIES=	net-p2p kde
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/apps/KDE3.x/network
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.pre/pre/}
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	KDE integration for MLDonkey eDonkey P2P client
 
 USE_KDELIBS_VER=3
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--program-transform-name=''
 USE_LDCONFIG=	yes
+INSTALLS_ICONS=	yes
 
-MAN1=	kmldonkey.1 kmldonkey_submit.1
-
-pre-configure:
-# disable AUTO* tools
-	@${FIND} -E ${WRKSRC} -type f \
-		-iregex ".*(Makefile.in|configure)" \
-		| ${XARGS} -x -n 10 \
-		${REINPLACE_CMD} -E \
-			-e 's!^(AUTOCONF|AUTOHEADER|AUTOMAKE|ACLOCAL).*$$!\1=${TRUE}!'
+DOCSDIR=	${PREFIX}/share/doc/HTML/en/${PORTNAME}
 
-pre-build:
-# disable AUTO* tools
-	@${ECHO_CMD} > ${WRKSRC}/admin/cvs.sh
+MAN1=	kmldonkey.1 kmldonkey_submit.1
 
 .include <bsd.port.mk>
diff --git a/net-p2p/kmldonkey/distinfo b/net-p2p/kmldonkey/distinfo
index ab337203718e..8f480287275f 100644
--- a/net-p2p/kmldonkey/distinfo
+++ b/net-p2p/kmldonkey/distinfo
@@ -1,3 +1,3 @@
-MD5 (kmldonkey-0.10.1.tar.bz2) = e1932b1455c7a5cec53145b675bdd8d7
-SHA256 (kmldonkey-0.10.1.tar.bz2) = d73efc6d967494b1e13f174aee18fa5e4cd2232f480e9d88310d17cfd6e3e5d1
-SIZE (kmldonkey-0.10.1.tar.bz2) = 960967
+MD5 (kmldonkey-0.11.tar.gz) = 0e7c0e8ccef76e4bcccbd7c75a3440e5
+SHA256 (kmldonkey-0.11.tar.gz) = 6de59b1cb2341fad2acf486f3ad0b2ffd037af2ef8c3774846c289e1877f8a4b
+SIZE (kmldonkey-0.11.tar.gz) = 1002254
diff --git a/net-p2p/kmldonkey/files/patch-kmldonkey__kmldonkey__downloadpage.cpp b/net-p2p/kmldonkey/files/patch-kmldonkey__kmldonkey__downloadpage.cpp
new file mode 100644
index 000000000000..b11b85b32834
--- /dev/null
+++ b/net-p2p/kmldonkey/files/patch-kmldonkey__kmldonkey__downloadpage.cpp
@@ -0,0 +1,10 @@
+--- ./kmldonkey/kmldonkey/downloadpage.cpp.orig	2008-06-19 20:56:42.000000000 -0300
++++ ./kmldonkey/kmldonkey/downloadpage.cpp	2008-07-12 06:02:12.000000000 -0300
+@@ -88,6 +88,7 @@
+     downloadView->addColumn( i18n( "Last seen" ) );
+     downloadView->addColumn( i18n( "Age" ) );
+     downloadView->addColumn( i18n( "File type" ) );
++    downloadView->addColumn( i18n( "Number" ) );
+     downloadView->setItemsRenameable( true );
+ 
+     downloadedView = new InfoList( downloadSplitter, "downloadedView", true );
diff --git a/net-p2p/kmldonkey/files/patch-src__kmldonkey__infodialog.cpp b/net-p2p/kmldonkey/files/patch-kmldonkey__kmldonkey__infodialog.cpp
index e1d0ba737cd9..f1d74f32cff6 100644
--- a/net-p2p/kmldonkey/files/patch-src__kmldonkey__infodialog.cpp
+++ b/net-p2p/kmldonkey/files/patch-kmldonkey__kmldonkey__infodialog.cpp
@@ -1,6 +1,6 @@
---- ./src/kmldonkey/infodialog.cpp.orig	Tue Jul 26 13:40:33 2005
-+++ ./src/kmldonkey/infodialog.cpp	Sun Apr  9 13:15:40 2006
-@@ -72,10 +72,20 @@
+--- ./kmldonkey/kmldonkey/infodialog.cpp.orig	2008-07-12 06:02:29.000000000 -0300
++++ ./kmldonkey/kmldonkey/infodialog.cpp	2008-07-12 06:04:27.000000000 -0300
+@@ -72,10 +72,21 @@
      layout->addWidget(makeLabel(i18n("Comment:"), frame), 6, 0);
      layout->addWidget(makeLabel(i18n("Alt. names:"), frame, true), 7, 0);
  
@@ -10,6 +10,7 @@
      nameView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
      nameView->setReadOnly(true);
 -    layout->addWidget(nameView, 0, 1);
++
 +    l1->addWidget(nameView);
 +
 +    l1->addWidget(makeLabel(i18n("Number:"), frame));
@@ -22,7 +23,7 @@
  
      availView = new AvailabilityWidget(fileno, frame, "availView");
      layout->addWidget(availView, 1, 1);
-@@ -206,6 +216,7 @@
+@@ -202,6 +213,7 @@
          return;
      }
      nameView->setText(fi->fileName());
diff --git a/net-p2p/kmldonkey/files/patch-src__kmldonkey__infodialog.h b/net-p2p/kmldonkey/files/patch-kmldonkey__kmldonkey__infodialog.h
index 1c73969a59f4..4e4622c4a9a7 100644
--- a/net-p2p/kmldonkey/files/patch-src__kmldonkey__infodialog.h
+++ b/net-p2p/kmldonkey/files/patch-kmldonkey__kmldonkey__infodialog.h
@@ -1,5 +1,5 @@
---- ./src/kmldonkey/infodialog.h.orig	Tue Jul 26 13:40:33 2005
-+++ ./src/kmldonkey/infodialog.h	Sun Apr  9 13:15:40 2006
+--- ./kmldonkey/kmldonkey/infodialog.h.orig	2008-07-12 06:04:43.000000000 -0300
++++ ./kmldonkey/kmldonkey/infodialog.h	2008-07-12 06:05:09.000000000 -0300
 @@ -51,7 +51,7 @@
  private:
      int fileno;
diff --git a/net-p2p/kmldonkey/files/patch-kmldonkey__kmldonkey__infolist.cpp b/net-p2p/kmldonkey/files/patch-kmldonkey__kmldonkey__infolist.cpp
new file mode 100644
index 000000000000..d5b30e52e891
--- /dev/null
+++ b/net-p2p/kmldonkey/files/patch-kmldonkey__kmldonkey__infolist.cpp
@@ -0,0 +1,26 @@
+--- ./kmldonkey/kmldonkey/infolist.cpp.orig	2008-07-12 06:05:22.000000000 -0300
++++ ./kmldonkey/kmldonkey/infolist.cpp	2008-07-12 06:06:56.000000000 -0300
+@@ -618,6 +618,14 @@
+     return i18n( "normal priority", "Normal" );
+ }
+ 
++QString humanReadableFileNumber( int fileNo )
++{
++    QString foo;
++
++    foo = KGlobal::locale()->formatNumber(fileNo, 0);
++
++    return foo;
++}
+ 
+ DownloadFile::DownloadFile( KListView *parent, int file )
+     : InfoItem( parent, file )
+@@ -712,6 +720,8 @@
+         }
+         case 13: // filetype
+             return KMimeType::findByURL( KURL( "file:/" + it->fileName() ), 0, false, true )->comment();
++        case 14: // number
++            return humanReadableFileNumber(it->fileNo());
+ 
+         default:
+             return "ERROR!";
diff --git a/net-p2p/kmldonkey/files/patch-kmldonkey__kmldonkey__infolist.h b/net-p2p/kmldonkey/files/patch-kmldonkey__kmldonkey__infolist.h
new file mode 100644
index 000000000000..22907ba87ad2
--- /dev/null
+++ b/net-p2p/kmldonkey/files/patch-kmldonkey__kmldonkey__infolist.h
@@ -0,0 +1,10 @@
+--- ./kmldonkey/kmldonkey/infolist.h.orig	2008-07-12 06:07:09.000000000 -0300
++++ ./kmldonkey/kmldonkey/infolist.h	2008-07-12 06:07:25.000000000 -0300
+@@ -301,6 +301,7 @@
+ QString humanReadableTime( time_t t, bool shortFormat );
+ QString calculateETA( FileInfo* fi );
+ QString humanReadablePriority( int pri );
++QString humanReadableFileNumber( int fileNo );
+ 
+ 
+ #endif /* __INFOLIST_H__ */
diff --git a/net-p2p/kmldonkey/files/patch-src__kmldonkey__downloadpage.cpp b/net-p2p/kmldonkey/files/patch-src__kmldonkey__downloadpage.cpp
deleted file mode 100644
index 766778dcf3e7..000000000000
--- a/net-p2p/kmldonkey/files/patch-src__kmldonkey__downloadpage.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/kmldonkey/downloadpage.cpp.orig	Tue Jul 26 13:40:33 2005
-+++ ./src/kmldonkey/downloadpage.cpp	Sun Apr  9 13:15:40 2006
-@@ -68,6 +68,7 @@
-     downloadView->addColumn( i18n( "Last seen" ) );
-     downloadView->addColumn( i18n( "Age" ) );
-     downloadView->addColumn( i18n( "File type" ) );
-+    downloadView->addColumn( i18n( "Number" ) );
-     downloadView->setItemsRenameable(true);
- 
-     downloadedView = new InfoList(downloadSplitter, "downloadedView", true);
diff --git a/net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.cpp b/net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.cpp
deleted file mode 100644
index d472e2a4acf3..000000000000
--- a/net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./src/kmldonkey/infolist.cpp.orig	Tue Jul 26 13:40:33 2005
-+++ ./src/kmldonkey/infolist.cpp	Sun Apr  9 13:15:40 2006
-@@ -491,6 +491,14 @@
-     return i18n("normal priority", "Normal");
- }
- 
-+QString humanReadableFileNumber(int fileNo)
-+{
-+    QString foo;
-+
-+    foo = KGlobal::locale()->formatNumber(fileNo, 0);
-+
-+    return foo;
-+}
- 
- // DownloadFile
- 
-@@ -569,6 +577,8 @@
-     }
-     case 13: // filetype
-         return KMimeType::findByURL( KURL( "file:/" + it->fileName() ), 0, false, true)->comment();
-+    case 14: // number
-+        return humanReadableFileNumber(it->fileNo());
-     default:
-         return "ERROR!";
-     }
diff --git a/net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.h b/net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.h
deleted file mode 100644
index 82853bec3963..000000000000
--- a/net-p2p/kmldonkey/files/patch-src__kmldonkey__infolist.h
+++ /dev/null
@@ -1,9 +0,0 @@
---- ./src/kmldonkey/infolist.h.orig	Sun Apr  9 13:19:37 2006
-+++ ./src/kmldonkey/infolist.h	Sun Apr  9 13:19:01 2006
-@@ -321,5 +321,6 @@
- QString humanReadableTime(time_t t, bool shortFormat);
- QString calculateETA(FileInfo* fi);
- QString humanReadablePriority(int pri);
-+QString humanReadableFileNumber(int fileNo);
- 
- #endif
diff --git a/net-p2p/kmldonkey/pkg-plist b/net-p2p/kmldonkey/pkg-plist
index 76eb6adfc28e..4eda894d9545 100644
--- a/net-p2p/kmldonkey/pkg-plist
+++ b/net-p2p/kmldonkey/pkg-plist
@@ -7,11 +7,6 @@ include/kmldonkey/donkeyprotocol.h
 include/kmldonkey/donkeysocket.h
 include/kmldonkey/ed2kurl.h
 include/kmldonkey/fileinfo.h
-include/kmldonkey/giftdownload.h
-include/kmldonkey/gifthost.h
-include/kmldonkey/giftmessage.h
-include/kmldonkey/giftprotocol.h
-include/kmldonkey/giftsocket.h
 include/kmldonkey/hostiface.h
 include/kmldonkey/hostmanager.h
 include/kmldonkey/infoiface.h
@@ -48,8 +43,8 @@ lib/libkmldonkeytools.a
 lib/libkmldonkeytools.la
 lib/libkmldonkeytools.so
 lib/libkmldonkeytools.so.0
-share/applnk/Internet/kmldonkey.desktop
-share/applnk/Settings/Network/kcmdonkey.desktop
+share/applications/kde/kcmdonkey.desktop
+share/applications/kde/kmldonkey.desktop
 share/apps/kicker/applets/mldonkeyapplet.desktop
 share/apps/kmldonkey/eventsrc
 share/apps/kmldonkey/images/networks/bittorrent.png
@@ -65,27 +60,9 @@ share/apps/konqueror/servicemenus/ed2k_slurp.desktop
 share/apps/mldonkeyapplet/pics/mld-launchgui.png
 share/apps/mldonkeyapplet/pics/mld-mutedonkey.png
 share/apps/mldonkeyapplet/pics/mld-unmutedonkey.png
-share/doc/HTML/de/kmldonkey/common
-share/doc/HTML/de/kmldonkey/index.cache.bz2
-share/doc/HTML/de/kmldonkey/index.docbook
-share/doc/HTML/et/kmldonkey/common
-share/doc/HTML/et/kmldonkey/index.cache.bz2
-share/doc/HTML/et/kmldonkey/index.docbook
-share/doc/HTML/it/kmldonkey/common
-share/doc/HTML/it/kmldonkey/index.cache.bz2
-share/doc/HTML/it/kmldonkey/index.docbook
-share/doc/HTML/nl/kmldonkey/common
-share/doc/HTML/nl/kmldonkey/index.cache.bz2
-share/doc/HTML/nl/kmldonkey/index.docbook
-share/doc/HTML/pt/kmldonkey/common
-share/doc/HTML/pt/kmldonkey/index.cache.bz2
-share/doc/HTML/pt/kmldonkey/index.docbook
-share/doc/HTML/ru/kmldonkey/common
-share/doc/HTML/ru/kmldonkey/index.cache.bz2
-share/doc/HTML/ru/kmldonkey/index.docbook
-share/doc/HTML/sv/kmldonkey/common
-share/doc/HTML/sv/kmldonkey/index.cache.bz2
-share/doc/HTML/sv/kmldonkey/index.docbook
+%%DOCSDIR%%/common
+%%DOCSDIR%%/index.cache.bz2
+%%DOCSDIR%%/index.docbook
 share/icons/hicolor/128x128/apps/kmldonkey.png
 share/icons/hicolor/128x128/apps/mldonkey.png
 share/icons/hicolor/16x16/apps/kmldonkey.png
@@ -98,26 +75,6 @@ share/icons/hicolor/48x48/apps/kmldonkey.png
 share/icons/hicolor/48x48/apps/mldonkey.png
 share/icons/hicolor/64x64/apps/kmldonkey.png
 share/icons/hicolor/64x64/apps/mldonkey.png
-share/locale/ca/LC_MESSAGES/kmldonkey.mo
-share/locale/cy/LC_MESSAGES/kmldonkey.mo
-share/locale/de/LC_MESSAGES/kmldonkey.mo
-share/locale/el/LC_MESSAGES/kmldonkey.mo
-share/locale/es/LC_MESSAGES/kmldonkey.mo
-share/locale/et/LC_MESSAGES/kmldonkey.mo
-share/locale/hu/LC_MESSAGES/kmldonkey.mo
-share/locale/is/LC_MESSAGES/kmldonkey.mo
-share/locale/it/LC_MESSAGES/kmldonkey.mo
-share/locale/lt/LC_MESSAGES/kmldonkey.mo
-share/locale/mt/LC_MESSAGES/kmldonkey.mo
-share/locale/nb/LC_MESSAGES/kmldonkey.mo
-share/locale/nl/LC_MESSAGES/kmldonkey.mo
-share/locale/pt/LC_MESSAGES/kmldonkey.mo
-share/locale/pt_BR/LC_MESSAGES/kmldonkey.mo
-share/locale/ro/LC_MESSAGES/kmldonkey.mo
-share/locale/ru/LC_MESSAGES/kmldonkey.mo
-share/locale/sv/LC_MESSAGES/kmldonkey.mo
-share/locale/ta/LC_MESSAGES/kmldonkey.mo
-share/locale/zh_CN/LC_MESSAGES/kmldonkey.mo
 share/services/ed2k.protocol
 share/services/kded/kmldonkeyd.desktop
 share/services/kmldonkey_debugpage.desktop
@@ -128,6 +85,61 @@ share/servicetypes/kmldonkey_plugin.desktop
 @dirrmtry share/servicetypes
 @dirrmtry share/services/kded
 @dirrmtry share/services
+@dirrmtry share/pixmaps
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uz/LC_MESSAGES
+@dirrmtry share/locale/uz
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/tg/LC_MESSAGES
+@dirrmtry share/locale/tg
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fr_FR/LC_MESSAGES
+@dirrmtry share/locale/fr_FR
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/fa_IR/LC_MESSAGES
+@dirrmtry share/locale/fa_IR
+@dirrmtry share/locale/en_AU/LC_MESSAGES
+@dirrmtry share/locale/en_AU
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/de_AT/LC_MESSAGES
+@dirrmtry share/locale/de_AT
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
 @dirrmtry share/icons/hicolor/64x64/apps
 @dirrmtry share/icons/hicolor/64x64
 @dirrmtry share/icons/hicolor/48x48/apps
@@ -142,24 +154,11 @@ share/servicetypes/kmldonkey_plugin.desktop
 @dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
-@dirrm share/doc/HTML/sv/kmldonkey
-@dirrmtry share/doc/HTML/sv
-@dirrm share/doc/HTML/ru/kmldonkey
-@dirrmtry share/doc/HTML/ru
-@dirrm share/doc/HTML/pt/kmldonkey
-@dirrmtry share/doc/HTML/pt
-@dirrm share/doc/HTML/nl/kmldonkey
-@dirrmtry share/doc/HTML/nl
-@dirrm share/doc/HTML/it/kmldonkey
-@dirrmtry share/doc/HTML/it
-@dirrm share/doc/HTML/et/kmldonkey
-@dirrmtry share/doc/HTML/et
-@dirrm share/doc/HTML/en/kmldonkey-apidocs/src/html
-@dirrm share/doc/HTML/en/kmldonkey-apidocs/src
-@dirrm share/doc/HTML/en/kmldonkey-apidocs
+@dirrmtry share/doc/HTML/en/kmldonkey-apidocs/kmldonkey/html
+@dirrmtry share/doc/HTML/en/kmldonkey-apidocs/kmldonkey
+@dirrmtry share/doc/HTML/en/kmldonkey-apidocs
+@dirrm %%DOCSDIR%%
 @dirrmtry share/doc/HTML/en
-@dirrm share/doc/HTML/de/kmldonkey
-@dirrmtry share/doc/HTML/de
 @dirrmtry share/doc/HTML
 @dirrm share/apps/mldonkeyapplet/pics
 @dirrm share/apps/mldonkeyapplet
@@ -171,9 +170,12 @@ share/servicetypes/kmldonkey_plugin.desktop
 @dirrmtry share/apps/kicker/applets
 @dirrmtry share/apps/kicker
 @dirrmtry share/apps
-@dirrmtry share/applnk/Settings/Network
-@dirrmtry share/applnk/Settings
-@dirrmtry share/applnk/Internet
-@dirrmtry share/applnk
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
 @dirrmtry lib/kde3
+@dirrmtry lib/X11/fonts/local
+@dirrmtry lib/X11/fonts
+@dirrmtry lib/X11/app-defaults
+@dirrmtry lib/X11
 @dirrm include/kmldonkey
+@dirrmtry include/X11