[Midnightbsd-cvs] src: lib/libcrypt: Update libcrypt

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update libcrypt

Modified Files:
--------------
    src/lib/libcrypt:
        Makefile (r1.1.1.1 -> r1.2)
        crypt.3 (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: crypt.3
===================================================================
RCS file: /home/cvs/src/lib/libcrypt/crypt.3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libcrypt/crypt.3 -L lib/libcrypt/crypt.3 -u -r1.1.1.1 -r1.2
--- lib/libcrypt/crypt.3
+++ lib/libcrypt/crypt.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libcrypt/crypt.3,v 1.31 2005/02/09 18:03:14 ru Exp $
+.\" $FreeBSD: src/lib/libcrypt/crypt.3,v 1.32 2007/04/04 14:04:55 ceri Exp $
 .\"
 .Dd January 19, 1997
 .Dt CRYPT 3
@@ -257,7 +257,6 @@
 .Xr login 1 ,
 .Xr passwd 1 ,
 .Xr auth_getval 3 ,
-.Xr cipher 3 ,
 .Xr getpass 3 ,
 .Xr auth.conf 5 ,
 .Xr passwd 5
Index: Makefile
===================================================================
RCS file: /home/cvs/src/lib/libcrypt/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L lib/libcrypt/Makefile -L lib/libcrypt/Makefile -u -r1.1.1.1 -r1.2
--- lib/libcrypt/Makefile
+++ lib/libcrypt/Makefile
@@ -1,11 +1,14 @@
 #
-# $FreeBSD: src/lib/libcrypt/Makefile,v 1.35.2.1 2005/07/22 17:29:04 kensmith Exp $
+# $FreeBSD: src/lib/libcrypt/Makefile,v 1.39 2007/05/21 02:49:03 deischen Exp $
 #
 
-SHLIB_MAJOR=	3
-LIB=		crypt
 SHLIBDIR?=	/lib
 
+.include <bsd.own.mk>
+
+SHLIB_MAJOR=	4
+LIB=		crypt
+
 .PATH:		${.CURDIR}/../libmd
 SRCS=		crypt.c misc.c \
 		crypt-md5.c md5c.c \
@@ -15,7 +18,7 @@
 CFLAGS+=	-I${.CURDIR}/../libmd -I${.CURDIR}/../libutil
 
 # Pull in the strong crypto, if it is present.
-.if exists(${.CURDIR}/../../secure/lib/libcrypt) && !defined(NO_CRYPT)
+.if exists(${.CURDIR}/../../secure/lib/libcrypt) && ${MK_CRYPT} != "no"
 .PATH:		${.CURDIR}/../../secure/lib/libcrypt
 SRCS+=		crypt-des.c crypt-blowfish.c blowfish.c
 CFLAGS+=	-I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH