cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to xxdiff 3.1

Browse Source 
from Wim Lewis <wiml at hhhh.org>
This commit is contained in:
sturm 2005-04-24 19:02:04 +00:00
parent 63ee44468c
commit 24051e0561
15 changed files with 121 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
textproc/xxdiff/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.20 2004/12/07 00:23:24 alek Exp $
# $OpenBSD: Makefile,v 1.21 2005/04/24 19:02:04 sturm Exp $
COMMENT= "graphical file comparator and merge tool"
DISTNAME= xxdiff-2.9.1
PKGNAME= ${DISTNAME}p0
DISTNAME= xxdiff-3.1
CATEGORIES= textproc x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xxdiff/}
@ -40,7 +39,12 @@ do-configure:
> ${WRKSRC}/Makefile
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xxdiff ${PREFIX}/bin/xxdiff
cd ${WRKSRC}/../bin; \
${INSTALL_PROGRAM} xxdiff ${PREFIX}/bin/xxdiff; \
for f in xxdiff-cvs-diff xxdiff-encrypted xxdiff-find-grep-sed \
xxdiff-match; do \
${INSTALL_SCRIPT} $$f ${PREFIX}/bin; \
done
${INSTALL_MAN} ${WRKSRC}/xxdiff.1 ${PREFIX}/man/man1/xxdiff.1
.include <bsd.port.mk>

8
textproc/xxdiff/distinfo
View File

@ -1,4 +1,4 @@
MD5 (xxdiff-2.9.1.tar.gz) = d790c8eb3575ffef42d46818094d3c3e
RMD160 (xxdiff-2.9.1.tar.gz) = b752005952b4a50a602ff1e3baa919f24f170bf9
SHA1 (xxdiff-2.9.1.tar.gz) = ae6e24b18117d41e36141313b010a0f1019e6107
SIZE (xxdiff-2.9.1.tar.gz) = 808107
MD5 (xxdiff-3.1.tar.gz) = ead4e429e8a084eda46ecbf4d47d4512
RMD160 (xxdiff-3.1.tar.gz) = 3b6c2955ebc5d22b7fde4a81fb5deffde65f1427
SHA1 (xxdiff-3.1.tar.gz) = 90e503cf05bdfab960cc57b55b31e345277a6aaf
SIZE (xxdiff-3.1.tar.gz) = 1074150

