[Midnightbsd-cvs] src: src/secure: Merge changes.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Merge changes.

Modified Files:
--------------
    src/secure:
        Makefile (r1.1.1.1 -> r1.2)
        Makefile.inc (r1.1.1.1 -> r1.2)
    src/secure/lib:
        Makefile (r1.1.1.1 -> r1.2)
        Makefile.inc (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/src/secure/Makefile.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L secure/Makefile.inc -L secure/Makefile.inc -u -r1.1.1.1 -r1.2
--- secure/Makefile.inc
+++ secure/Makefile.inc
@@ -1,4 +1,6 @@
-# $FreeBSD: src/secure/Makefile.inc,v 1.24 2004/08/06 07:27:05 cperciva Exp $
+# $FreeBSD: src/secure/Makefile.inc,v 1.25 2006/03/17 18:54:31 ru Exp $
+
+.include <bsd.own.mk>
 
 .if exists(${.CURDIR}/../../lib/libcrypt/obj)
 CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt/obj
@@ -6,10 +8,10 @@
 CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt
 .endif
 
-.if !defined(MAKE_IDEA)
+.if ${MK_IDEA} == "no"
 CFLAGS+= -DNO_IDEA
 .endif
 
-.if !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
 SSHDIR=		${.CURDIR}/../../../crypto/openssh
 .endif
Index: Makefile
===================================================================
RCS file: /home/cvs/src/secure/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L secure/Makefile -L secure/Makefile -u -r1.1.1.1 -r1.2
--- secure/Makefile
+++ secure/Makefile
@@ -1,4 +1,6 @@
-# $FreeBSD: src/secure/Makefile,v 1.26 2004/12/21 10:16:01 ru Exp $
+# $FreeBSD: src/secure/Makefile,v 1.27 2006/03/17 18:54:31 ru Exp $
+
+.include <bsd.own.mk>
 
 SUBDIR= lib libexec usr.bin usr.sbin
 
@@ -7,7 +9,7 @@
 	bin/ed libexec/telnetd usr.bin/fetch usr.bin/telnet	\
 	usr.sbin/pkg_install usr.sbin/ppp usr.sbin/pppd		\
 	usr.sbin/tcpdump/tcpdump
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
 SPROGS+=usr.sbin/sendmail
 .endif
 
@@ -26,11 +28,11 @@
 insecure:
 .for entry in ${SPROGS}
 	cd ${.CURDIR}/../${entry}; \
-	${MAKE} -DNO_CRYPT cleandir; \
-	${MAKE} -DNO_CRYPT obj; \
-	${MAKE} -DNO_CRYPT depend; \
-	${MAKE} -DNO_CRYPT all; \
-	${MAKE} -DNO_CRYPT install
+	${MAKE} -DWITHOUT_CRYPT cleandir; \
+	${MAKE} -DWITHOUT_CRYPT obj; \
+	${MAKE} -DWITHOUT_CRYPT depend; \
+	${MAKE} -DWITHOUT_CRYPT all; \
+	${MAKE} -DWITHOUT_CRYPT install
 .endfor
 
 .include <bsd.subdir.mk>
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/src/secure/lib/Makefile.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L secure/lib/Makefile.inc -L secure/lib/Makefile.inc -u -r1.1.1.1 -r1.2
--- secure/lib/Makefile.inc
+++ secure/lib/Makefile.inc
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD: src/secure/lib/Makefile.inc,v 1.9 2003/04/30 07:54:38 ru Exp $
 
 .include "../Makefile.inc"
Index: Makefile
===================================================================
RCS file: /home/cvs/src/secure/lib/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L secure/lib/Makefile -L secure/lib/Makefile -u -r1.1.1.1 -r1.2
--- secure/lib/Makefile
+++ secure/lib/Makefile
@@ -1,9 +1,12 @@
-# $FreeBSD: src/secure/lib/Makefile,v 1.33 2003/07/16 20:59:14 markm Exp $
+# $MidnightBSD$
+# $FreeBSD: src/secure/lib/Makefile,v 1.34 2006/03/17 18:54:31 ru Exp $
+
+.include <bsd.own.mk>
 
 SUBDIR= 
-.if !defined(NO_OPENSSL)
+.if ${MK_OPENSSL} != "no"
 SUBDIR+=libcrypto libssl
-.if !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
 SUBDIR+=libssh
 .endif
 .endif