Date: Wed, 15 Oct 2014 21:43:23 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370957 - in head/textproc/kdiff3: . files Message-ID: <201410152143.s9FLhNuh081852@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Wed Oct 15 21:43:23 2014 New Revision: 370957 URL: https://svnweb.freebsd.org/changeset/ports/370957 QAT: https://qat.redports.org/buildarchive/r370957/ Log: 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) Added: head/textproc/kdiff3/files/patch-CMakeLists.txt (contents, props changed) Deleted: head/textproc/kdiff3/files/patch-src-QT4__fileaccess.cpp head/textproc/kdiff3/files/patch-src-QT4__kdiff3.cpp Modified: head/textproc/kdiff3/Makefile head/textproc/kdiff3/distinfo head/textproc/kdiff3/pkg-plist Modified: head/textproc/kdiff3/Makefile ============================================================================== --- head/textproc/kdiff3/Makefile Wed Oct 15 21:33:53 2014 (r370956) +++ head/textproc/kdiff3/Makefile Wed Oct 15 21:43:23 2014 (r370957) @@ -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 Modified: head/textproc/kdiff3/distinfo ============================================================================== --- head/textproc/kdiff3/distinfo Wed Oct 15 21:33:53 2014 (r370956) +++ head/textproc/kdiff3/distinfo Wed Oct 15 21:43:23 2014 (r370957) @@ -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 Added: head/textproc/kdiff3/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/kdiff3/files/patch-CMakeLists.txt Wed Oct 15 21:43:23 2014 (r370957) @@ -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) Modified: head/textproc/kdiff3/pkg-plist ============================================================================== --- head/textproc/kdiff3/pkg-plist Wed Oct 15 21:33:53 2014 (r370956) +++ head/textproc/kdiff3/pkg-plist Wed Oct 15 21:43:23 2014 (r370957) @@ -154,21 +154,3 @@ share/kde4/services/kdiff3fileitemaction %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410152143.s9FLhNuh081852>