From owner-svn-soc-all@FreeBSD.ORG  Tue Jun  5 01:41:49 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 94DE5106566C
	for <svn-soc-all@FreeBSD.org>; Tue,  5 Jun 2012 01:41:47 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Tue, 05 Jun 2012 01:41:47 +0000
Date: Tue, 05 Jun 2012 01:41:47 +0000
From: jhagewood@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120605014147.94DE5106566C@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r237108 - in soc2012/jhagewood/diff3: . diff3
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jun 2012 01:41:49 -0000

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