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

update: textproc/xxdiff



Here is an update to textproc/xxdiff that moves it to qt3 support:

summary of changes:
* update to xxdiff version 2.6
* remove NEED_VERSION
* add license note
* move to qt3 (with PORTHOME quirk for uic3) 
* add $OpenBSD$ tag to patch files
* update pkg/SECURITY file to reflect reality

------------%< snip %<----------------------%< snip %<------------

diff -rup xxdiff.orig/Makefile xxdiff/Makefile
--- xxdiff.orig/Makefile	Mon Jul 15 20:04:42 2002
+++ xxdiff/Makefile	Tue Jul 16 18:08:35 2002
@@ -2,28 +2,34 @@
 
 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_(_at_)_danimal_(_dot_)_org>
 
+# GPL
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
 BUILD_DEPENDS=	::devel/bison ::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
diff -rup xxdiff.orig/distinfo xxdiff/distinfo
--- xxdiff.orig/distinfo	Mon Jul 15 20:04:42 2002
+++ xxdiff/distinfo	Mon Jul 15 20:08:04 2002
@@ -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
diff -rup xxdiff.orig/patches/patch-app_cpp xxdiff/patches/patch-app_cpp
--- xxdiff.orig/patches/patch-app_cpp	Mon Jul 15 20:04:42 2002
+++ xxdiff/patches/patch-app_cpp	Tue Jul 16 18:10:52 2002
@@ -1,6 +1,8 @@
---- 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: $
+
+--- app.cpp.orig	Mon Jul 15 20:51:16 2002
++++ app.cpp	Mon Jul 15 20:51:21 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;
diff -rup xxdiff.orig/patches/patch-buffer_cpp xxdiff/patches/patch-buffer_cpp
--- xxdiff.orig/patches/patch-buffer_cpp	Mon Jul 15 20:04:42 2002
+++ xxdiff/patches/patch-buffer_cpp	Tue Jul 16 18:11:17 2002
@@ -1,6 +1,8 @@
---- 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: $
+
+--- buffer.cpp.orig	Mon Jul 15 20:53:08 2002
++++ buffer.cpp	Mon Jul 15 20:53:31 2002
+@@ -342,7 +342,7 @@ void XxBuffer::setDirectoryEntries( 
           it != _directoryEntries.end();
           ++it ) {
        int len = (*it).length();
diff -rup xxdiff.orig/patches/patch-resParser_l xxdiff/patches/patch-resParser_l
--- xxdiff.orig/patches/patch-resParser_l	Mon Jul 15 20:04:42 2002
+++ xxdiff/patches/patch-resParser_l	Tue Jul 16 18:11:31 2002
@@ -1,5 +1,7 @@
---- resParser.l.orig	Tue Feb 26 18:01:36 2002
-+++ resParser.l	Tue Feb 26 18:02:09 2002
+$OpenBSD: $
+
+--- resParser.l.orig	Mon Jul 15 20:54:39 2002
++++ resParser.l	Mon Jul 15 20:55:22 2002
 @@ -65,11 +65,11 @@ iddot           [a-zA-Z][a-zA-Z0-9\.]*
  {geomspec}	{ 
     int len = ::strlen( yytext );
@@ -11,10 +13,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 ) {
diff -rup xxdiff.orig/patches/patch-xxdiff_1 xxdiff/patches/patch-xxdiff_1
--- xxdiff.orig/patches/patch-xxdiff_1	Mon Jul 15 20:04:42 2002
+++ xxdiff/patches/patch-xxdiff_1	Tue Jul 16 18:12:29 2002
@@ -1,11 +1,13 @@
---- xxdiff.1.orig	Tue Feb 26 18:08:26 2002
-+++ xxdiff.1	Tue Feb 26 18:09:18 2002
-@@ -18,7 +18,7 @@
+$OpenBSD: $
+
+--- xxdiff.1.orig	Mon Jul 15 20:56:50 2002
++++ xxdiff.1	Mon Jul 15 21:02:17 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

diff -rup xxdiff.orig/pkg/SECURITY xxdiff/pkg/SECURITY
--- xxdiff.orig/pkg/SECURITY	Mon Jul 15 20:04:42 2002
+++ xxdiff/pkg/SECURITY	Mon Jul 15 21:12:29 2002
@@ -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



Visit your host, monkey.org