Index: gnu/lib/libdialog/Makefile
===========================================================================
--- gnu/lib/libdialog/Makefile	2005/07/27 01:23:19	#10
+++ gnu/lib/libdialog/Makefile	2005/07/27 01:23:19
@@ -1,11 +1,11 @@
 # Makefile for libdialog
 # $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.43 2005/07/22 17:18:57 kensmith Exp $
 
 LIB=    dialog
 INCS=	dialog.h
 MAN=	dialog.3
 
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
 SRCS=   kernel.c rc.c checklist.c inputbox.c menubox.c msgbox.c \
 	lineedit.c radiolist.c textbox.c yesno.c prgbox.c raw_popen.c \
 	fselect.c ui_objects.c dir.c notify.c help.c gauge.c tree.c
Index: gnu/lib/libg2c/Makefile
===========================================================================
--- gnu/lib/libg2c/Makefile	2005/07/27 01:23:19	#8
+++ gnu/lib/libg2c/Makefile	2005/07/27 01:23:19
@@ -1,11 +1,11 @@
 # $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.16 2005/07/22 17:18:57 kensmith Exp $
 
 SRCDIR=	${.CURDIR}/../../../contrib/libf2c
 
 .PATH: ${SRCDIR} ${SRCDIR}/libU77 ${SRCDIR}/libF77 ${SRCDIR}/libI77
 
 LIB=		g2c
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 
 # Traditional FORTRAN Library members defined in libF77
 
Index: gnu/lib/libobjc/Makefile
===========================================================================
--- gnu/lib/libobjc/Makefile	2005/07/27 01:23:19	#14
+++ gnu/lib/libobjc/Makefile	2005/07/27 01:23:19
@@ -1,4 +1,4 @@
 # $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.27 2005/07/22 17:18:58 kensmith Exp $
 
 OBJCDIR=${.CURDIR}/../../../contrib/libobjc
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
@@ -6,7 +6,7 @@
 .PATH: ${OBJCDIR}/objc ${OBJCDIR}
 
 LIB=		objc
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 NO_MAN=
 
 SRCS=   archive.c class.c encoding.c gc.c hash.c init.c misc.c \
Index: gnu/lib/libreadline/Makefile.inc
===========================================================================
--- gnu/lib/libreadline/Makefile.inc	2005/07/27 01:23:19	#6
+++ gnu/lib/libreadline/Makefile.inc	2005/07/27 01:23:19
@@ -1,6 +1,6 @@
 # $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.12 2005/07/22 17:18:58 kensmith Exp $
 
-SHLIB_MAJOR=5
+SHLIB_MAJOR=6
 RL_LIBRARY_VERSION=5.0
 
 SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
Index: gnu/lib/libregex/Makefile
===========================================================================
--- gnu/lib/libregex/Makefile	2005/07/27 01:23:19	#10
+++ gnu/lib/libregex/Makefile	2005/07/27 01:23:19
@@ -1,9 +1,9 @@
 # $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.32 2005/07/22 17:18:58 kensmith Exp $
 
 SUBDIR=		doc
 
 LIB=		gnuregex
-SHLIB_MAJOR=	2
+SHLIB_MAJOR=	3
 
 SRCS=		gnuregex.c
 INCSGROUPS=	INCS WRINCS PXINCS
Index: gnu/lib/libstdc++/Makefile
===========================================================================
--- gnu/lib/libstdc++/Makefile	2005/07/27 01:23:19	#29
+++ gnu/lib/libstdc++/Makefile	2005/07/27 01:23:19
@@ -1,4 +1,4 @@
 # $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.56 2005/07/22 17:18:58 kensmith Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 SRCDIR=	${.CURDIR}/../../../contrib/libstdc++
@@ -9,7 +9,7 @@
        ${SUPDIR} ${GCCDIR}
 
 LIB=		stdc++
-SHLIB_MAJOR=	4
+SHLIB_MAJOR=	5
 
 CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
 CFLAGS+=	-I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include
