[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Update of textproc/xxdiff to version 3.1



On Sat, 16 Apr 2005, Nikolay Sturm wrote:
People, don't send updates as tar-balls, use unified diffs against
-current. We are already swamped with submissions, making our life
harder does not help at all.

Okay. I looked around for some sort of submission guideline, but finding none I followed an observed practice here.

Here's a unified diff against the head; mind the leading whitespace, and the added/removed files...


cvs server: Diffing . Index: Makefile =================================================================== RCS file: /cvs/ports/textproc/xxdiff/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- Makefile 7 Dec 2004 00:23:24 -0000 1.20 +++ Makefile 16 Apr 2005 20:37:43 -0000 @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.20 2004/12/07 00:23:24 alek Exp $ +# $OpenBSD: $

 COMMENT=	"graphical file comparator and merge tool"

-DISTNAME=	xxdiff-2.9.1
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	xxdiff-3.1
+PKGNAME=	${DISTNAME}
 CATEGORIES=	textproc x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=xxdiff/}

@@ -14,8 +14,8 @@
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=		X11 Xext c m png pthread stdc++

+WANTLIB=	X11 Xext c m png pthread stdc++
 BUILD_DEPENDS=	:bison-*:devel/bison \
 		:tmake->=1.10:devel/tmake
 MODULES=	x11/qt3
@@ -31,16 +31,14 @@
 NO_REGRESS=	Yes

 post-extract:
-	@rm ${WRKSRC}/getopt.h
-	@rm ${WRKSRC}/getopt.c
-	@rm ${WRKSRC}/getopt1.c
+	cd ${WRKSRC} && rm getopt.h getopt.c getopt1.c

 do-configure:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/tmake -t xxdiff.t xxdiff.pro \
-		> ${WRKSRC}/Makefile
+	cd ${WRKSRC} && ${LOCALBASE}/bin/tmake -t xxdiff.t xxdiff.pro > ${WRKSRC}/Makefile

 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xxdiff ${PREFIX}/bin/xxdiff
