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

[pkgsrc/trunk]: pkgsrc/devel/kdiff3-kde3 Reimport kdiff3 0.9.91nb12 as kdiff3...

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6714ea5961c1
branches:  trunk
changeset: 601527:6714ea5961c1
user:      markd <markd%pkgsrc.org@localhost>
date:      Wed Mar 21 23:04:00 2012 +0000

description:
Reimport kdiff3 0.9.91nb12 as kdiff3-kde3

diffstat:

 devel/kdiff3-kde3/DESCR            |    8 +
 devel/kdiff3-kde3/Makefile         |   25 ++++
 devel/kdiff3-kde3/PLIST            |  218 +++++++++++++++++++++++++++++++++++++
 devel/kdiff3-kde3/distinfo         |    9 +
 devel/kdiff3-kde3/patches/patch-aa |   13 ++
 devel/kdiff3-kde3/patches/patch-ab |   14 ++
 devel/kdiff3-kde3/patches/patch-ac |   14 ++
 devel/kdiff3-kde3/patches/patch-ad |   14 ++
 8 files changed, 315 insertions(+), 0 deletions(-)

diffs (truncated from 347 to 300 lines):

diff -r 98b2635d39b9 -r 6714ea5961c1 devel/kdiff3-kde3/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/kdiff3-kde3/DESCR   Wed Mar 21 23:04:00 2012 +0000
@@ -0,0 +1,8 @@
+KDiff3 is a program that
+
+    * compares and merges two or three input files or directories,
+    * shows the differences line by line and character by character (!),
+    * provides an automatic merge-facility and
+    * an integrated editor for comfortable solving of merge-conflicts
+    * has support for KDE-KIO (ftp, sftp, http, fish, smb)
+    * and has an intuitive graphical user interface.
diff -r 98b2635d39b9 -r 6714ea5961c1 devel/kdiff3-kde3/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/kdiff3-kde3/Makefile        Wed Mar 21 23:04:00 2012 +0000
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1.1.1 2012/03/21 23:04:00 markd Exp $
+
+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
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+USE_TOOLS+=            msgfmt
+USE_LANGUAGES=         c c++
+USE_LIBTOOL=           yes
+GNU_CONFIGURE=         yes
+SET_LIBDIR=            yes
+CONFIGURE_ARGS+=       --without-arts
+
+.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff -r 98b2635d39b9 -r 6714ea5961c1 devel/kdiff3-kde3/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/kdiff3-kde3/PLIST   Wed Mar 21 23:04:00 2012 +0000
@@ -0,0 +1,218 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/21 23:04:01 markd Exp $
+bin/kdiff3
+lib/kde3/libkdiff3part.la
+man/man1/kdiff3.1
+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/locale/bg/LC_MESSAGES/kdiff3.mo
+share/locale/br/LC_MESSAGES/kdiff3.mo
+share/locale/ca/LC_MESSAGES/kdiff3.mo
+share/locale/cs/LC_MESSAGES/kdiff3.mo
+share/locale/cy/LC_MESSAGES/kdiff3.mo
+share/locale/da/LC_MESSAGES/kdiff3.mo
+share/locale/de/LC_MESSAGES/kdiff3.mo
+share/locale/el/LC_MESSAGES/kdiff3.mo
+share/locale/en_GB/LC_MESSAGES/kdiff3.mo
+share/locale/es/LC_MESSAGES/kdiff3.mo
+share/locale/et/LC_MESSAGES/kdiff3.mo
+share/locale/fr/LC_MESSAGES/kdiff3.mo
+share/locale/ga/LC_MESSAGES/kdiff3.mo
+share/locale/hi/LC_MESSAGES/kdiff3.mo
+share/locale/hu/LC_MESSAGES/kdiff3.mo
+share/locale/is/LC_MESSAGES/kdiff3.mo
+share/locale/it/LC_MESSAGES/kdiff3.mo
+share/locale/ja/LC_MESSAGES/kdiff3.mo
+share/locale/ka/LC_MESSAGES/kdiff3.mo
+share/locale/lt/LC_MESSAGES/kdiff3.mo
+share/locale/nb/LC_MESSAGES/kdiff3.mo
+share/locale/nl/LC_MESSAGES/kdiff3.mo
+share/locale/pl/LC_MESSAGES/kdiff3.mo
+share/locale/pt/LC_MESSAGES/kdiff3.mo
+share/locale/pt_BR/LC_MESSAGES/kdiff3.mo
+share/locale/ro/LC_MESSAGES/kdiff3.mo
+share/locale/ru/LC_MESSAGES/kdiff3.mo
+share/locale/rw/LC_MESSAGES/kdiff3.mo
+share/locale/sr/LC_MESSAGES/kdiff3.mo
+share/locale/sr@Latn/LC_MESSAGES/kdiff3.mo
+share/locale/sv/LC_MESSAGES/kdiff3.mo
+share/locale/ta/LC_MESSAGES/kdiff3.mo
+share/locale/tg/LC_MESSAGES/kdiff3.mo
+share/locale/tr/LC_MESSAGES/kdiff3.mo
+share/locale/zh_CN/LC_MESSAGES/kdiff3.mo
diff -r 98b2635d39b9 -r 6714ea5961c1 devel/kdiff3-kde3/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/kdiff3-kde3/distinfo        Wed Mar 21 23:04:00 2012 +0000
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2012/03/21 23:04:01 markd Exp $
+
+SHA1 (kdiff3-0.9.91.tar.gz) = e92778473d7267ea1c38855979840e74b261b31b
+RMD160 (kdiff3-0.9.91.tar.gz) = 5e30c0c40b6ad4775db7cddcd6725dfd503e2e36
+Size (kdiff3-0.9.91.tar.gz) = 2173290 bytes
+SHA1 (patch-aa) = 4269af8f2796b860650f696e6e16ec521bb97ea5
+SHA1 (patch-ab) = 7e9160cba637e0978c39964a1cd49d6f7b84959c
+SHA1 (patch-ac) = 884bae88e6a3004ab49e5155308de237d121788c
+SHA1 (patch-ad) = 596732f071a92c504c437dcd336b399fcb16fcfb
diff -r 98b2635d39b9 -r 6714ea5961c1 devel/kdiff3-kde3/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/kdiff3-kde3/patches/patch-aa        Wed Mar 21 23:04:00 2012 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2012/03/21 23:04:01 markd Exp $
+
+--- doc/Makefile.in.orig       2006-05-14 20:34:22.000000000 +0900
++++ doc/Makefile.in
+@@ -561,7 +561,7 @@ install-data: install-data-recursive
+ uninstall: uninstall-nls  uninstall-recursive
+ 
+ install-am: all-am
+-      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ 
+ installcheck: installcheck-recursive
+ install-strip:
diff -r 98b2635d39b9 -r 6714ea5961c1 devel/kdiff3-kde3/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/kdiff3-kde3/patches/patch-ab        Wed Mar 21 23:04:00 2012 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1.1.1 2012/03/21 23:04:01 markd Exp $
+
+Fix build with gcc4.3
Home | Main Index | Thread Index | Old Index