8 files changed, 4 insertions, 149 deletions

diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index d48590c463a2..ab241bd2b1de 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -5,16 +5,13 @@
 # $FreeBSD$
 
 PORTNAME=	kbibtex
-PORTVERSION=	0.1.5
-PORTREVISION=	2
+PORTVERSION=	0.2
 CATEGORIES=	databases kde
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~fischer/${PORTNAME}/download/
 
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	BibTeX editor for KDE
 
-EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
-
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
@@ -24,6 +21,5 @@ MAN1=		kbibtex.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${TOUCH} ${WRKSRC}/config.h.in
 
 .include <bsd.port.mk>
diff --git a/databases/kbibtex/distinfo b/databases/kbibtex/distinfo
index 9eff7591f9c4..9f02be45a44b 100644
--- a/databases/kbibtex/distinfo
+++ b/databases/kbibtex/distinfo
@@ -1,3 +1,3 @@
-MD5 (kbibtex-0.1.5.tar.bz2) = 83a8c1cade06837431b6ebe79d13ef7b
-SHA256 (kbibtex-0.1.5.tar.bz2) = 588cbd5055c0baea950263c8d768c13c69ef72c54543137dea4d88fb7e4f8f13
-SIZE (kbibtex-0.1.5.tar.bz2) = 556109
+MD5 (kbibtex-0.2.tar.bz2) = 4ed33020f68c970e5ec37a20d3a49b59
+SHA256 (kbibtex-0.2.tar.bz2) = 016de092ec90d473d5dbd4890e1e6592c2a9eded5d70da180db4710accd536c9
+SIZE (kbibtex-0.2.tar.bz2) = 629421
diff --git a/databases/kbibtex/files/patch-src-documentlistview.cpp b/databases/kbibtex/files/patch-src-documentlistview.cpp
deleted file mode 100644
index b5012d453c37..000000000000
--- a/databases/kbibtex/files/patch-src-documentlistview.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: src/documentlistview.cpp
-===================================================================
---- src/documentlistview.cpp	(Revision 301)
-+++ src/documentlistview.cpp	(Revision 302)
-@@ -221,10 +221,13 @@
-         while ( it.current() )
-         {
-             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
--            m_bibtexFile->deleteElement( kblvi->element() );
--            it++;
--            takeItem( kblvi );
--            delete ( kblvi );
-+            if ( kblvi->isVisible() )
-+            {
-+                m_bibtexFile->deleteElement( kblvi->element() );
-+                it++;
-+                takeItem( kblvi );
-+                delete ( kblvi );
-+            }
-         }
- 
-         if ( above )
-@@ -246,7 +249,7 @@
-         {
-             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
-             BibTeX::Entry *entry = dynamic_cast<BibTeX::Entry*>( kblvi->element() );
--            if ( entry != NULL )
-+            if ( entry != NULL && kblvi->isVisible() )
-             {
-                 if ( !refs.isEmpty() )
-                     refs.append( "," );
-@@ -621,7 +624,8 @@
-         while ( it.current() )
-         {
-             DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
--            exporter->save( &buffer, kblvi->element() );
-+            if ( kblvi->isVisible() )
-+                exporter->save( &buffer, kblvi->element() );
-             it++;
-         }
-         delete exporter;
diff --git a/databases/kbibtex/files/patch-src-documentwidget.cpp b/databases/kbibtex/files/patch-src-documentwidget.cpp
deleted file mode 100644
index 432ba33d16f8..000000000000
--- a/databases/kbibtex/files/patch-src-documentwidget.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/documentwidget.cpp.orig	Thu Apr  5 02:18:55 2007
-+++ src/documentwidget.cpp	Thu Apr  5 02:18:11 2007
-@@ -255,7 +255,11 @@
- 
-         updateFromGUI();
- 
--        BibTeX::XSLTransform * transform = NULL;
-+        KStandardDirs * kstd = KGlobal::dirs();
-+        QString resPath = kstd->findResource( "data", "kbibtexpart/xslt/html.xsl" );
-+        BibTeX::XSLTransform *transform = NULL;
-+        if ( resPath != NULL )
-+            transform = new BibTeX::XSLTransform( resPath );
- 
-         BibTeX::FileExporter * exporter = NULL;
-         switch ( format )
-@@ -471,13 +475,13 @@
-         m_listViewElements->setFactory( factory, client );
-         m_sourceView->setFactory( factory, client );
- 
-+        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
-         if ( m_viewDocumentActionMenu != NULL )
-             connect( m_viewDocumentActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotViewDocument( int ) ) );
- 
-         m_copyReference = client->action( "edit_copyref" );
-         m_find = client->action( "edit_find" );
-         m_findNext = client->action( "edit_find_next" );
--        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
-         m_listViewElements->setViewShowColumnsMenu( dynamic_cast<KActionMenu*>( client->action( "view_showcolumns" ) ) );
-         m_searchWebsitesActionMenu = dynamic_cast<KActionMenu*>( client->action( "search_document_online" ) );
-     }
-@@ -486,6 +490,7 @@
-     {
-         KPopupMenu * popup = m_viewDocumentActionMenu->popupMenu();
-         popup->clear();
-+        m_viewDocumentActionMenuURLs.clear();
- 
-         BibTeX::Element * currentElement = NULL;
- 
-@@ -517,6 +522,7 @@
-                         popup->insertItem( SmallIcon( "html" ), prettyURL );
-                     else
-                         popup->insertItem( prettyURL );
-+                    m_viewDocumentActionMenuURLs.append( prettyURL );
-                 }
-                 m_viewDocumentActionMenu->setEnabled( TRUE );
-             }
-@@ -908,7 +914,7 @@
- 
-     void DocumentWidget::slotViewDocument( int id )
-     {
--        kapp->invokeBrowser( m_viewDocumentActionMenu->popupMenu() ->text( id ) );
-+        kapp->invokeBrowser( m_viewDocumentActionMenuURLs[ m_viewDocumentActionMenu->popupMenu() ->indexOf( id ) ] );
-     }
- 
- }
diff --git a/databases/kbibtex/files/patch-src-documentwidget.h b/databases/kbibtex/files/patch-src-documentwidget.h
deleted file mode 100644
index 0e2c863e85de..000000000000
--- a/databases/kbibtex/files/patch-src-documentwidget.h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/documentwidget.h
-===================================================================
---- src/documentwidget.h	(Revision 308)
-+++ src/documentwidget.h	(Revision 310)
-@@ -106,6 +106,7 @@
-         int m_newElementCounter;
-         EditMode m_editMode;
-         KActionMenu *m_viewDocumentActionMenu;
-+        QStringList m_viewDocumentActionMenuURLs;
-         KActionMenu *m_searchWebsitesActionMenu;
-         KAction *m_find;
-         KAction *m_findNext;
diff --git a/databases/kbibtex/files/patch-src-fileimporter.h b/databases/kbibtex/files/patch-src-fileimporter.h
deleted file mode 100644
index 4823f7196052..000000000000
--- a/databases/kbibtex/files/patch-src-fileimporter.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fileimporter.h.orig	Mon Mar 26 20:15:05 2007
-+++ src/fileimporter.h	Mon Mar 26 20:15:33 2007
-@@ -39,7 +39,7 @@
-         ~FileImporter();
- 
-         File* load ( const QString& text );
--        virtual File* load( QIODevice *iodevice ) = NULL;
-+        virtual File* load( QIODevice *iodevice ) = 0;
- 
-         static bool guessCanDecode( const QString & ) { return FALSE; };
- 
diff --git a/databases/kbibtex/files/patch-src-settings.cpp b/databases/kbibtex/files/patch-src-settings.cpp
deleted file mode 100644
index 205878def1d8..000000000000
--- a/databases/kbibtex/files/patch-src-settings.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kbibtex-0.1.5_orig/src/settings.cpp kbibtex-0.1.5/src/settings.cpp
---- src/settings.cpp	2006-10-03 21:14:45.000000000 +0200
-+++ src/settings.cpp	2007-02-27 13:20:13.000000000 +0100
-@@ -170,7 +170,7 @@
- 
-         config->setGroup( "SearchURLs" );
-         int i = 1;
--        for ( QValueList<SearchURL*>::ConstIterator it = searchURLs.begin(); it != searchURLs.end(); ++it )
-+        for ( QValueList<SearchURL*>::ConstIterator it = searchURLs.begin(); it != searchURLs.end(); ++it, ++i )
-         {
-             config->writeEntry( QString( "SearchURLDescription%1" ).arg( i ), ( *it ) ->description );
-             config->writeEntry( QString( "SearchURL%1" ).arg( i ), ( *it ) ->url );
diff --git a/databases/kbibtex/files/patch-src-webquerypubmed.cpp b/databases/kbibtex/files/patch-src-webquerypubmed.cpp
deleted file mode 100644
index eed9013cdab7..000000000000
--- a/databases/kbibtex/files/patch-src-webquerypubmed.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/webquerypubmed.cpp	2006-10-04 21:10:15.000000000 +0200
-+++ src/webquerypubmed.cpp	2007-02-27 13:44:16.000000000 +0100
-@@ -206,6 +206,7 @@
-         doc.setContent( buffer );
-         QDomElement docElem = doc.documentElement();
-         ResultParser resultParser( m_listViewResults, doc.documentElement() );
-+        buffer->close();
- 
-         setEnabled( TRUE );
-         QApplication::restoreOverrideCursor();