Index: kerberos5/lib/Makefile.inc
===========================================================================
--- kerberos5/lib/Makefile.inc	2005/07/27 01:23:19	#5
+++ kerberos5/lib/Makefile.inc	2005/07/27 01:23:19
@@ -1,5 +1,5 @@
 # $FreeBSD: src/kerberos5/lib/Makefile.inc,v 1.7 2005/07/22 17:18:58 kensmith Exp $
 
-SHLIB_MAJOR?=	7
+SHLIB_MAJOR?=	8
 
 .include "../Makefile.inc"
Index: lib/Makefile.inc
===========================================================================
--- lib/Makefile.inc	2005/07/27 01:23:19	#2
+++ lib/Makefile.inc	2005/07/27 01:23:19
@@ -1,3 +1,3 @@
 # $FreeBSD: src/lib/Makefile.inc,v 1.3 2005/07/22 17:18:58 kensmith Exp $
 # Default version for system libs (override in <lib>/Makefile if necessary)
-SHLIB_MAJOR?= 2
+SHLIB_MAJOR?= 3
Index: lib/libalias/Makefile
===========================================================================
--- lib/libalias/Makefile	2005/07/27 01:23:19	#13
+++ lib/libalias/Makefile	2005/07/27 01:23:19
@@ -1,10 +1,10 @@
 # $FreeBSD: src/lib/libalias/Makefile,v 1.31 2005/07/22 17:18:59 kensmith Exp $
 
 .PATH:	${.CURDIR}/../../sys/netinet/libalias
 
 LIB=	alias
 SHLIBDIR?= /lib
-SHLIB_MAJOR=	4
+SHLIB_MAJOR=	5
 MAN=	libalias.3
 SRCS=	alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
 	alias_nbt.c alias_pptp.c alias_proxy.c alias_skinny.c alias_smedia.c \
Index: lib/libarchive/Makefile
===========================================================================
--- lib/libarchive/Makefile	2005/07/27 01:23:19	#34
+++ lib/libarchive/Makefile	2005/07/27 01:23:19
@@ -1,4 +1,4 @@
 # $FreeBSD: src/lib/libarchive/Makefile,v 1.37 2005/07/22 17:18:59 kensmith Exp $
 
 #
 # Use "make distfile" to build a conventional tar.gz archive
@@ -9,7 +9,7 @@
 LIB=	archive
 VERSION=	1.02.026
 ARCHIVE_API_FEATURE=	2
-ARCHIVE_API_VERSION=	1
+ARCHIVE_API_VERSION=	2
 SHLIB_MAJOR=	${ARCHIVE_API_VERSION}
 CFLAGS+=	-DPACKAGE_NAME=\"lib${LIB}\"
 CFLAGS+=	-DPACKAGE_VERSION=\"${VERSION}\"
Index: lib/libbegemot/Makefile
===========================================================================
--- lib/libbegemot/Makefile	2005/07/27 01:23:19	#2
+++ lib/libbegemot/Makefile	2005/07/27 01:23:19
@@ -1,11 +1,11 @@
 # $FreeBSD: src/lib/libbegemot/Makefile,v 1.3 2005/07/22 17:18:59 kensmith Exp $
 
 LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot
 
 .PATH: ${LIBBEGEMOT_DIR}
 
 LIB=	begemot
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
 SHLIBDIR?= /lib
 
 # WARNS?=	6
Index: lib/libbluetooth/Makefile
===========================================================================
--- lib/libbluetooth/Makefile	2005/07/27 01:23:19	#1
+++ lib/libbluetooth/Makefile	2005/07/27 01:23:19
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.5 2003/07/22 18:38:04 max Exp $
 # $FreeBSD: src/lib/libbluetooth/Makefile,v 1.2 2005/07/22 17:18:59 kensmith Exp $
 
 LIB=		bluetooth
 MAN=		bluetooth.3
