mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-06 11:41:52 +00:00
Code Issues Releases Activity

- Fix build with Tcl 8.6 [1]

Browse Source 
- Trim Makefile header
- Assign to tcltk@FreeBSD.org

Reported by:	miwi (Tcl/Tk 86 exp-run)
This commit is contained in:
Pietro Cerutti 2013-05-13 15:08:04 +00:00
parent fcd211203a
commit 1ea9c58c8a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=318100
2 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sysutils/dirdiff/Makefile
View File

@ -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

46
sysutils/dirdiff/files/patch-filecmp.c Normal file
View File

@ -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;
}