Bump the version of all non-symbol-versioned shared libraries in

preparation for 8.0-RELEASE.  Add the previous version of those
libraries to ObsoleteFiles.inc and bump __FreeBSD_Version.

Reviewed by:    kib
Approved by:    re (rwatson)

41 files changed, 41 insertions, 41 deletions

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 2ea740e..e9cf750 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -1,3 +1,3 @@
 # $FreeBSD$
 # Default version for system libs (override in <lib>/Makefile if necessary)
-SHLIB_MAJOR?= 4
+SHLIB_MAJOR?= 5
diff --git a/lib/libalias/libalias/Makefile b/lib/libalias/libalias/Makefile
index 0731b5c..a3f9889 100644
--- a/lib/libalias/libalias/Makefile
+++ b/lib/libalias/libalias/Makefile
@@ -4,7 +4,7 @@
 
 LIB=	alias
 SHLIBDIR?= /lib
-SHLIB_MAJOR= 6
+SHLIB_MAJOR= 7
 MAN=	libalias.3
 SRCS=	alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c
 INCS=	alias.h
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index 44a6301..c377f9b 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -7,7 +7,7 @@ LDADD=	-lbz2 -lz -lmd
 
 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
 # It has no real relation to the libarchive version number.
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
 
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"config_freebsd.h\"
 CFLAGS+=	-I${.OBJDIR}
diff --git a/lib/libautofs/Makefile b/lib/libautofs/Makefile
index 889e971..ea4d8cf 100644
--- a/lib/libautofs/Makefile
+++ b/lib/libautofs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 LIB=	autofs
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
 WARNS?=	4
 
 SRCS=	libautofs.c
diff --git a/lib/libbegemot/Makefile b/lib/libbegemot/Makefile
index 95739bb..b964e6b 100644
--- a/lib/libbegemot/Makefile
+++ b/lib/libbegemot/Makefile
@@ -5,7 +5,7 @@ LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot
 .PATH: ${LIBBEGEMOT_DIR}
 
 LIB=	begemot
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
 SHLIBDIR?= /lib
 
 # WARNS?=	6
diff --git a/lib/libbluetooth/Makefile b/lib/libbluetooth/Makefile
index 763c574..7e21892 100644
--- a/lib/libbluetooth/Makefile
+++ b/lib/libbluetooth/Makefile
@@ -7,7 +7,7 @@ MAN=		bluetooth.3
 WARNS?=		2
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../../sys
 
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 
 SRCS=		bluetooth.c dev.c hci.c
 INCS=		bluetooth.h
diff --git a/lib/libbsm/Makefile b/lib/libbsm/Makefile
index fa9b507..157b61e 100644
--- a/lib/libbsm/Makefile
+++ b/lib/libbsm/Makefile
@@ -6,7 +6,7 @@ OPENBSMDIR=		${.CURDIR}/../../contrib/openbsm
 LIBBSMDIR=		${OPENBSMDIR}/libbsm
 
 LIB=		bsm
-SHLIB_MAJOR=	2
+SHLIB_MAJOR=	3
 
 .PATH:		${LIBBSMDIR}
 .PATH:		${OPENBSMDIR}/bsm
diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc
index de9dd2b..566274c 100644
--- a/lib/libbsnmp/Makefile.inc
+++ b/lib/libbsnmp/Makefile.inc
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIB_MAJOR=	4
+SHLIB_MAJOR=	5
 WARNS?=		6
 NO_WERROR=
 INCSDIR=	${INCLUDEDIR}/bsnmp
diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile
index 76ef0bd..6ea018b 100644
--- a/lib/libbz2/Makefile
+++ b/lib/libbz2/Makefile
@@ -4,7 +4,7 @@ BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
 
 LIB=		bz2
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 SRCS=		bzlib.c blocksort.c compress.c crctable.c decompress.c \
 		huffman.c randtable.c
 INCS=		bzlib.h
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index 71f6fce..be0826d 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -6,7 +6,7 @@ SHLIBDIR?=	/lib
 
 .include <bsd.own.mk>
 
-SHLIB_MAJOR=	4
+SHLIB_MAJOR=	5
 LIB=		crypt
 
 .PATH:		${.CURDIR}/../libmd
diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile
index 0358628..c6233c2 100644
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@@ -3,7 +3,7 @@
 LIB=	devstat
 SHLIBDIR?= /lib
 # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented.
-SHLIB_MAJOR= 6
+SHLIB_MAJOR= 7
 SRCS=	devstat.c
 INCS=	devstat.h
 
diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
index 0acc6aa..9a1a549 100644
--- a/lib/libdwarf/Makefile
+++ b/lib/libdwarf/Makefile
@@ -21,7 +21,7 @@ INCS=	dwarf.h libdwarf.h
 
 CFLAGS+=	-I. -I${.CURDIR}
 
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 
 WARNS?=	6
 
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index c472494..ece6032 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -3,7 +3,7 @@
 # $FreeBSD$
 
 LIB=	edit
-SHLIB_MAJOR=	6
+SHLIB_MAJOR=	7
 SHLIBDIR?= /lib
 
 OSRCS=	chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \
diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile
index 1096187..e393684 100644
--- a/lib/libexpat/Makefile
+++ b/lib/libexpat/Makefile
@@ -4,7 +4,7 @@ EXPAT=		${.CURDIR}/../../contrib/expat
 
 LIB=		bsdxml
 SHLIBDIR?=	/lib
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 SRCS=		xmlparse.c xmlrole.c xmltok.c
 INCS=		bsdxml.h bsdxml_external.h
 MAN=		libbsdxml.3
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index 219a699..3576db7 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -25,7 +25,7 @@ CFLAGS+=	-DFTP_COMBINE_CWDS
 CSTD?=		c99
 WARNS?=		2
 
-SHLIB_MAJOR=    5
+SHLIB_MAJOR=    6
 
 ftperr.h: ftp.errors ${.CURDIR}/Makefile
 	@echo "static struct fetcherr ftp_errlist[] = {" > ${.TARGET}
diff --git a/lib/libftpio/Makefile b/lib/libftpio/Makefile
index 7b30984..bb9c9eb 100644
--- a/lib/libftpio/Makefile
+++ b/lib/libftpio/Makefile
@@ -3,7 +3,7 @@
 .include <bsd.own.mk>
 
 LIB=		ftpio
-SHLIB_MAJOR=	7
+SHLIB_MAJOR=	8
 
 SRCS=		ftpio.c ftperr.c
 INCS=		ftpio.h
diff --git a/lib/libgpib/Makefile b/lib/libgpib/Makefile
index 7e53df9..5465d8b 100644
--- a/lib/libgpib/Makefile
+++ b/lib/libgpib/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=		gpib
-SHLIB_MAJOR=	2
+SHLIB_MAJOR=	3
 INCS=		gpib.h
 INCSDIR=	${INCLUDEDIR}/gpib
 SRCS=		ibfoo.c
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index a415e26..5455945 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -32,7 +32,7 @@ SHLIBDIR?= /lib
 .include <bsd.own.mk>
 
 LIB=	ipsec
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
 CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=-DIPSEC_DEBUG -DIPSEC
 .if ${MK_INET6_SUPPORT} != "no"
diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile
index e66e718..2a0bd6a 100644
--- a/lib/libkiconv/Makefile
+++ b/lib/libkiconv/Makefile
@@ -5,7 +5,7 @@ SHLIBDIR?=	/lib
 SRCS=		kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c
 SRCS+=		quirks.c
 
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 
 MAN=		kiconv.3
 
diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile
index 2245f43..9fe09c5 100644
--- a/lib/libkse/Makefile
+++ b/lib/libkse/Makefile
@@ -19,7 +19,7 @@ SHLIBDIR= /lib
 SHLIB=kse
 .endif
 
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
 CFLAGS+=-DPTHREAD_KERNEL
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
 	-I${.CURDIR}/../../include
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index 3c0a93b..618a6f5 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -5,7 +5,7 @@ CONTRDIR=	${.CURDIR}/../../contrib/file
 .PATH: ${CONTRDIR}
 
 LIB=	magic
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 DPADD=	${LIBZ}
 LDADD=	-lz
 MAN=	libmagic.3 magic.5
diff --git a/lib/libmemstat/Makefile b/lib/libmemstat/Makefile
index 6114bf7..d261085 100644
--- a/lib/libmemstat/Makefile
+++ b/lib/libmemstat/Makefile
@@ -2,7 +2,7 @@
 
 WARNS?=		3
 LIB=		memstat
-SHLIB_MAJOR=	2
+SHLIB_MAJOR=	3
 DPADD=		${LIBKVM}
 LDADD=		-lkvm
 SRCS+=		memstat.c
diff --git a/lib/libncp/Makefile b/lib/libncp/Makefile
index 6f1274c..1a7ad6b 100644
--- a/lib/libncp/Makefile
+++ b/lib/libncp/Makefile
@@ -2,7 +2,7 @@
 
 LIB=		ncp
 
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 
 DPADD=		${LIBIPX}
 LDADD=		-lipx
diff --git a/lib/libnetgraph/Makefile b/lib/libnetgraph/Makefile
index 5d09abf..d0c444e 100644
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@@ -5,7 +5,7 @@ LIB=		netgraph
 WARNS?=		3
 MAN=		netgraph.3
 
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 
 SRCS=		sock.c msg.c debug.c
 INCS=		netgraph.h
diff --git a/lib/libngatm/Makefile b/lib/libngatm/Makefile
index dd8f859..dfa3321 100644
--- a/lib/libngatm/Makefile
+++ b/lib/libngatm/Makefile
@@ -3,7 +3,7 @@
 # Author: Harti Brandt <harti@freebsd.org>
 #
 LIB=	ngatm
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
 MAN=	libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3
 WARNS?=	6
 
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index 45f35b9..59406df 100644
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@@ -4,7 +4,7 @@
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 DIST_DIR=	${OPIE_DIST}/${.CURDIR:T}
-SHLIB_MAJOR=    5
+SHLIB_MAJOR=    6
 
 KEYFILE?=	\"/etc/opiekeys\"
 
diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc
index ec21817..1fe2f12 100644
--- a/lib/libpam/Makefile.inc
+++ b/lib/libpam/Makefile.inc
@@ -28,5 +28,5 @@
 DEBUG_FLAGS+=	-DDEBUG
 .endif
 
-SHLIB_MAJOR=	4
+SHLIB_MAJOR=	5
 PAM_MOD_DIR=	${LIBDIR}
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 38a2131..44ae23c 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -97,7 +97,7 @@ CFLAGS+=-DINET6
 CFLAGS+=-DHAVE_NET_PFVAR_H
 .endif
 
-SHLIB_MAJOR=6
+SHLIB_MAJOR=7
 
 #
 # Magic to grab sources out of src/contrib
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
index 8fc216f..d6d29b3 100644
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@@ -11,7 +11,7 @@ INCS=	libproc.h
 
 CFLAGS+=	-I. -I${.CURDIR}
 
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 
 WARNS?=	6
 
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index f4855dc..5054ea0b 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -30,7 +30,7 @@ LIB=		radius
 SRCS=		radlib.c
 INCS=		radlib.h radlib_vs.h
 CFLAGS+=	-Wall
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 MAN=		libradius.3 radius.conf.5
 
 .if ${MK_OPENSSL} == "no"
diff --git a/lib/libsdp/Makefile b/lib/libsdp/Makefile
index 5f205c8..fcedb50 100644
--- a/lib/libsdp/Makefile
+++ b/lib/libsdp/Makefile
@@ -7,7 +7,7 @@ MAN=		sdp.3
 WARNS?=		2
 CFLAGS+=	-I${.CURDIR}
 
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 
 SRCS=		search.c service.c session.c util.c
 INCS=		sdp.h
diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile
index e7ed8e5..3a9a64d 100644
--- a/lib/libsmb/Makefile
+++ b/lib/libsmb/Makefile
@@ -4,7 +4,7 @@ CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
 .PATH: ${CONTRIBDIR}/lib/smb
 
 LIB=	smb
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 DPADD=	${LIBKICONV}
 LDADD=	-lkiconv
 
diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile
index 703b525..13ceb43 100644
--- a/lib/libtacplus/Makefile
+++ b/lib/libtacplus/Makefile
@@ -30,7 +30,7 @@ INCS=		taclib.h
 CFLAGS+=	-Wall
 DPADD=		${LIBMD}
 LDADD=		-lmd
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 MAN=		libtacplus.3 tacplus.conf.5
 
 .include <bsd.lib.mk>
diff --git a/lib/libugidfw/Makefile b/lib/libugidfw/Makefile
index 2323403..23c5ea7 100644
--- a/lib/libugidfw/Makefile
+++ b/lib/libugidfw/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=		ugidfw
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 SRCS=		ugidfw.c
 INCS=		ugidfw.h
 
diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
index 1ee56fe..b06f774 100644
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
@@ -5,7 +5,7 @@
 #
 
 LIB=		usb
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 SHLIB_MINOR=	0
 SRCS=		libusb20.c
 SRCS+=		libusb20_desc.c
diff --git a/lib/libusbhid/Makefile b/lib/libusbhid/Makefile
index d681302..2a58a4b 100644
--- a/lib/libusbhid/Makefile
+++ b/lib/libusbhid/Makefile
@@ -4,7 +4,7 @@
 LIB=	usbhid
 MAN=	usbhid.3
 
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
 
 MLINKS=	usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \
 	usbhid.3 hid_dispose_report_desc.3 \
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index d714c0e..2933649 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -6,7 +6,7 @@ SHLIBDIR?= /lib
 .include <bsd.own.mk>
 
 LIB=	util
-SHLIB_MAJOR= 7
+SHLIB_MAJOR= 8
 
 SRCS=	_secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \
 	hexdump.c humanize_number.c kinfo_getfile.c kinfo_getvmmap.c kld.c \
diff --git a/lib/libvgl/Makefile b/lib/libvgl/Makefile
index 9362ea1..a379bd0 100644
--- a/lib/libvgl/Makefile
+++ b/lib/libvgl/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 LIB=	vgl
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 6
 CFLAGS+=-Wall -I${.CURDIR}
 SRCS=	main.c simple.c bitmap.c text.c mouse.c keyboard.c
 INCS=	vgl.h
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 5c655ab..4565827 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -5,7 +5,7 @@
 .include <bsd.own.mk>
 
 LIB=	wrap
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 6
 INCS=	tcpd.h
 MAN=	hosts_access.3
 MAN+=	hosts_access.5 hosts_options.5
diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile
index 45f9e7e..53d6a63 100644
--- a/lib/libypclnt/Makefile
+++ b/lib/libypclnt/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	ypclnt
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
 SRCS=	ypclnt_connect.c \
 	ypclnt_error.c \
 	ypclnt_free.c \
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 59f7c35..bdac622 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -7,7 +7,7 @@ SHLIBDIR?=	/lib
 .include "${.CURDIR}/../config.mk"
 
 LIB=		ncurses${LIB_SUFFIX}
-SHLIB_MAJOR=	7
+SHLIB_MAJOR=	8
 
 NO_LINT=