pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/kdiff3 Update to 0.9.96

details:   https://anonhg.NetBSD.org/pkgsrc/rev/47b66e755686
branches:  trunk
changeset: 601530:47b66e755686
user:      markd <markd%pkgsrc.org@localhost>
date:      Wed Mar 21 23:10:54 2012 +0000

description:
Update to 0.9.96

KDE4 version.

diffstat:

 devel/kdiff3/Makefile         |   34 +++---
 devel/kdiff3/PLIST            |  220 +++++++++++++++--------------------------
 devel/kdiff3/distinfo         |   12 +-
 devel/kdiff3/patches/patch-aa |   13 --
 devel/kdiff3/patches/patch-ab |   14 --
 devel/kdiff3/patches/patch-ac |   14 --
 devel/kdiff3/patches/patch-ad |   14 --
 7 files changed, 101 insertions(+), 220 deletions(-)

diffs (truncated from 436 to 300 lines):

diff -r b80c13407254 -r 47b66e755686 devel/kdiff3/Makefile
--- a/devel/kdiff3/Makefile     Wed Mar 21 23:05:27 2012 +0000
+++ b/devel/kdiff3/Makefile     Wed Mar 21 23:10:54 2012 +0000
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.18 2012/03/03 00:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2012/03/21 23:10:54 markd Exp $
+#
+
+DISTNAME=      kdiff3-0.9.96
+CATEGORIES=    devel
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=kdiff3/}
 
-DISTNAME=              kdiff3-0.9.91
-PKGREVISION=           14
-CATEGORIES=            devel kde
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=kdiff3/}
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://kdiff3.sourceforge.net/
+COMMENT=       File and directory diff and merge tool (KDE4)
+LICENSE=       gnu-gpl-v2
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://kdiff3.sourceforge.net/
-COMMENT=               File and directory diff and merge tool
+BUILD_DEPENDS+=        automoc4>=0.9.83:../../devel/automoc4
 
 PKG_DESTDIR_SUPPORT=   user-destdir
-
-USE_TOOLS+=            msgfmt
+USE_PKGLOCALEDIR=      yes
 USE_LANGUAGES=         c c++
-USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
-SET_LIBDIR=            yes
-CONFIGURE_ARGS+=       --without-arts
+
+USE_TOOLS+=    msgfmt pkg-config
 
-.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../meta-pkgs/kde4/kde4.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-
+.include "../../x11/kde-baseapps4/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b80c13407254 -r 47b66e755686 devel/kdiff3/PLIST
--- a/devel/kdiff3/PLIST        Wed Mar 21 23:05:27 2012 +0000
+++ b/devel/kdiff3/PLIST        Wed Mar 21 23:10:54 2012 +0000
@@ -1,218 +1,158 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:50 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/03/21 23:10:54 markd Exp $
 bin/kdiff3
-lib/kde3/libkdiff3part.la
-man/man1/kdiff3.1
+lib/kde4/kdiff3fileitemaction.so
+lib/kde4/libkdiff3part.so
+share/applications/kde4/kdiff3.desktop
 share/doc/kde/HTML/da/kdiff3/common
-share/doc/kde/HTML/da/kdiff3/dirbrowser.png
-share/doc/kde/HTML/da/kdiff3/dirmergebig.png
 share/doc/kde/HTML/da/kdiff3/index.cache.bz2
 share/doc/kde/HTML/da/kdiff3/index.docbook
-share/doc/kde/HTML/da/kdiff3/iteminfo.png
-share/doc/kde/HTML/da/kdiff3/letter_by_letter.png
-share/doc/kde/HTML/da/kdiff3/merge_current.png
-share/doc/kde/HTML/da/kdiff3/new.png
-share/doc/kde/HTML/da/kdiff3/open_dialog.png
-share/doc/kde/HTML/da/kdiff3/screenshot_diff.png
-share/doc/kde/HTML/da/kdiff3/screenshot_merge.png
-share/doc/kde/HTML/da/kdiff3/triple_diff.png
-share/doc/kde/HTML/da/kdiff3/white_space.png
 share/doc/kde/HTML/de/kdiff3/common
