freebsd-mk-defs/files/sys.patch

--- sys.mk.orig Wed Oct 20 15:05:43 2004
+++ sys.mk      Wed Oct 20 16:45:42 2004
@@ -253,17 +253,17 @@
 
 .endif
 
-__MAKE_CONF?=/etc/make.conf
-.if exists(${__MAKE_CONF})
-.include "${__MAKE_CONF}"
-.endif
+#__MAKE_CONF?=/etc/make.conf
+#.if exists(${__MAKE_CONF})
+#.include "${__MAKE_CONF}"
+#.endif
 
 .include <bsd.cpu.mk>
 
-.if exists(/etc/make.conf.local)
-.error Error, /etc/make.conf.local should be renamed to /etc/make.conf.
-.include </etc/make.conf.local>
-.endif
+#.if exists(/etc/make.conf.local)
+#.error Error, /etc/make.conf.local should be renamed to /etc/make.conf.
+#.include </etc/make.conf.local>
+#.endif
 
 # Default executable format
 # XXX hint for bsd.port.mk
1	--- sys.mk.orig Wed Oct 20 15:05:43 2004
2	+++ sys.mk Wed Oct 20 16:45:42 2004
3	@@ -253,17 +253,17 @@
4
5	.endif
6
7	-__MAKE_CONF?=/etc/make.conf
8	-.if exists(${__MAKE_CONF})
9	-.include "${__MAKE_CONF}"
10	-.endif
11	+#__MAKE_CONF?=/etc/make.conf
12	+#.if exists(${__MAKE_CONF})
13	+#.include "${__MAKE_CONF}"
14	+#.endif
15
16	.include <bsd.cpu.mk>
17
18	-.if exists(/etc/make.conf.local)
19	-.error Error, /etc/make.conf.local should be renamed to /etc/make.conf.
20	-.include </etc/make.conf.local>
21	-.endif
22	+#.if exists(/etc/make.conf.local)
23	+#.error Error, /etc/make.conf.local should be renamed to /etc/make.conf.
24	+#.include </etc/make.conf.local>
25	+#.endif
26
27	# Default executable format
28	# XXX hint for bsd.port.mk
Name	Value
svn:eol-style	native
svn:keywords	Author Date Id Revision