mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
Update to version 0.4
This commit is contained in:
parent
efbc142d7b
commit
5dd0d37d89
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=113591
@ -5,29 +5,22 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= kasablanca
|
||||
PORTVERSION= 0.3.1
|
||||
PORTVERSION= 0.4
|
||||
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 200404130000 ${WRKSRC}/subdirs
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|-O2||g; s|-lpthread|${PTHREAD_LIBS}|g' \
|
||||
${WRKSRC}/${CONFIGURE_SCRIPT}
|
||||
@${REINPLACE_CMD} -e 's|\(-lssl\)|\1 -lcrypto ${PTHREAD_LIBS}|' \
|
||||
${WRKSRC}/src/Makefile.in \
|
||||
${WRKSRC}/src/kbftp/Makefile.in
|
||||
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
|
||||
@${REINPLACE_CMD} -e 's|\(-lssl\)|\1 -lcrypto|' \
|
||||
${WRKSRC}/src/Makefile.in
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,2 +1,2 @@
|
||||
MD5 (kasablanca-0.3.1.tar.bz2) = 491555d8ddeb9a6627bd73b2477dbf26
|
||||
SIZE (kasablanca-0.3.1.tar.bz2) = 480586
|
||||
MD5 (kasablanca-0.4.tar.gz) = 19586e353d7b52583e3c8f4543a76df7
|
||||
SIZE (kasablanca-0.4.tar.gz) = 638733
|
||||
|
@ -1,118 +0,0 @@
|
||||
--- 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);
|
||||
}
|
||||
}
|
11
ftp/kasablanca/files/patch-eventhandler.cpp
Normal file
11
ftp/kasablanca/files/patch-eventhandler.cpp
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/eventhandler.cpp.orig Wed Jul 14 00:16:23 2004
|
||||
+++ src/eventhandler.cpp Wed Jul 14 00:27:52 2004
|
||||
@@ -58,7 +58,7 @@
|
||||
|
||||
bool EventHandler::eventFilter(QObject*, QEvent *e )
|
||||
{
|
||||
- EventType type = static_cast<EventType>(e->type());
|
||||
+ EventType type = (EventType)(e->type());
|
||||
|
||||
if (mp_thread == NULL)
|
||||
{
|
@ -1,100 +0,0 @@
|
||||
--- 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));
|
||||
}
|
||||
|
@ -1,3 +0,0 @@
|
||||
src
|
||||
po
|
||||
doc
|
@ -1,22 +1,26 @@
|
||||
bin/kasablanca
|
||||
bin/kbftp
|
||||
share/applnk/Utilities/kasablanca.desktop
|
||||
share/apps/kasablanca/about.png
|
||||
share/apps/kasablanca/kasablancaui.rc
|
||||
share/config.kcfg/kbconfig.kcfg
|
||||
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/22x22/apps/kasablanca.png
|
||||
share/icons/hicolor/32x32/apps/kasablanca.png
|
||||
share/icons/hicolor/48x48/apps/kasablanca.png
|
||||
share/icons/hicolor/64x64/apps/kasablanca.png
|
||||
share/locale/de/LC_MESSAGES/kasablanca.mo
|
||||
@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/22x22/apps 2>/dev/null || true
|
||||
@unexec rmdir %D/share/icons/hicolor/22x22 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
|
||||
@ -26,6 +30,7 @@ share/icons/hicolor/64x64/apps/kasablanca.png
|
||||
@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
|
||||
@unexec rmdir %D/share/config.kcfg 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
|
||||
|
Loading…
Reference in New Issue
Block a user