-share/doc/kde/HTML/de/kdiff3/dirbrowser.png
-share/doc/kde/HTML/de/kdiff3/dirmergebig.png
 share/doc/kde/HTML/de/kdiff3/index.cache.bz2
 share/doc/kde/HTML/de/kdiff3/index.docbook
-share/doc/kde/HTML/de/kdiff3/iteminfo.png
-share/doc/kde/HTML/de/kdiff3/letter_by_letter.png
-share/doc/kde/HTML/de/kdiff3/merge_current.png
-share/doc/kde/HTML/de/kdiff3/new.png
-share/doc/kde/HTML/de/kdiff3/open_dialog.png
-share/doc/kde/HTML/de/kdiff3/screenshot_diff.png
-share/doc/kde/HTML/de/kdiff3/screenshot_merge.png
-share/doc/kde/HTML/de/kdiff3/triple_diff.png
-share/doc/kde/HTML/de/kdiff3/white_space.png
 share/doc/kde/HTML/en/kdiff3/common
-share/doc/kde/HTML/en/kdiff3/compilation.html
-share/doc/kde/HTML/en/kdiff3/credits.html
 share/doc/kde/HTML/en/kdiff3/dirbrowser.png
-share/doc/kde/HTML/en/kdiff3/dirmerge.html
 share/doc/kde/HTML/en/kdiff3/dirmergebig.png
-share/doc/kde/HTML/en/kdiff3/dirmergeoptions.html
-share/doc/kde/HTML/en/kdiff3/dirmergevisible.html
-share/doc/kde/HTML/en/kdiff3/documentation.html
-share/doc/kde/HTML/en/kdiff3/dothemerge.html
-share/doc/kde/HTML/en/kdiff3/faq.html
-share/doc/kde/HTML/en/kdiff3/features.html
-share/doc/kde/HTML/en/kdiff3/find.html
 share/doc/kde/HTML/en/kdiff3/index.cache.bz2
 share/doc/kde/HTML/en/kdiff3/index.docbook
-share/doc/kde/HTML/en/kdiff3/index.html
-share/doc/kde/HTML/en/kdiff3/installation.html
-share/doc/kde/HTML/en/kdiff3/interpretinginformation.html
-share/doc/kde/HTML/en/kdiff3/introduction.html
 share/doc/kde/HTML/en/kdiff3/iteminfo.png
-share/doc/kde/HTML/en/kdiff3/kdiff3.1
-share/doc/kde/HTML/en/kdiff3/kpart.html
 share/doc/kde/HTML/en/kdiff3/letter_by_letter.png
 share/doc/kde/HTML/en/kdiff3/merge_current.png
-share/doc/kde/HTML/en/kdiff3/merging.html
-share/doc/kde/HTML/en/kdiff3/misc.html
-share/doc/kde/HTML/en/kdiff3/navigation.html
 share/doc/kde/HTML/en/kdiff3/new.png
 share/doc/kde/HTML/en/kdiff3/open_dialog.png
-share/doc/kde/HTML/en/kdiff3/opendialog.html
-share/doc/kde/HTML/en/kdiff3/options.html
-share/doc/kde/HTML/en/kdiff3/other.html
-share/doc/kde/HTML/en/kdiff3/pasteinput.html
-share/doc/kde/HTML/en/kdiff3/preprocessors.html
-share/doc/kde/HTML/en/kdiff3/printing.html
-share/doc/kde/HTML/en/kdiff3/requirements.html
-share/doc/kde/HTML/en/kdiff3/saving.html
 share/doc/kde/HTML/en/kdiff3/screenshot_diff.png
 share/doc/kde/HTML/en/kdiff3/screenshot_merge.png
