From owner-freebsd-current@FreeBSD.ORG Tue Jun 23 23:21:04 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 0AA8B106564A; Tue, 23 Jun 2009 23:21:04 +0000 (UTC) (envelope-from a_best01@uni-muenster.de) Received: from zivm-out2.uni-muenster.de (ZIVM-OUT2.UNI-MUENSTER.DE [128.176.192.9]) by mx1.freebsd.org (Postfix) with ESMTP id 64E008FC0C; Tue, 23 Jun 2009 23:21:03 +0000 (UTC) (envelope-from a_best01@uni-muenster.de) X-IronPort-AV: E=Sophos;i="4.42,278,1243807200"; d="scan'208";a="216854511" Received: from zivmaildisp2.uni-muenster.de (HELO ZIVMAILUSER03.UNI-MUENSTER.DE) ([128.176.188.143]) by zivm-relay2.uni-muenster.de with ESMTP; 24 Jun 2009 01:21:02 +0200 Received: by ZIVMAILUSER03.UNI-MUENSTER.DE (Postfix, from userid 149459) id 5D09B1B075E; Wed, 24 Jun 2009 01:21:02 +0200 (CEST) Date: Wed, 24 Jun 2009 01:21:02 +0200 (CEST) From: Alexander Best Sender: Organization: Westfaelische Wilhelms-Universitaet Muenster To: Giorgos Keramidas Message-ID: In-Reply-To: <87prcumtml.fsf@kobe.laptop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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 23:21:04 -0000 sure: *************** *** 265,270 **** .if ${MK_SENDMAIL} != "no" mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.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* . --- 268,276 ---- .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* . md5 of src/etc/makefile is 607b7b5c8e5f608abc81211bf379de1a btw. cheers. Giorgos Keramidas schrieb am 2009-06-24: > On Wed, 24 Jun 2009 01:08:30 +0200 (CEST), Alexander Best > wrote: > > hmmmmm.... > > src/etc/Makefile still fails: > > Hmm... Looks like a unified diff to me... > > The text leading up to this was: > > -------------------------- > > |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 > > -------------------------- > > Patching file etc/Makefile using Plan A... > > Hunk #1 succeeded at 104 with fuzz 2. > > Hunk #2 failed at 268. > > 1 out of 2 hunks failed--saving rejects to etc/Makefile.rej > > Hmm... The next patch looks like a unified diff to me... > > my source is revision 194787, but that souldn't matter since > > src/etc/Makefile > > hasn't been changed for 2 weeks (193635). > This is odd. can you show me the rej file?