[Midnightbsd-cvs] src: Makefile: merge changes.

[laffer1 at midnightbsd.org]

Log Message:
-----------
merge changes.

Modified Files:
--------------
    src/lib/libbz2:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/lib/libbz2/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libbz2/Makefile -L lib/libbz2/Makefile -u -r1.2 -r1.3
--- lib/libbz2/Makefile
+++ lib/libbz2/Makefile
@@ -1,11 +1,11 @@
 # $MidnightBSD$
-# $FreeBSD: src/lib/libbz2/Makefile,v 1.5.10.1 2005/07/22 17:29:03 kensmith Exp $
+# $FreeBSD: src/lib/libbz2/Makefile,v 1.7 2007/05/21 02:49:03 deischen Exp $
 
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
 
 LIB=		bz2
-SHLIB_MAJOR=	2
+SHLIB_MAJOR=	3
 SRCS=		bzlib.c blocksort.c compress.c crctable.c decompress.c \
 		huffman.c randtable.c
 INCS=		bzlib.h