[Midnightbsd-cvs] src [9560] trunk/rescue/rescue/Makefile: fix build

[laffer1 at midnightbsd.org]

Revision: 9560
          http://svnweb.midnightbsd.org/src/?rev=9560
Author:   laffer1
Date:     2017-09-18 18:54:40 -0400 (Mon, 18 Sep 2017)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/rescue/rescue/Makefile

Modified: trunk/rescue/rescue/Makefile
===================================================================
--- trunk/rescue/rescue/Makefile	2017-09-18 22:54:16 UTC (rev 9559)
+++ trunk/rescue/rescue/Makefile	2017-09-18 22:54:40 UTC (rev 9560)
@@ -1,7 +1,7 @@
 #$MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
-NO_MAN=
+MAN=
 
 .include <bsd.own.mk>
 MK_SSP=	no
@@ -51,8 +51,9 @@
 CRUNCH_SRCDIRS+= bin
 CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo 	\
 	 ed expr getfacl hostname kenv kill ln ls mkdir mv	\
-	 pkill ps pwd realpath rm rmdir setfacl sh stty sync test
-CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil
+	 pkill ps pwd realpath rm rmdir setfacl sh sleep stty	\
+	 sync test
+CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -ll -ltermcap -lutil
 CRUNCH_BUILDTOOLS+= bin/sh
 
 # Additional options for specific programs
@@ -87,9 +88,9 @@
 # headers in addition to the standard 'paths.h' header.
 #
 CRUNCH_SRCDIRS+= sbin
-CRUNCH_PROGS_sbin= badsect				\
+CRUNCH_PROGS_sbin= badsect					\
 	camcontrol ccdconfig clri devfs dmesg dump		\
-	dumpfs dumpon fsck fsck_ffs fsck_msdosfs fsdb		\
+	fsck fsck_ffs fsck_msdosfs fsdb		\
 	fsirand gbde geom ifconfig init 			\
 	kldconfig kldload kldstat kldunload ldconfig 		\
 	md5 mdconfig mdmfs mknod mount mount_cd9660		\
@@ -113,19 +114,27 @@
 .if ${MK_ZFS} != "no"
 CRUNCH_PROGS_sbin+= zfs
 CRUNCH_PROGS_sbin+= zpool
+CRUNCH_PROGS_usr.sbin+= zdb
 .endif
 
 # crunchgen does not like C++ programs; this should be fixed someday
 # CRUNCH_PROGS+= devd
 
-CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec
+CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec -llzma
 .if ${MK_IPX} != "no"
 CRUNCH_LIBS+= -lipx
 .endif
 .if ${MK_ZFS} != "no"
-CRUNCH_LIBS+= -lavl -ljail -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
+CRUNCH_LIBS+= -lavl -lzpool -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
+.else
+# liblzma needs pthread
+CRUNCH_LIBS+= -lpthread
 .endif
-CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
+CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv
+.if ${MK_OPENSSL} == "no"
+CRUNCH_LIBS+= -lmd
+.endif
+CRUNCH_LIBS+= -lsbuf -lufs -lz
 
 .if ${MACHINE_CPUARCH} == "i386"
 CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
@@ -146,6 +155,7 @@
 .if ${MK_ZFS} != "no"
 CRUNCH_SRCDIR_zfs= ${.CURDIR}/../../cddl/sbin/zfs
 CRUNCH_SRCDIR_zpool= ${.CURDIR}/../../cddl/sbin/zpool
+CRUNCH_SRCDIR_zdb= ${.CURDIR}/../../cddl/usr.sbin/zdb
 .endif
 CRUNCH_ALIAS_reboot= fastboot halt fasthalt
 CRUNCH_ALIAS_restore= rrestore
@@ -171,15 +181,18 @@
 CRUNCH_ALIAS_bzip2= bunzip2 bzcat
 CRUNCH_LIBS+= -lbz2
 
+CRUNCH_PROGS_usr.bin+= less
+CRUNCH_ALIAS_less= more
+
 CRUNCH_PROGS_usr.bin+= xz
 CRUNCH_ALIAS_xz= unxz lzma unlzma xzcat lzcat
-CRUNCH_LIBS+= -llzma
 
 CRUNCH_PROGS_usr.bin+= tar
-CRUNCH_LIBS+= -larchive -lmd
+CRUNCH_LIBS+= -larchive
 .if ${MK_OPENSSL} != "no"
 CRUNCH_LIBS+= -lcrypto
 .endif
+CRUNCH_LIBS+= -lmd
 
 CRUNCH_PROGS_usr.bin+= vi
 CRUNCH_ALIAS_vi= ex
@@ -192,7 +205,7 @@
 #
 CRUNCH_SRCDIRS+= usr.sbin
 
-CRUNCH_PROGS_usr.sbin= chroot
+CRUNCH_PROGS_usr.sbin+= chroot
 
 CRUNCH_PROGS_usr.sbin+= chown
 CRUNCH_ALIAS_chown= chgrp