ZFS patches for FreeBSD. Makefile.inc1.rej

[Steve Clement]

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"