-share/doc/kde/HTML/en/kdiff3/screenshots.html
-share/doc/kde/HTML/en/kdiff3/selections.html
-share/doc/kde/HTML/en/kdiff3/startingdirmerge.html
 share/doc/kde/HTML/en/kdiff3/triple_diff.png
 share/doc/kde/HTML/en/kdiff3/white_space.png
 share/doc/kde/HTML/es/kdiff3/common
-share/doc/kde/HTML/es/kdiff3/dirbrowser.png
-share/doc/kde/HTML/es/kdiff3/dirmergebig.png
 share/doc/kde/HTML/es/kdiff3/index.cache.bz2
 share/doc/kde/HTML/es/kdiff3/index.docbook
-share/doc/kde/HTML/es/kdiff3/iteminfo.png
-share/doc/kde/HTML/es/kdiff3/letter_by_letter.png
-share/doc/kde/HTML/es/kdiff3/merge_current.png
-share/doc/kde/HTML/es/kdiff3/new.png
-share/doc/kde/HTML/es/kdiff3/open_dialog.png
-share/doc/kde/HTML/es/kdiff3/screenshot_diff.png
-share/doc/kde/HTML/es/kdiff3/screenshot_merge.png
-share/doc/kde/HTML/es/kdiff3/triple_diff.png
-share/doc/kde/HTML/es/kdiff3/white_space.png
 share/doc/kde/HTML/et/kdiff3/common
-share/doc/kde/HTML/et/kdiff3/dirbrowser.png
-share/doc/kde/HTML/et/kdiff3/dirmergebig.png
 share/doc/kde/HTML/et/kdiff3/index.cache.bz2
 share/doc/kde/HTML/et/kdiff3/index.docbook
-share/doc/kde/HTML/et/kdiff3/iteminfo.png
-share/doc/kde/HTML/et/kdiff3/letter_by_letter.png
-share/doc/kde/HTML/et/kdiff3/merge_current.png
-share/doc/kde/HTML/et/kdiff3/new.png
-share/doc/kde/HTML/et/kdiff3/open_dialog.png
-share/doc/kde/HTML/et/kdiff3/screenshot_diff.png
-share/doc/kde/HTML/et/kdiff3/screenshot_merge.png
-share/doc/kde/HTML/et/kdiff3/triple_diff.png
-share/doc/kde/HTML/et/kdiff3/white_space.png
 share/doc/kde/HTML/fr/kdiff3/common
-share/doc/kde/HTML/fr/kdiff3/dirbrowser.png
-share/doc/kde/HTML/fr/kdiff3/dirmergebig.png
 share/doc/kde/HTML/fr/kdiff3/index.cache.bz2
 share/doc/kde/HTML/fr/kdiff3/index.docbook
-share/doc/kde/HTML/fr/kdiff3/iteminfo.png
-share/doc/kde/HTML/fr/kdiff3/letter_by_letter.png
-share/doc/kde/HTML/fr/kdiff3/merge_current.png
-share/doc/kde/HTML/fr/kdiff3/new.png
-share/doc/kde/HTML/fr/kdiff3/open_dialog.png
-share/doc/kde/HTML/fr/kdiff3/screenshot_diff.png
-share/doc/kde/HTML/fr/kdiff3/screenshot_merge.png
-share/doc/kde/HTML/fr/kdiff3/triple_diff.png
-share/doc/kde/HTML/fr/kdiff3/white_space.png
 share/doc/kde/HTML/it/kdiff3/common
-share/doc/kde/HTML/it/kdiff3/dirbrowser.png
-share/doc/kde/HTML/it/kdiff3/dirmergebig.png
 share/doc/kde/HTML/it/kdiff3/index.cache.bz2
 share/doc/kde/HTML/it/kdiff3/index.docbook
-share/doc/kde/HTML/it/kdiff3/iteminfo.png
-share/doc/kde/HTML/it/kdiff3/letter_by_letter.png
-share/doc/kde/HTML/it/kdiff3/merge_current.png
-share/doc/kde/HTML/it/kdiff3/new.png
-share/doc/kde/HTML/it/kdiff3/open_dialog.png
-share/doc/kde/HTML/it/kdiff3/screenshot_diff.png
-share/doc/kde/HTML/it/kdiff3/screenshot_merge.png
-share/doc/kde/HTML/it/kdiff3/triple_diff.png
-share/doc/kde/HTML/it/kdiff3/white_space.png
 share/doc/kde/HTML/nl/kdiff3/common
