From 8f5c11fdbe0c2d8d7434ca656cae0d4c676ee4af Mon Sep 17 00:00:00 2001 From: bapt Date: Fri, 29 Apr 2016 23:27:15 +0000 Subject: import sdiff(1) from GSoC 2012 Import sdiff(1) from the diff version written by Raymond Lai, improved during GSoC 2012 by Jesse Hagewood. Compared to the version done in during that summer of code: - Remove the zlib frontend: zsdiff - Compatible output (column size and separators) with GNU sdiff Compared to GNU sdiff in ports: - The only difference is padding using spaces vs tabs Compared to OpenBSD and NetBSD import: - Implement missing options (including long options) from GNU sdiff - Improved support for the edition mode (signal handling) - Output visually compatible with GNU sdiff: size of columns While here import regression tests from NetBSD adapted to fit the output as expected by GNU sdiff Reviewed by: emaste (in part) Obtained from: OpenBSD, NetBSD, GSoC 2012 Relnotes: yes Differential Revision: https://reviews.freebsd.org/D5981 Differential Revision: https://reviews.freebsd.org/D6032 (diff with NetBSD version) Differential Revision: https://reviews.freebsd.org/D6033 (diff with OpenBSD version) --- gnu/usr.bin/Makefile | 1 - gnu/usr.bin/sdiff/Makefile | 28 ---------------------------- gnu/usr.bin/sdiff/Makefile.depend | 18 ------------------ gnu/usr.bin/sdiff/sdiff.c.diff | 11 ----------- 4 files changed, 58 deletions(-) delete mode 100644 gnu/usr.bin/sdiff/Makefile delete mode 100644 gnu/usr.bin/sdiff/Makefile.depend delete mode 100644 gnu/usr.bin/sdiff/sdiff.c.diff (limited to 'gnu') diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 518000d..63cbd0b 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -13,7 +13,6 @@ SUBDIR= ${_binutils} \ grep \ ${_groff} \ ${_rcs} \ - sdiff \ ${_tests} SUBDIR_DEPEND_gdb= ${_binutils} diff --git a/gnu/usr.bin/sdiff/Makefile b/gnu/usr.bin/sdiff/Makefile deleted file mode 100644 index efadcf2..0000000 --- a/gnu/usr.bin/sdiff/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# $FreeBSD$ - -DIFFSRC=${.CURDIR}/../../../contrib/diff/src -.PATH: ${DIFFSRC} \ - ${.CURDIR}/../../../contrib/diff/lib \ - ${.CURDIR}/../../../contrib/diff/man - -PROG= sdiff -SRCS= sdiff.c version-etc.c \ - error.c xmalloc.c c-stack.c basename.c strtoumax.c \ - exitfail.c - -# Important for ctype macros! -CFLAGS+=-funsigned-char - -CFLAGS+=-I${.CURDIR}/../../../contrib/diff -CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src -CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib -CFLAGS+=-DHAVE_CONFIG_H -CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\" - -.for f in sdiff.c -${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff - patch -s -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f} -CLEANFILES+= ${f} -.endfor - -.include diff --git a/gnu/usr.bin/sdiff/Makefile.depend b/gnu/usr.bin/sdiff/Makefile.depend deleted file mode 100644 index 3646e2e..0000000 --- a/gnu/usr.bin/sdiff/Makefile.depend +++ /dev/null @@ -1,18 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - gnu/lib/csu \ - gnu/lib/libgcc \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/gnu/usr.bin/sdiff/sdiff.c.diff b/gnu/usr.bin/sdiff/sdiff.c.diff deleted file mode 100644 index bdb208b..0000000 --- a/gnu/usr.bin/sdiff/sdiff.c.diff +++ /dev/null @@ -1,11 +0,0 @@ -$FreeBSD$ ---- sdiff.c.orig 2004-04-12 15:44:35.000000000 +0800 -+++ sdiff.c 2007-06-15 14:53:08.790433972 +0800 -@@ -455,7 +455,6 @@ - initialize_main (&argc, &argv); - program_name = argv[0]; - setlocale (LC_ALL, ""); -- bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); - c_stack_action (cleanup); - -- cgit v1.1