Date: Tue, 05 Jun 2012 01:41:47 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r237108 - in soc2012/jhagewood/diff3: . diff3 Message-ID: <20120605014147.94DE5106566C@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhagewood Date: Tue Jun 5 01:41:46 2012 New Revision: 237108 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237108 Log: Modified: soc2012/jhagewood/diff3/diff3/Makefile soc2012/jhagewood/diff3/hagewood-diff3.patch Modified: soc2012/jhagewood/diff3/diff3/Makefile ============================================================================== --- soc2012/jhagewood/diff3/diff3/Makefile Tue Jun 5 01:17:55 2012 (r237107) +++ soc2012/jhagewood/diff3/diff3/Makefile Tue Jun 5 01:41:46 2012 (r237108) @@ -6,6 +6,6 @@ beforeinstall: install ${INSTALL_COPY}c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/diff3.ksh ${DESTDIR}/usr/bin/diff3 + ${.CURDIR}/diff3.sh ${DESTDIR}/usr/bin/diff3 .include <bsd.prog.mk> Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch ============================================================================== --- soc2012/jhagewood/diff3/hagewood-diff3.patch Tue Jun 5 01:17:55 2012 (r237107) +++ soc2012/jhagewood/diff3/hagewood-diff3.patch Tue Jun 5 01:41:46 2012 (r237108) @@ -1,3 +1,14 @@ +diff -rupN jhagewood/diff3/diff3-orig/Makefile jhagewood/diff3/diff3/Makefile +--- jhagewood/diff3/diff3-orig/Makefile 2012-06-04 23:30:11.000000000 -0400 ++++ jhagewood/diff3/diff3/Makefile 2012-06-05 01:41:11.000000000 -0400 +@@ -6,6 +6,6 @@ BINDIR= /usr/libexec + + beforeinstall: + install ${INSTALL_COPY}c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ +- ${.CURDIR}/diff3.ksh ${DESTDIR}/usr/bin/diff3 ++ ${.CURDIR}/diff3.sh ${DESTDIR}/usr/bin/diff3 + + .include <bsd.prog.mk> diff -rupN jhagewood/diff3/diff3-orig/diff3prog.c jhagewood/diff3/diff3/diff3prog.c --- jhagewood/diff3/diff3-orig/diff3prog.c 2012-06-04 23:30:11.000000000 -0400 +++ jhagewood/diff3/diff3/diff3prog.c 2012-06-05 01:17:18.000000000 -0400
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120605014147.94DE5106566C>