Index: gnu/usr.bin/diff/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/diff/Makefile,v retrieving revision 1.16 diff -u -p -u -r1.16 Makefile --- gnu/usr.bin/diff/Makefile 17 Feb 2004 05:38:45 -0000 1.16 +++ gnu/usr.bin/diff/Makefile 13 Jun 2007 08:51:04 -0000 @@ -1,16 +1,24 @@ # $FreeBSD: src/gnu/usr.bin/diff/Makefile,v 1.16 2004/02/17 05:38:45 ache Exp $ -.PATH: ${.CURDIR}/../../../contrib/diff +DIFFSRC=${.CURDIR}/../../../contrib/diff/src +.PATH: ${DIFFSRC} \ + ${.CURDIR}/../../../contrib/diff/lib \ + ${.CURDIR}/../../../contrib/diff/man PROG= diff -SRCS= analyze.c cmpbuf.c context.c diff.c dir.c ed.c \ - ifdef.c io.c normal.c prepend_args.c side.c util.c version.c +SRCS= analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \ + normal.c side.c util.c version.c \ + xmalloc.c strtoumax.c cmpbuf.c exitfail.c error.c quotesys.c \ + strftime.c c-stack.c basename.c exclude.c freesoft.c hard-locale.c \ + posixver.c prepargs.c # Important for ctype macros! CFLAGS+=-funsigned-char -CFLAGS+=-I${.CURDIR}/../../../contrib/diff \ - -I${DESTDIR}/usr/include/gnu +CFLAGS+=-I${DESTDIR}/usr/include/gnu +CFLAGS+=-I${.CURDIR} +CFLAGS+=-I${DIFFSRC} +CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib CFLAGS+=-DHAVE_CONFIG_H CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\" @@ -19,4 +27,10 @@ SUBDIR+=doc DPADD= ${LIBGNUREGEX} LDADD= -lgnuregex +.for f in diff.c util.c +${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff + patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f} +CLEANFILES+= ${f} +.endfor + .include Index: gnu/usr.bin/diff/config.h =================================================================== RCS file: gnu/usr.bin/diff/config.h diff -N gnu/usr.bin/diff/config.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/usr.bin/diff/config.h 13 Jun 2007 07:27:25 -0000 @@ -0,0 +1,515 @@ +/* config.h. Generated by configure. */ +/* config.hin. Generated from configure.ac by autoheader. */ + +/* Define to 1 if the `closedir' function returns void instead of `int'. */ +/* #undef CLOSEDIR_VOID */ + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ + +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ + +/* Name of "diff" program, unless overridden. */ +#define DEFAULT_DIFF_PROGRAM "diff" + +/* Name of editor program, unless overridden. */ +#define DEFAULT_EDITOR_PROGRAM "/usr/bin/vi" + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* Define on systems for which file names may have a so-called `drive letter' + prefix, define this to compute the length of that prefix, including the + colon. */ +#define FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX 0 + +/* Define if the backslash character may also serve as a file name component + separator. */ +#define FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR 0 + +#if FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX +# define FILESYSTEM_PREFIX_LEN(Filename) \ + ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0) +#else +# define FILESYSTEM_PREFIX_LEN(Filename) 0 +#endif + +/* Define to 1 if you have `alloca', as a function or macro. */ +#define HAVE_ALLOCA 1 + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +/* #undef HAVE_ALLOCA_H */ + +/* Define to 1 if you have the `bcopy' function. */ +#define HAVE_BCOPY 1 + +/* Define to 1 if you have the `btowc' function. */ +#define HAVE_BTOWC 1 + +/* Define to 1 if you have the `bzero' function. */ +#define HAVE_BZERO 1 + +/* Define to 1 if you have the `clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + +/* Define if backslash-a works in C strings. */ +#define HAVE_C_BACKSLASH_A 1 + +/* Define to 1 if C supports variable-length arrays. */ +#define HAVE_C_VARARRAYS 1 + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_CLEARERR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_FEOF_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FERROR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FFLUSH_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FGETS_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FPUTC_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FPUTS_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FREAD_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FWRITE_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_GETCHAR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_GETC_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. + */ +#define HAVE_DECL_GETENV 1 + +/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_PUTCHAR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_PUTC_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `strerror', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR 1 + +/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_R 1 + +/* Define to 1 if you have the declaration of `strtoimax', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOIMAX 1 + +/* Define to 1 if you have the declaration of `strtol', and to 0 if you don't. + */ +#define HAVE_DECL_STRTOL 1 + +/* Define to 1 if you have the declaration of `strtoul', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOUL 1 + +/* Define to 1 if you have the declaration of `strtoull', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOULL 1 + +/* Define to 1 if you have the declaration of `strtoumax', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOUMAX 1 + +/* Define to 1 if you have the `diraccess' function. */ +/* #undef HAVE_DIRACCESS */ + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define if the malloc check has been performed. */ +#define HAVE_DONE_WORKING_MALLOC_CHECK 1 + +/* Define if the realloc check has been performed. */ +#define HAVE_DONE_WORKING_REALLOC_CHECK 1 + +/* Define to 1 if you have the `doprnt' function. */ +/* #undef HAVE_DOPRNT */ + +/* Define to 1 if you have the `dup2' function. */ +#define HAVE_DUP2 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if your system has a working `fnmatch' function. */ +#define HAVE_FNMATCH 1 + +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define if you have the iconv() function. */ +/* #undef HAVE_ICONV */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `isascii' function. */ +#define HAVE_ISASCII 1 + +/* Define to 1 if you have the `iswprint' function. */ +#define HAVE_ISWPRINT 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBINTL_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + +/* Define to 1 if you have the `localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + +/* Define if you have the long long type. */ +#define HAVE_LONG_LONG 1 + +/* Define to 1 if you have the `mblen' function. */ +#define HAVE_MBLEN 1 + +/* Define to 1 if you have the `mbrlen' function. */ +#define HAVE_MBRLEN 1 + +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 if you have the `memchr' function. */ +#define HAVE_MEMCHR 1 + +/* Define to 1 if you have the `memcpy' function. */ +#define HAVE_MEMCPY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mempcpy' function. */ +/* #undef HAVE_MEMPCPY */ + +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define to 1 if you have the `mkstemp' function. */ +#define HAVE_MKSTEMP 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + +/* Define to 1 if you have the DOS-style `setmode' function. */ +/* #undef HAVE_SETMODE_DOS */ + +/* Define to 1 if you have the `sigaction' function. */ +#define HAVE_SIGACTION 1 + +/* Define to 1 if the system has the type `siginfo_t'. */ +#define HAVE_SIGINFO_T 1 + +/* Define to 1 if you have the `sigprocmask' function. */ +#define HAVE_SIGPROCMASK 1 + +/* Define to 1 if the system has the type `stack_t'. */ +#define HAVE_STACK_T 1 + +/* Define to 1 if stdbool.h conforms to C99. */ +#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDDEF_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strcasecmp' function. */ +#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strtoul' function. */ +/* #undef HAVE_STRTOUL */ + +/* Define to 1 if you have the `strtoull' function. */ +/* #undef HAVE_STRTOULL */ + +/* Define to 1 if you have the `strtoumax' function. */ +#define HAVE_STRTOUMAX 1 + +/* Define to 1 if `st_blksize' is member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 + +/* Define to 1 if `st_rdev' is member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_RDEV 1 + +/* Define to 1 if `tm_zone' is member of `struct tm'. */ +#define HAVE_STRUCT_TM_TM_ZONE 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_FILE_H 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TIME_H 1 + +/* Define to 1 if you have the `tmpnam' function. */ +#define HAVE_TMPNAM 1 + +/* Define if struct tm has the tm_gmtoff member. */ +#define HAVE_TM_GMTOFF 1 + +/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use + `HAVE_STRUCT_TM_TM_ZONE' instead. */ +#define HAVE_TM_ZONE 1 + +/* Define to 1 if you don't have `tm_zone' but do have the external array + `tzname'. */ +/* #undef HAVE_TZNAME */ + +/* Define to 1 if you have the `tzset' function. */ +#define HAVE_TZSET 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define if you have the unsigned long long type. */ +#define HAVE_UNSIGNED_LONG_LONG 1 + +/* Define to 1 if you have the `vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 if you have the `vprintf' function. */ +#define HAVE_VPRINTF 1 + +/* Define to 1 if you have the `waitpid' function. */ +#define HAVE_WAITPID 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCTYPE_H 1 + +/* Define to 1 if `fork' works. */ +#define HAVE_WORKING_FORK 1 + +/* Define to 1 if `vfork' works. */ +#define HAVE_WORKING_VFORK 1 + +/* Define to 1 if extending the stack slightly past the limit causes a + SIGSEGV, and an alternate stack can be established with sigaltstack, and + the signal handler is passed a context that specifies the run time stack. + This behavior is defined by POSIX 1003.1-2001 with the X/Open System + Interface (XSI) option and is a standardized way to implement a SEGV-based + stack overflow detection heuristic. */ +/* #undef HAVE_XSI_STACK_OVERFLOW_HEURISTIC */ + +/* Define to 1 if you have the `__secure_getenv' function. */ +/* #undef HAVE___SECURE_GETENV */ + +#if FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +#else +# define ISSLASH(C) ((C) == '/') +#endif + +/* Name of package */ +#define PACKAGE "diffutils" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "bug-gnu-utils@gnu.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "GNU diffutils" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "GNU diffutils 2.8.1" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "diffutils" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "2.8.1" + +/* Define if compiler has function prototypes */ +#define PROTOTYPES 1 + +/* Name of "pr" program. */ +#define PR_PROGRAM "/usr/bin/pr" + +/* Define to 1 to avoid alloca in the regular-expression implementation. */ +#define REGEX_MALLOC 1 + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ + +/* Define to 1 if the `S_IS*' macros in do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if strerror_r returns char *. */ +/* #undef STRERROR_R_CHAR_P */ + +/* Define to be the nanoseconds member of struct stat's st_mtim, if it exists. + */ +/* #undef ST_MTIM_NSEC */ + +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* Define to 1 if your declares `struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + +/* Version number of package */ +#define VERSION "2.8.1" + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +#ifndef _GNU_SOURCE +# define _GNU_SOURCE +#endif + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +/* Enable Solaris extensions. */ +#define __EXTENSIONS__ 1 + +/* Define like PROTOTYPES; this can be used by system headers. */ +#define __PROTOTYPES 1 + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +/* #undef inline */ + +/* Define to widest signed type if doesn't define. */ +/* #undef intmax_t */ + +/* Define to rpl_malloc if the replacement function should be used. */ +/* #undef malloc */ + +/* Define to a type if does not define. */ +/* #undef mbstate_t */ + +/* Define to the name of the strftime replacement function. */ +#define my_strftime nstrftime + +/* Define to `int' if does not define. */ +/* #undef pid_t */ + +/* Define to `int' if does not define. */ +/* #undef ptrdiff_t */ + +/* Define to rpl_realloc if the replacement function should be used. */ +/* #undef realloc */ + +/* Define to `int' if does not define. */ +/* #undef ssize_t */ + +/* Define to widest unsigned type if doesn't define. */ +/* #undef uintmax_t */ + +/* Define as `fork' if `vfork' does not work. */ +/* #undef vfork */ Index: gnu/usr.bin/diff/diff.1 =================================================================== RCS file: gnu/usr.bin/diff/diff.1 diff -N gnu/usr.bin/diff/diff.1 --- gnu/usr.bin/diff/diff.1 3 Nov 2005 03:49:57 -0000 1.10 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,508 +0,0 @@ -.\" $FreeBSD: src/gnu/usr.bin/diff/diff.1,v 1.10 2005/11/03 03:49:57 delphij Exp $ -.TH DIFF 1 "22sep1993" "GNU Tools" "GNU Tools" -.SH NAME -diff \- find differences between two files -.SH SYNOPSIS -.B diff -[options] from-file to-file -.SH DESCRIPTION -In the simplest case, -.I diff -compares the contents of the two files -.I from-file -and -.IR to-file . -A file name of -.B \- -stands for -text read from the standard input. As a special case, -.B "diff \- \-" -compares a copy of standard input to itself. - -If -.I from-file -is a directory and -.I to-file -is not, -.I diff -compares the file in -.I from-file -whose file name is that of -.IR to-file , -and vice versa. The non-directory file must not be -.BR \- . - -If both -.I from-file -and -.I to-file -are directories, -.I diff -compares corresponding files in both directories, in -alphabetical order; this comparison is not recursive unless the -.B \-r -or -.B \-\-recursive -option is given. -.I diff -never -compares the actual contents of a directory as if it were a file. The -file that is fully specified may not be standard input, because standard -input is nameless and the notion of ``file with the same name'' does not -apply. - -.B diff -options begin with -.BR \- , -so normally -.I from-file -and -.I to-file -may not begin with -.BR \- . -However, -.B \-\- -as an -argument by itself treats the remaining arguments as file names even if -they begin with -.BR \- . -.SS Options -Below is a summary of all of the options that GNU -.I diff -accepts. -Most options have two equivalent names, one of which is a single letter -preceded by -.BR \- , -and the other of which is a long name preceded by -.BR \-\- . -Multiple single letter options (unless they take an -argument) can be combined into a single command line word: -.B \-ac -is -equivalent to -.BR "\-a \-c" . -Long named options can be abbreviated to -any unique prefix of their name. Brackets -.RB ( [ -and -.BR ] ) -indicate that an -option takes an optional argument. -.TP -.BI \- lines -Show -.I lines -(an integer) lines of context. This option does not -specify an output format by itself; it has no effect unless it is -combined with -.B \-c -or -.BR \-u . -This option is obsolete. For proper -operation, -.I patch -typically needs at least two lines of context. -.TP -.B \-a -Treat all files as text and compare them line-by-line, even if they -do not seem to be text. -.TP -.B \-b -Ignore changes in amount of white space. -.TP -.B \-B -Ignore changes that just insert or delete blank lines. -.TP -.B \-\-brief -Report only whether the files differ, not the details of the -differences. -.TP -.B \-c -Use the context output format. -.TP -.BI "\-C " lines -.br -.ns -.TP -.BI \-\-context[= lines ] -Use the context output format, showing -.I lines -(an integer) lines of -context, or three if -.I lines -is not given. -For proper operation, -.I patch -typically needs at least two lines of -context. -.TP -.BI \-\-changed\-group\-format= format -Use -.I format -to output a line group containing differing lines from -both files in if-then-else format. -For more details on what can be specified in the -.I format -string, consult the info documentation of -.I diff . -.TP -.B \-d -Change the algorithm to perhaps find a smaller set of changes. This makes -.I diff -slower (sometimes much slower). -.TP -.BI "\-D " name -Make merged if-then-else format output, conditional on the preprocessor -macro -.IR name . -.TP -.B \-e -.br -.ns -.TP -.B \-\-ed -Make output that is a valid -.I ed -script. -.TP -.BI \-\-exclude= pattern -When comparing directories, ignore files and subdirectories whose basenames -match -.IR pattern . -.TP -.BI \-\-exclude\-from= file -When comparing directories, ignore files and subdirectories whose basenames -match any pattern contained in -.IR file . -.TP -.B \-\-expand\-tabs -Expand tabs to spaces in the output, to preserve the alignment of tabs -in the input files. -.TP -.B \-f -Make output that looks vaguely like an -.I ed -script but has changes -in the order they appear in the file. -.TP -.BI "\-F " regexp -In context and unified format, for each hunk of differences, show some -of the last preceding line that matches -.IR regexp . -.TP -.B \-\-forward\-ed -Make output that looks vaguely like an -.B ed -script but has changes -in the order they appear in the file. -.TP -.B \-h -This option currently has no effect; it is present for Unix -compatibility. -.TP -.B \-H -Use heuristics to speed handling of large files that have numerous -scattered small changes. -.TP -.BI \-\-horizon\-lines= lines -Do not discard the last -.I lines -lines of the common prefix -and the first -.I lines -lines of the common suffix. -.TP -.B \-i -Ignore changes in case; consider upper- and lower-case letters -equivalent. -.TP -.BI "\-I " regexp -Ignore changes that just insert or delete lines that match -.IR regexp . -.TP -.BI \-\-ifdef= name -Make merged if-then-else format output, conditional on the preprocessor -macro -.IR name . -.TP -.B \-\-ignore\-all\-space -Ignore white space when comparing lines. -.TP -.B \-\-ignore\-blank\-lines -Ignore changes that just insert or delete blank lines. -.TP -.B \-\-ignore\-case -Ignore changes in case; consider upper- and lower-case to be the same. -.TP -.BI \-\-ignore\-matching\-lines= regexp -Ignore changes that just insert or delete lines that match -.IR regexp . -.TP -.B \-\-ignore\-space\-change -Ignore changes in amount of white space. -.TP -.B \-\-initial\-tab -Output a tab rather than a space before the text of a line in normal or -context format. This causes the alignment of tabs in the line to look -normal. -.TP -.B \-l -Pass the output through -.I pr -to paginate it. -.TP -.BI "\-L " label -.br -.ns -.TP -.BI \-\-label= label -Use -.I label -instead of the file name in the context format -and unified format -headers. -.TP -.B \-\-left\-column -Print only the left column of two common lines in side by side format. -.TP -.BI \-\-line\-format= format -Use -.I format -to output all input lines in in-then-else format. -.TP -.B \-\-minimal -Change the algorithm to perhaps find a smaller set of changes. This -makes -.I diff -slower (sometimes much slower). -.TP -.B \-n -Output RCS-format diffs; like -.B \-f -except that each command -specifies the number of lines affected. -.TP -.B \-N -.br -.ns -.TP -.B \-\-new\-file -In directory comparison, if a file is found in only one directory, -treat it as present but empty in the other directory. -.TP -.BI \-\-new\-group\-format= format -Use -.I format -to output a group of lines taken from just the second -file in if-then-else format. -.TP -.BI \-\-new\-line\-format= format -Use -.I format -to output a line taken from just the second file in -if-then-else format. -.TP -.B \-o -Use the old traditional output format. -.TP -.BI \-\-old\-group\-format= format -Use -.I format -to output a group of lines taken from just the first -file in if-then-else format. -.TP -.BI \-\-old\-line\-format= format -Use -.I format -to output a line taken from just the first file in -if-then-else format. -.TP -.B \-p -Show which C function each change is in. -.TP -.B \-P -When comparing directories, if a file appears only in the second -directory of the two, treat it as present but empty in the other. -.TP -.B \-\-paginate -Pass the output through -.I pr -to paginate it. -.TP -.B \-q -Report only whether the files differ, not the details of the -differences. -.TP -.B \-\-rcs -Output RCS-format diffs; like -.B \-f -except that each command -specifies the number of lines affected. -.TP -.B \-r -.br -.ns -.TP -.B \-\-recursive -When comparing directories, recursively compare any subdirectories -found. -.TP -.B \-s -.br -.ns -.TP -.B \-\-report\-identical\-files -Report when two files are the same. -.TP -.BI "\-S " file -When comparing directories, start with the file -.IR file . -This is -used for resuming an aborted comparison. -.TP -.B \-\-sdiff\-merge\-assist -Print extra information to help -.IR sdiff . -.I sdiff -uses this -option when it runs -.IR diff . -This option is not intended for users -to use directly. -.TP -.B \-\-show\-c\-function -Show which C function each change is in. -.TP -.BI \-\-show\-function\-line= regexp -In context and unified format, for each hunk of differences, show some -of the last preceding line that matches -.IR regexp . -.TP -.B \-\-side\-by\-side -Use the side by side output format. -.TP -.B \-\-speed\-large\-files -Use heuristics to speed handling of large files that have numerous -scattered small changes. -.TP -.BI \-\-starting\-file= file -When comparing directories, start with the file -.IR file . -This is -used for resuming an aborted comparison. -.TP -.B \-\-suppress\-common\-lines -Do not print common lines in side by side format. -.TP -.B \-t -Expand tabs to spaces in the output, to preserve the alignment of tabs -in the input files. -.TP -.B \-T -Output a tab rather than a space before the text of a line in normal or -context format. This causes the alignment of tabs in the line to look -normal. -.TP -.B \-\-text -Treat all files as text and compare them line-by-line, even if they -do not appear to be text. -.TP -.B \-u -Use the unified output format. -.TP -.BI \-\-unchanged\-group\-format= format -Use -.I format -to output a group of common lines taken from both files -in if-then-else format. -.TP -.BI \-\-unchanged\-line\-format= format -Use -.I format -to output a line common to both files in if-then-else -format. -.TP -.B \-\-unidirectional\-new\-file -When comparing directories, if a file appears only in the second -directory of the two, treat it as present but empty in the other. -.TP -.BI "\-U " lines -.br -.ns -.TP -.BI \-\-unified[= lines ] -Use the unified output format, showing -.I lines -(an integer) lines of -context, or three if -.I lines -is not given. -For proper operation, -.I patch -typically needs at least two lines of -context. -.TP -.B \-v -.br -.ns -.TP -.B \-\-version -Output the version number of -.IR diff . -.TP -.B \-w -Ignore horizontal white space when comparing lines. -.TP -.BI "\-W " columns -.br -.ns -.TP -.BI \-\-width= columns -Use an output width of -.I columns -in side by side format. -.TP -.BI "\-x " pattern -When comparing directories, ignore files and subdirectories whose basenames -match -.IR pattern . -.TP -.BI "\-X " file -When comparing directories, ignore files and subdirectories whose basenames -match any pattern contained in -.IR file . -.TP -.B \-y -Use the side by side output format. -.SH RETURN VALUE -.I diff -returns 0 if the files are identical or 1 if the files differ. -If one or both of the files cannot be opened, -then the return value is set to 2. -.SH ENVIRONMENT -The environment variable -.B DIFF_OPTIONS -can hold a set of default -options for -.I diff. -These options are interpreted first and can be overwritten by explicit command -line parameters. -.SH EXAMPLES -To save to a file some changes that you have made to your local source -tree (possibly including new files), which you would like to show to others -(perhaps using the -.B send-pr(1) -program), you could type -.sp -diff -urN foo.orig foo >foo.diff -.sp -where -.I foo.orig -and -.I foo -might be directory hierarchies or single files. -.SH SEE ALSO -cmp(1), comm(1), diff3(1), ed(1), patch(1), pr(1), sdiff(1). -.SH DIAGNOSTICS -An exit status of 0 means no differences were found, 1 means some -differences were found, and 2 means trouble. Index: gnu/usr.bin/diff/diff.c.diff =================================================================== RCS file: gnu/usr.bin/diff/diff.c.diff diff -N gnu/usr.bin/diff/diff.c.diff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/usr.bin/diff/diff.c.diff 13 Jun 2007 08:30:54 -0000 @@ -0,0 +1,52 @@ +$FreeBSD$ + +--- diff.c.orig 2002-03-24 15:35:28.000000000 +0800 ++++ diff.c 2007-06-13 16:26:23.000000000 +0800 +@@ -139,7 +139,7 @@ + } + + static char const shortopts[] = +-"0123456789abBcC:dD:eEfF:hHiI:lL:nNpPqrsS:tTuU:vwW:x:X:y"; ++"0123456789abBcC:dD:eEfF:hHiI:lL:nNopPqrsS:tTuU:vwW:x:X:y"; + + /* Values for long options that do not have single-letter equivalents. */ + enum +@@ -265,14 +265,15 @@ + initialize_main (&argc, &argv); + program_name = argv[0]; + setlocale (LC_ALL, ""); +- bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + c_stack_action (c_stack_die); + function_regexp_list.buf = &function_regexp; + ignore_regexp_list.buf = &ignore_regexp; +- re_set_syntax (RE_SYNTAX_GREP | RE_NO_POSIX_BACKTRACKING); ++ re_set_syntax (RE_SYNTAX_GREP); + excluded = new_exclude (); + ++ prepend_default_options (getenv ("DIFF_OPTIONS"), &argc, &argv); ++ + /* Decode the options. */ + + while ((c = getopt_long (argc, argv, shortopts, longopts, 0)) != -1) +@@ -428,6 +429,11 @@ + new_file = 1; + break; + ++ case 'o': ++ /* Output in the old tradition style. */ ++ specify_style (OUTPUT_NORMAL); ++ break; ++ + case 'p': + show_c_function = 1; + add_regexp (&function_regexp_list, "^[[:alpha:]$_]"); +@@ -958,8 +964,6 @@ + { + if (output_style != style) + { +- if (output_style != OUTPUT_UNSPECIFIED) +- try_help ("conflicting output style options", 0); + output_style = style; + } + } Index: gnu/usr.bin/diff/util.c.diff =================================================================== RCS file: gnu/usr.bin/diff/util.c.diff diff -N gnu/usr.bin/diff/util.c.diff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/usr.bin/diff/util.c.diff 13 Jun 2007 08:19:04 -0000 @@ -0,0 +1,11 @@ +--- /usr/src/contrib/diff/src/util.c 2002-02-28 12:23:10.000000000 +0800 ++++ util.c 2007-06-13 16:18:48.000000000 +0800 +@@ -215,7 +215,7 @@ + close (pipes[0]); + } + +- execl (pr_program, pr_program, "-h", name, 0); ++ execl (pr_program, pr_program, "-h", name, (char *)NULL); + _exit (errno == ENOEXEC ? 126 : 127); + } + else Index: gnu/usr.bin/diff/doc/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/diff/doc/Makefile,v retrieving revision 1.6 diff -u -p -u -r1.6 Makefile --- gnu/usr.bin/diff/doc/Makefile 27 Aug 1999 23:35:33 -0000 1.6 +++ gnu/usr.bin/diff/doc/Makefile 13 Jun 2007 06:38:38 -0000 @@ -4,6 +4,6 @@ INFO = diff INFOENTRY_diff= "* DIFF: (diff). DIFF/PATCH Reference Manual." -SRCDIR=${.CURDIR}/../../../../contrib/diff +SRCDIR=${.CURDIR}/../../../../contrib/diff/doc .include Index: gnu/usr.bin/diff3/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/diff3/Makefile,v retrieving revision 1.7 diff -u -p -u -r1.7 Makefile --- gnu/usr.bin/diff3/Makefile 17 Feb 2004 01:28:48 -0000 1.7 +++ gnu/usr.bin/diff3/Makefile 13 Jun 2007 07:18:09 -0000 @@ -1,15 +1,27 @@ # $FreeBSD: src/gnu/usr.bin/diff3/Makefile,v 1.7 2004/02/17 01:28:48 ache Exp $ -.PATH: ${.CURDIR}/../../../contrib/diff +DIFFSRC=${.CURDIR}/../../../contrib/diff/src +.PATH: ${DIFFSRC} \ + ${.CURDIR}/../../../contrib/diff/lib \ + ${.CURDIR}/../../../contrib/diff/man PROG= diff3 -SRCS= diff3.c version.c +SRCS= diff3.c version.c \ + xmalloc.c error.c c-stack.c exitfail.c freesoft.c cmpbuf.c # Important for ctype macros! CFLAGS+=-funsigned-char -CFLAGS+=-I${.CURDIR}/../../../contrib/diff +CFLAGS+=-I${.CURDIR}/../diff/ +CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src +CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib CFLAGS+=-DHAVE_CONFIG_H CFLAGS+=-DDIFF_PROGRAM=\"/usr/bin/diff\" +.for f in diff3.c +${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff + patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f} +CLEANFILES+= ${f} +.endfor + .include Index: gnu/usr.bin/diff3/diff3.1 =================================================================== RCS file: gnu/usr.bin/diff3/diff3.1 diff -N gnu/usr.bin/diff3/diff3.1 --- gnu/usr.bin/diff3/diff3.1 20 Feb 1995 18:47:18 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,210 +0,0 @@ -.TH DIFF3 1 "22sep1993" "GNU Tools" "GNU Tools" -.SH NAME -diff3 \- find differences between three files -.SH SYNOPSIS -.B diff3 -[options] mine older yours -.SH DESCRIPTION -The -.I diff3 -command compares three files and outputs descriptions -of their differences. - -The files to compare are -.IR mine , -.IR older , -and -.IR yours . -At most one of these three file names may be -.BR \- , -which tells -.I diff3 -to read the standard input for that file. -.SS Options -Below is a summary of all of the options that GNU -.I diff3 -accepts. Multiple single letter options (unless they take an argument) -can be combined into a single command line argument. -.TP -.B \-a -Treat all files as text and compare them line-by-line, even if they -do not appear to be text. -.TP -.B \-A -Incorporate all changes from -.I older -to -.I yours -into -.IR mine , -surrounding all conflicts with bracket lines. -.TP -.B \-B -Old behavior of -A. Shows non-conflicts. -.TP -.B \-e -Generate an -.I ed -script that incorporates all the changes from -.I older -to -.I yours -into -.IR mine . -.TP -.B \-E -Like -.BR \-e , -except bracket lines from overlapping changes' first -and third files. -With -.BR \-e , -an overlapping change looks like this: -.sp -.nf -<<<<<<< \fImine\fP -lines from \fImine\fP -======= -lines from \fIyours\fP ->>>>>>> \fIyours\fP -.fi -.TP -.B \-\-ed -Generate an -.I ed -script that incorporates all the changes from -.I older -to -.I yours -into -.IR mine . -.TP -.B \-\-easy\-only -Like -.BR \-e , -except output only the nonoverlapping changes. -.TP -.B \-i -Generate -.B w -and -.B q -commands at the end of the -.I ed -script for System V compatibility. This option must be combined with -one of the -.B \-AeExX3 -options, and may not be combined with -.BR \-m . -.TP -.B \-\-initial\-tab -Output a tab rather than two spaces before the text of a line in normal format. -This causes the alignment of tabs in the line to look normal. -.TP -.BI "\-L " label -.ns -.TP -.BI \-\-label= label -Use the label -.I label -for the brackets output by the -.BR \-A , -.B \-E -and -.B \-X -options. This option may be given up to three -times, one for each input file. The default labels are the names of -the input files. Thus -.B "diff3 \-L X \-L Y \-L Z \-m A B C" -acts like -.BR "diff3 \-m A B C , -except that the output looks like it came from -files named -.BR X , -.B Y -and -.B Z -rather than from files -named -.BR A , -.B B -and -.BR C . -.TP -.B \-m -.br -.ns -.TP -.B \-\-merge -Apply the edit script to the first file and send the result to standard -output. Unlike piping the output from -.I diff3 -to -.IR ed , -this -works even for binary files and incomplete lines. -.B \-A -is assumed -if no edit script option is specified. -.TP -.B \-\-overlap\-only -Like -.BR \-e , -except output only the overlapping changes. -.TP -.B \-\-show\-all -Incorporate all unmerged changes from -.I older -to -.I yours -into -.IR mine , -surrounding all overlapping changes with bracket lines. -.TP -.B \-\-show\-overlap -Like -.BR \-e , -except bracket lines from overlapping changes' first -and third files. -.TP -.B \-T -Output a tab rather than two spaces before the text of a line in normal format. -This causes the alignment of tabs in the line to look normal. -.TP -.B \-\-text -Treat all files as text and compare them line-by-line, even if they -do not appear to be text. -.TP -.B \-v -.br -.ns -.TP -.B \-\-version -Output the version number of -.IR diff3 . -.TP -.B \-x -Like -.BR \-e , -except output only the overlapping changes. -.TP -.B \-X -Like -.BR \-E , -except output only the overlapping changes. -In other words, like -.BR \-x , -except bracket changes as in -.BR \-E . -.TP -.B \-3 -Like -.BR \-e , -except output only the nonoverlapping changes. -.SH SEE ALSO -cmp(1), comm(1), diff(1), ed(1), patch(1), sdiff(1). -.SH DIAGNOSTICS -An exit status of 0 means -.I diff3 -was successful, 1 means some -conflicts were found, and 2 means trouble. Index: gnu/usr.bin/diff3/diff3.c.diff =================================================================== RCS file: gnu/usr.bin/diff3/diff3.c.diff diff -N gnu/usr.bin/diff3/diff3.c.diff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/usr.bin/diff3/diff3.c.diff 13 Jun 2007 09:04:59 -0000 @@ -0,0 +1,11 @@ +$FreeBSD$ +--- diff3.c.orig 2002-04-06 04:37:31.000000000 +0800 ++++ diff3.c 2007-06-13 17:04:12.000000000 +0800 +@@ -250,7 +250,6 @@ + initialize_main (&argc, &argv); + program_name = argv[0]; + setlocale (LC_ALL, ""); +- bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + c_stack_action (c_stack_die); + Index: gnu/usr.bin/sdiff/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/sdiff/Makefile,v retrieving revision 1.6 diff -u -p -u -r1.6 Makefile --- gnu/usr.bin/sdiff/Makefile 17 Feb 2004 01:30:56 -0000 1.6 +++ gnu/usr.bin/sdiff/Makefile 13 Jun 2007 07:27:36 -0000 @@ -1,16 +1,28 @@ # $FreeBSD: src/gnu/usr.bin/sdiff/Makefile,v 1.6 2004/02/17 01:30:56 ache Exp $ -.PATH: ${.CURDIR}/../../../contrib/diff +DIFFSRC=${.CURDIR}/../../../contrib/diff/src +.PATH: ${DIFFSRC} \ + ${.CURDIR}/../../../contrib/diff/lib \ + ${.CURDIR}/../../../contrib/diff/man PROG= sdiff -SRCS= sdiff.c version.c +SRCS= sdiff.c version.c \ + error.c xmalloc.c c-stack.c basename.c freesoft.c strtoumax.c \ + exitfail.c # Important for ctype macros! CFLAGS+=-funsigned-char -CFLAGS+=-I${.CURDIR}/../../../contrib/diff +CFLAGS+=-I${.CURDIR}/../diff +CFLAGS+=-I${DIFFSRC} +CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib CFLAGS+=-DHAVE_CONFIG_H CFLAGS+=-DDIFF_PROGRAM=\"/usr/bin/diff\" -CFLAGS+=-DDEFAULT_EDITOR_PROGRAM=\"/usr/bin/vi\" + +.for f in sdiff.c +${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff + patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f} +CLEANFILES+= ${f} +.endfor .include Index: gnu/usr.bin/sdiff/sdiff.1 =================================================================== RCS file: gnu/usr.bin/sdiff/sdiff.1 diff -N gnu/usr.bin/sdiff/sdiff.1 --- gnu/usr.bin/sdiff/sdiff.1 14 Dec 2002 23:58:49 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,205 +0,0 @@ -.\" $FreeBSD: src/gnu/usr.bin/sdiff/sdiff.1,v 1.2 2002/12/14 23:58:49 keramida Exp $ -.\" -.TH SDIFF 1 "22sep1993" "GNU Tools" "GNU Tools" -.SH NAME -sdiff \- find differences between two files and merge interactively -.SH SYNOPSIS -.B sdiff -.B -o -outfile [options] from-file to-file -.SH DESCRIPTION -The -.I sdiff -command merges two files and interactively outputs the -results to -.IR outfile . - -If -.I from-file -is a directory and -.I to-file -is not, -.I sdiff -compares the file in -.I from-file -whose file name is that of -.IR to-file , -and vice versa. -.I from-file -and -.I to-file -may not both be -directories. - -.I sdiff -options begin with -.BR \- , -so normally -.I from-file -and -.I to-file -may not begin with -.BR \- . -However, -.B \-\- -as an -argument by itself treats the remaining arguments as file names even if -they begin with -.BR \- . -You may not use -.B \- -as an input file. - -.I sdiff -without -.B \-o -(or -.BR \-\-output ) -produces a -side-by-side difference. This usage is obsolete; use -.B "diff \-\-side\-by\-side" -instead. -.SS Options -Below is a summary of all of the options that GNU -.I sdiff -accepts. -Each option has two equivalent names, one of which is a single -letter preceded by -.BR \- , -and the other of which is a long name -preceded by -.BR \-\- . -Multiple single letter options (unless they take -an argument) can be combined into a single command line argument. Long -named options can be abbreviated to any unique prefix of their name. -.TP -.B \-a -Treat all files as text and compare them line-by-line, even if they -do not appear to be text. -.TP -.B \-b -Ignore changes in amount of white space. -.TP -.B \-B -Ignore changes that just insert or delete blank lines. -.TP -.B \-d -Change the algorithm to perhaps find a smaller set of changes. This -makes -.I sdiff -slower (sometimes much slower). -.TP -.B \-H -Use heuristics to speed handling of large files that have numerous -scattered small changes. -.TP -.B \-\-expand\-tabs -Expand tabs to spaces in the output, to preserve the alignment of tabs -in the input files. -.TP -.B \-i -Ignore changes in case; consider upper- and lower-case to be the same. -.TP -.BI "\-I " regexp -Ignore changes that just insert or delete lines that match -.IR regexp . -.TP -.B \-\-ignore\-all\-space -Ignore white space when comparing lines. -.TP -.B \-\-ignore\-blank\-lines -Ignore changes that just insert or delete blank lines. -.TP -.B \-\-ignore\-case -Ignore changes in case; consider upper- and lower-case to be the same. -.TP -.BI \-\-ignore\-matching\-lines= regexp -Ignore changes that just insert or delete lines that match -.IR regexp . -.TP -.B \-\-ignore\-space\-change -Ignore changes in amount of white space. -.TP -.B \-l -.br -.ns -.TP -.B \-\-left\-column -Print only the left column of two common lines. -.TP -.B \-\-minimal -Change the algorithm to perhaps find a smaller set of changes. This -makes -.I sdiff -slower (sometimes much slower). -.TP -.BI "\-o " file -.br -.ns -.TP -.BI \-\-output= file -Put merged output into -.IR file . -This option is required for merging. -.TP -.B \-s -.br -.ns -.TP -.B \-\-suppress\-common\-lines -Do not print common lines. -.TP -.B \-\-speed\-large\-files -Use heuristics to speed handling of large files that have numerous -scattered small changes. -.TP -.B \-t -Expand tabs to spaces in the output, to preserve the alignment of tabs -in the input files. -.TP -.B \-\-text -Treat all files as text and compare them line-by-line, even if they -do not appear to be text. -.TP -.B \-v -.br -.ns -.TP -.B \-\-version -Output the version number of -.IR sdiff . -.TP -.BI "\-w " columns -.br -.ns -.TP -.BI \-\-width= columns -Use an output width of -.IR columns . -Note that for historical reasons, this option is -.B \-W -in -.IR diff , -.B \-w -in -.IR sdiff . -.TP -.B \-W -Ignore horizontal white space when comparing lines. -Note that for historical reasons, this option is -.B \-w -in -.IR diff , -.B \-W -in -.IR sdiff . -.SH SEE ALSO -cmp(1), comm(1), diff(1), diff3(1). - -The -.B info -documentation of -.BR diff . -.SH DIAGNOSTICS -An exit status of 0 means no differences were found, 1 means some -differences were found, and 2 means trouble. Index: gnu/usr.bin/sdiff/sdiff.c.diff =================================================================== RCS file: gnu/usr.bin/sdiff/sdiff.c.diff diff -N gnu/usr.bin/sdiff/sdiff.c.diff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/usr.bin/sdiff/sdiff.c.diff 13 Jun 2007 09:05:57 -0000 @@ -0,0 +1,11 @@ +$FreeBSD$ +--- sdiff.c.orig 2002-03-11 16:00:47.000000000 +0800 ++++ sdiff.c 2007-06-13 17:05:31.000000000 +0800 +@@ -453,7 +453,6 @@ + initialize_main (&argc, &argv); + program_name = argv[0]; + setlocale (LC_ALL, ""); +- bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + c_stack_action (c_stack_die); +