diff options
author | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2006-05-20 00:42:47 +0000 |
---|---|---|
committer | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2006-05-20 00:42:47 +0000 |
commit | 67912d1312ac440886a63a5370cfcb11874fe873 (patch) | |
tree | ddcaea5d53380d69ad228e74f3f237b219231fc0 /textproc/kdiff3 | |
parent | - fix build error (diff) |
Update to 0.9.90
PR: ports/97465
Submitted by: maintainer
Approved by: lawrance (mentor)
Notes
Notes:
svn path=/head/; revision=162840
Diffstat (limited to 'textproc/kdiff3')
-rw-r--r-- | textproc/kdiff3/Makefile | 3 | ||||
-rw-r--r-- | textproc/kdiff3/distinfo | 6 | ||||
-rw-r--r-- | textproc/kdiff3/pkg-descr | 6 | ||||
-rw-r--r-- | textproc/kdiff3/pkg-plist | 3 |
4 files changed, 10 insertions, 8 deletions
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile index e3a7c4cb1b35..e356443470f4 100644 --- a/textproc/kdiff3/Makefile +++ b/textproc/kdiff3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdiff3 -PORTVERSION= 0.9.89 +PORTVERSION= 0.9.90 CATEGORIES= textproc kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,6 +16,7 @@ COMMENT= A KDE3 graphical frontend for diff USE_KDEBASE_VER=3 USE_AUTOTOOLS= libtool:15 +USE_GETTEXT= yes CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" diff --git a/textproc/kdiff3/distinfo b/textproc/kdiff3/distinfo index a7701e4d83b2..1313b96438c6 100644 --- a/textproc/kdiff3/distinfo +++ b/textproc/kdiff3/distinfo @@ -1,3 +1,3 @@ -MD5 (kdiff3-0.9.89.tar.gz) = 4feeb1ceb2d12c40ff1db9b3cfce171a -SHA256 (kdiff3-0.9.89.tar.gz) = fb65cfcad525d474c3ed908b2d0c17820d56235a1621c21545b594711c595894 -SIZE (kdiff3-0.9.89.tar.gz) = 1831323 +MD5 (kdiff3-0.9.90.tar.gz) = 7224d636e1f1fa577abfbc17192e71bd +SHA256 (kdiff3-0.9.90.tar.gz) = 39ce3880a4ff586a96460dac32a483cc081979ffcc82508ea39ace4f39ce6000 +SIZE (kdiff3-0.9.90.tar.gz) = 1846495 diff --git a/textproc/kdiff3/pkg-descr b/textproc/kdiff3/pkg-descr index dec50936e414..22e108d1c4d5 100644 --- a/textproc/kdiff3/pkg-descr +++ b/textproc/kdiff3/pkg-descr @@ -5,9 +5,9 @@ KDiff3 is a program that: * provides an automatic merge-facility and * an integrated editor for comfortable solving of merge-conflicts, * supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.), + * Printing of differences, + * Manual alignment of lines, + * Automatic merging of version control history (cvs Log keyword), * and has an intuitive graphical user interface. WWW: http://kdiff3.sourceforge.net/ - -Heiner -h.eichmann@gmx.de diff --git a/textproc/kdiff3/pkg-plist b/textproc/kdiff3/pkg-plist index c7ce13099799..6ad3700d849e 100644 --- a/textproc/kdiff3/pkg-plist +++ b/textproc/kdiff3/pkg-plist @@ -134,6 +134,7 @@ share/doc/HTML/it/kdiff3/screenshot_merge.png share/doc/HTML/it/kdiff3/triple_diff.png share/doc/HTML/it/kdiff3/white_space.png share/doc/HTML/kdiff3/README +share/doc/HTML/kdiff3/createpdfdoc share/doc/HTML/nl/kdiff3/common share/doc/HTML/nl/kdiff3/dirbrowser.png share/doc/HTML/nl/kdiff3/dirmergebig.png @@ -220,7 +221,6 @@ share/services/kdiff3part.desktop @dirrm share/doc/HTML/sv/kdiff3 @dirrm share/doc/HTML/pt/kdiff3 @dirrm share/doc/HTML/nl/kdiff3 -@dirrm share/doc/HTML/kdiff3 @dirrm share/doc/HTML/it/kdiff3 @dirrm share/doc/HTML/fr/kdiff3 @dirrm share/doc/HTML/et/kdiff3 @@ -228,5 +228,6 @@ share/services/kdiff3part.desktop @dirrm share/doc/HTML/en/kdiff3 @dirrm share/doc/HTML/de/kdiff3 @dirrm share/doc/HTML/da/kdiff3 +@dirrm share/doc/HTML/kdiff3 @dirrm share/apps/kdiff3part @dirrm share/apps/kdiff3 |