+	${INSTALL_PROGRAM} ${WRKSRC}/../bin/xxdiff ${PREFIX}/bin/xxdiff
+	cd ${WRKSRC}/../bin && ${INSTALL_SCRIPT} xxdiff-cvs-diff xxdiff-encrypted xxdiff-find-grep-sed xxdiff-match ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xxdiff.1 ${PREFIX}/man/man1/xxdiff.1

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/xxdiff/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 5 Jan 2005 17:34:35 -0000 1.5
+++ distinfo 16 Apr 2005 20:37:43 -0000
@@ -1,4 +1,3 @@
-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
+SHA1 (xxdiff-3.1.tar.gz) = 90e503cf05bdfab960cc57b55b31e345277a6aaf
+RMD160 (xxdiff-3.1.tar.gz) = 3b6c2955ebc5d22b7fde4a81fb5deffde65f1427
+SIZE (xxdiff-3.1.tar.gz) = 1074150
cvs server: Diffing patches
Index: patches/patch-buffer_cpp
===================================================================
RCS file: /cvs/ports/textproc/xxdiff/patches/patch-buffer_cpp,v
retrieving revision 1.2
diff -u -r1.2 patch-buffer_cpp
--- patches/patch-buffer_cpp 17 Jul 2002 07:27:02 -0000 1.2
+++ patches/patch-buffer_cpp 16 Apr 2005 20:37:43 -0000
@@ -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$
+--- buffer.cpp.orig Fri Nov 5 15:25:29 2004
++++ buffer.cpp Fri Dec 31 01:12:02 2004
+@@ -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;
}
Index: patches/patch-builderDirs2_cpp
===================================================================
RCS file: patches/patch-builderDirs2_cpp
diff -N patches/patch-builderDirs2_cpp
--- patches/patch-builderDirs2_cpp 16 Oct 2002 13:23:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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() { }
-+
- };
- - /*==============================================================================
Index: patches/patch-builderFiles2_cpp
===================================================================
RCS file: patches/patch-builderFiles2_cpp
diff -N patches/patch-builderFiles2_cpp
--- patches/patch-builderFiles2_cpp 16 Oct 2002 13:23:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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() { }
-+
- };
- - //------------------------------------------------------------------------------
Index: patches/patch-builderFiles3_cpp
===================================================================
RCS file: patches/patch-builderFiles3_cpp
diff -N patches/patch-builderFiles3_cpp
--- patches/patch-builderFiles3_cpp 16 Oct 2002 13:23:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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() { }
-+
- };
- - //------------------------------------------------------------------------------
Index: patches/patch-builderUnmerge_cpp
===================================================================
RCS file: patches/patch-builderUnmerge_cpp
diff -N patches/patch-builderUnmerge_cpp
--- patches/patch-builderUnmerge_cpp 16 Oct 2002 13:23:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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() { }
- };
- - //------------------------------------------------------------------------------
Index: patches/patch-exceptions_h
===================================================================
RCS file: patches/patch-exceptions_h
diff -N patches/patch-exceptions_h
--- patches/patch-exceptions_h 16 Oct 2002 13:23:41 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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() { }
- };
- - Index: patches/patch-hordiffImp_cpp
===================================================================
RCS file: patches/patch-hordiffImp_cpp
diff -N patches/patch-hordiffImp_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-hordiffImp_cpp 16 Apr 2005 20:37:43 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- hordiffImp.cpp.orig Sun Apr 10 12:49:03 2005
++++ hordiffImp.cpp Sun Apr 10 12:51:01 2005
+@@ -50,16 +50,18 @@ 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.
++ // Reads 'len' characters from src regardless of NULs.
++ // May write up to len+1 characters into dest including the trailing NUL.
+ +- 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;
Index: patches/patch-resParser_l
===================================================================
RCS file: /cvs/ports/textproc/xxdiff/patches/patch-resParser_l,v
retrieving revision 1.2
diff -u -r1.2 patch-resParser_l
--- patches/patch-resParser_l 17 Jul 2002 07:27:02 -0000 1.2
+++ patches/patch-resParser_l 16 Apr 2005 20:37:43 -0000
@@ -1,31 +1,41 @@
-$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$
+--- resParser.l.orig 2003-12-25 13:32:56.000000000 -0800
++++ resParser.l 2004-10-28 19:49:42.000000000 -0700
+@@ -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,11 @@ 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;
+- }
++ size_t len;
++ len = ::strlcpy( lexerBuffer, &(yytext[1]), LEX_BUFFER_MAX);
++ /* if the whole string fit in lexerBuffer, remove the trailing quote */
++ if ( len < LEX_BUFFER_MAX )
++ lexerBuffer[ len-1 ] = 0;
yylval->str = lexerBuffer;
+ return STRING; + }
Index: patches/patch-util_cpp
===================================================================
RCS file: patches/patch-util_cpp
diff -N patches/patch-util_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-util_cpp 16 Apr 2005 20:37:43 -0000
@@ -0,0 +1,34 @@
+--- util.cpp.orig Fri Nov 5 10:47:06 2004
++++ util.cpp Fri Dec 31 23:15:05 2004
+@@ -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;
+ }
+ Index: patches/patch-xxdiff_1
===================================================================
RCS file: patches/patch-xxdiff_1
diff -N patches/patch-xxdiff_1
--- patches/patch-xxdiff_1 16 Oct 2002 13:23:41 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: patches/patch-xxdiff_pro
===================================================================
RCS file: /cvs/ports/textproc/xxdiff/patches/patch-xxdiff_pro,v
retrieving revision 1.1
diff -u -r1.1 patch-xxdiff_pro
--- patches/patch-xxdiff_pro 2 Feb 2003 16:37:56 -0000 1.1
+++ patches/patch-xxdiff_pro 16 Apr 2005 20:37:43 -0000
@@ -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$
+--- xxdiff.pro.orig Fri Nov 5 15:29:46 2004
++++ xxdiff.pro Fri Dec 31 01:12:02 2004
+@@ -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 \
cvs server: Diffing pkg
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/xxdiff/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST	15 Sep 2004 18:44:09 -0000	1.3
+++ pkg/PLIST	16 Apr 2005 20:37:43 -0000
@@ -1,3 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:44:09 espie Exp $
 bin/xxdiff
+bin/xxdiff-cvs-diff
+bin/xxdiff-encrypted
+bin/xxdiff-find-grep-sed
+bin/xxdiff-match
 @man man/man1/xxdiff.1



Visit your host, monkey.org