@@ -7,7 +7,7 @@
 WARNS?=		2
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../../sys
 
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 
 SRCS=		bluetooth.c
 INCS=		bluetooth.h
Index: lib/libbsnmp/Makefile.inc
===========================================================================
--- lib/libbsnmp/Makefile.inc	2005/07/27 01:23:19	#5
+++ lib/libbsnmp/Makefile.inc	2005/07/27 01:23:19
@@ -1,6 +1,6 @@
 # $FreeBSD: src/lib/libbsnmp/Makefile.inc,v 1.6 2005/07/22 17:18:59 kensmith Exp $
 
-SHLIB_MAJOR=	2
+SHLIB_MAJOR=	3
 WARNS?=		6
 NO_WERROR=
 INCSDIR=	${INCLUDEDIR}/bsnmp
Index: lib/libbz2/Makefile
===========================================================================
--- lib/libbz2/Makefile	2005/07/27 01:23:19	#4
+++ lib/libbz2/Makefile	2005/07/27 01:23:19
@@ -1,10 +1,10 @@
 # $FreeBSD: src/lib/libbz2/Makefile,v 1.6 2005/07/22 17:18:59 kensmith Exp $
 
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
 
 LIB=		bz2
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 SRCS=		bzlib.c blocksort.c compress.c crctable.c decompress.c \
 		huffman.c randtable.c
 INCS=		bzlib.h
Index: lib/libc_r/Makefile
===========================================================================
--- lib/libc_r/Makefile	2005/07/27 01:23:19	#12
+++ lib/libc_r/Makefile	2005/07/27 01:23:19
@@ -1,4 +1,4 @@
 # $FreeBSD: src/lib/libc_r/Makefile,v 1.42 2005/07/22 17:19:00 kensmith Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -8,7 +8,7 @@
 # (for system call stubs) to CFLAGS below.  -DSYSLIBC_SCCS affects just the
 # system call stubs.
 LIB=c_r
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 6
 CFLAGS+=-DPTHREAD_KERNEL 
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/uthread \
 	-I${.CURDIR}/../../include
Index: lib/libcrypt/Makefile
===========================================================================
--- lib/libcrypt/Makefile	2005/07/27 01:23:19	#6
+++ lib/libcrypt/Makefile	2005/07/27 01:23:19
@@ -1,8 +1,8 @@
 #
 # $FreeBSD: src/lib/libcrypt/Makefile,v 1.36 2005/07/22 17:19:00 kensmith Exp $
 #
 
-SHLIB_MAJOR=	2
+SHLIB_MAJOR=	3
 LIB=		crypt
 SHLIBDIR?=	/lib
 
Index: lib/libdevstat/Makefile
===========================================================================
--- lib/libdevstat/Makefile	2005/07/27 01:23:19	#9
+++ lib/libdevstat/Makefile	2005/07/27 01:23:19
@@ -1,9 +1,9 @@
 # $FreeBSD: src/lib/libdevstat/Makefile,v 1.15 2005/07/22 17:19:00 kensmith Exp $
 
 LIB=	devstat
 SHLIBDIR?= /lib
 # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented.
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
 SRCS=	devstat.c
 INCS=	devstat.h
 
Index: lib/libdevstat/devstat.h
===========================================================================
--- lib/libdevstat/devstat.h	2005/07/27 01:23:19	#7
+++ lib/libdevstat/devstat.h	2005/07/27 01:23:19
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libdevstat/devstat.h,v 1.11 2005/07/22 17:19:00 kensmith Exp $
  */
 
 #ifndef _DEVSTAT_H
@@ -43,7 +43,7 @@
  * backwards-compatible API changes, so application writers have a way to 
  * determine when a particular feature is available.
  */
-#define	DEVSTAT_USER_API_VER	5
+#define	DEVSTAT_USER_API_VER	6
 
 #define DEVSTAT_ERRBUF_SIZE  2048 /* size of the devstat library error string */
 