8
textproc/xxdiff/patches/patch-app_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-app_cpp,v 1.3 2002/10/16 13:23:41 naddy Exp $
--- app.cpp.orig Wed Sep 11 01:04:22 2002
+++ app.cpp Tue Oct 15 21:56:38 2002
@@ -2182,7 +2182,7 @@ void XxApp::editFile( const QString& fil
$OpenBSD: patch-app_cpp,v 1.4 2005/04/24 19:02:05 sturm Exp $
--- app.cpp.orig Sat Nov 6 00:25:29 2004
+++ app.cpp Thu Apr 21 19:59:48 2005
@@ -2444,7 +2444,7 @@ void XxApp::editFile( const QString& fil
size_t size;
/* Bind a name to the socket. */
name.sun_family = AF_FILE;

12
textproc/xxdiff/patches/patch-buffer_cpp
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-buffer_cpp,v 1.2 2002/07/17 07:27:02 wilfried Exp $
--- buffer.cpp.orig Sun May 19 10:23:10 2002
+++ buffer.cpp Wed Jul 17 09:24:02 2002
@@ -342,7 +342,7 @@ void XxBuffer::setDirectoryEntries(
$OpenBSD: patch-buffer_cpp,v 1.3 2005/04/24 19:02:05 sturm Exp $
--- buffer.cpp.orig Sat Nov 6 00:25:29 2004
+++ buffer.cpp Thu Apr 21 19:59:48 2005
@@ -377,7 +377,7 @@ void XxBuffer::setDirectoryEntries(
it != _directoryEntries.end();
++it ) {
int len = (*it).length();
- ::strncpy( bufferPtr, (*it).latin1(), len );
+ ::strlcpy( bufferPtr, (*it).latin1(), len );
bufferPtr[len] = '\n';
+ ::memcpy( bufferPtr, (*it).latin1(), len );
bufferPtr[len] = _newlineChar;
bufferPtr += len + 1;
}

11
textproc/xxdiff/patches/patch-builderDirs2_cpp
View File

@ -1,11 +0,0 @@
--- builderDirs2.cpp.orig Mon Sep 30 10:54:25 2002
+++ builderDirs2.cpp Mon Sep 30 10:55:01 2002
@@ -99,6 +99,8 @@ public:
const char* buf
);
+ virtual ~XxParseDiffError() throw() { }
+
};
/*==============================================================================

11
textproc/xxdiff/patches/patch-builderFiles2_cpp
View File

@ -1,11 +0,0 @@
--- builderFiles2.cpp.orig Mon Sep 30 11:07:34 2002
+++ builderFiles2.cpp Mon Sep 30 11:08:04 2002
@@ -177,6 +177,8 @@ public:
const XxFln f2n2
);
+ virtual ~XxParseDiffError() throw() { }
+
};
//------------------------------------------------------------------------------

11
textproc/xxdiff/patches/patch-builderFiles3_cpp
View File

@ -1,11 +0,0 @@
--- builderFiles3.cpp.orig Mon Sep 30 10:51:54 2002
+++ builderFiles3.cpp Mon Sep 30 10:52:34 2002
@@ -79,6 +79,8 @@ public:
const XxFln f3n2
);
+ virtual ~XxParseDiffError() throw() { }
+
};
//------------------------------------------------------------------------------

10
textproc/xxdiff/patches/patch-builderUnmerge_cpp
View File

@ -1,10 +0,0 @@
--- builderUnmerge.cpp.orig Mon Sep 30 10:55:56 2002
+++ builderUnmerge.cpp Mon Sep 30 10:56:37 2002
@@ -73,6 +73,7 @@ public:
const XxFln f3n2
);
+ virtual ~XxConflictFormatError() throw() { }
};
//------------------------------------------------------------------------------

28
textproc/xxdiff/patches/patch-exceptions_h
View File

@ -1,28 +0,0 @@
--- exceptions.h.orig Mon Sep 30 10:33:26 2002
+++ exceptions.h Mon Sep 30 10:40:21 2002
@@ -118,6 +118,8 @@ public:
int helpMask = 0
);
+ virtual ~XxUsageError() throw() { }
+
};
@@ -138,6 +140,8 @@ public:
const QString& msg = QString::null // use errno string only.
);
+ virtual ~XxIoError() throw() { }
+
};
/*==============================================================================
@@ -158,6 +162,7 @@ public:
XX_EXC_PARAMS_DECL(file,line)
);
+ virtual ~XxInternalError() throw() { }
};

23
textproc/xxdiff/patches/patch-hordiffImp_cpp Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-hordiffImp_cpp,v 1.1 2005/04/24 19:02:05 sturm Exp $
--- hordiffImp.cpp.orig Fri Apr 22 20:11:45 2005
+++ hordiffImp.cpp Fri Apr 22 20:14:31 2005
@@ -50,16 +50,16 @@ namespace {
//------------------------------------------------------------------------------
//
-inline int strncpyNoWs( char* dest, const char* src, unsigned int len )
+inline unsigned int strncpyNoWs( char* dest, const char* src, unsigned int len )
{
// Copy a string into another, but compressing the whitespace to one space.
// Returns the length of the copied string.
- int ic = 0;
+ unsigned int ic = 0;
for ( unsigned int ii = 0; ii < len; ++ii ) {
if ( isspace( src[ii] ) ) {
dest[ic++] = ' ';
- int sc = 0;
+ unsigned int sc = 0;
unsigned int iid = ii + 1;
while ( isspace( src[iid] ) && iid < len ) { ++sc; ++iid; }
ii += sc;

52
textproc/xxdiff/patches/patch-resParser_l
View File

@ -1,31 +1,37 @@
$OpenBSD: patch-resParser_l,v 1.2 2002/07/17 07:27:02 wilfried Exp $
--- resParser.l.orig Tue Jun 11 12:25:10 2002
+++ resParser.l Wed Jul 17 09:24:02 2002
@@ -65,11 +65,11 @@ iddot [a-zA-Z][a-zA-Z0-9\.]*
$OpenBSD: patch-resParser_l,v 1.3 2005/04/24 19:02:05 sturm Exp $
--- resParser.l.orig Thu Dec 25 22:32:56 2003
+++ resParser.l Thu Apr 21 20:07:16 2005
@@ -63,15 +63,7 @@ iddot [a-zA-Z][a-zA-Z0-9\.]*
<GEOM_SC>{
{geomspec} {
int len = ::strlen( yytext );
if ( len >= LEX_BUFFER_MAX ) {
- int len = ::strlen( yytext );
- if ( len >= LEX_BUFFER_MAX ) {
- ::strncpy( lexerBuffer, yytext, LEX_BUFFER_MAX );
+ ::strlcpy( lexerBuffer, yytext, LEX_BUFFER_MAX );
lexerBuffer[ LEX_BUFFER_MAX-1 ] = 0;
}
else {
- lexerBuffer[ LEX_BUFFER_MAX-1 ] = 0;
- }
- else {
- ::strncpy( lexerBuffer, yytext, len );
+ ::strlcpy( lexerBuffer, yytext, len );
lexerBuffer[ len ] = 0;
}
- lexerBuffer[ len ] = 0;
- }
+ ::strlcpy( lexerBuffer, yytext, LEX_BUFFER_MAX );
yylval->str = lexerBuffer;
@@ -207,11 +207,11 @@ iddot [a-zA-Z][a-zA-Z0-9\.]*
BEGIN(INITIAL);
return GEOMSPEC;
@@ -205,15 +197,7 @@ iddot [a-zA-Z][a-zA-Z0-9\.]*
{string} {
/* strip the quotes */
int len = ::strlen( yytext );
if ( len >= LEX_BUFFER_MAX ) {
- int len = ::strlen( yytext );
- if ( len >= LEX_BUFFER_MAX ) {
- ::strncpy( lexerBuffer, &(yytext[1]), LEX_BUFFER_MAX );
+ ::strlcpy( lexerBuffer, &(yytext[1]), LEX_BUFFER_MAX );
lexerBuffer[ LEX_BUFFER_MAX-1 ] = 0;
}
else {
- lexerBuffer[ LEX_BUFFER_MAX-1 ] = 0;
- }
- else {
- ::strncpy( lexerBuffer, &(yytext[1]), len-2 );
+ ::strlcpy( lexerBuffer, &(yytext[1]), len-2 );
lexerBuffer[ len-2 ] = 0;
}
- lexerBuffer[ len-2 ] = 0;
- }
+ ::strlcpy( lexerBuffer, &(yytext[1]), LEX_BUFFER_MAX );
yylval->str = lexerBuffer;
return STRING;
}

