[Midnightbsd-cvs] src: Makefile: bump shared library version for libssh

[laffer1 at midnightbsd.org]

Log Message:
-----------
bump shared library version for libssh

Modified Files:
--------------
    src/secure/lib/libssh:
        Makefile (r1.7 -> r1.8)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/secure/lib/libssh/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L secure/lib/libssh/Makefile -L secure/lib/libssh/Makefile -u -r1.7 -r1.8
--- secure/lib/libssh/Makefile
+++ secure/lib/libssh/Makefile
@@ -1,8 +1,10 @@
 # $MidnightBSD$
 # $FreeBSD: src/secure/lib/libssh/Makefile,v 1.34.2.2 2005/09/11 16:50:33 des Exp $
 
+.include <bsd.own.mk>
+
 LIB=	ssh
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 SRCS=	acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.c \
 	canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \
 	cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \
@@ -12,13 +14,13 @@
 	atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
 	monitor_fdpass.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c \
 	kexgex.c kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \
-	entropy.c scard-opensc.c umac.c
+	entropy.c scard-opensc.c
 
 # gss-genr.c should be in $SRCS but causes linking problems, so it is
 # compiled directly into sshd instead.
 
 # Portability layer
-SRCS+=	bsd-closefrom.c bsd-misc.c getrrsetbyname.c openssl-compat.c \
+SRCS+=	bsd-closefrom.c bsd-misc.c getrrsetbyname.c \
 	port-tun.c vis.c xcrypt.c xmmap.c
 # MidnightBSD additions
 SRCS+=	version.c
@@ -31,8 +33,8 @@
 DPADD=	${LIBZ}
 LDADD=	-lz
 
-.if !defined(NO_KERBEROS)
-CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
+.if ${MK_KERBEROS_SUPPORT} != "no"
+CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL
 DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
 LDADD+=	-lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
 .endif