-share/doc/kde/HTML/nl/kdiff3/dirbrowser.png
-share/doc/kde/HTML/nl/kdiff3/dirmergebig.png
 share/doc/kde/HTML/nl/kdiff3/index.cache.bz2
 share/doc/kde/HTML/nl/kdiff3/index.docbook
-share/doc/kde/HTML/nl/kdiff3/iteminfo.png
-share/doc/kde/HTML/nl/kdiff3/letter_by_letter.png
-share/doc/kde/HTML/nl/kdiff3/merge_current.png
-share/doc/kde/HTML/nl/kdiff3/new.png
-share/doc/kde/HTML/nl/kdiff3/open_dialog.png
-share/doc/kde/HTML/nl/kdiff3/screenshot_diff.png
-share/doc/kde/HTML/nl/kdiff3/screenshot_merge.png
-share/doc/kde/HTML/nl/kdiff3/triple_diff.png
-share/doc/kde/HTML/nl/kdiff3/white_space.png
 share/doc/kde/HTML/pt/kdiff3/common
-share/doc/kde/HTML/pt/kdiff3/dirbrowser.png
-share/doc/kde/HTML/pt/kdiff3/dirmergebig.png
 share/doc/kde/HTML/pt/kdiff3/index.cache.bz2
 share/doc/kde/HTML/pt/kdiff3/index.docbook
-share/doc/kde/HTML/pt/kdiff3/iteminfo.png
-share/doc/kde/HTML/pt/kdiff3/letter_by_letter.png
-share/doc/kde/HTML/pt/kdiff3/merge_current.png
-share/doc/kde/HTML/pt/kdiff3/new.png
-share/doc/kde/HTML/pt/kdiff3/open_dialog.png
-share/doc/kde/HTML/pt/kdiff3/screenshot_diff.png
-share/doc/kde/HTML/pt/kdiff3/screenshot_merge.png
-share/doc/kde/HTML/pt/kdiff3/triple_diff.png
-share/doc/kde/HTML/pt/kdiff3/white_space.png
-share/doc/kde/HTML/sv/kdiff3/common
-share/doc/kde/HTML/sv/kdiff3/dirbrowser.png
-share/doc/kde/HTML/sv/kdiff3/dirmergebig.png
-share/doc/kde/HTML/sv/kdiff3/index.cache.bz2
-share/doc/kde/HTML/sv/kdiff3/index.docbook
-share/doc/kde/HTML/sv/kdiff3/iteminfo.png
-share/doc/kde/HTML/sv/kdiff3/letter_by_letter.png
-share/doc/kde/HTML/sv/kdiff3/merge_current.png
-share/doc/kde/HTML/sv/kdiff3/new.png
-share/doc/kde/HTML/sv/kdiff3/open_dialog.png
-share/doc/kde/HTML/sv/kdiff3/screenshot_diff.png
-share/doc/kde/HTML/sv/kdiff3/screenshot_merge.png
-share/doc/kde/HTML/sv/kdiff3/triple_diff.png
-share/doc/kde/HTML/sv/kdiff3/white_space.png
 share/icons/hicolor/16x16/apps/kdiff3.png
 share/icons/hicolor/32x32/apps/kdiff3.png
 share/icons/locolor/16x16/apps/kdiff3.png
 share/icons/locolor/32x32/apps/kdiff3.png
-share/kde/applnk/Development/kdiff3.desktop
 share/kde/apps/kdiff3/kdiff3_shell.rc
 share/kde/apps/kdiff3part/kdiff3_part.rc