Index: lib/libedit/Makefile
===========================================================================
--- lib/libedit/Makefile	2005/07/27 01:23:19	#8
+++ lib/libedit/Makefile	2005/07/27 01:23:19
@@ -1,9 +1,9 @@
 #	$NetBSD: Makefile,v 1.19 2000/08/15 12:01:40 mrg Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD: src/lib/libedit/Makefile,v 1.29 2005/07/22 17:19:00 kensmith Exp $
 
 LIB=	edit
-SHLIB_MAJOR=	4
+SHLIB_MAJOR=	5
 SHLIBDIR?= /lib
 
 OSRCS=	chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \
Index: lib/libexpat/Makefile
===========================================================================
--- lib/libexpat/Makefile	2005/07/27 01:23:19	#4
+++ lib/libexpat/Makefile	2005/07/27 01:23:19
@@ -1,10 +1,10 @@
 # $FreeBSD: src/lib/libexpat/Makefile,v 1.5 2005/07/22 17:19:00 kensmith Exp $
 
 EXPAT=		${.CURDIR}/../../contrib/expat
 
 LIB=		bsdxml
 SHLIBDIR?=	/lib
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 SRCS=		xmlparse.c xmlrole.c xmltok.c
 INCS=		bsdxml.h
 MAN=		libbsdxml.3
Index: lib/libfetch/Makefile
===========================================================================
--- lib/libfetch/Makefile	2005/07/27 01:23:19	#22
+++ lib/libfetch/Makefile	2005/07/27 01:23:19
@@ -1,4 +1,4 @@
 # $FreeBSD: src/lib/libfetch/Makefile,v 1.45 2005/07/22 17:19:00 kensmith Exp $
 
 LIB=		fetch
 CFLAGS+=	-I.
@@ -18,7 +18,7 @@
 CSTD?=		c99
 WARNS?=		2
 
-SHLIB_MAJOR=    3
+SHLIB_MAJOR=    4
 
 ftperr.h: ftp.errors
 	@echo "static struct fetcherr _ftp_errlist[] = {" > ${.TARGET}
Index: lib/libftpio/Makefile
===========================================================================
--- lib/libftpio/Makefile	2005/07/27 01:23:19	#2
+++ lib/libftpio/Makefile	2005/07/27 01:23:19
@@ -1,7 +1,7 @@
 # $FreeBSD: src/lib/libftpio/Makefile,v 1.14 2005/07/22 17:19:01 kensmith Exp $
 
 LIB=		ftpio
-SHLIB_MAJOR=	5
+SHLIB_MAJOR=	6
 
 SRCS=		ftpio.c ftperr.c
 INCS=		ftpio.h
Index: lib/libgpib/Makefile
===========================================================================
--- lib/libgpib/Makefile	2005/07/27 01:23:19	#1
+++ lib/libgpib/Makefile	2005/07/27 01:23:19
@@ -1,8 +1,8 @@
 # $FreeBSD: src/lib/libgpib/Makefile,v 1.2 2005/07/22 17:19:01 kensmith Exp $
 
 LIB =		gpib
 SHLIBDIR ?=	/lib
-SHLIB_MAJOR =	0
+SHLIB_MAJOR =	1
 NO_MAN =	sorry
 SRCS =		ibfoo.c
 INCS =		gpib.h
Index: lib/libipsec/Makefile
===========================================================================
--- lib/libipsec/Makefile	2005/07/27 01:23:19	#6
+++ lib/libipsec/Makefile	2005/07/27 01:23:19
@@ -25,11 +25,11 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD: src/lib/libipsec/Makefile,v 1.17 2005/07/22 17:19:01 kensmith Exp $
 
 LIB=	ipsec
 SHLIBDIR?= /lib
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
 CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=-DIPSEC_DEBUG -DIPSEC
 .if !defined(NO_INET6)
