[Midnightbsd-cvs] src: Makefile: New World Order

[laffer1 at midnightbsd.org]

Log Message:
-----------
New World Order

Modified Files:
--------------
    src/usr.bin:
        Makefile (r1.16 -> r1.17)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -L usr.bin/Makefile -L usr.bin/Makefile -u -r1.16 -r1.17
--- usr.bin/Makefile
+++ usr.bin/Makefile
@@ -2,6 +2,8 @@
 # $FreeBSD: src/usr.bin/Makefile,v 1.279.2.1 2005/08/15 18:34:20 cperciva Exp $
 # $MidnightBSD$
 
+.include <bsd.own.mk>
+
 # XXX MISSING:		diction graph learn plot
 #			spline struct xsend
 # XXX Use GNU versions: apropos bc dc diff grep ld man patch whatis
@@ -26,9 +28,9 @@
 	bzip2recover \
 	${_c89} \
 	${_c99} \
-	calendar \
+	${_calendar} \
 	cap_mkdb \
-	catman \
+	${_catman} \
 	chat \
 	checknr \
 	${_chkey} \
@@ -78,7 +80,7 @@
 	${_gprof} \
 	gzip \
 	head \
-	hesinfo \
+	${_hesinfo} \
 	hexdump \
 	${_host} \
 	id \
@@ -243,53 +245,61 @@
 	${_ypmatch} \
 	${_ypwhich}
 
-.if !defined(NO_ATM)
+.if ${MK_ATM} != "no"
 _atm=		atm
 .endif
 
-.if !defined(NO_BIND) && !defined(NO_BIND_UTILS)
+.if ${MK_MAN} != "no"
+_catman=	catman
+.endif
+
+.if ${MK_BIND_UTILS} != "no"
 _dig=		dig
 _host=		host
 _nslookup=	nslookup
 _nsupdate=	nsupdate
 .endif
 
-.if !defined(NO_BLUETOOTH)
+.if ${MK_BLUETOOTH} != "no"
 _bluetooth=	bluetooth
 .endif
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_CALENDAR} != "no"
+_calendar=	calendar
+.endif
+
+.if ${MK_OPENSSL} != "no"
 _chkey=		chkey
 _newkey=	newkey
-.if ${MACHINE_ARCH} == "sparc64"
-.if !defined(NO_LIBTHR)
+.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
 _csup=		csup
 .endif
-.elif !defined(NO_LIBPTHREAD)
-_csup=		csup
 .endif
+
+.if ${MK_HESIOD} != "no"
+_hesinfo=	hesinfo
 .endif
 
-.if !defined(NO_NETCAT)
+.if ${MK_NETCAT} != "no"
 _nc=		nc
 .endif
 
-.if !defined(NO_NIS) 
+.if ${MK_NIS} != "no"
 _ypcat=		ypcat
 _ypmatch=	ypmatch
 _ypwhich=	ypwhich
 .endif
 
-.if !defined(NO_RCMDS)
+.if ${MK_RCMDS} != "no"
 _rlogin=	rlogin
 _rsh=		rsh
 .endif
 
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 _vacation=	vacation
 .endif
 
-.if !defined(NO_TOOLCHAIN)
+.if ${MK_TOOLCHAIN} != "no"
 _c89=		c89
 _c99=		c99
 _gprof=		gprof
@@ -298,21 +308,25 @@
 _yacc=		yacc
 .endif
 
-.if !defined(NO_USB)
+.if ${MK_USB} != "no"
 _usbhidaction=	usbhidaction
 _usbhidctl=	usbhidctl
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
+.if ${MK_NCP} != "no"
 _ncplist=	ncplist
 _ncplogin=	ncplogin
+.endif
 _pcc=		pcc
 _smbutil=	smbutil
 .endif
 
 .if ${MACHINE_ARCH} == "amd64"
+.if ${MK_NCP} != "no"
 _ncplist=	ncplist
 _ncplogin=	ncplogin
+.endif
 _smbutil=	smbutil
 .endif