textproc/kdiff3:

- update to 0.9.98
- remove upstreamed patches
- add patch for proper DOCS and NLS options support
- add LICENSE_FILE
- drop @dirrm from plist
- while I'm here, remove USE_KDE4=kdehier (to be deprecated soon)
  and switch to out-of-source build

PR:		194286
Submitted by:	luca.pizzamiglio@gmail.com (maintainer)

3 files changed, 31 insertions, 59 deletions

diff --git a/textproc/kdiff3/files/patch-CMakeLists.txt b/textproc/kdiff3/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..f8b92a80596f
--- /dev/null
+++ b/textproc/kdiff3/files/patch-CMakeLists.txt
@@ -0,0 +1,31 @@
+--- CMakeLists.txt.orig	2011-08-27 12:48:36.000000000 +0200
++++ CMakeLists.txt	2014-01-14 15:16:41.070645341 +0100
+@@ -20,8 +20,26 @@
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kdiff3.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdiff3.h )
+ 
+ add_subdirectory(src-QT4)
+-add_subdirectory(po)
+-add_subdirectory(doc)
++if(BUILD_po)
++  message(STATUS "")
++  message(STATUS "NLS activated ")
++  message(STATUS "")
++  add_subdirectory(po)
++else(BUILD_po)
++  message(STATUS "")
++  message(STATUS "NLS deactivated ")
++  message(STATUS "")
++endif(BUILD_po)
++if(BUILD_doc)
++  message(STATUS "")
++  message(STATUS "DOCS activated ")
++  message(STATUS "")
++  add_subdirectory(doc)
++else(BUILD_doc)
++  message(STATUS "")
++  message(STATUS "DOCS deactivated ")
++  message(STATUS "")
++endif(BUILD_doc)
+ 
+ 
+ find_file(KFILEITEMACTIONPLUGIN_FOUND kfileitemactionplugin.h PATHS ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH)
diff --git a/textproc/kdiff3/files/patch-src-QT4__fileaccess.cpp b/textproc/kdiff3/files/patch-src-QT4__fileaccess.cpp
deleted file mode 100644
index 35bb7c08a518..000000000000
--- a/textproc/kdiff3/files/patch-src-QT4__fileaccess.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
---- ./src-QT4/fileaccess.cpp.orig	2012-08-10 16:51:08.000000000 -0500
-+++ ./src-QT4/fileaccess.cpp	2014-06-05 09:45:18.675613156 -0500
-@@ -183,7 +183,8 @@
- 
- void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent )
- {
--   m_filePath   = nicePath( fi.filePath() ); // remove "./" at start   
-+   m_filePath   = pParent == 0 ? fi.absoluteFilePath() : 
-+                                 nicePath( fi.filePath() ); // remove "./" at start   
- 
-    m_bSymLink   = fi.isSymLink();
-    if ( m_bSymLink || (!m_bExists  && m_filePath.contains("@@") ) )
-@@ -566,7 +567,16 @@
-    if ( parent() != 0 )
-       return parent()->absoluteFilePath() + "/" + m_filePath;
-    else
--      return m_filePath;
-+   {
-+      if ( m_filePath.isEmpty() )
-+	 return QString();
-+      
-+      QFileInfo fi( m_filePath );
-+      if ( fi.isAbsolute() )
-+	 return m_filePath;
-+      else
-+	 return fi.absoluteFilePath(); // Probably never reached
-+   }
- }  // Full abs path
- 
- // Just the name-part of the path, without parent directories
-@@ -1184,7 +1194,7 @@
-       m_bSuccess = false;
-       KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl, permissions, KIO::HideProgressInfo );
-       connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*)));
--      connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long)));
-+      connect( pJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long)));
- 
-       ProgressProxy::enterEventLoop( pJob,
-          i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) );
-@@ -1673,7 +1683,7 @@
-                   &pp,      SLOT( slotListDirInfoMessage(KJob*, const QString&) ));
- 
-          // This line makes the transfer via fish unreliable.:-(
--         //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long)));
-+         //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long)));
- 
-          ProgressProxy::enterEventLoop( pListJob,
-             i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) );
diff --git a/textproc/kdiff3/files/patch-src-QT4__kdiff3.cpp b/textproc/kdiff3/files/patch-src-QT4__kdiff3.cpp
deleted file mode 100644
index 2dbd2c3d6026..000000000000
--- a/textproc/kdiff3/files/patch-src-QT4__kdiff3.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src-QT4/kdiff3.cpp.orig	2012-07-14 05:27:14.000000000 -0500
-+++ ./src-QT4/kdiff3.cpp	2014-06-05 09:45:18.677611475 -0500
-@@ -210,6 +210,8 @@
-       m_outputFilename = args->getOption("output");
-       if ( m_outputFilename.isEmpty() )
-          m_outputFilename = args->getOption("out");
-+      if ( ! m_outputFilename.isEmpty() )
-+         m_outputFilename = FileAccess( m_outputFilename, true ).absoluteFilePath();
-    }
- 
-    m_bAutoFlag = args!=0  && args->isSet("auto");