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

- give it a chance to compile: USE_GMAKE

Browse Source 
- remove unneeded pkg/SECURITY file
- regen patches while here

ok jasper@
This commit is contained in:
ajacoutot 2008-01-24 11:49:21 +00:00
parent c97caecc2c
commit 2df89dced5
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
textproc/xxdiff/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.23 2007/09/15 20:59:42 merdely Exp $
# $OpenBSD: Makefile,v 1.24 2008/01/24 11:49:21 ajacoutot Exp $
COMMENT= graphical file comparator and merge tool
DISTNAME= xxdiff-3.1
PKGNAME= ${DISTNAME}p0
CATEGORIES= textproc x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xxdiff/}
@ -13,7 +14,8 @@ PERMIT_PACKAGE_CDROM= Yes
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
@ -27,6 +29,7 @@ MAKE_ENV+= UIC=${MODQT_UIC}
# For qsettings to write its setup
PORTHOME= ${WRKDIST}
USE_GMAKE= Yes
USE_X11= Yes
NO_REGRESS= Yes

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

@ -1,7 +1,7 @@
$OpenBSD: patch-app_cpp,v 1.4 2005/04/24 19:02:05 sturm Exp $
$OpenBSD: patch-app_cpp,v 1.5 2008/01/24 11:49:21 ajacoutot 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
+++ app.cpp Thu Jan 24 09:43:06 2008
@@ -2444,7 +2444,7 @@ void XxApp::editFile( const QString& filename )
size_t size;
/* Bind a name to the socket. */
name.sun_family = AF_FILE;

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

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-util_cpp,v 1.2 2008/01/24 11:49:21 ajacoutot Exp $
--- util.cpp.orig Fri Nov 5 19:47:06 2004
+++ util.cpp Thu Jan 24 09:43:07 2008
@@ -1031,10 +1031,28 @@ QString XxUtil::escapeChars( const QString& format )
QString XxUtil::unescapeChars( const QString& format )
{
QString newFormat = format;

10
textproc/xxdiff/pkg/SECURITY
View File

@ -1,10 +0,0 @@
$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
strlcpy where needed.
Files affected are:
${WRKSRC}/src/app.cpp
${WRKSRC}/src/buffer.cpp
${WRKSRC}/src/resParser.l