Index: lib/libkiconv/Makefile
===========================================================================
--- lib/libkiconv/Makefile	2005/07/27 01:23:19	#2
+++ lib/libkiconv/Makefile	2005/07/27 01:23:19
@@ -1,11 +1,11 @@
 # $FreeBSD: src/lib/libkiconv/Makefile,v 1.3 2005/07/22 17:19:01 kensmith Exp $
 
 LIB=		kiconv
 SHLIBDIR?=	/lib
 SRCS=		xlat16_iconv.c xlat16_sysctl.c
 SRCS+=		quirks.c
 
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 
 MAN=		kiconv.3
 
Index: lib/libmagic/Makefile
===========================================================================
--- lib/libmagic/Makefile	2005/07/27 01:23:19	#5
+++ lib/libmagic/Makefile	2005/07/27 01:23:19
@@ -1,11 +1,11 @@
 # $FreeBSD: src/lib/libmagic/Makefile,v 1.7 2005/07/22 17:19:01 kensmith Exp $
 # Copyright (c) David E. O'Brien, 2000-2004
 
 CONTRDIR=	${.CURDIR}/../../contrib/file
 .PATH: ${CONTRDIR}
 
 LIB=	magic
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 MAN=	libmagic.3 magic.5
 
 SRCS=	apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c \
Index: lib/libmp/Makefile
===========================================================================
--- lib/libmp/Makefile	2005/07/27 01:23:19	#8
+++ lib/libmp/Makefile	2005/07/27 01:23:19
@@ -1,7 +1,7 @@
 # $FreeBSD: src/lib/libmp/Makefile,v 1.10 2005/07/22 17:19:01 kensmith Exp $
 
 LIB=		mp
-SHLIB_MAJOR=	4
+SHLIB_MAJOR=	5
 MAN=		libmp.3
 INCS=		mp.h
 SRCS=		mpasbn.c
Index: lib/libncp/Makefile
===========================================================================
--- lib/libncp/Makefile	2005/07/27 01:23:19	#3
+++ lib/libncp/Makefile	2005/07/27 01:23:19
@@ -1,10 +1,10 @@
 # $FreeBSD: src/lib/libncp/Makefile,v 1.6 2005/07/22 17:19:02 kensmith Exp $
 
 NCPLIB=${.CURDIR}
 
 LIB=		ncp
 
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 
 NO_MAN=
 
Index: lib/libncurses/Makefile
===========================================================================
--- lib/libncurses/Makefile	2005/07/27 01:23:19	#27
+++ lib/libncurses/Makefile	2005/07/27 01:23:19
@@ -1,10 +1,10 @@
 # $FreeBSD: src/lib/libncurses/Makefile,v 1.79 2005/07/22 17:19:02 kensmith Exp $
 
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 LIB=	ncurses
 SHLIBDIR?= /lib
-SHLIB_MAJOR=5
+SHLIB_MAJOR=6
 
 # Should be elsewhere
 AWK?=	awk
Index: lib/libnetgraph/Makefile
===========================================================================
--- lib/libnetgraph/Makefile	2005/07/27 01:23:19	#4
+++ lib/libnetgraph/Makefile	2005/07/27 01:23:19
@@ -1,11 +1,11 @@
 # $FreeBSD: src/lib/libnetgraph/Makefile,v 1.11 2005/07/22 17:19:02 kensmith Exp $
 # $Whistle: Makefile,v 1.4 1999/01/17 03:41:02 julian Exp $
 
 LIB=		netgraph
 WARNS?=		3
 MAN=		netgraph.3
 
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 
 SRCS=		sock.c msg.c debug.c
 INCS=		netgraph.h
Index: lib/libngatm/Makefile
===========================================================================
--- lib/libngatm/Makefile	2005/07/27 01:23:19	#5
+++ lib/libngatm/Makefile	2005/07/27 01:23:19
@@ -1,9 +1,9 @@
 # $FreeBSD: src/lib/libngatm/Makefile,v 1.6 2005/07/22 17:19:02 kensmith Exp $
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
 LIB=	ngatm
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
 MAN=	libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3
 WARNS?=	6
 
