Date: Mon, 23 Jul 2012 19:28:43 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r239703 - in soc2012/jhagewood/diff3: . diff3 Message-ID: <20120723192843.AFA16106564A@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhagewood Date: Mon Jul 23 19:28:42 2012 New Revision: 239703 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239703 Log: diff3prog to diff3 Modified: soc2012/jhagewood/diff3/diff3/Makefile soc2012/jhagewood/diff3/diff3/diff3.1 soc2012/jhagewood/diff3/diff3/diff3.ksh soc2012/jhagewood/diff3/diff3/diff3.sh soc2012/jhagewood/diff3/hagewood-diff3.patch Modified: soc2012/jhagewood/diff3/diff3/Makefile ============================================================================== --- soc2012/jhagewood/diff3/diff3/Makefile Mon Jul 23 19:15:10 2012 (r239702) +++ soc2012/jhagewood/diff3/diff3/Makefile Mon Jul 23 19:28:42 2012 (r239703) @@ -1,11 +1,11 @@ # $OpenBSD: Makefile,v 1.2 2003/07/22 00:11:30 millert Exp $ -PROG= diff3prog +PROG= diff3 MAN= diff3.1 BINDIR= /usr/libexec beforeinstall: - install ${INSTALL_COPY}c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + install diff3prog.c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/diff3.sh ${DESTDIR}/usr/bin/diff3 .include <bsd.prog.mk> Modified: soc2012/jhagewood/diff3/diff3/diff3.1 ============================================================================== --- soc2012/jhagewood/diff3/diff3/diff3.1 Mon Jul 23 19:15:10 2012 (r239702) +++ soc2012/jhagewood/diff3/diff3/diff3.1 Mon Jul 23 19:28:42 2012 (r239703) @@ -168,7 +168,7 @@ as the temporary directory. .El .Sh FILES -.Bl -tag -width /usr/libexec/diff3prog -compact +.Bl -tag -width /usr/libexec/diff3 -compact .It Pa /tmp/d3a.XXXXXXXXXX temporary file .It Pa /tmp/d3b.XXXXXXXXXX Modified: soc2012/jhagewood/diff3/diff3/diff3.ksh ============================================================================== --- soc2012/jhagewood/diff3/diff3/diff3.ksh Mon Jul 23 19:15:10 2012 (r239702) +++ soc2012/jhagewood/diff3/diff3/diff3.ksh Mon Jul 23 19:28:42 2012 (r239703) @@ -25,7 +25,7 @@ OPTIND=1 # force getopts to reset itself export PATH=/bin:/usr/bin -diff3prog=/usr/libexec/diff3prog +diff3prog=/usr/libexec/diff3 USAGE="usage: diff3 [-3aEeXx] file1 file2 file3" # Pull out any command line flags (some for diff, some for diff3) Modified: soc2012/jhagewood/diff3/diff3/diff3.sh ============================================================================== --- soc2012/jhagewood/diff3/diff3/diff3.sh Mon Jul 23 19:15:10 2012 (r239702) +++ soc2012/jhagewood/diff3/diff3/diff3.sh Mon Jul 23 19:28:42 2012 (r239703) @@ -25,8 +25,8 @@ OPTIND=1 # force getopts to reset itself export PATH=/bin:/usr/bin -#diff3prog=/usr/libexec/diff3prog -diff3prog=$PWD/diff3prog +#diff3prog=/usr/libexec/diff3 +diff3prog=$PWD/diff3 USAGE="usage: diff3 [-3aEeXx] file1 file2 file3" # Pull out any command line flags (some for diff, some for diff3) Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch ============================================================================== --- soc2012/jhagewood/diff3/hagewood-diff3.patch Mon Jul 23 19:15:10 2012 (r239702) +++ soc2012/jhagewood/diff3/hagewood-diff3.patch Mon Jul 23 19:28:42 2012 (r239703) @@ -1,18 +1,31 @@ diff -rupN diff3-orig/Makefile diff3/Makefile --- diff3-orig/Makefile 2012-07-23 02:07:00.000000000 -0400 -+++ diff3/Makefile 2012-07-23 02:09:25.000000000 -0400 -@@ -6,6 +6,6 @@ BINDIR= /usr/libexec ++++ diff3/Makefile 2012-07-23 15:27:33.000000000 -0400 +@@ -1,11 +1,11 @@ + # $OpenBSD: Makefile,v 1.2 2003/07/22 00:11:30 millert Exp $ + +-PROG= diff3prog ++PROG= diff3 + MAN= diff3.1 + BINDIR= /usr/libexec beforeinstall: - install ${INSTALL_COPY}c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ +- install ${INSTALL_COPY}c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/diff3.ksh ${DESTDIR}/usr/bin/diff3 ++ install diff3prog.c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${.CURDIR}/diff3.sh ${DESTDIR}/usr/bin/diff3 .include <bsd.prog.mk> diff -rupN diff3-orig/diff3.1 diff3/diff3.1 --- diff3-orig/diff3.1 2012-07-23 02:07:00.000000000 -0400 -+++ diff3/diff3.1 2012-07-23 02:07:00.000000000 -0400 -@@ -173,7 +173,7 @@ as the temporary directory. ++++ diff3/diff3.1 2012-07-23 15:21:13.000000000 -0400 +@@ -168,12 +168,12 @@ will use the directory specified by + as the temporary directory. + .El + .Sh FILES +-.Bl -tag -width /usr/libexec/diff3prog -compact ++.Bl -tag -width /usr/libexec/diff3 -compact + .It Pa /tmp/d3a.XXXXXXXXXX temporary file .It Pa /tmp/d3b.XXXXXXXXXX temporary file @@ -21,6 +34,32 @@ the actual executable .El .Sh SEE ALSO +diff -rupN diff3-orig/diff3.ksh diff3/diff3.ksh +--- diff3-orig/diff3.ksh 2012-07-23 02:07:00.000000000 -0400 ++++ diff3/diff3.ksh 2012-07-23 15:21:48.000000000 -0400 +@@ -25,7 +25,7 @@ set -o posix # set POSIX mode to preven + OPTIND=1 # force getopts to reset itself + + export PATH=/bin:/usr/bin +-diff3prog=/usr/libexec/diff3prog ++diff3prog=/usr/libexec/diff3 + USAGE="usage: diff3 [-3aEeXx] file1 file2 file3" + + # Pull out any command line flags (some for diff, some for diff3) +diff -rupN diff3-orig/diff3.sh diff3/diff3.sh +--- diff3-orig/diff3.sh 2012-07-23 02:07:00.000000000 -0400 ++++ diff3/diff3.sh 2012-07-23 15:22:35.000000000 -0400 +@@ -25,8 +25,8 @@ + OPTIND=1 # force getopts to reset itself + + export PATH=/bin:/usr/bin +-#diff3prog=/usr/libexec/diff3prog +-diff3prog=$PWD/diff3prog ++#diff3prog=/usr/libexec/diff3 ++diff3prog=$PWD/diff3 + USAGE="usage: diff3 [-3aEeXx] file1 file2 file3" + + # Pull out any command line flags (some for diff, some for diff3) diff -rupN diff3-orig/diff3prog.c diff3/diff3prog.c --- diff3-orig/diff3prog.c 2012-07-23 02:07:00.000000000 -0400 +++ diff3/diff3prog.c 2012-07-23 02:07:00.000000000 -0400
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120723192843.AFA16106564A>