-share/kde/services/kdiff3part.desktop
-share/locale/az/LC_MESSAGES/kdiff3.mo
+share/kde4/services/kdiff3fileitemaction.desktop
+share/kde4/services/kdiff3part.desktop
+share/locale/ar/LC_MESSAGES/kdiff3.mo
 share/locale/bg/LC_MESSAGES/kdiff3.mo
 share/locale/br/LC_MESSAGES/kdiff3.mo
+share/locale/bs/LC_MESSAGES/kdiff3.mo
+share/locale/bs/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/bs/LC_MESSAGES/kdiff3plugin.mo
 share/locale/ca/LC_MESSAGES/kdiff3.mo
+share/locale/ca/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/ca/LC_MESSAGES/kdiff3plugin.mo
+share/locale/ca@valencia/LC_MESSAGES/kdiff3.mo
+share/locale/ca@valencia/LC_MESSAGES/kdiff3plugin.mo
 share/locale/cs/LC_MESSAGES/kdiff3.mo
+share/locale/cs/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/cs/LC_MESSAGES/kdiff3plugin.mo
 share/locale/cy/LC_MESSAGES/kdiff3.mo
 share/locale/da/LC_MESSAGES/kdiff3.mo
+share/locale/da/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/da/LC_MESSAGES/kdiff3plugin.mo
 share/locale/de/LC_MESSAGES/kdiff3.mo
+share/locale/de/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/de/LC_MESSAGES/kdiff3plugin.mo
 share/locale/el/LC_MESSAGES/kdiff3.mo
+share/locale/el/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/el/LC_MESSAGES/kdiff3plugin.mo
 share/locale/en_GB/LC_MESSAGES/kdiff3.mo
+share/locale/en_GB/LC_MESSAGES/kdiff3plugin.mo
+share/locale/eo/LC_MESSAGES/kdiff3.mo
+share/locale/eo/LC_MESSAGES/kdiff3plugin.mo
 share/locale/es/LC_MESSAGES/kdiff3.mo
+share/locale/es/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/es/LC_MESSAGES/kdiff3plugin.mo
 share/locale/et/LC_MESSAGES/kdiff3.mo
+share/locale/et/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/et/LC_MESSAGES/kdiff3plugin.mo
 share/locale/fr/LC_MESSAGES/kdiff3.mo
+share/locale/fr/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/fr/LC_MESSAGES/kdiff3plugin.mo
 share/locale/ga/LC_MESSAGES/kdiff3.mo
+share/locale/ga/LC_MESSAGES/kdiff3plugin.mo
+share/locale/gl/LC_MESSAGES/kdiff3.mo
+share/locale/gl/LC_MESSAGES/kdiff3plugin.mo
 share/locale/hi/LC_MESSAGES/kdiff3.mo
+share/locale/hne/LC_MESSAGES/kdiff3.mo
+share/locale/hr/LC_MESSAGES/kdiff3.mo
+share/locale/hr/LC_MESSAGES/kdiff3plugin.mo
 share/locale/hu/LC_MESSAGES/kdiff3.mo
+share/locale/hu/LC_MESSAGES/kdiff3plugin.mo
 share/locale/is/LC_MESSAGES/kdiff3.mo
+share/locale/is/LC_MESSAGES/kdiff3plugin.mo
 share/locale/it/LC_MESSAGES/kdiff3.mo
+share/locale/it/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/it/LC_MESSAGES/kdiff3plugin.mo
 share/locale/ja/LC_MESSAGES/kdiff3.mo
+share/locale/ja/LC_MESSAGES/kdiff3fileitemactionplugin.mo
+share/locale/ja/LC_MESSAGES/kdiff3plugin.mo
 share/locale/ka/LC_MESSAGES/kdiff3.mo
 share/locale/lt/LC_MESSAGES/kdiff3.mo
+share/locale/lt/LC_MESSAGES/kdiff3plugin.mo
+share/locale/mai/LC_MESSAGES/kdiff3.mo
+share/locale/ml/LC_MESSAGES/kdiff3.mo
+share/locale/ml/LC_MESSAGES/kdiff3plugin.mo
Home | Main Index | Thread Index | Old Index