Bug 79257 - Port upgrade: kdiff3 to 0.9.88
Summary: Port upgrade: kdiff3 to 0.9.88
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-03-26 16:50 UTC by Heiner
Modified: 2005-04-06 14:45 UTC (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Heiner 2005-03-26 16:50:02 UTC 
See Fix.

Heiner

Fix: Remove the files in files/ !!!!

--Boundary-00=_kKZRCHWrYmBX8ea
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="diff"



--Boundary-00=_kKZRCHWrYmBX8ea----X5SS9tQYEbWVSXnoXOatazt9wnXaxZWUFiHmQX9VmMTHKdje
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

diff -urN ../../textproc/kdiff3/Makefile ./Makefile
--- ../../textproc/kdiff3/Makefile	Mon Mar 21 18:40:09 2005
+++ ./Makefile	Sat Mar 26 16:55:46 2005
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdiff3
-PORTVERSION=	0.9.84
-PORTREVISION=	1
+PORTVERSION=	0.9.88
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -urN ../../textproc/kdiff3/distinfo ./distinfo
--- ../../textproc/kdiff3/distinfo	Mon Jun  7 16:28:44 2004
+++ ./distinfo	Sat Mar 26 16:57:23 2005
@@ -1,2 +1,2 @@
-MD5 (kdiff3-0.9.84.tar.gz) = 57e576a12a8e81c634cb6d4be4084903
-SIZE (kdiff3-0.9.84.tar.gz) = 1469216
+MD5 (kdiff3-0.9.88.tar.gz) = 5aabc33f1c00b854f207782f4e218f95
+SIZE (kdiff3-0.9.88.tar.gz) = 1612708
diff -urN ../../textproc/kdiff3/files/patch-src-pdiff.cpp ./files/patch-src-pdiff.cpp
--- ../../textproc/kdiff3/files/patch-src-pdiff.cpp	Mon Jun  7 16:28:45 2004
+++ ./files/patch-src-pdiff.cpp	Thu Jan  1 01:00:00 1970
@@ -1,19 +0,0 @@
---- src/pdiff.cpp.orig	Sat May 29 22:22:15 2004
-+++ src/pdiff.cpp	Mon May 31 10:59:57 2004
-@@ -462,12 +462,12 @@
-       // 2. If the files don't have the same name then show all names
-       if ( caption.isEmpty() && (!f1.isEmpty() || !f2.isEmpty() || !f3.isEmpty()) )
-       {
--         caption = ( f1.isEmpty()? "" : ".../"+f1 );
--         caption += QString(caption.isEmpty() || f2.isEmpty() ? "" : " <-> ") + ( f2.isEmpty()? "" : ".../"+f2 );
--         caption += QString(caption.isEmpty() || f3.isEmpty() ? "" : " <-> ") + ( f3.isEmpty()? "" : ".../"+f3 ) ;
-+         caption = ( f1.isEmpty()? QString("") : ".../"+f1 );
-+         caption += QString(caption.isEmpty() || f2.isEmpty() ? "" : " <-> ") + ( f2.isEmpty()? QString("") : ".../"+f2 );
-+         caption += QString(caption.isEmpty() || f3.isEmpty() ? "" : " <-> ") + ( f3.isEmpty()? QString("") : ".../"+f3 ) ;
-       }      
-       
--      m_pKDiff3Shell->setCaption( caption.isEmpty() ? "KDiff3" : caption+" - KDiff3");
-+      m_pKDiff3Shell->setCaption( caption.isEmpty() ? QString("KDiff3") : caption+" - KDiff3");
-    }
-    
-    
diff -urN ../../textproc/kdiff3/pkg-plist ./pkg-plist
--- ../../textproc/kdiff3/pkg-plist	Mon Jun  7 16:28:44 2004
+++ ./pkg-plist	Sat Mar 26 17:10:51 2005
@@ -18,6 +18,20 @@
 share/doc/HTML/da/kdiff3/screenshot_merge.png
 share/doc/HTML/da/kdiff3/triple_diff.png
 share/doc/HTML/da/kdiff3/white_space.png
+share/doc/HTML/de/kdiff3/common
+share/doc/HTML/de/kdiff3/dirbrowser.png
+share/doc/HTML/de/kdiff3/dirmergebig.png
+share/doc/HTML/de/kdiff3/index.cache.bz2
+share/doc/HTML/de/kdiff3/index.docbook
+share/doc/HTML/de/kdiff3/iteminfo.png
+share/doc/HTML/de/kdiff3/letter_by_letter.png
+share/doc/HTML/de/kdiff3/merge_current.png
+share/doc/HTML/de/kdiff3/new.png
+share/doc/HTML/de/kdiff3/open_dialog.png
+share/doc/HTML/de/kdiff3/screenshot_diff.png
+share/doc/HTML/de/kdiff3/screenshot_merge.png
+share/doc/HTML/de/kdiff3/triple_diff.png
+share/doc/HTML/de/kdiff3/white_space.png
 share/doc/HTML/en/kdiff3/common
 share/doc/HTML/en/kdiff3/compilation.html
 share/doc/HTML/en/kdiff3/credits.html
