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)

6 files changed, 37 insertions, 83 deletions

diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index 80a8f74c8dc2..88bb4a1ff602 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kdiff3
-PORTVERSION=	0.9.97
-PORTREVISION=	4
+PORTVERSION=	0.9.98
 CATEGORIES=	textproc kde
 MASTER_SITES=	SF
 
@@ -11,10 +10,11 @@ MAINTAINER=	luca.pizzamiglio@gmail.com
 COMMENT=	KDE4 graphical frontend for diff
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_KDE4=	kdelibs libkonq kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs libkonq kdeprefix automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USES=		cmake
+USES=		cmake:outsource
 
 OPTIONS_DEFINE=	NLS DOCS
 OPTIONS_DEFAULT=	NLS
diff --git a/textproc/kdiff3/distinfo b/textproc/kdiff3/distinfo
index 4adbe508ea26..5dc8e5261b8a 100644
--- a/textproc/kdiff3/distinfo
+++ b/textproc/kdiff3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kdiff3-0.9.97.tar.gz) = e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a
-SIZE (kdiff3-0.9.97.tar.gz) = 1803769
+SHA256 (kdiff3-0.9.98.tar.gz) = 802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668
+SIZE (kdiff3-0.9.98.tar.gz) = 1762715
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");
diff --git a/textproc/kdiff3/pkg-plist b/textproc/kdiff3/pkg-plist
index 1e5618a2f6c1..b0511847c2fd 100644
--- a/textproc/kdiff3/pkg-plist
+++ b/textproc/kdiff3/pkg-plist
@@ -154,21 +154,3 @@ share/kde4/services/kdiff3fileitemaction.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3fileitemactionplugin.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kdiff3plugin.mo
-%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/rw
-@dirrmtry share/icons/locolor/32x32/apps
-@dirrmtry share/icons/locolor/32x32
-@dirrmtry share/icons/locolor/16x16/apps
-@dirrmtry share/icons/locolor/16x16
-@dirrmtry share/icons/locolor
-%%PORTDOCS%%@dirrmtry share/doc/HTML/pt/kdiff3
-%%PORTDOCS%%@dirrmtry share/doc/HTML/nl/kdiff3
-%%PORTDOCS%%@dirrmtry share/doc/HTML/it/kdiff3
-%%PORTDOCS%%@dirrmtry share/doc/HTML/fr/kdiff3
-%%PORTDOCS%%@dirrmtry share/doc/HTML/et/kdiff3
-%%PORTDOCS%%@dirrmtry share/doc/HTML/es/kdiff3
-%%PORTDOCS%%@dirrmtry share/doc/HTML/en/kdiff3
-%%PORTDOCS%%@dirrmtry share/doc/HTML/de/kdiff3
-%%PORTDOCS%%@dirrmtry share/doc/HTML/da/kdiff3
-@dirrmtry share/apps/kdiff3part
-@dirrmtry share/apps/kdiff3