Index: lib/libopie/Makefile
===========================================================================
--- lib/libopie/Makefile	2005/07/27 01:23:19	#8
+++ lib/libopie/Makefile	2005/07/27 01:23:19
@@ -1,10 +1,10 @@
 # Makefile for libopie
 #
 # $FreeBSD: src/lib/libopie/Makefile,v 1.21 2005/07/22 17:19:02 kensmith Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 DIST_DIR=	${OPIE_DIST}/${.CURDIR:T}
-SHLIB_MAJOR=    3
+SHLIB_MAJOR=    4
 
 KEYFILE?=	\"/etc/opiekeys\"
 
Index: lib/libpam/Makefile.inc
===========================================================================
--- lib/libpam/Makefile.inc	2005/07/27 01:23:19	#15
+++ lib/libpam/Makefile.inc	2005/07/27 01:23:19
@@ -22,11 +22,11 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD: src/lib/libpam/Makefile.inc,v 1.17 2005/07/22 17:19:02 kensmith Exp $
 
 .ifdef PAM_DEBUG
 DEBUG_FLAGS+=	-DDEBUG
 .endif
 
-SHLIB_MAJOR=	2
+SHLIB_MAJOR=	3
 PAM_MOD_DIR=	${LIBDIR}
Index: lib/libpthread/Makefile
===========================================================================
--- lib/libpthread/Makefile	2005/07/27 01:23:19	#22
+++ lib/libpthread/Makefile	2005/07/27 01:23:19
@@ -1,4 +1,4 @@
 # $FreeBSD: src/lib/libpthread/Makefile,v 1.54 2005/07/22 17:19:03 kensmith Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -12,7 +12,7 @@
 .else
 LIB=pthread
 .endif
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
 CFLAGS+=-DPTHREAD_KERNEL
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
 	-I${.CURDIR}/../../include
Index: lib/libradius/Makefile
===========================================================================
--- lib/libradius/Makefile	2005/07/27 01:23:19	#8
+++ lib/libradius/Makefile	2005/07/27 01:23:19
@@ -22,13 +22,13 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD: src/lib/libradius/Makefile,v 1.12 2005/07/22 17:19:03 kensmith Exp $
 
 LIB=		radius
 SRCS=		radlib.c
 INCS=		radlib.h radlib_vs.h
 CFLAGS+=	-Wall
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 MAN=		libradius.3 radius.conf.5
 
 .if defined(NO_CRYPT) || defined(NO_OPENSSL)
Index: lib/libsdp/Makefile
===========================================================================
--- lib/libsdp/Makefile	2005/07/27 01:23:19	#3
+++ lib/libsdp/Makefile	2005/07/27 01:23:19
@@ -1,5 +1,5 @@
 # $Id: Makefile,v 1.2 2003/09/07 20:34:19 max Exp $
 # $FreeBSD: src/lib/libsdp/Makefile,v 1.4 2005/07/22 17:19:03 kensmith Exp $
 
 LIB=		sdp
 MAN=		sdp.3
@@ -7,7 +7,7 @@
 WARNS?=		2
 CFLAGS+=	-I${.CURDIR}
 
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 
 SRCS=		search.c service.c session.c util.c
 INCS=		sdp.h
Index: lib/libsmb/Makefile
===========================================================================
--- lib/libsmb/Makefile	2005/07/27 01:23:19	#6
+++ lib/libsmb/Makefile	2005/07/27 01:23:19
@@ -1,10 +1,10 @@
 # $FreeBSD: src/lib/libsmb/Makefile,v 1.8 2005/07/22 17:19:03 kensmith Exp $
 
 CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
 .PATH: ${CONTRIBDIR}/lib/smb
 
 LIB=	smb
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 NO_MAN=
 
 SRCS=	rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \
Index: lib/libtacplus/Makefile
===========================================================================
--- lib/libtacplus/Makefile	2005/07/27 01:23:19	#4
+++ lib/libtacplus/Makefile	2005/07/27 01:23:19
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 #	$FreeBSD: src/lib/libtacplus/Makefile,v 1.7 2005/07/22 17:19:03 kensmith Exp $
 
 LIB=		tacplus
 SRCS=		taclib.c
