From f675e8b5a14a69e79cade599a3cf524d7dce42a3 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Thu, 21 Apr 2005 13:42:34 +0000 Subject: [PATCH] Bump major numbers in preparation for libc work. --- gnu/lib/gcc34/libobjc/Makefile | 4 ++-- gnu/lib/gcc34/libstdc++/Makefile | 4 ++-- gnu/lib/libdialog/Makefile | 5 ++--- gnu/lib/libg2c/Makefile | 5 ++--- gnu/lib/libreadline/Makefile.inc | 4 ++-- gnu/lib/libregex/Makefile | 3 +-- kerberos5/lib/Makefile.inc | 4 ++-- lib/Makefile.inc | 4 ++-- lib/libalias/Makefile | 5 ++--- lib/libarchive/Makefile | 4 ++-- lib/libbz2/Makefile | 5 ++--- lib/libc/Makefile | 5 ++--- lib/libc_r/Makefile | 5 ++--- lib/libcaps/Makefile | 5 ++--- lib/libcr/Makefile | 5 ++--- lib/libcrypt/Makefile | 4 ++-- lib/libedit/Makefile | 5 ++--- lib/libfetch/Makefile | 5 ++--- lib/libftpio/Makefile | 4 ++-- lib/libiberty/Makefile | 4 ++-- lib/libipsec/Makefile | 5 ++--- lib/libisc/Makefile | 5 ++--- lib/libkcore/Makefile | 4 ++-- lib/libkinfo/Makefile | 4 ++-- lib/libmagic/Makefile | 4 ++-- lib/libncp/Makefile | 5 ++--- lib/libncurses/Makefile.inc | 5 ++--- lib/libnetgraph/Makefile | 5 ++--- lib/libopie/Makefile | 5 ++--- lib/libpam/Makefile.inc | 5 ++--- lib/libpcap/Makefile | 5 ++--- lib/libradius/Makefile | 5 ++--- lib/libsmb/Makefile | 5 ++--- lib/libtacplus/Makefile | 5 ++--- lib/libthread_xu/Makefile | 5 ++--- lib/libusbhid/Makefile | 5 ++--- lib/libutil/Makefile | 5 ++--- lib/libvgl/Makefile | 4 +--- lib/libwrap/Makefile | 5 ++--- lib/libxpg4/Makefile | 6 ++---- lib/liby/Makefile | 5 ++--- secure/lib/libcrypto/Makefile | 4 ++-- secure/lib/libssl/Makefile | 4 ++-- 43 files changed, 84 insertions(+), 115 deletions(-) diff --git a/gnu/lib/gcc34/libobjc/Makefile b/gnu/lib/gcc34/libobjc/Makefile index 465f3ffb62..d5c784435a 100644 --- a/gnu/lib/gcc34/libobjc/Makefile +++ b/gnu/lib/gcc34/libobjc/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/gnu/lib/gcc34/libobjc/Makefile,v 1.3 2005/02/09 22:46:58 joerg Exp $ +# $DragonFly: src/gnu/lib/gcc34/libobjc/Makefile,v 1.4 2005/04/21 13:42:33 joerg Exp $ GCC_NO_PATH= 1 .include "../Makefile.inc" @@ -9,7 +9,7 @@ GCC_NO_PATH= 1 CFLAGS+= -I${GCCDIR}/libobjc/objc -I. -DIN_TARGET_LIBS LIB= objc -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= NXConstStr.m Object.m Protocol.m archive.c class.c encoding.c SRCS+= gc.c hash.c init.c linking.m misc.c nil_method.c objects.c diff --git a/gnu/lib/gcc34/libstdc++/Makefile b/gnu/lib/gcc34/libstdc++/Makefile index bd09f6c212..d275a51c92 100644 --- a/gnu/lib/gcc34/libstdc++/Makefile +++ b/gnu/lib/gcc34/libstdc++/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/gnu/lib/gcc34/libstdc++/Makefile,v 1.1 2004/06/14 22:27:52 joerg Exp $ +# $DragonFly: src/gnu/lib/gcc34/libstdc++/Makefile,v 1.2 2005/04/21 13:42:33 joerg Exp $ .include "../Makefile.inc" @@ -20,7 +20,7 @@ SUPDIR= ${SRCDIR}/libsupc++ #SUBDIR= doc LIB= stdc++ -SHLIB_MAJOR= 6 +SHLIB_MAJOR= 7 CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR}/gcc -I${GCCDIR}/include diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile index 54a7830406..879df154d4 100644 --- a/gnu/lib/libdialog/Makefile +++ b/gnu/lib/libdialog/Makefile @@ -1,13 +1,12 @@ # Makefile for libdialog # $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.31.2.5 2002/08/07 16:31:43 ru Exp $ -# $DragonFly: src/gnu/lib/libdialog/Makefile,v 1.2 2003/06/17 04:25:43 dillon Exp $ +# $DragonFly: src/gnu/lib/libdialog/Makefile,v 1.3 2005/04/21 13:42:33 joerg Exp $ LIB= dialog INCS= dialog.h MAN= dialog.3 -SHLIB_MAJOR= 4 -SHLIB_MINOR= 0 +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 b1b788aadf..8366acad43 100644 --- a/gnu/lib/libg2c/Makefile +++ b/gnu/lib/libg2c/Makefile @@ -1,13 +1,12 @@ # $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.8.2.1 2002/07/22 14:21:44 ru Exp $ -# $DragonFly: src/gnu/lib/libg2c/Attic/Makefile,v 1.2 2003/06/17 04:25:44 dillon Exp $ +# $DragonFly: src/gnu/lib/libg2c/Attic/Makefile,v 1.3 2005/04/21 13:42:33 joerg Exp $ SRCDIR= ${.CURDIR}/../../../contrib/libf2c .PATH: ${SRCDIR} ${SRCDIR}/libU77 ${SRCDIR}/libF77 ${SRCDIR}/libI77 LIB= g2c -SHLIB_MAJOR= 1 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 2 # Traditional FORTRAN Library members defined in libF77 diff --git a/gnu/lib/libreadline/Makefile.inc b/gnu/lib/libreadline/Makefile.inc index d5798d77e8..c298da470c 100644 --- a/gnu/lib/libreadline/Makefile.inc +++ b/gnu/lib/libreadline/Makefile.inc @@ -1,7 +1,7 @@ # $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.4.2.1 2000/07/06 23:11:07 ache Exp $ -# $DragonFly: src/gnu/lib/libreadline/Attic/Makefile.inc,v 1.3 2004/10/23 16:58:53 joerg Exp $ +# $DragonFly: src/gnu/lib/libreadline/Attic/Makefile.inc,v 1.4 2005/04/21 13:42:33 joerg Exp $ -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 6 RL_LIBRARY_VERSION= 5.0 RLDIR= ${.CURDIR}/${RELATIVE}../../../../contrib/readline-5.0 diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile index 7971c0266c..dac6756a4a 100644 --- a/gnu/lib/libregex/Makefile +++ b/gnu/lib/libregex/Makefile @@ -1,11 +1,10 @@ # $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.22.2.1 2002/07/22 14:21:45 ru Exp $ -# $DragonFly: src/gnu/lib/libregex/Makefile,v 1.2 2003/06/17 04:25:44 dillon Exp $ +# $DragonFly: src/gnu/lib/libregex/Makefile,v 1.3 2005/04/21 13:42:33 joerg Exp $ SUBDIR+= doc LIB= gnuregex SHLIB_MAJOR= 2 -SHLIB_MINOR= 0 SRCS= regex.c INCS= regex.h diff --git a/kerberos5/lib/Makefile.inc b/kerberos5/lib/Makefile.inc index 50a0cb7213..65a2b85951 100644 --- a/kerberos5/lib/Makefile.inc +++ b/kerberos5/lib/Makefile.inc @@ -1,7 +1,7 @@ # $FreeBSD: src/kerberos5/lib/Makefile.inc,v 1.6 2003/10/09 19:48:45 nectar Exp $ -# $DragonFly: src/kerberos5/lib/Makefile.inc,v 1.3 2005/01/16 14:25:46 eirikn Exp $ +# $DragonFly: src/kerberos5/lib/Makefile.inc,v 1.4 2005/04/21 13:42:33 joerg Exp $ -SHLIB_MAJOR?= 7 +SHLIB_MAJOR?= 8 CFLAGS+=-I${.OBJDIR}/../../lib/libroken -I${.OBJDIR}/../../lib/libasn1 \ -I${.OBJDIR}/../../lib/libkrb5 -I${KRB5DIR}/lib/roken \ diff --git a/lib/Makefile.inc b/lib/Makefile.inc index 62677fda48..dd0880fc86 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -1,3 +1,3 @@ +# $DragonFly: src/lib/Makefile.inc,v 1.2 2005/04/21 13:42:33 joerg Exp $ # Default version for system libs (override in /Makefile if necessary) -SHLIB_MAJOR?= 2 -SHLIB_MINOR?= 0 +SHLIB_MAJOR?= 3 diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile index 5ded1deac4..f8246479f7 100644 --- a/lib/libalias/Makefile +++ b/lib/libalias/Makefile @@ -1,9 +1,8 @@ # $FreeBSD: src/lib/libalias/Makefile,v 1.13.2.5 2002/07/24 03:21:24 luigi Exp $ -# $DragonFly: src/lib/libalias/Makefile,v 1.2 2003/06/17 04:26:41 dillon Exp $ +# $DragonFly: src/lib/libalias/Makefile,v 1.3 2005/04/21 13:42:33 joerg Exp $ LIB= alias -SHLIB_MAJOR= 4 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 5 CFLAGS+= -Wall -Wmissing-prototypes .if defined(IPFW2) CFLAGS+= -DIPFW2 diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index a1ab1cc8c1..cc03eb09a7 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/lib/libarchive/Makefile,v 1.1 2004/11/10 18:02:24 joerg Exp $ +# $DragonFly: src/lib/libarchive/Makefile,v 1.2 2005/04/21 13:42:33 joerg Exp $ LIB= archive @@ -9,7 +9,7 @@ CONTRIBDIR= ${.CURDIR}/../../contrib/libarchive VERSION= 1.01.015 ARCHIVE_API_FEATURE= 2 ARCHIVE_API_VERSION= 1 -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 CFLAGS+= -DPACKAGE_NAME=\"lib${LIB}\" CFLAGS+= -DPACKAGE_VERSION=\"${VERSION}\" CFLAGS+= -DHAVE_CONFIG_H diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile index 530f7fe03f..34220870e4 100644 --- a/lib/libbz2/Makefile +++ b/lib/libbz2/Makefile @@ -1,12 +1,11 @@ # $FreeBSD: src/lib/libbz2/Makefile,v 1.2.2.2 2002/07/22 14:21:49 ru Exp $ -# $DragonFly: src/lib/libbz2/Makefile,v 1.3 2004/01/31 06:56:38 dillon Exp $ +# $DragonFly: src/lib/libbz2/Makefile,v 1.4 2005/04/21 13:42:33 joerg Exp $ BZ2DIR= ${.CURDIR}/../../contrib/bzip2 .PATH: ${BZ2DIR} LIB= bz2 -SHLIB_MAJOR= 1 -SHLIB_MINOR= 0 +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/Makefile b/lib/libc/Makefile index 928a314e70..b2a4c3ce49 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 # $FreeBSD: src/lib/libc/Makefile,v 1.24 1999/09/29 15:18:29 marcel Exp $ -# $DragonFly: src/lib/libc/Makefile,v 1.7 2005/03/20 17:46:31 joerg Exp $ +# $DragonFly: src/lib/libc/Makefile,v 1.8 2005/04/21 13:42:33 joerg Exp $ # # All library objects contain rcsid strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -8,8 +8,7 @@ # from CFLAGS below. To remove these strings from just the system call # stubs, remove just -DSYSLIBC_RCS from CFLAGS. LIB=c -SHLIB_MAJOR= 4 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 5 CFLAGS+=-DLIBC_RCS -DSYSLIBC_RCS -I${.CURDIR}/include AINC= -I${.CURDIR}/${MACHINE_ARCH} CLEANFILES+=tags diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile index 9c190538be..83c5d27c6d 100644 --- a/lib/libc_r/Makefile +++ b/lib/libc_r/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/lib/libc_r/Makefile,v 1.24.2.7 2002/10/22 14:44:02 fjoe Exp $ -# $DragonFly: src/lib/libc_r/Makefile,v 1.4 2005/03/20 17:46:31 joerg Exp $ +# $DragonFly: src/lib/libc_r/Makefile,v 1.5 2005/04/21 13:42:33 joerg Exp $ # # All library objects contain rcsid strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -7,8 +7,7 @@ # from CFLAGS below. To remove these strings from just the system call # stubs, remove just -DSYSLIBC_RCS from CFLAGS. LIB=c_r -SHLIB_MAJOR= 4 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 5 CFLAGS+=-DLIBC_RCS -DSYSLIBC_RCS -I${.CURDIR}/../libc/include CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE -I${.CURDIR}/uthread CFLAGS+=-I${.CURDIR}/../../include diff --git a/lib/libcaps/Makefile b/lib/libcaps/Makefile index 9dc30be6e4..95d4567770 100644 --- a/lib/libcaps/Makefile +++ b/lib/libcaps/Makefile @@ -1,8 +1,7 @@ -# $DragonFly: src/lib/libcaps/Makefile,v 1.5 2004/03/07 23:36:43 dillon Exp $ +# $DragonFly: src/lib/libcaps/Makefile,v 1.6 2005/04/21 13:42:33 joerg Exp $ # LIB=caps -SHLIB_MAJOR= 1 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 2 AINC= -I${.CURDIR}/${MACHINE_ARCH} -I${.OBJDIR} CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/${MACHINE_ARCH} CFLAGS+= -DSMP -D_UTHREAD diff --git a/lib/libcr/Makefile b/lib/libcr/Makefile index ccbfec20a3..c75c84acad 100644 --- a/lib/libcr/Makefile +++ b/lib/libcr/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 # $FreeBSD: src/lib/libc/Makefile,v 1.24 1999/09/29 15:18:29 marcel Exp $ -# $DragonFly: src/lib/libcr/Attic/Makefile,v 1.4 2004/08/12 19:59:29 eirikn Exp $ +# $DragonFly: src/lib/libcr/Attic/Makefile,v 1.5 2005/04/21 13:42:33 joerg Exp $ # # All library objects contain rcsid strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -8,8 +8,7 @@ # from CFLAGS below. To remove these strings from just the system call # stubs, remove just -DSYSLIBC_RCS from CFLAGS. LIB=cr -SHLIB_MAJOR= 4 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 5 CFLAGS+=-DLIBC_RCS -DSYSLIBC_RCS -I${.CURDIR}/include AINC= -I${.CURDIR}/${MACHINE_ARCH} CLEANFILES+=tags diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index d0235f9495..9fc3b61e73 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -1,9 +1,9 @@ # # $FreeBSD: src/lib/libcrypt/Makefile,v 1.24.2.4 2001/07/16 03:28:26 peter Exp $ -# $DragonFly: src/lib/libcrypt/Makefile,v 1.3 2003/08/03 16:45:15 dillon Exp $ +# $DragonFly: src/lib/libcrypt/Makefile,v 1.4 2005/04/21 13:42:33 joerg Exp $ # -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 LIB= crypt .PATH: ${.CURDIR}/../libmd diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile index 3c5f06652d..ef58b105be 100644 --- a/lib/libedit/Makefile +++ b/lib/libedit/Makefile @@ -1,10 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libedit/Makefile,v 1.18.2.2 2002/07/23 10:20:19 ru Exp $ -# $DragonFly: src/lib/libedit/Makefile,v 1.2 2003/06/17 04:26:49 dillon Exp $ +# $DragonFly: src/lib/libedit/Makefile,v 1.3 2005/04/21 13:42:33 joerg Exp $ LIB= edit -SHLIB_MAJOR= 3 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 4 OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \ parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile index e8fe929140..179f8c7ddf 100644 --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/lib/libfetch/Makefile,v 1.14.2.5 2003/01/09 11:50:32 des Exp $ -# $DragonFly: src/lib/libfetch/Makefile,v 1.6 2005/02/28 13:09:24 joerg Exp $ +# $DragonFly: src/lib/libfetch/Makefile,v 1.7 2005/04/21 13:42:33 joerg Exp $ LIB= fetch WARNS?= 6 @@ -17,8 +17,7 @@ DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto .endif -SHLIB_MAJOR= 3 -SHLIB_MINOR= 0 +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 7a2b1fdbb4..fed70140a6 100644 --- a/lib/libftpio/Makefile +++ b/lib/libftpio/Makefile @@ -1,8 +1,8 @@ # $FreeBSD: src/lib/libftpio/Makefile,v 1.9.2.2 2001/04/25 10:04:30 ru Exp $ -# $DragonFly: src/lib/libftpio/Makefile,v 1.3 2004/08/16 12:59:21 joerg Exp $ +# $DragonFly: src/lib/libftpio/Makefile,v 1.4 2005/04/21 13:42:33 joerg Exp $ LIB= ftpio -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 7 SRCS= ftpio.c ftperr.c INCS= ftpio.h diff --git a/lib/libiberty/Makefile b/lib/libiberty/Makefile index 62129deedf..0b5d146ba7 100644 --- a/lib/libiberty/Makefile +++ b/lib/libiberty/Makefile @@ -1,7 +1,7 @@ -# $DragonFly: src/lib/libiberty/Makefile,v 1.3 2004/10/23 12:15:21 joerg Exp $ +# $DragonFly: src/lib/libiberty/Makefile,v 1.4 2005/04/21 13:42:33 joerg Exp $ LIB= iberty -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= argv.c concat.c hex.c SRCS+= lbasename.c lrealpath.c SRCS+= xatexit.c xexit.c diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile index 0a9498945c..2e666d66bc 100644 --- a/lib/libipsec/Makefile +++ b/lib/libipsec/Makefile @@ -25,11 +25,10 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # $FreeBSD: src/lib/libipsec/Makefile,v 1.2.2.3 2001/04/25 10:04:30 ru Exp $ -# $DragonFly: src/lib/libipsec/Makefile,v 1.2 2003/06/17 04:26:49 dillon Exp $ +# $DragonFly: src/lib/libipsec/Makefile,v 1.3 2005/04/21 13:42:33 joerg Exp $ LIB= ipsec -SHLIB_MAJOR= 1 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 2 CFLAGS+=-I. -I${.CURDIR} CFLAGS+=-DIPSEC_DEBUG -DIPSEC .if !defined(NOINET6) diff --git a/lib/libisc/Makefile b/lib/libisc/Makefile index 6ec115c0d5..12c5d6a540 100644 --- a/lib/libisc/Makefile +++ b/lib/libisc/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/lib/libisc/Makefile,v 1.1.2.6 2002/07/22 14:21:49 ru Exp $ -# $DragonFly: src/lib/libisc/Makefile,v 1.6 2004/10/02 03:08:07 dillon Exp $ +# $DragonFly: src/lib/libisc/Makefile,v 1.7 2005/04/21 13:42:33 joerg Exp $ BIND_DIR= ${.CURDIR}/../../contrib/bind-9.2.4rc7 @@ -7,8 +7,7 @@ BIND_DIR= ${.CURDIR}/../../contrib/bind-9.2.4rc7 .include "${BIND_DIR}/lib/isc/api" LIB= isc -SHLIB_MAJOR= 1 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 2 .PATH: ${BIND_DIR}/lib SRCS+= isc/nls/msgcat.c diff --git a/lib/libkcore/Makefile b/lib/libkcore/Makefile index 840ba90bfc..e80bab62c5 100644 --- a/lib/libkcore/Makefile +++ b/lib/libkcore/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/lib/libkcore/Makefile,v 1.2 2004/12/22 11:01:49 joerg Exp $ +# $DragonFly: src/lib/libkcore/Makefile,v 1.3 2005/04/21 13:42:34 joerg Exp $ .PATH: ${.CURDIR}/../../sys/kern @@ -12,6 +12,6 @@ NOMAN= CFLAGS+= -I${.CURDIR} -g WARNS?= 6 -SHLIB_MAJOR?= 1 +SHLIB_MAJOR?= 2 .include diff --git a/lib/libkinfo/Makefile b/lib/libkinfo/Makefile index b78ed8b00c..778ffc6ea3 100644 --- a/lib/libkinfo/Makefile +++ b/lib/libkinfo/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/lib/libkinfo/Makefile,v 1.3 2004/12/22 11:01:49 joerg Exp $ +# $DragonFly: src/lib/libkinfo/Makefile,v 1.4 2005/04/21 13:42:34 joerg Exp $ LIB= kinfo SRCS= kinfo_file.c kinfo_sched.c kinfo_tty.c kinfo_vfs.c @@ -8,6 +8,6 @@ NOMAN= CFLAGS+= -I${.CURDIR} WARNS?= 6 -SHLIB_MAJOR?= 1 +SHLIB_MAJOR?= 2 .include diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index eef01b3834..77546bfaf7 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/lib/libmagic/Makefile,v 1.6 2005/03/02 03:13:01 joerg Exp $ +# $DragonFly: src/lib/libmagic/Makefile,v 1.7 2005/04/21 13:42:34 joerg Exp $ FILEVER= 4.12 MAGICDIR= ${.CURDIR}/../../contrib/file-${FILEVER}/magic @@ -8,7 +8,7 @@ SRCDIR= ${.CURDIR}/../../contrib/file-${FILEVER}/src MAGIC= /usr/share/misc/magic LIB= magic -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c\ is_tar.c magic.c print.c readelf.c softmagic.c diff --git a/lib/libncp/Makefile b/lib/libncp/Makefile index 7e58ffffb8..9f4b5cff08 100644 --- a/lib/libncp/Makefile +++ b/lib/libncp/Makefile @@ -1,12 +1,11 @@ # $FreeBSD: src/lib/libncp/Makefile,v 1.3 1999/11/12 15:09:56 peter Exp $ -# $DragonFly: src/lib/libncp/Makefile,v 1.2 2003/06/17 04:26:50 dillon Exp $ +# $DragonFly: src/lib/libncp/Makefile,v 1.3 2005/04/21 13:42:34 joerg Exp $ NCPLIB=${.CURDIR} LIB= ncp -SHLIB_MAJOR= 1 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 2 NOMAN= diff --git a/lib/libncurses/Makefile.inc b/lib/libncurses/Makefile.inc index 9cefc16922..2815ebf918 100644 --- a/lib/libncurses/Makefile.inc +++ b/lib/libncurses/Makefile.inc @@ -1,4 +1,4 @@ -# $DragonFly: src/lib/libncurses/Makefile.inc,v 1.3 2005/03/14 15:15:13 joerg Exp $ +# $DragonFly: src/lib/libncurses/Makefile.inc,v 1.4 2005/04/21 13:42:34 joerg Exp $ NCURSESDIR= ${.CURDIR}/../../../contrib/ncurses-5.4/ @@ -6,5 +6,4 @@ CFLAGS+= -I${NCURSESDIR}/include/ CFLAGS+= -I${.CURDIR}/../include/ CFLAGS+= -I${.CURDIR} -I${.OBJDIR} -SHLIB_MAJOR= 5 -SHLIB_MINOR= 4 +SHLIB_MAJOR= 6 diff --git a/lib/libnetgraph/Makefile b/lib/libnetgraph/Makefile index 83d2b3234f..22b7b3434d 100644 --- a/lib/libnetgraph/Makefile +++ b/lib/libnetgraph/Makefile @@ -1,12 +1,11 @@ # $FreeBSD: src/lib/libnetgraph/Makefile,v 1.4.2.2 2001/04/25 10:04:35 ru Exp $ -# $DragonFly: src/lib/libnetgraph/Makefile,v 1.2 2003/06/17 04:26:50 dillon Exp $ +# $DragonFly: src/lib/libnetgraph/Makefile,v 1.3 2005/04/21 13:42:34 joerg Exp $ # $Whistle: Makefile,v 1.4 1999/01/17 03:41:02 julian Exp $ LIB= netgraph MAN= netgraph.3 -SHLIB_MAJOR= 1 -#SHLIB_MINOR= 1 +SHLIB_MAJOR= 2 SRCS= sock.c msg.c debug.c INCS= netgraph.h diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile index 8ce2b71989..36d6dc1194 100644 --- a/lib/libopie/Makefile +++ b/lib/libopie/Makefile @@ -1,12 +1,11 @@ # Makefile for libopie # # $FreeBSD: src/lib/libopie/Makefile,v 1.10.2.3 2002/07/15 14:17:08 des Exp $ -# $DragonFly: src/lib/libopie/Makefile,v 1.2 2003/06/17 04:26:50 dillon Exp $ +# $DragonFly: src/lib/libopie/Makefile,v 1.3 2005/04/21 13:42:34 joerg Exp $ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} -SHLIB_MAJOR= 2 -SHLIB_MINOR= 1 +SHLIB_MAJOR= 3 KEYFILE?= \"/etc/opiekeys\" diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc index 9fe08ba232..523654574e 100644 --- a/lib/libpam/Makefile.inc +++ b/lib/libpam/Makefile.inc @@ -23,7 +23,6 @@ # SUCH DAMAGE. # # $FreeBSD: src/lib/libpam/Makefile.inc,v 1.1.1.1 1998/11/18 01:44:37 jdp Exp $ -# $DragonFly: src/lib/libpam/Attic/Makefile.inc,v 1.2 2003/06/17 04:26:50 dillon Exp $ +# $DragonFly: src/lib/libpam/Attic/Makefile.inc,v 1.3 2005/04/21 13:42:34 joerg Exp $ -SHLIB_MAJOR= 1 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 2 diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index 01e0619e7a..6dbc141982 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -1,6 +1,6 @@ # Makefile for libpcap # $FreeBSD: src/lib/libpcap/Makefile,v 1.24.2.4 2002/07/22 14:21:50 ru Exp $ -# $DragonFly: src/lib/libpcap/Makefile,v 1.6 2004/07/23 13:03:20 eirikn Exp $ +# $DragonFly: src/lib/libpcap/Makefile,v 1.7 2005/04/21 13:42:34 joerg Exp $ LIB= pcap SRCS= grammar.y tokdefs.h pcap-bpf.c version.h \ @@ -17,8 +17,7 @@ CFLAGS+=-D_U_="__attribute__((unused))" CFLAGS+=-DINET6 .endif -SHLIB_MAJOR=2 -SHLIB_MINOR=5 +SHLIB_MAJOR=3 # # Magic to grab sources out of src/contrib diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile index 4fa7560c70..ffe78ddf4d 100644 --- a/lib/libradius/Makefile +++ b/lib/libradius/Makefile @@ -23,15 +23,14 @@ # SUCH DAMAGE. # # $FreeBSD: src/lib/libradius/Makefile,v 1.3.2.2 2002/06/17 02:24:57 brian Exp $ -# $DragonFly: src/lib/libradius/Makefile,v 1.3 2005/04/20 20:45:57 joerg Exp $ +# $DragonFly: src/lib/libradius/Makefile,v 1.4 2005/04/21 13:42:34 joerg Exp $ LIB= radius SRCS= radlib.c INCS= radlib.h radlib_vs.h DPADD+= ${LIBMD} LDADD+= -lmd -SHLIB_MAJOR= 1 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 2 MAN= libradius.3 radius.conf.5 WARNS?= 6 diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile index 22f72aaf50..620822252e 100644 --- a/lib/libsmb/Makefile +++ b/lib/libsmb/Makefile @@ -1,10 +1,9 @@ # $FreeBSD: src/lib/libsmb/Makefile,v 1.1.2.2 2001/12/20 09:21:31 sheldonh Exp $ -# $DragonFly: src/lib/libsmb/Makefile,v 1.2 2003/06/17 04:26:51 dillon Exp $ +# $DragonFly: src/lib/libsmb/Makefile,v 1.3 2005/04/21 13:42:34 joerg Exp $ LIB= smb -SHLIB_MAJOR= 1 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 2 NOMAN= diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile index 1d03215af6..4a4430abc1 100644 --- a/lib/libtacplus/Makefile +++ b/lib/libtacplus/Makefile @@ -23,7 +23,7 @@ # SUCH DAMAGE. # # $FreeBSD: src/lib/libtacplus/Makefile,v 1.2.2.2 2002/10/09 08:50:42 pst Exp $ -# $DragonFly: src/lib/libtacplus/Makefile,v 1.2 2003/06/17 04:26:51 dillon Exp $ +# $DragonFly: src/lib/libtacplus/Makefile,v 1.3 2005/04/21 13:42:34 joerg Exp $ LIB= tacplus SRCS= taclib.c @@ -31,8 +31,7 @@ INCS= taclib.h CFLAGS+= -Wall DPADD+= ${LIBMD} LDADD+= -lmd -SHLIB_MAJOR= 1 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 2 MAN= libtacplus.3 tacplus.conf.5 .include diff --git a/lib/libthread_xu/Makefile b/lib/libthread_xu/Makefile index fab2337ea7..b9e334bc88 100644 --- a/lib/libthread_xu/Makefile +++ b/lib/libthread_xu/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/lib/libpthread/Makefile,v 1.53 2004/10/24 15:32:32 ru Exp $ -# $DragonFly: src/lib/libthread_xu/Makefile,v 1.2 2005/03/29 19:26:20 joerg Exp $ +# $DragonFly: src/lib/libthread_xu/Makefile,v 1.3 2005/04/21 13:42:34 joerg 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 @@ -9,8 +9,7 @@ # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. LIB=thread_xu -SHLIB_MAJOR= 1 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 2 CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include diff --git a/lib/libusbhid/Makefile b/lib/libusbhid/Makefile index cbe26ddc4f..18fbf49b65 100644 --- a/lib/libusbhid/Makefile +++ b/lib/libusbhid/Makefile @@ -1,12 +1,11 @@ # $NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $ # $FreeBSD: src/lib/libusbhid/Makefile,v 1.6 2002/03/28 18:44:24 joe Exp $ -# $DragonFly: src/lib/libusbhid/Makefile,v 1.3 2004/01/31 06:56:39 dillon Exp $ +# $DragonFly: src/lib/libusbhid/Makefile,v 1.4 2005/04/21 13:42:34 joerg Exp $ LIB= usbhid MAN= usbhid.3 -SHLIB_MAJOR= 0 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 1 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 b334afcbb4..762ef1263e 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -1,10 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libutil/Makefile,v 1.33.2.4 2001/04/25 10:04:42 ru Exp $ -# $DragonFly: src/lib/libutil/Makefile,v 1.4 2004/11/05 17:05:26 dillon Exp $ +# $DragonFly: src/lib/libutil/Makefile,v 1.5 2005/04/21 13:42:34 joerg Exp $ LIB= util -SHLIB_MAJOR= 3 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 4 CFLAGS+=-Wall -DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../../sys CFLAGS+=-DINET6 SRCS= login.c login_tty.c logout.c logwtmp.c pty.c \ diff --git a/lib/libvgl/Makefile b/lib/libvgl/Makefile index b318b7b2f5..abae232753 100644 --- a/lib/libvgl/Makefile +++ b/lib/libvgl/Makefile @@ -1,8 +1,6 @@ # $FreeBSD: src/lib/libvgl/Makefile,v 1.6.2.1 2001/04/25 10:04:43 ru Exp $ -# $DragonFly: src/lib/libvgl/Makefile,v 1.2 2003/06/17 04:26:52 dillon Exp $ +# $DragonFly: src/lib/libvgl/Makefile,v 1.3 2005/04/21 13:42:34 joerg Exp $ LIB= vgl -SHLIB_MAJOR= 2 -SHLIB_MINOR= 0 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 719baa7663..e0068240e6 100644 --- a/lib/libwrap/Makefile +++ b/lib/libwrap/Makefile @@ -1,11 +1,10 @@ # # $FreeBSD: src/lib/libwrap/Makefile,v 1.5.2.3 2002/07/22 14:21:50 ru Exp $ -# $DragonFly: src/lib/libwrap/Makefile,v 1.3 2004/01/31 06:56:39 dillon Exp $ +# $DragonFly: src/lib/libwrap/Makefile,v 1.4 2005/04/21 13:42:34 joerg Exp $ # LIB= wrap -SHLIB_MAJOR= 3 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 4 INCS= tcpd.h MAN= hosts_access.3 MAN+= hosts_access.5 hosts_options.5 diff --git a/lib/libxpg4/Makefile b/lib/libxpg4/Makefile index 8df7f4ca40..b02b040f34 100644 --- a/lib/libxpg4/Makefile +++ b/lib/libxpg4/Makefile @@ -1,10 +1,8 @@ # $FreeBSD: src/lib/libxpg4/Makefile,v 1.6.6.2 2000/06/13 00:42:40 ache Exp $ -# $DragonFly: src/lib/libxpg4/Makefile,v 1.2 2003/06/17 04:26:52 dillon Exp $ +# $DragonFly: src/lib/libxpg4/Makefile,v 1.3 2005/04/21 13:42:34 joerg Exp $ LIB= xpg4 -SHLIB_MAJOR= 3 -SHLIB_MINOR= 0 - +SHLIB_MAJOR= 4 SRCS= fakelib.c NOMAN= YES diff --git a/lib/liby/Makefile b/lib/liby/Makefile index 67fb03af8b..bb61fd0cc0 100644 --- a/lib/liby/Makefile +++ b/lib/liby/Makefile @@ -1,9 +1,8 @@ # $FreeBSD: src/lib/liby/Makefile,v 1.7 1999/08/28 00:05:59 peter Exp $ -# $DragonFly: src/lib/liby/Makefile,v 1.3 2004/03/20 16:27:40 drhodus Exp $ +# $DragonFly: src/lib/liby/Makefile,v 1.4 2005/04/21 13:42:34 joerg Exp $ LIB= y -SHLIB_MAJOR= 2 -SHLIB_MINOR= 0 +SHLIB_MAJOR= 3 SRCS= main.c yyerror.c diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 123abc3710..573780ad11 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -1,8 +1,8 @@ # $FreeBSD: src/secure/lib/libcrypto/Makefile,v 1.15.2.14 2003/02/14 22:38:14 nectar Exp $ -# $DragonFly: src/secure/lib/libcrypto/Makefile,v 1.4 2004/03/23 07:47:14 dillon Exp $ +# $DragonFly: src/secure/lib/libcrypto/Makefile,v 1.5 2005/04/21 13:42:34 joerg Exp $ LIB= crypto -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 NOLINT= true diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index 02ee34d189..585b93a6f4 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -1,8 +1,8 @@ # $FreeBSD: src/secure/lib/libssl/Makefile,v 1.4.2.8 2003/02/14 22:38:20 nectar Exp $ -# $DragonFly: src/secure/lib/libssl/Makefile,v 1.2 2003/06/17 04:27:48 dillon Exp $ +# $DragonFly: src/secure/lib/libssl/Makefile,v 1.3 2005/04/21 13:42:34 joerg Exp $ LIB= ssl -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 4 NOLINT= true -- 2.41.0