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

Update to xxdiff-2.6, from maintainer Dan Weeks <danimal@danimal.org>

Browse Source 
* move to qt3 (with PORTHOME quirk for uic3)
* add license note
* add $OpenBSD$ tag to patch files
* update pkg/SECURITY file to reflect reality
This commit is contained in:
wilfried 2002-07-17 07:27:02 +00:00
parent 6295dfe328
commit ddceea5672
7 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
textproc/xxdiff/Makefile
View File

@ -1,29 +1,36 @@
# $OpenBSD: Makefile,v 1.11 2002/05/14 12:07:11 naddy Exp $
# $OpenBSD: Makefile,v 1.12 2002/07/17 07:27:02 wilfried Exp $
COMMENT= "graphical file comparator and merge tool"
DISTNAME= xxdiff-2.4
DISTNAME= xxdiff-2.6
CATEGORIES= textproc x11
NEED_VERSION= 1.504
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xxdiff/}
HOMEPAGE= http://xxdiff.sourceforge.net/
MAINTAINER= Dan Weeks <danimal@danimal.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
BUILD_DEPENDS= ::devel/bison ::devel/tmake
BUILD_DEPENDS= :bison-*:devel/bison \
:tmake->=1.8p1:devel/tmake
MODULES= qt3
WRKDIST= ${WRKDIR}/${DISTNAME}/src
MAKE_ENV+= UIC=${MODQT_UIC}
# For qsettings to write its setup
PORTHOME= ${WRKDIST}
NO_REGRESS= Yes
do-configure:
@cd ${WRKSRC} && tmake xxdiff.pro > ${WRKSRC}/Makefile
@cd ${WRKSRC} && tmake -t xxdiff.t xxdiff.pro > ${WRKSRC}/Makefile
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xxdiff ${PREFIX}/bin/xxdiff

6
textproc/xxdiff/distinfo
View File

@ -1,3 +1,3 @@
MD5 (xxdiff-2.4.tar.gz) = c9966c078c0cfde264dcf91f7d2faa7d
RMD160 (xxdiff-2.4.tar.gz) = 10c9e6de4587d15e25966b491dc0564562ba459d
SHA1 (xxdiff-2.4.tar.gz) = a9ffdb8ebb79aa1c724b605a2084dbf00820cfcf
MD5 (xxdiff-2.6.tar.gz) = 45e58050949445123c69874edb2e5642
RMD160 (xxdiff-2.6.tar.gz) = ee118276847848f6ac860f0650927fdd2e61f696
SHA1 (xxdiff-2.6.tar.gz) = bf7d0ca22bb34b38c063caac8b2957cdb3d4384f

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

@ -1,6 +1,7 @@
--- app.cpp.orig Tue Feb 26 18:00:47 2002
+++ app.cpp Tue Feb 26 18:01:14 2002
@@ -2118,7 +2118,7 @@ void XxApp::editFile( const QString& fil
$OpenBSD: patch-app_cpp,v 1.2 2002/07/17 07:27:02 wilfried Exp $
--- app.cpp.orig Fri May 31 11:14:25 2002
+++ app.cpp Wed Jul 17 09:24:02 2002
@@ -2160,7 +2160,7 @@ void XxApp::editFile( const QString& fil
size_t size;
/* Bind a name to the socket. */
name.sun_family = AF_FILE;

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

@ -1,6 +1,7 @@
--- buffer.cpp.orig Tue Feb 26 17:58:56 2002
+++ buffer.cpp Tue Feb 26 17:59:14 2002
@@ -291,7 +291,7 @@ void XxBuffer::setDirectoryEntries(
$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(
it != _directoryEntries.end();
++it ) {
int len = (*it).length();

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

@ -1,5 +1,6 @@
--- resParser.l.orig Tue Feb 26 18:01:36 2002
+++ resParser.l Tue Feb 26 18:02:09 2002
$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\.]*
{geomspec} {
int len = ::strlen( yytext );
@ -11,10 +12,10 @@
else {
- ::strncpy( lexerBuffer, yytext, len );
+ ::strlcpy( lexerBuffer, yytext, len );
lexerBuffer[ len ] = 0;
}
yylval->str = lexerBuffer;
BEGIN(INITIAL);
@@ -206,11 +206,11 @@ iddot [a-zA-Z][a-zA-Z0-9\.]*
@@ -207,11 +207,11 @@ iddot [a-zA-Z][a-zA-Z0-9\.]*
/* strip the quotes */
int len = ::strlen( yytext );
if ( len >= LEX_BUFFER_MAX ) {

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

@ -1,11 +1,12 @@
--- xxdiff.1.orig Tue Feb 26 18:08:26 2002
+++ xxdiff.1 Tue Feb 26 18:09:18 2002
@@ -18,7 +18,7 @@
$OpenBSD: patch-xxdiff_1,v 1.2 2002/07/17 07:27:02 wilfried 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.1
+.TH XXDIFF 2.4
+.TH XXDIFF 2.6
.SH NAME
xxdiff \- a graphical file comparator and merge tool
.SH SYNOPSIS

3
textproc/xxdiff/pkg/SECURITY
View File

@ -1,4 +1,4 @@
$OpenBSD: SECURITY,v 1.4 2002/04/09 15:43:40 naddy Exp $
$OpenBSD: SECURITY,v 1.5 2002/07/17 07:27:02 wilfried Exp $
Xxdiff uses strncpy in a few functions.
The included patches correct the usage to
@ -7,5 +7,4 @@ strlcpy where needed.
Files affected are:
${WRKSRC}/src/app.cpp
${WRKSRC}/src/buffer.cpp
${WRKSRC}/src/diffs.cpp
${WRKSRC}/src/resParser.l