From owner-freebsd-fs@FreeBSD.ORG  Wed Feb 21 07:38:36 2007
Return-Path: <owner-freebsd-fs@FreeBSD.ORG>
X-Original-To: freebsd-fs@freebsd.org
Delivered-To: freebsd-fs@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 662EB16A4FD
	for <freebsd-fs@freebsd.org>; Wed, 21 Feb 2007 07:38:36 +0000 (UTC)
	(envelope-from steve@localhost.lu)
Received: from linion.ion.lu (linion.ion.lu [80.90.47.168])
	by mx1.freebsd.org (Postfix) with ESMTP id B188813C442
	for <freebsd-fs@freebsd.org>; Wed, 21 Feb 2007 07:38:35 +0000 (UTC)
	(envelope-from steve@localhost.lu)
Received: (qmail 36632 invoked by uid 89); 21 Feb 2007 08:27:10 +0100
Received: from localhost (HELO webmail-lite.ion.lu) (127.0.0.1)
	by linion.ion.lu with SMTP; 21 Feb 2007 08:27:10 +0100
Received: from 62.229.116.183
	(SquirrelMail authenticated user steve@localhost.lu)
	by webmail-lite.ion.lu with HTTP;
	Wed, 21 Feb 2007 08:27:10 +0100 (CET)
Message-ID: <43302.62.229.116.183.1172042830.squirrel@webmail-lite.ion.lu>
Date: Wed, 21 Feb 2007 08:27:10 +0100 (CET)
From: "Steve Clement" <steve@localhost.lu>
To: freebsd-fs@freebsd.org
User-Agent: SquirrelMail/1.4.9a
MIME-Version: 1.0
Content-Type: text/plain;charset=iso-8859-1
Content-Transfer-Encoding: 8bit
X-Priority: 3 (Normal)
Importance: Normal
Subject: ZFS patches for FreeBSD. Makefile.inc1.rej
X-BeenThere: freebsd-fs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Filesystems <freebsd-fs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-fs>
List-Post: <mailto:freebsd-fs@freebsd.org>
List-Help: <mailto:freebsd-fs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Feb 2007 07:38:36 -0000

Using 6.2-RELEASE, the patches apply fine but Makefile.inc1 get's rejected.

The reject is below, could the person that is taking care of the ZFS
Patches check if this is true and eventually fix it...

sincerely yours,

Steve Clement

laptop-steve# cat Makefile.inc1.rej
***************
*** 40,46 ****
  .if ${MK_GAMES} != "no"
  SUBDIR+=games
  .endif
- SUBDIR+=gnu include
  .if ${MK_KERBEROS} != "no"
  SUBDIR+=kerberos5
  .endif
--- 40,46 ----
  .if ${MK_GAMES} != "no"
  SUBDIR+=games
  .endif
+ SUBDIR+=cddl gnu include
  .if ${MK_KERBEROS} != "no"
  SUBDIR+=kerberos5
  .endif
***************
*** 998,1004 ****
                ${_secure_lib_libcrypto} ${_secure_lib_libssh} \
                ${_secure_lib_libssl}

- _generic_libs=        gnu/lib ${_kerberos5_lib} lib ${_secure_lib}
usr.bin/lex/lib

  lib/libopie__L lib/libtacplus__L: lib/libmd__L

--- 1000,1006 ----
                ${_secure_lib_libcrypto} ${_secure_lib_libssh} \
                ${_secure_lib_libssl}

+ _generic_libs=        cddl/lib gnu/lib ${_kerberos5_lib} lib
${_secure_lib} usr.bin/lex/lib

  lib/libopie__L lib/libtacplus__L: lib/libmd__L




-- 
     __o   | Steve Clement - Unix System Administrator
   _ \<,_  | Current Location: Luxembourgr/Europe
  (_)/ (_) | "Work to Eat, Eat to Live, Live to Bike, Bike to Work"