From owner-svn-soc-all@FreeBSD.ORG Mon Jul 23 06:13:09 2012 Return-Path: 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 53537106564A for ; Mon, 23 Jul 2012 06:13:07 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Mon, 23 Jul 2012 06:13:07 +0000 Date: Mon, 23 Jul 2012 06:13:07 +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: <20120723061307.53537106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r239690 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2012 06:13:09 -0000 Author: jhagewood Date: Mon Jul 23 06:13:06 2012 New Revision: 239690 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239690 Log: Changed diff3 back to diff3prog temporarily, doesn't build otherwise. Modified: soc2012/jhagewood/diff3/diff3/Makefile soc2012/jhagewood/diff3/hagewood-diff3.patch Modified: soc2012/jhagewood/diff3/diff3/Makefile ============================================================================== --- soc2012/jhagewood/diff3/diff3/Makefile Mon Jul 23 04:48:58 2012 (r239689) +++ soc2012/jhagewood/diff3/diff3/Makefile Mon Jul 23 06:13:06 2012 (r239690) @@ -1,6 +1,6 @@ # $OpenBSD: Makefile,v 1.2 2003/07/22 00:11:30 millert Exp $ -PROG= diff3 +PROG= diff3prog MAN= diff3.1 BINDIR= /usr/libexec Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch ============================================================================== --- soc2012/jhagewood/diff3/hagewood-diff3.patch Mon Jul 23 04:48:58 2012 (r239689) +++ soc2012/jhagewood/diff3/hagewood-diff3.patch Mon Jul 23 06:13:06 2012 (r239690) @@ -1,13 +1,7 @@ -diff -rupN jhagewood/diff3/diff3-orig/Makefile jhagewood/diff3/diff3/Makefile ---- jhagewood/diff3/diff3-orig/Makefile 2012-07-19 17:32:16.000000000 -0400 -+++ jhagewood/diff3/diff3/Makefile 2012-07-20 03:09:41.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 +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 beforeinstall: install ${INSTALL_COPY}c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ @@ -15,9 +9,9 @@ + ${.CURDIR}/diff3.sh ${DESTDIR}/usr/bin/diff3 .include -diff -rupN jhagewood/diff3/diff3-orig/diff3.1 jhagewood/diff3/diff3/diff3.1 ---- jhagewood/diff3/diff3-orig/diff3.1 2012-07-19 17:32:16.000000000 -0400 -+++ jhagewood/diff3/diff3/diff3.1 2012-07-21 20:49:56.000000000 -0400 +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. temporary file .It Pa /tmp/d3b.XXXXXXXXXX @@ -27,9 +21,9 @@ the actual executable .El .Sh SEE ALSO -diff -rupN jhagewood/diff3/diff3-orig/diff3prog.c jhagewood/diff3/diff3/diff3prog.c ---- jhagewood/diff3/diff3-orig/diff3prog.c 2012-07-19 17:32:16.000000000 -0400 -+++ jhagewood/diff3/diff3/diff3prog.c 2012-07-21 20:48:17.000000000 -0400 +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 @@ -64,19 +64,23 @@ * @(#)diff3.c 8.1 (Berkeley) 6/6/93 */