[Midnightbsd-cvs] src [7537] trunk/usr.bin/make: sync freebsd make with 10.x

[laffer1 at midnightbsd.org]

Revision: 7537
          http://svnweb.midnightbsd.org/src/?rev=7537
Author:   laffer1
Date:     2016-04-14 21:21:52 -0400 (Thu, 14 Apr 2016)
Log Message:
-----------
sync freebsd make with 10.x

Modified Paths:
--------------
    trunk/usr.bin/make/GNode.h
    trunk/usr.bin/make/Makefile

Modified: trunk/usr.bin/make/GNode.h
===================================================================
--- trunk/usr.bin/make/GNode.h	2016-04-14 23:45:38 UTC (rev 7536)
+++ trunk/usr.bin/make/GNode.h	2016-04-15 01:21:52 UTC (rev 7537)
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD: src/usr.bin/make/GNode.h,v 1.3 2012/01/18 01:49:21 laffer1 Exp $
+ * $MidnightBSD$
  * $FreeBSD: src/usr.bin/make/GNode.h,v 1.5 2007/04/20 06:33:25 fjoe Exp $
  */
 
@@ -140,7 +140,7 @@
 		UPTODATE,	/* Was already up-to-date */
 
 		/*
-		 * An error occured while it was being
+		 * An error occurred while it was being
 		 * made (used only in compat mode)
 		 */
 		ERROR,

Modified: trunk/usr.bin/make/Makefile
===================================================================
--- trunk/usr.bin/make/Makefile	2016-04-14 23:45:38 UTC (rev 7536)
+++ trunk/usr.bin/make/Makefile	2016-04-15 01:21:52 UTC (rev 7537)
@@ -16,7 +16,7 @@
 .endif
 
 # Version has the RYYYYMMDDX format, where R is from RELENG_<R>
-CFLAGS+=-DMAKE_VERSION=\"9201210220\"
+CFLAGS+=-DMAKE_VERSION=\"10201205300\"
 
 # There is no obvious performance improvement currently.
 # CFLAGS+=-DUSE_KQUEUE
@@ -55,9 +55,9 @@
 hash:
 	( echo '/*' ;							\
 	  echo ' * DO NOT EDIT' ;					\
-	  echo ' * $$''FreeBSD$$' ;					\
+	  echo ' * $$''MidnightBSD$$' ;					\
 	  echo -n ' * auto-generated from ' ;				\
-	  sed -nEe '/\$$FreeBSD/s/^.*\$$(.*)\$$.*$$/\1/p'		\
+	  sed -nEe '/\$$MidnightBSD/s/^.*\$$(.*)\$$.*$$/\1/p'		\
 		${.CURDIR}/parse.c ;					\
 	  echo ' * DO NOT EDIT' ;					\
 	  echo ' */' ;							\
@@ -119,5 +119,4 @@
 	cp ${.ALLSRC} ${.TARGET}
 .endif
 
-
 .include <bsd.prog.mk>