From owner-freebsd-current@FreeBSD.ORG Tue Jun 23 22:28:23 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B71D01065674 for ; Tue, 23 Jun 2009 22:28:23 +0000 (UTC) (envelope-from keramida@freebsd.org) Received: from poseidon.ceid.upatras.gr (poseidon.ceid.upatras.gr [150.140.141.169]) by mx1.freebsd.org (Postfix) with ESMTP id 24DE68FC13 for ; Tue, 23 Jun 2009 22:28:23 +0000 (UTC) (envelope-from keramida@freebsd.org) Received: from mail.ceid.upatras.gr (unknown [10.1.0.143]) by poseidon.ceid.upatras.gr (Postfix) with ESMTP id 65BBDEB4A58; Wed, 24 Jun 2009 01:24:02 +0300 (EEST) Received: from localhost (europa.ceid.upatras.gr [127.0.0.1]) by mail.ceid.upatras.gr (Postfix) with ESMTP id 4E97345245; Wed, 24 Jun 2009 01:24:02 +0300 (EEST) X-Virus-Scanned: amavisd-new at ceid.upatras.gr Received: from mail.ceid.upatras.gr ([127.0.0.1]) by localhost (europa.ceid.upatras.gr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0KmVzzpOCWmp; Wed, 24 Jun 2009 01:24:02 +0300 (EEST) Received: from kobe.laptop (adsl105-76.kln.forthnet.gr [77.49.224.76]) by mail.ceid.upatras.gr (Postfix) with ESMTP id 0F097450D0; Wed, 24 Jun 2009 01:24:02 +0300 (EEST) Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.3/8.14.3) with ESMTP id n5NMO11o098059; Wed, 24 Jun 2009 01:24:01 +0300 (EEST) (envelope-from keramida@freebsd.org) Received: (from keramida@localhost) by kobe.laptop (8.14.3/8.14.3/Submit) id n5NMO0U5098058; Wed, 24 Jun 2009 01:24:00 +0300 (EEST) (envelope-from keramida@freebsd.org) From: Giorgos Keramidas To: Alexander Best References: Date: Wed, 24 Jun 2009 01:24:00 +0300 In-Reply-To: (Alexander Best's message of "Wed, 24 Jun 2009 00:02:46 +0200 (CEST)") Message-ID: <877hz2y4fz.fsf@kobe.laptop> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: freebsd-current@freebsd.org Subject: Re: WITHOUT_GAMES=true and /usr/games X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2009 22:28:24 -0000 On Wed, 24 Jun 2009 00:02:46 +0200 (CEST), Alexander Best 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 @@ -104,6 +104,9 @@ .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" @@ -265,6 +268,9 @@ .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 @@ -0,0 +1,16 @@ +# $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 @@ -7,8 +7,6 @@ . 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 @@ -45,8 +45,6 @@ .. empty mode=0555 flags=schg .. - games gname=games mode=0775 - .. heimdal mode=0700 .. log %%%