aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/lib/libdialog/Makefile2
-rw-r--r--gnu/lib/libg2c/Makefile2
-rw-r--r--gnu/lib/libobjc/Makefile2
-rw-r--r--gnu/lib/libreadline/Makefile.inc2
-rw-r--r--gnu/lib/libregex/Makefile2
-rw-r--r--gnu/lib/libstdc++/Makefile2
-rw-r--r--kerberos5/lib/Makefile.inc2
-rw-r--r--lib/Makefile.inc2
-rw-r--r--lib/libalias/Makefile2
-rw-r--r--lib/libarchive/Makefile2
-rw-r--r--lib/libbegemot/Makefile2
-rw-r--r--lib/libbluetooth/Makefile2
-rw-r--r--lib/libbsnmp/Makefile.inc2
-rw-r--r--lib/libbz2/Makefile2
-rw-r--r--lib/libc_r/Makefile2
-rw-r--r--lib/libcrypt/Makefile2
-rw-r--r--lib/libdevstat/Makefile2
-rw-r--r--lib/libdevstat/devstat.h2
-rw-r--r--lib/libedit/Makefile2
-rw-r--r--lib/libexpat/Makefile2
-rw-r--r--lib/libfetch/Makefile2
-rw-r--r--lib/libftpio/Makefile2
-rw-r--r--lib/libgpib/Makefile2
-rw-r--r--lib/libipsec/Makefile2
-rw-r--r--lib/libkiconv/Makefile2
-rw-r--r--lib/libkse/Makefile2
-rw-r--r--lib/libmagic/Makefile2
-rw-r--r--lib/libmp/Makefile2
-rw-r--r--lib/libncp/Makefile2
-rw-r--r--lib/libncurses/Makefile2
-rw-r--r--lib/libnetgraph/Makefile2
-rw-r--r--lib/libngatm/Makefile2
-rw-r--r--lib/libopie/Makefile2
-rw-r--r--lib/libpam/Makefile.inc2
-rw-r--r--lib/libpthread/Makefile2
-rw-r--r--lib/libradius/Makefile2
-rw-r--r--lib/libsdp/Makefile2
-rw-r--r--lib/libsmb/Makefile2
-rw-r--r--lib/libtacplus/Makefile2
-rw-r--r--lib/libthr/Makefile2
-rw-r--r--lib/libthread_db/Makefile2
-rw-r--r--lib/libugidfw/Makefile2
-rw-r--r--lib/libusbhid/Makefile2
-rw-r--r--lib/libutil/Makefile2
-rw-r--r--lib/libvgl/Makefile2
-rw-r--r--lib/libwrap/Makefile2
-rw-r--r--lib/libypclnt/Makefile2
-rw-r--r--lib/msun/Makefile2
-rw-r--r--lib/ncurses/ncurses/Makefile2
-rw-r--r--secure/lib/libcrypto/Makefile2
-rw-r--r--secure/lib/libssh/Makefile2
-rw-r--r--secure/lib/libssl/Makefile2
-rw-r--r--usr.sbin/bsnmpd/modules/Makefile.inc2
53 files changed, 53 insertions, 53 deletions
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 1d6a6aa2f545..e2e171024bb0 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -5,7 +5,7 @@ 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
diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index 49a4ca646c77..0a2ed81d67d9 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -5,7 +5,7 @@ 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
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index 52f0d2c837b5..644aa37dd4f4 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -6,7 +6,7 @@ GCCDIR= ${.CURDIR}/../../../contrib/gcc
.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 \
diff --git a/gnu/lib/libreadline/Makefile.inc b/gnu/lib/libreadline/Makefile.inc
index 8e898af66e3f..2f2245268dad 100644
--- a/gnu/lib/libreadline/Makefile.inc
+++ b/gnu/lib/libreadline/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-SHLIB_MAJOR=5
+SHLIB_MAJOR=6
RL_LIBRARY_VERSION=5.0
SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile
index 56b6afdc53f8..777a09911cc9 100644
--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@@ -3,7 +3,7 @@
SUBDIR= doc
LIB= gnuregex
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
SRCS= gnuregex.c
INCSGROUPS= INCS WRINCS PXINCS
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 80fae1e91e78..dba2f1203650 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -9,7 +9,7 @@ SUPDIR= ${SRCDIR}/libsupc++
${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
diff --git a/kerberos5/lib/Makefile.inc b/kerberos5/lib/Makefile.inc
index ab7791b70369..2f21f36100aa 100644
--- a/kerberos5/lib/Makefile.inc
+++ b/kerberos5/lib/Makefile.inc
@@ -1,5 +1,5 @@
# $FreeBSD$
-SHLIB_MAJOR?= 7
+SHLIB_MAJOR?= 8
.include "../Makefile.inc"
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index a7e1d21b7f2f..ae850bab75eb 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?= 2
+SHLIB_MAJOR?= 3
diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile
index 448346738298..465216a9c1c3 100644
--- a/lib/libalias/Makefile
+++ b/lib/libalias/Makefile
@@ -4,7 +4,7 @@
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 \
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index 7c33278206d3..1428c82d5bb0 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -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}\"
diff --git a/lib/libbegemot/Makefile b/lib/libbegemot/Makefile
index aec42b669b02..1b728aa64588 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= 1
+SHLIB_MAJOR= 2
SHLIBDIR?= /lib
# WARNS?= 6
diff --git a/lib/libbluetooth/Makefile b/lib/libbluetooth/Makefile
index becd41b8dafc..200f7e1840c5 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= 1
+SHLIB_MAJOR= 2
SRCS= bluetooth.c
INCS= bluetooth.h
diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc
index 8a8fde0964bd..c5dec8d6bddf 100644
--- a/lib/libbsnmp/Makefile.inc
+++ b/lib/libbsnmp/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
WARNS?= 6
NO_WERROR=
INCSDIR= ${INCLUDEDIR}/bsnmp
diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile
index b76b11c9779c..1bd848e1bc87 100644
--- a/lib/libbz2/Makefile
+++ b/lib/libbz2/Makefile
@@ -4,7 +4,7 @@ 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
diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile
index 08512b3304ec..496c7e62484f 100644
--- a/lib/libc_r/Makefile
+++ b/lib/libc_r/Makefile
@@ -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
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index 20e660fb59d6..6082f6ae307f 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
LIB= crypt
SHLIBDIR?= /lib
diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile
index 11368f898b88..61b19947fb23 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= 4
+SHLIB_MAJOR= 5
SRCS= devstat.c
INCS= devstat.h
diff --git a/lib/libdevstat/devstat.h b/lib/libdevstat/devstat.h
index 7ffcf3b4b1a0..61b8ccbe9777 100644
--- a/lib/libdevstat/devstat.h
+++ b/lib/libdevstat/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 */
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index 49d58fdd9850..dcd79eae2f5a 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -3,7 +3,7 @@
# $FreeBSD$
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 \
diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile
index 496a12bcc446..cac2fccb7fae 100644
--- a/lib/libexpat/Makefile
+++ b/lib/libexpat/Makefile
@@ -4,7 +4,7 @@ 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
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index d247593c1360..1b69c4953208 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -18,7 +18,7 @@ LDADD= -lssl -lcrypto
CSTD?= c99
WARNS?= 2
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
ftperr.h: ftp.errors
@echo "static struct fetcherr _ftp_errlist[] = {" > ${.TARGET}
diff --git a/lib/libftpio/Makefile b/lib/libftpio/Makefile
index 4cce5d8f9b73..b803db8519b8 100644
--- a/lib/libftpio/Makefile
+++ b/lib/libftpio/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
LIB= ftpio
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 6
SRCS= ftpio.c ftperr.c
INCS= ftpio.h
diff --git a/lib/libgpib/Makefile b/lib/libgpib/Makefile
index 6009e7978b83..157ee699b56e 100644
--- a/lib/libgpib/Makefile
+++ b/lib/libgpib/Makefile
@@ -2,7 +2,7 @@
LIB = gpib
SHLIBDIR ?= /lib
-SHLIB_MAJOR = 0
+SHLIB_MAJOR = 1
NO_MAN = sorry
SRCS = ibfoo.c
INCS = gpib.h
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index 8aaa6c0a250f..2a60d93e9a55 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -29,7 +29,7 @@
LIB= ipsec
SHLIBDIR?= /lib
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
CFLAGS+=-I. -I${.CURDIR}
CFLAGS+=-DIPSEC_DEBUG -DIPSEC
.if !defined(NO_INET6)
diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile
index 763c5fd6eb1b..ad4f2f04ed76 100644
--- a/lib/libkiconv/Makefile
+++ b/lib/libkiconv/Makefile
@@ -5,7 +5,7 @@ SHLIBDIR?= /lib
SRCS= xlat16_iconv.c xlat16_sysctl.c
SRCS+= quirks.c
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
MAN= kiconv.3
diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile
index 65525aaa7734..aaa055ff9df6 100644
--- a/lib/libkse/Makefile
+++ b/lib/libkse/Makefile
@@ -12,7 +12,7 @@ LIB=kse
.else
LIB=pthread
.endif
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
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 7659fe65cc0d..59f96344ba34 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -5,7 +5,7 @@ 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 \
diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile
index 26ff2c88f284..51d395fb362b 100644
--- a/lib/libmp/Makefile
+++ b/lib/libmp/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
LIB= mp
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
MAN= libmp.3
INCS= mp.h
SRCS= mpasbn.c
diff --git a/lib/libncp/Makefile b/lib/libncp/Makefile
index d93b9169d41c..ab1689c0e3c9 100644
--- a/lib/libncp/Makefile
+++ b/lib/libncp/Makefile
@@ -4,7 +4,7 @@ NCPLIB=${.CURDIR}
LIB= ncp
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
NO_MAN=
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index 7eaa4dec71b9..d372af0fded8 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -4,7 +4,7 @@ NCURSES=${.CURDIR}/../../contrib/ncurses
LIB= ncurses
SHLIBDIR?= /lib
-SHLIB_MAJOR=5
+SHLIB_MAJOR=6
# Should be elsewhere
AWK?= awk
diff --git a/lib/libnetgraph/Makefile b/lib/libnetgraph/Makefile
index 42c9cd39112b..42596e238ed7 100644
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@@ -5,7 +5,7 @@ LIB= netgraph
WARNS?= 3
MAN= netgraph.3
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SRCS= sock.c msg.c debug.c
INCS= netgraph.h
diff --git a/lib/libngatm/Makefile b/lib/libngatm/Makefile
index 36709141187a..d53a61216144 100644
--- a/lib/libngatm/Makefile
+++ b/lib/libngatm/Makefile
@@ -3,7 +3,7 @@
# 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
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index f26ec1ddf725..5b6740ed61e5 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= 3
+SHLIB_MAJOR= 4
KEYFILE?= \"/etc/opiekeys\"
diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc
index 1374326fbcd4..9fefb468d485 100644
--- a/lib/libpam/Makefile.inc
+++ b/lib/libpam/Makefile.inc
@@ -28,5 +28,5 @@
DEBUG_FLAGS+= -DDEBUG
.endif
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
PAM_MOD_DIR= ${LIBDIR}
diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
index 65525aaa7734..aaa055ff9df6 100644
--- a/lib/libpthread/Makefile
+++ b/lib/libpthread/Makefile
@@ -12,7 +12,7 @@ LIB=kse
.else
LIB=pthread
.endif
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
CFLAGS+=-DPTHREAD_KERNEL
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
-I${.CURDIR}/../../include
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index 61eef25f82e9..98d7b345bf34 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -28,7 +28,7 @@ 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)
diff --git a/lib/libsdp/Makefile b/lib/libsdp/Makefile
index c4ee1957bcd3..bf71fe3e9a93 100644
--- a/lib/libsdp/Makefile
+++ b/lib/libsdp/Makefile
@@ -7,7 +7,7 @@ MAN= sdp.3
WARNS?= 2
CFLAGS+= -I${.CURDIR}
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SRCS= search.c service.c session.c util.c
INCS= sdp.h
diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile
index 4699c475849d..371b0454973f 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= 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 \
diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile
index 58cbcf3b2fcf..f39f27143cb1 100644
--- a/lib/libtacplus/Makefile
+++ b/lib/libtacplus/Makefile
@@ -30,7 +30,7 @@ INCS= taclib.h
CFLAGS+= -Wall
DPADD= ${LIBMD}
LDADD= -lmd
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
MAN= libtacplus.3 tacplus.conf.5
.include <bsd.lib.mk>
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index 126fc5e7c52b..57dd9790eaf7 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -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
diff --git a/lib/libthread_db/Makefile b/lib/libthread_db/Makefile
index fda5afec1edb..53f5500adc2b 100644
--- a/lib/libthread_db/Makefile
+++ b/lib/libthread_db/Makefile
@@ -3,7 +3,7 @@
.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
diff --git a/lib/libugidfw/Makefile b/lib/libugidfw/Makefile
index 5ba44b0c2436..bdcb5ca11d59 100644
--- a/lib/libugidfw/Makefile
+++ b/lib/libugidfw/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
LIB= ugidfw
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SRCS= ugidfw.c
INCS= ugidfw.h
diff --git a/lib/libusbhid/Makefile b/lib/libusbhid/Makefile
index 208d32d2561a..4c6ad06daec8 100644
--- a/lib/libusbhid/Makefile
+++ b/lib/libusbhid/Makefile
@@ -4,7 +4,7 @@
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 \
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 7157c51994b3..0cab08abba6d 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
LIB= util
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
SHLIBDIR?= /lib
CFLAGS+=-DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../libc/gen/
CFLAGS+=-DINET6
diff --git a/lib/libvgl/Makefile b/lib/libvgl/Makefile
index 227ad7ac48f0..6f88eeb0beda 100644
--- a/lib/libvgl/Makefile
+++ b/lib/libvgl/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
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
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 8748b5cab078..1f3ccd0cbd3b 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -3,7 +3,7 @@
#
LIB= wrap
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
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 6e5de685fe01..de237de07534 100644
--- a/lib/libypclnt/Makefile
+++ b/lib/libypclnt/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
LIB= ypclnt
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SRCS= ypclnt_connect.c \
ypclnt_error.c \
ypclnt_free.c \
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 44c99477a891..b6452c6cd579 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -26,7 +26,7 @@ ARCH_SUBDIR= ${MACHINE_ARCH}
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 \
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 7eaa4dec71b9..d372af0fded8 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -4,7 +4,7 @@ NCURSES=${.CURDIR}/../../contrib/ncurses
LIB= ncurses
SHLIBDIR?= /lib
-SHLIB_MAJOR=5
+SHLIB_MAJOR=6
# Should be elsewhere
AWK?= awk
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 88a0eb35d7a9..5c22f97b0440 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -2,7 +2,7 @@
LIB= crypto
SHLIBDIR?= /lib
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
NO_LINT=
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index b290c86dc908..70deccb76b6b 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
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 \
diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index 697642606333..4db4b0a4d7c5 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
LIB= ssl
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
NO_LINT=
diff --git a/usr.sbin/bsnmpd/modules/Makefile.inc b/usr.sbin/bsnmpd/modules/Makefile.inc
index 603ba399ac08..eb4a8676c616 100644
--- a/usr.sbin/bsnmpd/modules/Makefile.inc
+++ b/usr.sbin/bsnmpd/modules/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
WARNS?= 6
INCSDIR= ${INCLUDEDIR}/bsnmp