ports/57542: Port upgrade: kdiff3 to 0.9.70

[Heiner]

On Friday 03 October 2003 19:22, you wrote:

...
> Creating gzip'd tar ball in '/usr/ports/packages/All/kdiff3-0.9.70.tgz'
> tar: share/doc/HTML/en/kdiff3/index.html: Cannot stat: No such file or
...


Hi!

Can't reproduce. Did the patch apply cleanly? If you look at it:

-share/doc/HTML/en/kdiff3/index.html

There should be no reference to index.html in the pkg-plist!
If the patch doesn't work, try the attached shar.

Heiner


# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#       .
#       ./files
#       ./files/patch-src-directorymergewindow.cpp
#       ./Makefile
#       ./distinfo
#       ./pkg-plist
#       ./pkg-descr
#
echo c - .
mkdir -p . > /dev/null 2>&1
echo c - ./files
mkdir -p ./files > /dev/null 2>&1
echo x - ./files/patch-src-directorymergewindow.cpp
sed 's/^X//' >./files/patch-src-directorymergewindow.cpp << 'END-of-./files/
patch-src-directorymergewindow.cpp'
X--- src/directorymergewindow.cpp.orig  Fri Oct  3 15:45:48 2003
X+++ src/directorymergewindow.cpp       Fri Oct  3 15:46:42 2003
X@@ -863,7 +863,7 @@
X
X       mfi.m_subPath = mfi.m_fileInfoA.exists() ? 
mfi.m_fileInfoA.filePath() :
X                       mfi.m_fileInfoB.exists() ? 
mfi.m_fileInfoB.filePath() :
X-                      mfi.m_fileInfoC.exists() ? 
mfi.m_fileInfoC.filePath() : "";
X+                      mfi.m_fileInfoC.exists() ? 
mfi.m_fileInfoC.filePath() : QString("");
X
X       g_pProgressDialog->setInformation(
X          "Processing " + QString::number(currentIdx) +" / "+ 
QString::number(nrOfFiles)
END-of-./files/patch-src-directorymergewindow.cpp
echo x - ./Makefile
sed 's/^X//' >./Makefile << 'END-of-./Makefile'
X# New ports collection makefile for:   kdiff3
X# Date created:                2003/01/03
X# Whom:                        Heiner Eichmann <h.eichmann at gmx.de>
X#
X# $FreeBSD: ports/textproc/kdiff3/Makefile,v 1.6 2003/06/13 11:50:16 arved 
Exp $
X#
X
XPORTNAME=      kdiff3
XPORTVERSION=   0.9.70
XCATEGORIES=    textproc kde
XMASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
XMASTER_SITE_SUBDIR=    ${PORTNAME}
X
XMAINTAINER=    h.eichmann at gmx.de
XCOMMENT=       A KDE3 graphical frontend for diff
X
XCONFIGURE_ARGS+=       --program-transform-name=s,^,,
X
XUSE_KDELIBS_VER=       3
XGNU_CONFIGURE= yes
X
X.include <bsd.port.mk>
END-of-./Makefile
echo x - ./distinfo
sed 's/^X//' >./distinfo << 'END-of-./distinfo'
XMD5 (kdiff3-0.9.70.tar.gz) = 17dba67818b61c5c51dfe6163c2d44d2
END-of-./distinfo
echo x - ./pkg-plist
sed 's/^X//' >./pkg-plist << 'END-of-./pkg-plist'
Xbin/kdiff3
Xlib/kde3/libkdiff3part.la
Xlib/kde3/libkdiff3part.so
Xshare/applnk/Development/kdiff3.desktop
Xshare/apps/kdiff3/kdiff3_shell.rc
Xshare/apps/kdiff3part/kdiff3_part.rc
Xshare/doc/HTML/en/kdiff3/common
Xshare/doc/HTML/en/kdiff3/dirbrowser.png
Xshare/doc/HTML/en/kdiff3/dirmergebig.png
Xshare/doc/HTML/en/kdiff3/index.cache.bz2
Xshare/doc/HTML/en/kdiff3/index.docbook
Xshare/doc/HTML/en/kdiff3/iteminfo.png
Xshare/doc/HTML/en/kdiff3/letter_by_letter.png
Xshare/doc/HTML/en/kdiff3/merge_current.png
Xshare/doc/HTML/en/kdiff3/new.png
Xshare/doc/HTML/en/kdiff3/open_dialog.png
Xshare/doc/HTML/en/kdiff3/screenshot_diff.png
Xshare/doc/HTML/en/kdiff3/screenshot_merge.png
Xshare/doc/HTML/en/kdiff3/triple_diff.png
Xshare/doc/HTML/en/kdiff3/white_space.png
Xshare/icons/hicolor/16x16/apps/kdiff3.png
Xshare/icons/hicolor/32x32/apps/kdiff3.png
Xshare/icons/locolor/16x16/apps/kdiff3.png
Xshare/icons/locolor/32x32/apps/kdiff3.png
Xshare/nls/POSIX
Xshare/nls/en_US.US-ASCII
Xshare/services/kdiff3part.desktop
X at dirrm share/doc/HTML/en/kdiff3
X at dirrm share/apps/kdiff3part
X at dirrm share/apps/kdiff3
END-of-./pkg-plist
echo x - ./pkg-descr
sed 's/^X//' >./pkg-descr << 'END-of-./pkg-descr'
XKDiff3 is a program that:
X
X    * compares two or three text input files,
X    * shows the differences line by line and character by character (!),
X    * provides an automatic merge-facility and
X    * an integrated editor for comfortable solving of merge-conflicts
X    * and has an intuitive graphical user interface,
X    * and it can also compare and merge directories!
X
XWWW: http://kdiff3.sourceforge.net/
X
XHeiner
Xh.eichmann at gmx.de
END-of-./pkg-descr
exit