Date: Mon, 13 May 2013 15:08:04 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318100 - in head/sysutils/dirdiff: . files Message-ID: <201305131508.r4DF84dP061286@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Mon May 13 15:08:04 2013 New Revision: 318100 URL: http://svnweb.freebsd.org/changeset/ports/318100 Log: - Fix build with Tcl 8.6 [1] - Trim Makefile header - Assign to tcltk@FreeBSD.org Reported by: miwi (Tcl/Tk 86 exp-run) Added: head/sysutils/dirdiff/files/ head/sysutils/dirdiff/files/patch-filecmp.c (contents, props changed) Modified: head/sysutils/dirdiff/Makefile (contents, props changed) Modified: head/sysutils/dirdiff/Makefile ============================================================================== --- head/sysutils/dirdiff/Makefile Mon May 13 14:50:52 2013 (r318099) +++ head/sysutils/dirdiff/Makefile Mon May 13 15:08:04 2013 (r318100) @@ -1,9 +1,5 @@ -# New ports collection makefile for: dirdiff -# Whom: grog -# Date created: 7 May 2001 -# +# Created by: grog # $FreeBSD$ -# PORTNAME= dirdiff PORTVERSION= 2.1 @@ -11,8 +7,8 @@ PORTREVISION= 3 CATEGORIES= sysutils tcl tk MASTER_SITES= ftp://ftp.samba.org/pub/paulus/ -MAINTAINER= ports@FreeBSD.org -COMMENT= A graphical diff tool +MAINTAINER= tcltk@FreeBSD.org +COMMENT= Graphical diff tool LICENSE= GPLv2 # (or later) LICENSE_FILE= ${WRKSRC}/COPYING Added: head/sysutils/dirdiff/files/patch-filecmp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/dirdiff/files/patch-filecmp.c Mon May 13 15:08:04 2013 (r318100) @@ -0,0 +1,46 @@ +--- filecmp.c.orig 2005-04-19 12:22:01.000000000 +0200 ++++ filecmp.c 2013-05-13 17:00:44.000000000 +0200 +@@ -9,6 +9,7 @@ + #include <stdio.h> + #include <string.h> + #include <ctype.h> ++#include <unistd.h> + #include <tcl.h> + #include <sys/fcntl.h> + +@@ -125,7 +126,7 @@ + p2 += i; + k2 -= i; + /* 4 == strlen("<dollar>Id<dollar>") */ +- if (k1 < 4 && !e1 || k2 < 4 && !e2) ++ if ((k1 < 4 && !e1) || (k2 < 4 && !e2)) + break; + if (k1 < 4 || k2 < 4) { + /* near the end of one or both files */ +@@ -195,7 +196,7 @@ + k2 -= i; + if (match < BKTAGLEN) { + /* we have run out of one or other buffer */ +- if (k1 == 0 && e1 || k2 == 0 && e2) { ++ if ((k1 == 0 && e1) ||( k2 == 0 && e2)) { + if (k1 == k2) + break; + return 0; +@@ -219,7 +220,7 @@ + continue; + } + /* ran out before eol on one or both files */ +- if (t1 == k1 && e1 || t2 == k2 && e2) { ++ if ((t1 == k1 && e1) || (t2 == k2 && e2)) { + k1 -= t1; + k2 -= t2; + if (k1 == k2) +@@ -341,7 +342,7 @@ + if (n1 < 0 || n2 < 0) + return TCL_ERROR; + +- sprintf(interp->result, "%d", same); ++ Tcl_SetObjResult(interp, Tcl_NewIntObj(same)); + return TCL_OK; + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305131508.r4DF84dP061286>