socsvn commit: r239604 - in soc2012/jhagewood/diff3: . diff3
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Fri Jul 20 03:10:39 UTC 2012
Author: jhagewood
Date: Fri Jul 20 03:10:36 2012
New Revision: 239604
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239604
Log:
Changed output bin from diff3prog to diff3 in Makefile
Modified:
soc2012/jhagewood/diff3/diff3/Makefile
soc2012/jhagewood/diff3/hagewood-diff3.patch
Modified: soc2012/jhagewood/diff3/diff3/Makefile
==============================================================================
--- soc2012/jhagewood/diff3/diff3/Makefile Fri Jul 20 03:09:16 2012 (r239603)
+++ soc2012/jhagewood/diff3/diff3/Makefile Fri Jul 20 03:10:36 2012 (r239604)
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.2 2003/07/22 00:11:30 millert Exp $
-PROG= diff3prog
+PROG= diff3
MAN= diff3.1
BINDIR= /usr/libexec
Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch Fri Jul 20 03:09:16 2012 (r239603)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch Fri Jul 20 03:10:36 2012 (r239604)
@@ -1,7 +1,13 @@
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-19 17:32:16.000000000 -0400
-@@ -6,6 +6,6 @@ BINDIR= /usr/libexec
++++ 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
beforeinstall:
install ${INSTALL_COPY}c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
More information about the svn-soc-all
mailing list