From owner-svn-soc-all@FreeBSD.ORG Sun Jun 17 04:30:55 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 87D781065674 for ; Sun, 17 Jun 2012 04:30:53 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Sun, 17 Jun 2012 04:30:53 +0000 Date: Sun, 17 Jun 2012 04:30:53 +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: <20120617043053.87D781065674@hub.freebsd.org> Cc: Subject: socsvn commit: r237826 - in soc2012/jhagewood: diff diff3 mdocml 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: Sun, 17 Jun 2012 04:30:55 -0000 Author: jhagewood Date: Sun Jun 17 04:30:52 2012 New Revision: 237826 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237826 Log: Modified: soc2012/jhagewood/diff/hagewood-diff.patch soc2012/jhagewood/diff3/hagewood-diff3.patch soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch Modified: soc2012/jhagewood/diff/hagewood-diff.patch ============================================================================== --- soc2012/jhagewood/diff/hagewood-diff.patch Sun Jun 17 03:59:17 2012 (r237825) +++ soc2012/jhagewood/diff/hagewood-diff.patch Sun Jun 17 04:30:52 2012 (r237826) @@ -1,6 +1,6 @@ diff -rupN jhagewood/diff/diff-orig/diff.c jhagewood/diff/diff/diff.c ---- jhagewood/diff/diff-orig/diff.c 2012-06-10 03:31:05.000000000 -0400 -+++ jhagewood/diff/diff/diff.c 2012-06-15 22:42:05.000000000 -0400 +--- jhagewood/diff/diff-orig/diff.c 2012-06-17 04:30:34.000000000 -0400 ++++ jhagewood/diff/diff/diff.c 2012-06-17 04:30:34.000000000 -0400 @@ -45,10 +45,10 @@ __FBSDID("$FreeBSD$"); #include "diff.h" #include "pathnames.h" @@ -90,7 +90,7 @@ yflag = 1; break; + case OPT_NORMAL: -+ /* Default output style, do nothing to change output. */ ++ format = D_NORMAL; + break; case OPT_TSIZE: if (optarg != NULL) { @@ -105,8 +105,8 @@ break; case D_DIFFER: diff -rupN jhagewood/diff/diff-orig/diff.h jhagewood/diff/diff/diff.h ---- jhagewood/diff/diff-orig/diff.h 2012-06-10 03:31:05.000000000 -0400 -+++ jhagewood/diff/diff/diff.h 2012-06-13 05:07:22.000000000 -0400 +--- jhagewood/diff/diff-orig/diff.h 2012-06-17 04:30:34.000000000 -0400 ++++ jhagewood/diff/diff/diff.h 2012-06-17 04:30:34.000000000 -0400 @@ -75,7 +75,7 @@ struct excludes { struct excludes *next; }; @@ -117,8 +117,8 @@ extern int Bflag, strip_cr, tabsize; extern int format, context, status; diff -rupN jhagewood/diff/diff-orig/diffreg.c jhagewood/diff/diff/diffreg.c ---- jhagewood/diff/diff-orig/diffreg.c 2012-06-10 03:31:05.000000000 -0400 -+++ jhagewood/diff/diff/diffreg.c 2012-06-15 21:45:34.000000000 -0400 +--- jhagewood/diff/diff-orig/diffreg.c 2012-06-17 04:30:34.000000000 -0400 ++++ jhagewood/diff/diff/diffreg.c 2012-06-17 04:30:34.000000000 -0400 @@ -90,6 +90,12 @@ __FBSDID("$FreeBSD"); #include "diff.h" #include "pathnames.h" Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch ============================================================================== --- soc2012/jhagewood/diff3/hagewood-diff3.patch Sun Jun 17 03:59:17 2012 (r237825) +++ soc2012/jhagewood/diff3/hagewood-diff3.patch Sun Jun 17 04:30:52 2012 (r237826) @@ -1,6 +1,6 @@ diff -rupN jhagewood/diff3/diff3-orig/Makefile jhagewood/diff3/diff3/Makefile ---- jhagewood/diff3/diff3-orig/Makefile 2012-06-10 03:31:05.000000000 -0400 -+++ jhagewood/diff3/diff3/Makefile 2012-06-10 03:31:05.000000000 -0400 +--- jhagewood/diff3/diff3-orig/Makefile 2012-06-17 04:30:34.000000000 -0400 ++++ jhagewood/diff3/diff3/Makefile 2012-06-17 04:30:34.000000000 -0400 @@ -6,6 +6,6 @@ BINDIR= /usr/libexec beforeinstall: @@ -10,8 +10,8 @@ .include 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-15 18:23:03.000000000 -0400 +--- jhagewood/diff3/diff3-orig/diff3prog.c 2012-06-17 04:30:34.000000000 -0400 ++++ jhagewood/diff3/diff3/diff3prog.c 2012-06-17 04:30:34.000000000 -0400 @@ -64,19 +64,23 @@ * @(#)diff3.c 8.1 (Berkeley) 6/6/93 */ Modified: soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch ============================================================================== --- soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch Sun Jun 17 03:59:17 2012 (r237825) +++ soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch Sun Jun 17 04:30:52 2012 (r237826) @@ -1,6 +1,6 @@ diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man.h jhagewood/mdocml/mdocml-1.12.1/man.h ---- jhagewood/mdocml/mdocml-1.12.1-orig/man.h 2012-06-10 03:31:06.000000000 -0400 -+++ jhagewood/mdocml/mdocml-1.12.1/man.h 2012-06-12 04:34:37.000000000 -0400 +--- jhagewood/mdocml/mdocml-1.12.1-orig/man.h 2012-06-17 04:30:35.000000000 -0400 ++++ jhagewood/mdocml/mdocml-1.12.1/man.h 2012-06-17 04:30:35.000000000 -0400 @@ -43,6 +43,8 @@ enum mant { MAN_sp, MAN_nf, @@ -12,7 +12,7 @@ MAN_DT, diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man.h.orig jhagewood/mdocml/mdocml-1.12.1/man.h.orig --- jhagewood/mdocml/mdocml-1.12.1-orig/man.h.orig 1969-12-31 19:00:00.000000000 -0500 -+++ jhagewood/mdocml/mdocml-1.12.1/man.h.orig 2012-06-10 03:31:06.000000000 -0400 ++++ jhagewood/mdocml/mdocml-1.12.1/man.h.orig 2012-06-17 04:30:35.000000000 -0400 @@ -0,0 +1,113 @@ +/* $Id: man.h,v 1.60 2012/01/03 15:16:24 kristaps Exp $ */ +/* @@ -128,8 +128,8 @@ + +#endif /*!MAN_H*/ diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c jhagewood/mdocml/mdocml-1.12.1/man_term.c ---- jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c 2012-06-10 03:31:06.000000000 -0400 -+++ jhagewood/mdocml/mdocml-1.12.1/man_term.c 2012-06-12 04:36:15.000000000 -0400 +--- jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c 2012-06-17 04:30:35.000000000 -0400 ++++ jhagewood/mdocml/mdocml-1.12.1/man_term.c 2012-06-17 04:30:35.000000000 -0400 @@ -82,6 +82,8 @@ static int pre_alternate(DECL_ARGS); static int pre_ft(DECL_ARGS); static int pre_ign(DECL_ARGS); @@ -173,7 +173,7 @@ static int diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c.orig jhagewood/mdocml/mdocml-1.12.1/man_term.c.orig --- jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c.orig 1969-12-31 19:00:00.000000000 -0500 -+++ jhagewood/mdocml/mdocml-1.12.1/man_term.c.orig 2012-06-10 03:31:06.000000000 -0400 ++++ jhagewood/mdocml/mdocml-1.12.1/man_term.c.orig 2012-06-17 04:30:35.000000000 -0400 @@ -0,0 +1,1117 @@ +/* $Id: man_term.c,v 1.127 2012/01/03 15:16:24 kristaps Exp $ */ +/*