Update to version 0.4.0.2

7 files changed, 79 insertions, 10 deletions

diff --git a/ftp/kasablanca/Makefile b/ftp/kasablanca/Makefile
index 85bfbb4..d7261ac 100644
--- a/ftp/kasablanca/Makefile
+++ b/ftp/kasablanca/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kasablanca
-PORTVERSION=	0.4.0.1
-PORTREVISION=	1
+PORTVERSION=	0.4.0.2
 CATEGORIES=	ftp kde
 MASTER_SITES=	http://download.berlios.de/kasablanca/
 
diff --git a/ftp/kasablanca/distinfo b/ftp/kasablanca/distinfo
index 9dba336..f3ea27a 100644
--- a/ftp/kasablanca/distinfo
+++ b/ftp/kasablanca/distinfo
@@ -1,2 +1,2 @@
-MD5 (kasablanca-0.4.0.1.tar.gz) = 507e7345e3efaf1647fc164c45d3127e
-SIZE (kasablanca-0.4.0.1.tar.gz) = 644230
+MD5 (kasablanca-0.4.0.2.tar.gz) = 033bec75f0dac75c1dd892392a4a01ae
+SIZE (kasablanca-0.4.0.2.tar.gz) = 699799
diff --git a/ftp/kasablanca/files/patch-ftplib.cpp b/ftp/kasablanca/files/patch-ftplib.cpp
new file mode 100644
index 0000000..1e784f4
--- /dev/null
+++ b/ftp/kasablanca/files/patch-ftplib.cpp
@@ -0,0 +1,28 @@
+--- src/ftplib.cpp.orig	Wed Feb  2 23:31:16 2005
++++ src/ftplib.cpp	Wed Feb  2 23:37:05 2005
+@@ -71,6 +71,14 @@
+ #define FTPLIB_READ 1
+ #define FTPLIB_WRITE 2
+ 
++#ifndef __USE_LARGEFILE64
++ #define FOPEN fopen
++ #define FSEEKO fseeko
++#else
++ #define FOPEN fopen64
++ #define FSEEKO fseeko64
++#endif
++
+ /*
+  * Constructor
+  */
+@@ -1138,8 +1146,8 @@
+ 		if (typ == FTPLIB_FILE_WRITE) { ac[0] = 'r'; ac[1] = '\0'; }
+ 		if (mode == ftplib::image) ac[1] = 'b';
+ 
+-		local = fopen64(localfile, ac);
+-		if (typ == FTPLIB_FILE_WRITE_APPEND) fseeko64(local,mp_netbuf->offset,SEEK_SET);
++		local = FOPEN(localfile, ac);
++		if (typ == FTPLIB_FILE_WRITE_APPEND) FSEEKO(local,mp_netbuf->offset,SEEK_SET);
+ 
+ 		if (local == NULL)
+ 		{
diff --git a/ftp/kasablanca/files/patch-ftplib.h b/ftp/kasablanca/files/patch-ftplib.h
new file mode 100644
index 0000000..bbb2fe6
--- /dev/null
+++ b/ftp/kasablanca/files/patch-ftplib.h
@@ -0,0 +1,13 @@
+--- src/ftplib.h.orig	Wed Feb  2 23:29:55 2005
++++ src/ftplib.h	Wed Feb  2 23:30:51 2005
+@@ -56,6 +56,10 @@
+ #include <sys/time.h>
+ #include <openssl/ssl.h>
+ 
++#ifdef __FreeBSD__
++#define off64_t off_t
++#endif
++
+ using namespace std;
+ 
+ /**
diff --git a/ftp/kasablanca/files/patch-ftpthread.cpp b/ftp/kasablanca/files/patch-ftpthread.cpp
new file mode 100644
index 0000000..3d9802b
--- /dev/null
+++ b/ftp/kasablanca/files/patch-ftpthread.cpp
@@ -0,0 +1,19 @@
+--- src/ftpthread.cpp.orig	Mon Jan 31 14:24:47 2005
++++ src/ftpthread.cpp	Thu Feb  3 00:45:36 2005
+@@ -31,6 +31,7 @@
+ 
+ #include <iostream>
+ #include <list>
++#include <stdlib.h>
+ 
+ #include "kbconfig.h"
+ #include "ftplib.h"
+@@ -1226,7 +1227,7 @@
+ 				loc--;
+ 			}
+ 
+-			off64_t size = atoll(buffer.substr( sizebegin, datebegin - sizebegin).c_str());
++			off64_t size = strtoll(buffer.substr( sizebegin, datebegin - sizebegin).c_str(), (char **)NULL, 10);
+ 			
+ 			filestring.erase();
+ 			filestring.append(buffer, fileloc, buffer.length() - fileloc);
diff --git a/ftp/kasablanca/files/patch-kbfileinfo.h b/ftp/kasablanca/files/patch-kbfileinfo.h
index cc722a1..ad7a98a 100644
--- a/ftp/kasablanca/files/patch-kbfileinfo.h
+++ b/ftp/kasablanca/files/patch-kbfileinfo.h
@@ -1,10 +1,15 @@
---- src/kbfileinfo.h.orig	Wed Aug 18 15:04:42 2004
-+++ src/kbfileinfo.h	Wed Aug 18 15:06:10 2004
-@@ -12,6 +12,7 @@
+--- src/kbfileinfo.h.orig	Fri Jan 28 00:56:07 2005
++++ src/kbfileinfo.h	Wed Feb  2 23:17:14 2005
+@@ -12,7 +12,12 @@
  #ifndef KBFILEINFO_H
  #define KBFILEINFO_H
  
 +#include <fcntl.h>
  #include <qfileinfo.h>
++
++#ifdef __FreeBSD__
++#define off64_t off_t
++#endif
  
  class KbItem;
+ 
diff --git a/ftp/kasablanca/files/patch-kbitem.h b/ftp/kasablanca/files/patch-kbitem.h
index 49bba1f..1bfb407 100644
--- a/ftp/kasablanca/files/patch-kbitem.h
+++ b/ftp/kasablanca/files/patch-kbitem.h
@@ -1,10 +1,15 @@
---- src/kbitem.h.orig	Wed Aug 18 15:07:56 2004
-+++ src/kbitem.h	Wed Aug 18 15:08:22 2004
-@@ -12,6 +12,7 @@
+--- src/kbitem.h.orig	Fri Jan 28 00:56:07 2005
++++ src/kbitem.h	Wed Feb  2 23:38:36 2005
+@@ -12,7 +12,12 @@
  #ifndef KBITEM_H
  #define KBITEM_H
  
 +#include <fcntl.h>
  #include <qlistview.h>
++
++#ifdef __FreeBSD__
++#define off64_t off_t
++#endif
  
  class KbFileInfo;
+