@@ -30,7 +30,7 @@
 CFLAGS+=	-Wall
 DPADD=		${LIBMD}
 LDADD=		-lmd
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 MAN=		libtacplus.3 tacplus.conf.5
 
 .include <bsd.lib.mk>
Index: lib/libthr/Makefile
===========================================================================
--- lib/libthr/Makefile	2005/07/27 01:23:19	#13
+++ lib/libthr/Makefile	2005/07/27 01:23:19
@@ -1,4 +1,4 @@
 # $FreeBSD: src/lib/libthr/Makefile,v 1.14 2005/07/22 17:19:03 kensmith Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -8,7 +8,7 @@
 # (for system call stubs) to CFLAGS below.  -DSYSLIBC_SCCS affects just the
 # system call stubs.
 LIB=thr
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
 CFLAGS+=-DPTHREAD_KERNEL
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
 	-I${.CURDIR}/../../include
Index: lib/libthread_db/Makefile
===========================================================================
--- lib/libthread_db/Makefile	2005/07/27 01:23:19	#5
+++ lib/libthread_db/Makefile	2005/07/27 01:23:19
@@ -1,9 +1,9 @@
 # $FreeBSD: src/lib/libthread_db/Makefile,v 1.6 2005/07/22 17:19:03 kensmith Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}
 
 LIB=	thread_db
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
 SRCS=	thread_db.c
 SRCS+=	libpthread_db.c libpthread_md.c
 SRCS+=	libc_r_db.c libc_r_md.c
Index: lib/libugidfw/Makefile
===========================================================================
--- lib/libugidfw/Makefile	2005/07/27 01:23:19	#6
+++ lib/libugidfw/Makefile	2005/07/27 01:23:19
@@ -1,7 +1,7 @@
 # $FreeBSD: src/lib/libugidfw/Makefile,v 1.7 2005/07/22 17:19:04 kensmith Exp $
 
 LIB=		ugidfw
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 SRCS=		ugidfw.c
 INCS=		ugidfw.h
 
Index: lib/libusbhid/Makefile
===========================================================================
--- lib/libusbhid/Makefile	2005/07/27 01:23:19	#7
+++ lib/libusbhid/Makefile	2005/07/27 01:23:19
@@ -1,10 +1,10 @@
 #	$NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $
 #	$FreeBSD: src/lib/libusbhid/Makefile,v 1.10 2005/07/22 17:19:04 kensmith Exp $
 
 LIB=	usbhid
 MAN=	usbhid.3
 
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
 
 MLINKS=	usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \
 	usbhid.3 hid_dispose_report_desc.3 \
Index: lib/libutil/Makefile
===========================================================================
--- lib/libutil/Makefile	2005/07/27 01:23:19	#15
+++ lib/libutil/Makefile	2005/07/27 01:23:19
@@ -1,8 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 #	$FreeBSD: src/lib/libutil/Makefile,v 1.57 2005/07/22 17:19:04 kensmith Exp $
 
 LIB=	util
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
 SHLIBDIR?= /lib
 CFLAGS+=-DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../libc/gen/
 CFLAGS+=-DINET6
Index: lib/libvgl/Makefile
===========================================================================
--- lib/libvgl/Makefile	2005/07/27 01:23:19	#3
+++ lib/libvgl/Makefile	2005/07/27 01:23:19
@@ -1,6 +1,6 @@
 # $FreeBSD: src/lib/libvgl/Makefile,v 1.11 2005/07/22 17:19:04 kensmith Exp $
 LIB=	vgl
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
 CFLAGS+=-Wall -I${.CURDIR}
 SRCS=	main.c simple.c bitmap.c text.c mouse.c keyboard.c
 INCS=	vgl.h