@@ -75,6 +89,20 @@
 share/doc/HTML/et/kdiff3/screenshot_merge.png
 share/doc/HTML/et/kdiff3/triple_diff.png
 share/doc/HTML/et/kdiff3/white_space.png
+share/doc/HTML/fr/kdiff3/common
+share/doc/HTML/fr/kdiff3/dirbrowser.png
+share/doc/HTML/fr/kdiff3/dirmergebig.png
+share/doc/HTML/fr/kdiff3/index.cache.bz2
+share/doc/HTML/fr/kdiff3/index.docbook
+share/doc/HTML/fr/kdiff3/iteminfo.png
+share/doc/HTML/fr/kdiff3/letter_by_letter.png
+share/doc/HTML/fr/kdiff3/merge_current.png
+share/doc/HTML/fr/kdiff3/new.png
+share/doc/HTML/fr/kdiff3/open_dialog.png
+share/doc/HTML/fr/kdiff3/screenshot_diff.png
+share/doc/HTML/fr/kdiff3/screenshot_merge.png
+share/doc/HTML/fr/kdiff3/triple_diff.png
+share/doc/HTML/fr/kdiff3/white_space.png
 share/doc/HTML/it/kdiff3/common
 share/doc/HTML/it/kdiff3/dirbrowser.png
 share/doc/HTML/it/kdiff3/dirmergebig.png
@@ -90,6 +118,20 @@
 share/doc/HTML/it/kdiff3/triple_diff.png
 share/doc/HTML/it/kdiff3/white_space.png
 share/doc/HTML/kdiff3/README
+share/doc/HTML/pt/kdiff3/common
+share/doc/HTML/pt/kdiff3/dirbrowser.png
+share/doc/HTML/pt/kdiff3/dirmergebig.png
+share/doc/HTML/pt/kdiff3/index.cache.bz2
+share/doc/HTML/pt/kdiff3/index.docbook
+share/doc/HTML/pt/kdiff3/iteminfo.png
+share/doc/HTML/pt/kdiff3/letter_by_letter.png
+share/doc/HTML/pt/kdiff3/merge_current.png
+share/doc/HTML/pt/kdiff3/new.png
+share/doc/HTML/pt/kdiff3/open_dialog.png
+share/doc/HTML/pt/kdiff3/screenshot_diff.png
+share/doc/HTML/pt/kdiff3/screenshot_merge.png
+share/doc/HTML/pt/kdiff3/triple_diff.png
+share/doc/HTML/pt/kdiff3/white_space.png
 share/doc/HTML/sv/kdiff3/common
 share/doc/HTML/sv/kdiff3/dirbrowser.png
 share/doc/HTML/sv/kdiff3/dirmergebig.png
@@ -108,33 +150,38 @@
 share/icons/hicolor/32x32/apps/kdiff3.png
 share/icons/locolor/16x16/apps/kdiff3.png
 share/icons/locolor/32x32/apps/kdiff3.png
-share/locale/az/LC_MESSAGES/kdiff3.mo
-share/locale/ca/LC_MESSAGES/kdiff3.mo
 share/locale/da/LC_MESSAGES/kdiff3.mo
 share/locale/de/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/hi/LC_MESSAGES/kdiff3.mo
 share/locale/hu/LC_MESSAGES/kdiff3.mo
 share/locale/it/LC_MESSAGES/kdiff3.mo
+share/locale/ja/LC_MESSAGES/kdiff3.mo
+share/locale/lt/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/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
 share/services/kdiff3part.desktop
 @dirrm share/doc/HTML/sv/kdiff3
+@dirrm share/doc/HTML/pt/kdiff3
 @dirrm share/doc/HTML/kdiff3
 @dirrm share/doc/HTML/it/kdiff3
+@dirrm share/doc/HTML/fr/kdiff3
 @dirrm share/doc/HTML/et/kdiff3
 @dirrm share/doc/HTML/en/kdiff3
+@dirrm share/doc/HTML/de/kdiff3
 @dirrm share/doc/HTML/da/kdiff3
 @dirrm share/apps/kdiff3part
 @dirrm share/apps/kdiff3
Comment 1 Tilman Keskinoz freebsd_committer freebsd_triage 2005-04-06 14:45:23 UTC 
State Changed
From-To: open->closed

committed, thanks