35
textproc/xxdiff/patches/patch-util_cpp Normal file
View File

@ -0,0 +1,35 @@
$OpenBSD: patch-util_cpp,v 1.1 2005/04/24 19:02:05 sturm Exp $
--- util.cpp.orig Fri Apr 22 20:14:58 2005
+++ util.cpp Fri Apr 22 20:19:56 2005
@@ -1031,10 +1031,28 @@ QString XxUtil::escapeChars( const QStri
QString XxUtil::unescapeChars( const QString& format )
{
QString newFormat = format;
+ uint ix = 0;
- newFormat.replace( "\\n", "\n" );
- newFormat.replace( "\\r", "\r" );
- newFormat.replace( "\\\"", "\"" );
+ while ( ix < newFormat.length() ) {
+ int found = newFormat.find( QChar( '\\' ), ix );
+ if ( found < 0 )
+ break;
+ // use at() in case found+1 is past the end of the string
+ QChar escapedChar = newFormat.at( found+1 );
+ switch( escapedChar ) {
+ case 'n':
+ newFormat = newFormat.replace( found, 2, QChar( '\n' ) );
+ break;
+ case 'r':
+ newFormat = newFormat.replace( found, 2, QChar( '\r' ) );
+ break;
+ default:
+ newFormat = newFormat.remove( found, 1 );
+ break;
+ }
+ ix = found + 1;
+ }
+
return newFormat;
}

12
textproc/xxdiff/patches/patch-xxdiff_1
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-xxdiff_1,v 1.3 2002/10/16 13:23:41 naddy Exp $
--- xxdiff.1.orig Sat May 18 09:45:01 2002
+++ xxdiff.1 Wed Jul 17 09:24:02 2002
@@ -17,7 +17,7 @@
.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
.\"
.na
-.TH XXDIFF 2.7
+.TH XXDIFF 2.9.1
.SH NAME
xxdiff \- a graphical file comparator and merge tool
.SH SYNOPSIS

14
textproc/xxdiff/patches/patch-xxdiff_pro
View File

@ -1,20 +1,20 @@
$OpenBSD: patch-xxdiff_pro,v 1.1 2003/02/02 16:37:56 sturm Exp $
--- xxdiff.pro.orig Fri Jan 31 10:53:37 2003
+++ xxdiff.pro Fri Jan 31 10:54:04 2003
@@ -174,7 +174,6 @@ HEADERS = \
$OpenBSD: patch-xxdiff_pro,v 1.2 2005/04/24 19:02:05 sturm Exp $
--- xxdiff.pro.orig Sat Nov 6 00:29:46 2004
+++ xxdiff.pro Thu Apr 21 19:59:48 2005
@@ -159,7 +159,6 @@ HEADERS = \
lineNumbers.h \
util.h \
markers.h \
- getopt.h \
diffutils.h \
diffutils_hack.h \
doc.qml \
@@ -211,8 +210,6 @@ SOURCES = \
doc.html \
@@ -197,8 +196,6 @@ SOURCES = \
accelUtil.cpp \
resParser.cpp \
markers.cpp \
- getopt.c \
- getopt1.c \
version.c
proginfo.c
# diffutils.cpp \

6
textproc/xxdiff/pkg/PLIST
View File

@ -1,3 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:44:09 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2005/04/24 19:02:05 sturm Exp $
bin/xxdiff
bin/xxdiff-cvs-diff
bin/xxdiff-encrypted
bin/xxdiff-find-grep-sed
bin/xxdiff-match
@man man/man1/xxdiff.1