Index: stable/11/tools/build/options/WITH_FMAKE
===================================================================
--- stable/11/tools/build/options/WITH_FMAKE	(revision 307356)
+++ stable/11/tools/build/options/WITH_FMAKE	(nonexistent)
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Causes the old FreeBSD
-.Xr make 1
-program to be built and installed as fmake.

Property changes on: stable/11/tools/build/options/WITH_FMAKE
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: stable/11
===================================================================
--- stable/11	(revision 307356)
+++ stable/11	(revision 307357)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r306877