From owner-svn-soc-all@FreeBSD.ORG  Fri Jun 15 18:23:04 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 509B51065677
	for <svn-soc-all@FreeBSD.org>; Fri, 15 Jun 2012 18:23:02 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Fri, 15 Jun 2012 18:23:02 +0000
Date: Fri, 15 Jun 2012 18:23:02 +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: <20120615182302.509B51065677@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r237773 - 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: Fri, 15 Jun 2012 18:23:04 -0000

Author: jhagewood
Date: Fri Jun 15 18:23:01 2012
New Revision: 237773
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237773

Log:

Modified:
  soc2012/jhagewood/diff3/diff3/diff3prog.c
  soc2012/jhagewood/diff3/hagewood-diff3.patch

Modified: soc2012/jhagewood/diff3/diff3/diff3prog.c
==============================================================================
--- soc2012/jhagewood/diff3/diff3/diff3prog.c	Fri Jun 15 17:31:15 2012	(r237772)
+++ soc2012/jhagewood/diff3/diff3/diff3prog.c	Fri Jun 15 18:23:01 2012	(r237773)
@@ -224,7 +224,7 @@
 			oflag = eflag = 1;
 			break;
 		case 'v':
-			printf("OpenBSD diff3  1.11-FreeBSD");
+			/* To do. */
 			exit(0);
 		case 'x':
 			eflag = 1;

Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch	Fri Jun 15 17:31:15 2012	(r237772)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch	Fri Jun 15 18:23:01 2012	(r237773)
@@ -11,7 +11,7 @@
  .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-14 05:32:21.000000000 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c	2012-06-14 21:15:59.000000000 -0400
++++ jhagewood/diff3/diff3/diff3prog.c	2012-06-15 18:22:42.000000000 -0400
 @@ -64,19 +64,23 @@
   *	@(#)diff3.c	8.1 (Berkeley) 6/6/93
   */
@@ -24,7 +24,7 @@
  #endif
 +#endif /* not lint */
 +#include <sys/cdefs.h>
-+__FBSDID("$FreeBSD: soc2012/jhagewood/diff3/diff3/diff3prog.c 237727 2012-06-14 21:04:41Z jhagewood $");
++__FBSDID("$FreeBSD: soc2012/jhagewood/diff3/diff3/diff3prog.c 237728 2012-06-14 21:17:35Z jhagewood $");
  
 +#include <ctype.h>
 +#include <err.h>
@@ -133,7 +133,7 @@
  			oflag = eflag = 1;
  			break;
 +		case 'v':
-+			printf("OpenBSD diff3  1.11-FreeBSD");
++			/* To do. */
 +			exit(0);
  		case 'x':
  			eflag = 1;