Index: lib/libwrap/Makefile
===========================================================================
--- lib/libwrap/Makefile	2005/07/27 01:23:19	#8
+++ lib/libwrap/Makefile	2005/07/27 01:23:19
@@ -1,9 +1,9 @@
 #
 # $FreeBSD: src/lib/libwrap/Makefile,v 1.17 2005/07/22 17:19:04 kensmith Exp $
 #
 
 LIB=	wrap
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
 INCS=	tcpd.h
 MAN=	hosts_access.3
 MAN+=	hosts_access.5 hosts_options.5
Index: lib/libypclnt/Makefile
===========================================================================
--- lib/libypclnt/Makefile	2005/07/27 01:23:19	#9
+++ lib/libypclnt/Makefile	2005/07/27 01:23:19
@@ -1,7 +1,7 @@
 # $FreeBSD: src/lib/libypclnt/Makefile,v 1.13 2005/07/22 17:19:04 kensmith Exp $
 
 LIB=	ypclnt
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
 SRCS=	ypclnt_connect.c \
 	ypclnt_error.c \
 	ypclnt_free.c \
Index: lib/msun/Makefile
===========================================================================
--- lib/msun/Makefile	2005/07/27 01:23:19	#45
+++ lib/msun/Makefile	2005/07/27 01:23:19
@@ -1,5 +1,5 @@
 #  @(#)Makefile 5.1beta 93/09/24
 # $FreeBSD: src/lib/msun/Makefile,v 1.72 2005/07/22 17:19:05 kensmith Exp $
 #
 #  ====================================================
 #  Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -26,7 +26,7 @@
 
 LIB=	m
 SHLIBDIR?= /lib
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
 COMMON_SRCS= b_exp.c b_log.c b_tgamma.c \
 	e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \
 	e_atan2.c e_atan2f.c e_atanh.c e_atanhf.c e_cosh.c e_coshf.c e_exp.c \
Index: secure/lib/libcrypto/Makefile
===========================================================================
--- secure/lib/libcrypto/Makefile	2005/07/27 01:23:19	#33
+++ secure/lib/libcrypto/Makefile	2005/07/27 01:23:19
@@ -1,8 +1,8 @@
 # $FreeBSD: src/secure/lib/libcrypto/Makefile,v 1.74 2005/07/22 17:19:05 kensmith Exp $
 
 LIB=		crypto
 SHLIBDIR?=	/lib
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 
 NO_LINT=
 
Index: secure/lib/libssh/Makefile
===========================================================================
--- secure/lib/libssh/Makefile	2005/07/27 01:23:19	#25
+++ secure/lib/libssh/Makefile	2005/07/27 01:23:19
@@ -1,7 +1,7 @@
 # $FreeBSD: src/secure/lib/libssh/Makefile,v 1.35 2005/07/22 17:19:05 kensmith Exp $
 
 LIB=	ssh
-SHLIB_MAJOR=	2
+SHLIB_MAJOR=	3
 SRCS=	acss.c authfd.c authfile.c bufaux.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 \
Index: secure/lib/libssl/Makefile
===========================================================================
--- secure/lib/libssl/Makefile	2005/07/27 01:23:19	#12
+++ secure/lib/libssl/Makefile	2005/07/27 01:23:19
@@ -1,7 +1,7 @@
 # $FreeBSD: src/secure/lib/libssl/Makefile,v 1.22 2005/07/22 17:19:05 kensmith Exp $
 
 LIB=		ssl
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 
 NO_LINT=
 
Index: usr.sbin/bsnmpd/modules/Makefile.inc
===========================================================================
--- usr.sbin/bsnmpd/modules/Makefile.inc	2005/07/27 01:23:19	#3
+++ usr.sbin/bsnmpd/modules/Makefile.inc	2005/07/27 01:23:19
@@ -1,6 +1,6 @@
 # $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile.inc,v 1.10 2005/07/22 17:18:57 kensmith Exp $
 
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 WARNS?=		6
 INCSDIR=	${INCLUDEDIR}/bsnmp