Re: WITHOUT_GAMES=true and /usr/games

On Wed, 24 Jun 2009 00:02:46 +0200 (CEST), Alexander Best <alexbestms_at_math.uni-muenster.de> wrote:
> the patch doesn't seem to fully apply to HEAD. could you take a look at this?
> here's the output of patch -C -p1:

Oops, sorry, I emailed you the original patch not the rebased version to
a recent /head.  Try the one attached below.  It should apply cleanly on
top of subversion /head at revision 194777:

%%%
diff -r 34016babb0f2 -r 0f2d2f3bfba0 etc/Makefile
--- a/etc/Makefile	Tue Jun 23 22:08:55 2009 +0000
+++ b/etc/Makefile	Wed Jun 24 01:21:27 2009 +0300
_at__at_ -104,6 +104,9 _at__at_
 .if ${MK_SENDMAIL} != "no"
 MTREE+=	BSD.sendmail.dist
 .endif
+.if ${MK_GAMES} != "no"
+MTREE+= BSD.games.dist
+.endif
 .if ${MK_BIND} != "no"
 MTREE+=	BIND.chroot.dist
 .if ${MK_BIND_LIBS} != "no"
_at__at_ -265,6 +268,9 _at__at_
 .if ${MK_SENDMAIL} != "no"
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
 .endif
+.if ${MK_GAMES} != "no"
+	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.games.dist -p ${DESTDIR}/
+.endif
 	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
 	cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* .
 	cd ${DESTDIR}/usr/share/man/en.UTF-8; ln -sf ../man* .
diff -r 34016babb0f2 -r 0f2d2f3bfba0 etc/mtree/BSD.games.dist
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/BSD.games.dist	Wed Jun 24 01:21:27 2009 +0300
_at__at_ -0,0 +1,16 _at__at_
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    usr
+        games
+        ..
+    ..
+    var
+        games           gname=games mode=0775
+        ..
+    ..
+..
diff -r 34016babb0f2 -r 0f2d2f3bfba0 etc/mtree/BSD.usr.dist
--- a/etc/mtree/BSD.usr.dist	Tue Jun 23 22:08:55 2009 +0000
+++ b/etc/mtree/BSD.usr.dist	Wed Jun 24 01:21:27 2009 +0300
_at__at_ -7,8 +7,6 _at__at_
 .
     bin
     ..
-    games
-    ..
     include
     ..
     lib
diff -r 34016babb0f2 -r 0f2d2f3bfba0 etc/mtree/BSD.var.dist
--- a/etc/mtree/BSD.var.dist	Tue Jun 23 22:08:55 2009 +0000
+++ b/etc/mtree/BSD.var.dist	Wed Jun 24 01:21:27 2009 +0300
_at__at_ -45,8 +45,6 _at__at_
     ..
     empty           mode=0555 flags=schg
     ..
-    games           gname=games mode=0775
-    ..
     heimdal         mode=0700
     ..
     log
%%%