9 files changed, 316 insertions, 0 deletions

diff --git a/ftp/Makefile b/ftp/Makefile
index 41c4f675b78c..96ae0f9ddebe 100644
--- a/ftp/Makefile
+++ b/ftp/Makefile
@@ -41,6 +41,7 @@
     SUBDIR += jigdo
     SUBDIR += jmirror
     SUBDIR += junglemonkey
+    SUBDIR += kasablanca
     SUBDIR += kbear
     SUBDIR += kwebget
     SUBDIR += lftp
diff --git a/ftp/kasablanca/Makefile b/ftp/kasablanca/Makefile
new file mode 100644
index 000000000000..d332df577ca0
--- /dev/null
+++ b/ftp/kasablanca/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	kasablanca
+# Date created:			Fri Apr 16 12:10:00 CEST 2004
+# Whom:				Markus Brueffer <markus@FreeBSD.org>
+#
+# $FreeBSD$
+
+PORTNAME=	kasablanca
+PORTVERSION=	0.3.1
+CATEGORIES=	ftp kde
+MASTER_SITES=	http://download.berlios.de/kasablanca/
+
+MAINTAINER=	markus@FreeBSD.org
+COMMENT=	Graphical ftp client for KDE
+
+USE_BZIP2=	yes
+USE_KDELIBS_VER=3
+USE_GMAKE=	yes
+USE_OPENSSL=	yes
+GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
+
+post-extract:
+	@${CP} ${FILESDIR}/subdirs ${WRKSRC}
+	@${TOUCH} -t 200404152151 ${WRKSRC}/subdirs
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|\(-lssl\)|\1 -lcrypto|' \
+		${WRKSRC}/src/Makefile.in \
+		${WRKSRC}/src/kbftp/Makefile.in
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11/kde3/Makefile.kde"
+.include <bsd.port.post.mk>
diff --git a/ftp/kasablanca/distinfo b/ftp/kasablanca/distinfo
new file mode 100644
index 000000000000..f4d7f63ef3bd
--- /dev/null
+++ b/ftp/kasablanca/distinfo
@@ -0,0 +1,2 @@
+MD5 (kasablanca-0.3.1.tar.bz2) = 491555d8ddeb9a6627bd73b2477dbf26
+SIZE (kasablanca-0.3.1.tar.bz2) = 480586
diff --git a/ftp/kasablanca/files/patch-bookmarkdialog.cpp b/ftp/kasablanca/files/patch-bookmarkdialog.cpp
new file mode 100644
index 000000000000..fcb935fbcf20
--- /dev/null
+++ b/ftp/kasablanca/files/patch-bookmarkdialog.cpp
@@ -0,0 +1,118 @@
+--- src/bookmarkdialog.cpp.orig	Fri Apr 16 11:59:56 2004
++++ src/bookmarkdialog.cpp	Fri Apr 16 12:03:43 2004
+@@ -43,7 +43,7 @@
+ 	{
+ 		EnableInput(true);
+ 		BookmarkListBox->setSelected(0, true);
+-		RefreshEntry(m_bookmarks.at(0));
++		RefreshEntry(m_bookmarks[0]);
+ 	}
+ }
+ 
+@@ -110,7 +110,7 @@
+ 
+ 	for (int i = 0; i < static_cast<int>(m_bookmarks.size()); i++)
+    {
+-		BookmarkListBox->insertItem(m_bookmarks.at(i).GetName(),i);
++		BookmarkListBox->insertItem(m_bookmarks[i].GetName(),i);
+    }
+ 
+ 	return 1;
+@@ -131,7 +131,7 @@
+ 		return;
+ 	}
+ 
+-	if (ApplyEntry(&m_bookmarks.at(n)))
++	if (ApplyEntry(&m_bookmarks[n]))
+ 	{
+ 		if (WriteBookmarks() != 1)
+ 		{
+@@ -145,7 +145,7 @@
+ 
+ void BookmarkDialog::SLOT_EntrySelected(int n)
+ {
+-	RefreshEntry(m_bookmarks.at(n));
++	RefreshEntry(m_bookmarks[n]);
+ }
+ 
+ void BookmarkDialog::SLOT_ApplyEntry()
+@@ -154,13 +154,13 @@
+ 
+ 	int n = BookmarkListBox->currentItem();
+ 
+-	if (!ApplyEntry(&m_bookmarks.at(n))) KMessageBox::error(0,"entry form not complete!");
++	if (!ApplyEntry(&m_bookmarks[n])) KMessageBox::error(0,"entry form not complete!");
+ 	else
+ 	{
+ 		BookmarkListBox->clear();
+ 		for (int i = 0; i < static_cast<int>(m_bookmarks.size()); i++)
+    	{
+-			BookmarkListBox->insertItem(m_bookmarks.at(i).GetName(),i);
++			BookmarkListBox->insertItem(m_bookmarks[i].GetName(),i);
+    	}
+ 		BookmarkListBox->setSelected(n, true);
+ 	}
+@@ -198,7 +198,7 @@
+ 	BookmarkListBox->clear();
+ 	for (int i = 0; i < static_cast<int>(m_bookmarks.size()); i++)
+    {
+-		BookmarkListBox->insertItem(m_bookmarks.at(i).GetName(),i);
++		BookmarkListBox->insertItem(m_bookmarks[i].GetName(),i);
+    }
+ 
+ 	if (m_bookmarks.empty()) EnableInput(false);
+@@ -206,7 +206,7 @@
+ 	{
+ 		EnableInput(true);
+ 		BookmarkListBox->setSelected(0, true);
+-		RefreshEntry(m_bookmarks.at(0));
++		RefreshEntry(m_bookmarks[0]);
+ 	}
+ }
+ 
+@@ -218,10 +218,10 @@
+ 
+ 	for (int i = 0; i < static_cast<int>(m_bookmarks.size()); i++)
+ 	{
+-		if (m_bookmarks.at(i).CheckContent())
++		if (m_bookmarks[i].CheckContent())
+ 		{
+ 			QDomElement siteElement = doc.createElement("site");
+-			siteElement.setAttribute("name", m_bookmarks.at(i).GetName());
++			siteElement.setAttribute("name", m_bookmarks[i].GetName());
+ 			root.appendChild( siteElement );
+ 
+ 			QDomText text;
+@@ -229,27 +229,27 @@
+ 
+ 			curElement = doc.createElement( "user" );
+ 			siteElement.appendChild( curElement );
+-			text = doc.createTextNode(m_bookmarks.at(i).GetUser());
++			text = doc.createTextNode(m_bookmarks[i].GetUser());
+ 			curElement.appendChild(text);
+ 
+ 			curElement = doc.createElement( "pass" );
+ 			siteElement.appendChild( curElement );
+-			text = doc.createTextNode(m_bookmarks.at(i).GetPass());
++			text = doc.createTextNode(m_bookmarks[i].GetPass());
+ 			curElement.appendChild(text);
+ 
+ 			curElement = doc.createElement( "info" );
+ 			siteElement.appendChild( curElement );
+-			text = doc.createTextNode(m_bookmarks.at(i).GetInfo());
++			text = doc.createTextNode(m_bookmarks[i].GetInfo());
+ 			curElement.appendChild(text);
+ 
+ 			curElement = doc.createElement( "pasv" );
+ 			siteElement.appendChild( curElement );
+-			text = doc.createTextNode(QString::number(m_bookmarks.at(i).GetPasv()));
++			text = doc.createTextNode(QString::number(m_bookmarks[i].GetPasv()));
+ 			curElement.appendChild(text);
+ 
+ 			curElement = doc.createElement( "tls" );
+ 			siteElement.appendChild( curElement );
+-			text = doc.createTextNode(QString::number(m_bookmarks.at(i).GetTls()));
++			text = doc.createTextNode(QString::number(m_bookmarks[i].GetTls()));
+ 			curElement.appendChild(text);
+ 		}
+ 	}
diff --git a/ftp/kasablanca/files/patch-kasablanca.cpp b/ftp/kasablanca/files/patch-kasablanca.cpp
new file mode 100644
index 000000000000..3ad02a086f57
--- /dev/null
+++ b/ftp/kasablanca/files/patch-kasablanca.cpp
@@ -0,0 +1,100 @@
+--- src/kasablanca.cpp.orig	Fri Apr 16 11:52:53 2004
++++ src/kasablanca.cpp	Fri Apr 16 11:58:46 2004
+@@ -465,12 +465,12 @@
+ 			
+ 	site->Clear();
+ 
+-	site->SetInfo(m_bookmarks.at(n).GetInfo());
+-	site->SetName(m_bookmarks.at(n).GetName());
+-	site->SetPass(m_bookmarks.at(n).GetPass());
+-	site->SetPasv(m_bookmarks.at(n).GetPasv());
+-	site->SetTls(m_bookmarks.at(n).GetTls());
+-	site->SetUser(m_bookmarks.at(n).GetUser());
++	site->SetInfo(m_bookmarks[n].GetInfo());
++	site->SetName(m_bookmarks[n].GetName());
++	site->SetPass(m_bookmarks[n].GetPass());
++	site->SetPasv(m_bookmarks[n].GetPasv());
++	site->SetTls(m_bookmarks[n].GetTls());
++	site->SetUser(m_bookmarks[n].GetUser());
+ 
+ 	if (!proc->start())
+ 	{
+@@ -678,8 +678,8 @@
+ 	
+ 	for (int i = 0; i < static_cast<int>(m_bookmarks.size()); i++)
+    {
+-		m_bookmarksmenu_a.insertItem(m_bookmarks.at(i).GetName(),i + 1);
+-   	m_bookmarksmenu_b.insertItem(m_bookmarks.at(i).GetName(),i + 1);
++		m_bookmarksmenu_a.insertItem(m_bookmarks[i].GetName(),i + 1);
++   	m_bookmarksmenu_b.insertItem(m_bookmarks[i].GetName(),i + 1);
+    }
+ 
+    return 1;
+@@ -1370,7 +1370,7 @@
+ 			UpdateLocalDisplay(localbrowser);
+ 			UpdateRemote(remotebrowser);
+ 		}
+-		else if ((dir->type() == transferitem::fxp_a_to_b) or (dir->type() == transferitem::fxp_b_to_a))
++		else if ((dir->type() == transferitem::fxp_a_to_b) || (dir->type() == transferitem::fxp_b_to_a))
+ 		{
+ 			/* the scan dir flag is set */
+ 
+@@ -1556,7 +1556,7 @@
+ 				dialog.OverwriteButton->setEnabled(false);
+ 			}
+ 
+-			if ((file->m_filocal.isFile() == true) or (file->m_filocal.isDir() == true))
++			if ((file->m_filocal.isFile() == true) || (file->m_filocal.isDir() == true))
+ 			{
+ 				filepresent = true;
+ 				dialog.setCaption(file->m_filocal.fileName() + " exists yet...");
+@@ -1574,7 +1574,7 @@
+ 				case 4:
+ 					bool b = false;
+ 					
+-					while ((filepresent) or (!b))
++					while ((filepresent) || (!b))
+ 					//while ((localname.lower() == file->m_firemote.fileName().lower()) || (!b))
+ 					{
+ 						#if KDE_IS_VERSION(3,2,0)
+@@ -1585,7 +1585,7 @@
+ 
+ 						filepresent = false;
+ 						QFileInfo fi(file->m_filocal.dirPath() + "/" + localname);
+-						if ((fi.isFile() == true) or (fi.isDir() == true)) filepresent = true;
++						if ((fi.isFile() == true) || (fi.isDir() == true)) filepresent = true;
+ 					}
+ 					break;
+ 				}
+@@ -1930,10 +1930,10 @@
+ 	{
+ 		diritem * di = new diritem(browser,
+ 			browser->lastItem(),
+-			ditable.at(i).fileName(),
+-			ditable.at(i).dirPath(),
+-			ditable.at(i).date(),
+-			ditable.at(i).size(),ditable.at(i).date_int());
++			ditable[i].fileName(),
++			ditable[i].dirPath(),
++			ditable[i].date(),
++			ditable[i].size(),ditable[i].date_int());
+ 		di->setPixmap(0, il->loadIcon("folder",KIcon::Small));
+ 	}
+ 
+@@ -1941,11 +1941,11 @@
+ 	{
+ 		fileitem * fi = new fileitem(browser,
+ 			browser->lastItem(),
+-			fitable.at(i).fileName(),
+-			fitable.at(i).dirPath(),
+-			fitable.at(i).date(),
+-			fitable.at(i).size(),
+-			fitable.at(i).date_int());
++			fitable[i].fileName(),
++			fitable[i].dirPath(),
++			fitable[i].date(),
++			fitable[i].size(),
++			fitable[i].date_int());
+ 		fi->setPixmap(0, il->loadIcon("files",KIcon::Small));
+ 	}
+ 
diff --git a/ftp/kasablanca/files/patch-kbitem.cpp b/ftp/kasablanca/files/patch-kbitem.cpp
new file mode 100644
index 000000000000..fa16aa76855c
--- /dev/null
+++ b/ftp/kasablanca/files/patch-kbitem.cpp
@@ -0,0 +1,17 @@
+--- src/kbitem.cpp.orig	Fri Apr 16 12:04:47 2004
++++ src/kbitem.cpp	Fri Apr 16 12:05:13 2004
+@@ -23,12 +23,12 @@
+ 
+ int kbitem::compare(QListViewItem * i, int col, bool ascending) const
+ {
+-	if ((this->rtti() == 1001) and (i->rtti() == 1002)) 
++	if ((this->rtti() == 1001) && (i->rtti() == 1002)) 
+ 	{
+ 		if (ascending) return -1;
+ 		else return 1;
+ 	}
+-	else if ((this->rtti() == 1002) and (i->rtti() == 1001)) 
++	else if ((this->rtti() == 1002) && (i->rtti() == 1001)) 
+ 	{
+ 		if (ascending) return 1;
+ 		else return -1; 
diff --git a/ftp/kasablanca/files/subdirs b/ftp/kasablanca/files/subdirs
new file mode 100644
index 000000000000..fe15483091c5
--- /dev/null
+++ b/ftp/kasablanca/files/subdirs
@@ -0,0 +1,3 @@
+src
+po
+doc
diff --git a/ftp/kasablanca/pkg-descr b/ftp/kasablanca/pkg-descr
new file mode 100644
index 000000000000..c193cd1a092d
--- /dev/null
+++ b/ftp/kasablanca/pkg-descr
@@ -0,0 +1,9 @@
+Kasablanca is a a graphical ftp client for KDE.
+
+Features:
+   o ftps encryption via AUTH TLS
+   o fxp (direct server to server transfer)
+   o bookmarking system
+   o concurrent connections to multiple hosts
+
+WWW: http://kasablanca.berlios.de/
diff --git a/ftp/kasablanca/pkg-plist b/ftp/kasablanca/pkg-plist
new file mode 100644
index 000000000000..fd1dede79744
--- /dev/null
+++ b/ftp/kasablanca/pkg-plist
@@ -0,0 +1,32 @@
+bin/kasablanca
+bin/kbftp
+share/applnk/Utilities/kasablanca.desktop
+share/apps/kasablanca/about.png
+share/apps/kasablanca/kasablancaui.rc
+share/doc/HTML/en/kasablanca/common
+share/doc/HTML/en/kasablanca/index.cache.bz2
+share/doc/HTML/en/kasablanca/index.docbook
+share/icons/hicolor/128x128/apps/kasablanca.png
+share/icons/hicolor/16x16/apps/kasablanca.png
+share/icons/hicolor/32x32/apps/kasablanca.png
+share/icons/hicolor/48x48/apps/kasablanca.png
+share/icons/hicolor/64x64/apps/kasablanca.png
+@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrm share/doc/HTML/en/kasablanca
+@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrm share/apps/kasablanca
+@unexec rmdir %D/share/apps 2>/dev/null || true
+@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
+@unexec rmdir %D/share/applnk 2>/dev/null || true