Index: gnu/lib/Makefile.inc =================================================================== RCS file: /home/ncvs/src/gnu/lib/Makefile.inc,v retrieving revision 1.8 diff -u -p -r1.8 Makefile.inc --- gnu/lib/Makefile.inc 25 Sep 2002 09:55:19 -0000 1.8 +++ gnu/lib/Makefile.inc 3 Apr 2007 16:03:38 -0000 @@ -1,3 +1,6 @@ # $FreeBSD: src/gnu/lib/Makefile.inc,v 1.8 2002/09/25 09:55:19 markm Exp $ .include "../Makefile.inc" +.if exists(${.CURDIR}/../../../../lib/Makefile.inc) +.include "${.CURDIR}/../../../../lib/Makefile.inc" +.endif Index: gnu/lib/libdialog/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libdialog/Makefile,v retrieving revision 1.44 diff -u -p -r1.44 Makefile --- gnu/lib/libdialog/Makefile 17 Mar 2006 18:54:22 -0000 1.44 +++ gnu/lib/libdialog/Makefile 19 Apr 2007 06:12:56 -0000 @@ -7,7 +7,6 @@ LIB= dialog INCS= dialog.h MAN= dialog.3 -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 @@ -44,4 +43,8 @@ MLINKS+=dialog.3 draw_shadow.3 dialog.3 dialog.3 dialog_msgbox.3 dialog.3 dialog_ftree.3 \ dialog.3 dialog_tree.3 +.if exists(${.CURDIR}/../../../lib/Makefile.inc) +.include "${.CURDIR}/../../../lib/Makefile.inc" +.endif + .include Index: gnu/lib/libg2c/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libg2c/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- gnu/lib/libg2c/Makefile 18 Mar 2006 21:37:03 -0000 1.17 +++ gnu/lib/libg2c/Makefile 19 Apr 2007 06:12:39 -0000 @@ -7,7 +7,6 @@ SRCDIR= ${.CURDIR}/../../../contrib/libf .PATH: ${SRCDIR} ${SRCDIR}/libU77 ${SRCDIR}/libF77 ${SRCDIR}/libI77 LIB= g2c -SHLIB_MAJOR= 2 # Traditional FORTRAN Library members defined in libF77 @@ -114,4 +113,8 @@ ${E77OBJS:.o=.po}: f2cext.c INCS= g2c.h +.if exists(${.CURDIR}/../../../lib/Makefile.inc) +.include "${.CURDIR}/../../../lib/Makefile.inc" +.endif + .include Index: gnu/lib/libobjc/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libobjc/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- gnu/lib/libobjc/Makefile 16 Mar 2006 15:18:15 -0000 1.29 +++ gnu/lib/libobjc/Makefile 19 Apr 2007 06:13:11 -0000 @@ -6,7 +6,6 @@ GCCDIR= ${.CURDIR}/../../../contrib/gcc .PATH: ${OBJCDIR}/objc ${OBJCDIR} LIB= objc -SHLIB_MAJOR= 2 SRCS= archive.c class.c encoding.c gc.c hash.c init.c misc.c \ nil_method.c objects.c sarray.c selector.c sendmsg.c \ @@ -37,4 +36,8 @@ runtime-info.h: tconfig.h tm.h : ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET} +.if exists(${.CURDIR}/../../../lib/Makefile.inc) +.include "${.CURDIR}/../../../lib/Makefile.inc" +.endif + .include Index: gnu/lib/libreadline/Makefile.inc =================================================================== RCS file: /home/ncvs/src/gnu/lib/libreadline/Makefile.inc,v retrieving revision 1.14 diff -u -p -r1.14 Makefile.inc --- gnu/lib/libreadline/Makefile.inc 31 Dec 2006 09:27:16 -0000 1.14 +++ gnu/lib/libreadline/Makefile.inc 19 Mar 2007 08:38:12 -0000 @@ -1,6 +1,5 @@ # $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.14 2006/12/31 09:27:16 ache Exp $ -SHLIB_MAJOR=6 RL_LIBRARY_VERSION=5.2 SRCDIR= ${.CURDIR}/../../../../contrib/libreadline Index: gnu/lib/libregex/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libregex/Makefile,v retrieving revision 1.32 diff -u -p -r1.32 Makefile --- gnu/lib/libregex/Makefile 22 Jul 2005 17:18:58 -0000 1.32 +++ gnu/lib/libregex/Makefile 19 Apr 2007 06:13:58 -0000 @@ -3,7 +3,6 @@ SUBDIR= doc LIB= gnuregex -SHLIB_MAJOR= 3 SRCS= gnuregex.c INCSGROUPS= INCS WRINCS PXINCS @@ -25,4 +24,8 @@ gnuregex.c: regex.c sed 's===g' \ < ${.ALLSRC} > ${.TARGET} +.if exists(${.CURDIR}/../../../lib/Makefile.inc) +.include "${.CURDIR}/../../../lib/Makefile.inc" +.endif + .include Index: gnu/lib/libstdc++/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libstdc++/Makefile,v retrieving revision 1.58 diff -u -p -r1.58 Makefile --- gnu/lib/libstdc++/Makefile 5 Oct 2006 20:55:37 -0000 1.58 +++ gnu/lib/libstdc++/Makefile 19 Apr 2007 06:12:18 -0000 @@ -9,7 +9,6 @@ SUPDIR= ${SRCDIR}/libsupc++ ${SUPDIR} ${GCCDIR} LIB= stdc++ -SHLIB_MAJOR= 5 CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H .if ${MACHINE_ARCH} == "arm" @@ -228,4 +227,8 @@ c++config.h: ${.CURDIR}/config.h ${SRCDI echo "#endif // _CXXCONFIG_" >> ${.TARGET} CLEANFILES+= c++config.h +.if exists(${.CURDIR}/../../../lib/Makefile.inc) +.include "${.CURDIR}/../../../lib/Makefile.inc" +.endif + .include Index: lib/Makefile.inc =================================================================== RCS file: /home/ncvs/src/lib/Makefile.inc,v retrieving revision 1.3 diff -u -p -r1.3 Makefile.inc --- lib/Makefile.inc 22 Jul 2005 17:18:58 -0000 1.3 +++ lib/Makefile.inc 19 Mar 2007 08:07:23 -0000 @@ -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 /Makefile if necessary) -SHLIB_MAJOR?= 3 +SHLIB_MAJOR?= 7 Index: lib/libalias/Makefile.inc =================================================================== RCS file: lib/libalias/Makefile.inc diff -N lib/libalias/Makefile.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lib/libalias/Makefile.inc 19 Mar 2007 08:09:50 -0000 @@ -0,0 +1,5 @@ +# $FreeBSD$ + +# This is to include src/lib/Makefile.inc + +.include "../Makefile.inc" Index: lib/libatm/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libatm/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- lib/libatm/Makefile 21 May 2006 15:15:20 -0000 1.13 +++ lib/libatm/Makefile 19 Mar 2007 08:16:24 -0000 @@ -24,7 +24,6 @@ # $FreeBSD: src/lib/libatm/Makefile,v 1.13 2006/05/21 15:15:20 ume Exp $ LIB= atm -SHLIB_MAJOR= 4 SHLIBDIR?= /lib SRCS= atm_addr.c cache_key.c ioctl_subr.c ip_addr.c ip_checksum.c timer.c INCS= libatm.h Index: lib/libautofs/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libautofs/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- lib/libautofs/Makefile 8 Sep 2004 08:44:14 -0000 1.4 +++ lib/libautofs/Makefile 19 Mar 2007 08:17:00 -0000 @@ -2,7 +2,6 @@ # $FreeBSD: src/lib/libautofs/Makefile,v 1.4 2004/09/08 08:44:14 alfred Exp $ LIB= autofs -SHLIB_MAJOR= 1 WARNS?= 4 SRCS= libautofs.c Index: lib/libbegemot/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libbegemot/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- lib/libbegemot/Makefile 22 Jul 2005 17:18:59 -0000 1.3 +++ lib/libbegemot/Makefile 19 Mar 2007 08:17:22 -0000 @@ -5,7 +5,6 @@ LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/ .PATH: ${LIBBEGEMOT_DIR} LIB= begemot -SHLIB_MAJOR= 2 SHLIBDIR?= /lib # WARNS?= 6 Index: lib/libbluetooth/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libbluetooth/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- lib/libbluetooth/Makefile 22 Jul 2005 17:18:59 -0000 1.2 +++ lib/libbluetooth/Makefile 19 Mar 2007 08:17:39 -0000 @@ -7,8 +7,6 @@ MAN= bluetooth.3 WARNS?= 2 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys -SHLIB_MAJOR= 2 - SRCS= bluetooth.c INCS= bluetooth.h Index: lib/libbsnmp/Makefile.inc =================================================================== RCS file: /home/ncvs/src/lib/libbsnmp/Makefile.inc,v retrieving revision 1.6 diff -u -p -r1.6 Makefile.inc --- lib/libbsnmp/Makefile.inc 22 Jul 2005 17:18:59 -0000 1.6 +++ lib/libbsnmp/Makefile.inc 19 Mar 2007 08:18:41 -0000 @@ -1,6 +1,7 @@ # $FreeBSD: src/lib/libbsnmp/Makefile.inc,v 1.6 2005/07/22 17:18:59 kensmith Exp $ -SHLIB_MAJOR= 3 WARNS?= 6 NO_WERROR= INCSDIR= ${INCLUDEDIR}/bsnmp + +.include "../Makefile.inc" Index: lib/libbz2/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libbz2/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- lib/libbz2/Makefile 22 Jul 2005 17:18:59 -0000 1.6 +++ lib/libbz2/Makefile 19 Mar 2007 08:19:10 -0000 @@ -4,7 +4,6 @@ BZ2DIR= ${.CURDIR}/../../contrib/bzip2 .PATH: ${BZ2DIR} LIB= bz2 -SHLIB_MAJOR= 2 SRCS= bzlib.c blocksort.c compress.c crctable.c decompress.c \ huffman.c randtable.c INCS= bzlib.h Index: lib/libc/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libc/Makefile,v retrieving revision 1.69 diff -u -p -r1.69 Makefile --- lib/libc/Makefile 4 Mar 2007 12:25:03 -0000 1.69 +++ lib/libc/Makefile 19 Mar 2007 08:19:27 -0000 @@ -12,7 +12,6 @@ SHLIBDIR?= /lib # To include legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # to CFLAGS below. -DSYSLIBC_SCCS affects just the system call stubs. LIB=c -SHLIB_MAJOR= 7 WARNS?= 2 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH} Index: lib/libc_r/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libc_r/Makefile,v retrieving revision 1.45 diff -u -p -r1.45 Makefile --- lib/libc_r/Makefile 22 Aug 2006 07:51:07 -0000 1.45 +++ lib/libc_r/Makefile 19 Mar 2007 08:19:45 -0000 @@ -8,7 +8,6 @@ # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. LIB=c_r -SHLIB_MAJOR= 6 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/uthread \ -I${.CURDIR}/../../include Index: lib/libcrypt/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libcrypt/Makefile,v retrieving revision 1.38 diff -u -p -r1.38 Makefile --- lib/libcrypt/Makefile 18 Mar 2006 11:01:06 -0000 1.38 +++ lib/libcrypt/Makefile 19 Mar 2007 08:21:04 -0000 @@ -6,7 +6,6 @@ SHLIBDIR?= /lib .include -SHLIB_MAJOR= 3 LIB= crypt .PATH: ${.CURDIR}/../libmd Index: lib/libdevstat/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libdevstat/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- lib/libdevstat/Makefile 22 Jul 2005 17:19:00 -0000 1.15 +++ lib/libdevstat/Makefile 19 Mar 2007 08:21:53 -0000 @@ -3,7 +3,6 @@ LIB= devstat SHLIBDIR?= /lib # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented. -SHLIB_MAJOR= 5 SRCS= devstat.c INCS= devstat.h Index: lib/libedit/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libedit/Makefile,v retrieving revision 1.30 diff -u -p -r1.30 Makefile --- lib/libedit/Makefile 7 Aug 2005 20:51:52 -0000 1.30 +++ lib/libedit/Makefile 19 Mar 2007 08:22:21 -0000 @@ -3,7 +3,6 @@ # $FreeBSD: src/lib/libedit/Makefile,v 1.30 2005/08/07 20:51:52 stefanf Exp $ LIB= edit -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 =================================================================== RCS file: /home/ncvs/src/lib/libexpat/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- lib/libexpat/Makefile 22 Jul 2005 17:19:00 -0000 1.5 +++ lib/libexpat/Makefile 19 Mar 2007 08:23:17 -0000 @@ -4,7 +4,6 @@ EXPAT= ${.CURDIR}/../../contrib/expat LIB= bsdxml SHLIBDIR?= /lib -SHLIB_MAJOR= 2 SRCS= xmlparse.c xmlrole.c xmltok.c INCS= bsdxml.h MAN= libbsdxml.3 Index: lib/libfetch/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libfetch/Makefile,v retrieving revision 1.47 diff -u -p -r1.47 Makefile --- lib/libfetch/Makefile 27 Jul 2006 04:54:03 -0000 1.47 +++ lib/libfetch/Makefile 19 Mar 2007 08:23:29 -0000 @@ -23,8 +23,6 @@ LDADD= -lssl -lcrypto CSTD?= c99 WARNS?= 2 -SHLIB_MAJOR= 4 - ftperr.h: ftp.errors @echo "static struct fetcherr _ftp_errlist[] = {" > ${.TARGET} @cat ${.ALLSRC} \ Index: lib/libftpio/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libftpio/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- lib/libftpio/Makefile 27 Jul 2006 04:54:03 -0000 1.15 +++ lib/libftpio/Makefile 19 Mar 2007 08:23:42 -0000 @@ -3,7 +3,6 @@ .include LIB= ftpio -SHLIB_MAJOR= 6 SRCS= ftpio.c ftperr.c INCS= ftpio.h Index: lib/libgeom/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libgeom/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- lib/libgeom/Makefile 7 Mar 2004 16:07:57 -0000 1.10 +++ lib/libgeom/Makefile 19 Mar 2007 08:23:52 -0000 @@ -10,8 +10,6 @@ INCS= libgeom.h CFLAGS += -I${.CURDIR} -WARNS?= 3 - DPADD= ${LIBBSDXML} ${LIBSBUF} LDADD= -lbsdxml -lsbuf Index: lib/libgpib/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libgpib/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- lib/libgpib/Makefile 13 Apr 2006 08:12:31 -0000 1.5 +++ lib/libgpib/Makefile 19 Mar 2007 08:24:06 -0000 @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/libgpib/Makefile,v 1.5 2006/04/13 08:12:31 ru Exp $ LIB= gpib -SHLIB_MAJOR= 1 INCS= gpib.h INCSDIR= ${INCLUDEDIR}/gpib SRCS= ibfoo.c Index: lib/libipsec/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libipsec/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- lib/libipsec/Makefile 18 Mar 2006 11:01:06 -0000 1.19 +++ lib/libipsec/Makefile 19 Mar 2007 08:27:45 -0000 @@ -32,7 +32,6 @@ SHLIBDIR?= /lib .include LIB= ipsec -SHLIB_MAJOR= 2 CFLAGS+=-I. -I${.CURDIR} CFLAGS+=-DIPSEC_DEBUG -DIPSEC .if ${MK_INET6_SUPPORT} != "no" Index: lib/libkiconv/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libkiconv/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- lib/libkiconv/Makefile 22 Jul 2005 17:19:01 -0000 1.3 +++ lib/libkiconv/Makefile 19 Mar 2007 08:27:54 -0000 @@ -5,8 +5,6 @@ SHLIBDIR?= /lib SRCS= xlat16_iconv.c xlat16_sysctl.c SRCS+= quirks.c -SHLIB_MAJOR= 2 - MAN= kiconv.3 MLINKS+= kiconv.3 kiconv_add_xlat16_cspair.3 \ Index: lib/libmagic/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libmagic/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- lib/libmagic/Makefile 19 Jun 2006 08:10:23 -0000 1.9 +++ lib/libmagic/Makefile 19 Mar 2007 08:27:28 -0000 @@ -5,7 +5,6 @@ CONTRDIR= ${.CURDIR}/../../contrib/file .PATH: ${CONTRDIR} LIB= magic -SHLIB_MAJOR= 2 DPADD= ${LIBZ} LDADD= -lz MAN= libmagic.3 magic.5 Index: lib/libmemstat/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libmemstat/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- lib/libmemstat/Makefile 13 Nov 2005 13:42:03 -0000 1.5 +++ lib/libmemstat/Makefile 19 Mar 2007 08:28:02 -0000 @@ -2,7 +2,6 @@ WARNS?= 3 LIB= memstat -SHLIB_MAJOR= 1 DPADD= ${LIBKVM} LDADD= -lkvm SRCS+= memstat.c Index: lib/libmp/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libmp/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- lib/libmp/Makefile 10 Nov 2005 18:07:06 -0000 1.11 +++ lib/libmp/Makefile 19 Mar 2007 08:28:09 -0000 @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/libmp/Makefile,v 1.11 2005/11/10 18:07:06 ru Exp $ LIB= mp -SHLIB_MAJOR= 5 DPADD= ${LIBCRYPTO} LDADD= -lcrypto MAN= libmp.3 Index: lib/libncp/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libncp/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- lib/libncp/Makefile 16 Mar 2006 15:18:16 -0000 1.8 +++ lib/libncp/Makefile 19 Mar 2007 08:28:16 -0000 @@ -2,8 +2,6 @@ LIB= ncp -SHLIB_MAJOR= 2 - DPADD= ${LIBIPX} LDADD= -lipx Index: lib/libnetgraph/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libnetgraph/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- lib/libnetgraph/Makefile 22 Jul 2005 17:19:02 -0000 1.11 +++ lib/libnetgraph/Makefile 19 Mar 2007 08:28:33 -0000 @@ -5,8 +5,6 @@ LIB= netgraph WARNS?= 3 MAN= netgraph.3 -SHLIB_MAJOR= 2 - SRCS= sock.c msg.c debug.c INCS= netgraph.h Index: lib/libngatm/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libngatm/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- lib/libngatm/Makefile 22 Jul 2005 17:19:02 -0000 1.6 +++ lib/libngatm/Makefile 19 Mar 2007 08:28:41 -0000 @@ -3,7 +3,6 @@ # Author: Harti Brandt # LIB= ngatm -SHLIB_MAJOR= 2 MAN= libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3 WARNS?= 6 Index: lib/libopie/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libopie/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- lib/libopie/Makefile 22 Jul 2005 17:19:02 -0000 1.21 +++ lib/libopie/Makefile 19 Mar 2007 08:27:09 -0000 @@ -4,7 +4,6 @@ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} -SHLIB_MAJOR= 4 KEYFILE?= \"/etc/opiekeys\" Index: lib/libpam/Makefile.inc =================================================================== RCS file: /home/ncvs/src/lib/libpam/Makefile.inc,v retrieving revision 1.17 diff -u -p -r1.17 Makefile.inc --- lib/libpam/Makefile.inc 22 Jul 2005 17:19:02 -0000 1.17 +++ lib/libpam/Makefile.inc 19 Mar 2007 08:29:03 -0000 @@ -28,5 +28,6 @@ DEBUG_FLAGS+= -DDEBUG .endif -SHLIB_MAJOR= 3 PAM_MOD_DIR= ${LIBDIR} + +.include "../Makefile.inc" Index: lib/libpcap/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libpcap/Makefile,v retrieving revision 1.38 diff -u -p -r1.38 Makefile --- lib/libpcap/Makefile 13 Apr 2006 07:25:02 -0000 1.38 +++ lib/libpcap/Makefile 19 Mar 2007 08:27:01 -0000 @@ -23,8 +23,6 @@ CFLAGS+=-DHAVE_SNPRINTF -DHAVE_VSNPRINTF CFLAGS+=-DINET6 .endif -SHLIB_MAJOR=4 - # # Magic to grab sources out of src/contrib # Index: lib/libpthread/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libpthread/Makefile,v retrieving revision 1.59 diff -u -p -r1.59 Makefile --- lib/libpthread/Makefile 22 Aug 2006 07:51:07 -0000 1.59 +++ lib/libpthread/Makefile 19 Mar 2007 08:26:51 -0000 @@ -13,7 +13,6 @@ LIB=kse LIB=pthread SHLIBDIR?= /lib .endif -SHLIB_MAJOR= 2 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include Index: lib/libradius/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libradius/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- lib/libradius/Makefile 17 Mar 2006 18:54:27 -0000 1.14 +++ lib/libradius/Makefile 19 Mar 2007 08:26:43 -0000 @@ -30,7 +30,6 @@ LIB= radius SRCS= radlib.c INCS= radlib.h radlib_vs.h CFLAGS+= -Wall -SHLIB_MAJOR= 2 MAN= libradius.3 radius.conf.5 .if ${MK_OPENSSL} == "no" Index: lib/libsdp/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libsdp/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- lib/libsdp/Makefile 22 Jul 2005 17:19:03 -0000 1.4 +++ lib/libsdp/Makefile 19 Mar 2007 08:26:35 -0000 @@ -7,8 +7,6 @@ MAN= sdp.3 WARNS?= 2 CFLAGS+= -I${.CURDIR} -SHLIB_MAJOR= 2 - SRCS= search.c service.c session.c util.c INCS= sdp.h Index: lib/libsmb/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libsmb/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- lib/libsmb/Makefile 16 Mar 2006 15:18:16 -0000 1.10 +++ lib/libsmb/Makefile 19 Mar 2007 08:26:27 -0000 @@ -4,7 +4,6 @@ CONTRIBDIR= ${.CURDIR}/../../contrib/smb .PATH: ${CONTRIBDIR}/lib/smb LIB= smb -SHLIB_MAJOR= 2 DPADD= ${LIBKICONV} LDADD= -lkiconv Index: lib/libtacplus/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libtacplus/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- lib/libtacplus/Makefile 22 Jul 2005 17:19:03 -0000 1.7 +++ lib/libtacplus/Makefile 19 Mar 2007 08:26:19 -0000 @@ -30,7 +30,6 @@ INCS= taclib.h CFLAGS+= -Wall DPADD= ${LIBMD} LDADD= -lmd -SHLIB_MAJOR= 2 MAN= libtacplus.3 tacplus.conf.5 .include Index: lib/libthr/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libthr/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- lib/libthr/Makefile 26 Nov 2006 14:36:33 -0000 1.21 +++ lib/libthr/Makefile 19 Mar 2007 08:26:11 -0000 @@ -15,7 +15,6 @@ SHLIBDIR= /lib .endif LIB=thr -SHLIB_MAJOR= 2 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include Index: lib/libthread_db/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libthread_db/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- lib/libthread_db/Makefile 5 Oct 2006 06:26:31 -0000 1.8 +++ lib/libthread_db/Makefile 19 Mar 2007 08:26:00 -0000 @@ -3,7 +3,6 @@ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} LIB= thread_db -SHLIB_MAJOR= 2 SRCS= thread_db.c SRCS+= libpthread_db.c libpthread_md.c SRCS+= libthr_db.c Index: lib/libugidfw/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libugidfw/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- lib/libugidfw/Makefile 22 Jul 2005 17:19:04 -0000 1.7 +++ lib/libugidfw/Makefile 19 Mar 2007 08:25:49 -0000 @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/libugidfw/Makefile,v 1.7 2005/07/22 17:19:04 kensmith Exp $ LIB= ugidfw -SHLIB_MAJOR= 2 SRCS= ugidfw.c INCS= ugidfw.h Index: lib/libusbhid/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libusbhid/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- lib/libusbhid/Makefile 22 Jul 2005 17:19:04 -0000 1.10 +++ lib/libusbhid/Makefile 19 Mar 2007 08:25:41 -0000 @@ -4,8 +4,6 @@ LIB= usbhid MAN= usbhid.3 -SHLIB_MAJOR= 2 - MLINKS= usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \ usbhid.3 hid_dispose_report_desc.3 \ usbhid.3 hid_start_parse.3 usbhid.3 hid_end_parse.3 \ Index: lib/libutil/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libutil/Makefile,v retrieving revision 1.63 diff -u -p -r1.63 Makefile --- lib/libutil/Makefile 27 Jul 2006 12:36:46 -0000 1.63 +++ lib/libutil/Makefile 19 Mar 2007 08:25:32 -0000 @@ -6,7 +6,6 @@ SHLIBDIR?= /lib .include LIB= util -SHLIB_MAJOR= 6 SRCS= _secure_path.c auth.c fparseln.c humanize_number.c kld.c login.c \ login_auth.c login_cap.c login_class.c login_crypt.c login_ok.c \ Index: lib/libvgl/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libvgl/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- lib/libvgl/Makefile 22 Jul 2005 17:19:04 -0000 1.11 +++ lib/libvgl/Makefile 19 Mar 2007 08:25:21 -0000 @@ -1,6 +1,5 @@ # $FreeBSD: src/lib/libvgl/Makefile,v 1.11 2005/07/22 17:19:04 kensmith Exp $ LIB= vgl -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 =================================================================== RCS file: /home/ncvs/src/lib/libwrap/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- lib/libwrap/Makefile 27 Feb 2007 16:13:19 -0000 1.21 +++ lib/libwrap/Makefile 19 Mar 2007 08:25:09 -0000 @@ -5,7 +5,6 @@ .include LIB= wrap -SHLIB_MAJOR= 4 INCS= tcpd.h MAN= hosts_access.3 MAN+= hosts_access.5 hosts_options.5 Index: lib/libypclnt/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libypclnt/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- lib/libypclnt/Makefile 30 Mar 2007 06:12:45 -0000 1.15 +++ lib/libypclnt/Makefile 2 Apr 2007 09:42:11 -0000 @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/libypclnt/Makefile,v 1.15 2007/03/30 06:12:45 trhodes Exp $ LIB= ypclnt -SHLIB_MAJOR= 2 SRCS= ypclnt_connect.c \ ypclnt_error.c \ ypclnt_free.c \ Index: lib/msun/Makefile =================================================================== RCS file: /home/ncvs/src/lib/msun/Makefile,v retrieving revision 1.76 diff -u -p -r1.76 Makefile --- lib/msun/Makefile 7 Jan 2007 07:54:20 -0000 1.76 +++ lib/msun/Makefile 19 Mar 2007 08:24:49 -0000 @@ -26,7 +26,6 @@ ARCH_SUBDIR= ${MACHINE_ARCH} LIB= m SHLIBDIR?= /lib -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 =================================================================== RCS file: /home/ncvs/src/secure/lib/libcrypto/Makefile,v retrieving revision 1.80 diff -u -p -r1.80 Makefile --- secure/lib/libcrypto/Makefile 15 Mar 2007 20:10:13 -0000 1.80 +++ secure/lib/libcrypto/Makefile 19 Mar 2007 08:30:49 -0000 @@ -6,7 +6,6 @@ SUBDIR= engines .include LIB= crypto -SHLIB_MAJOR= 5 NO_LINT= Index: secure/lib/libssh/Makefile =================================================================== RCS file: /home/ncvs/src/secure/lib/libssh/Makefile,v retrieving revision 1.42 diff -u -p -r1.42 Makefile --- secure/lib/libssh/Makefile 30 Sep 2006 13:41:26 -0000 1.42 +++ secure/lib/libssh/Makefile 19 Mar 2007 08:31:02 -0000 @@ -3,7 +3,6 @@ .include LIB= ssh -SHLIB_MAJOR= 3 SRCS= acss.c authfd.c authfile.c bufaux.c bufbn.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 =================================================================== RCS file: /home/ncvs/src/secure/lib/libssl/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- secure/lib/libssl/Makefile 29 Jul 2006 19:41:38 -0000 1.25 +++ secure/lib/libssl/Makefile 19 Mar 2007 08:31:12 -0000 @@ -1,7 +1,6 @@ # $FreeBSD: src/secure/lib/libssl/Makefile,v 1.25 2006/07/29 19:41:38 simon Exp $ LIB= ssl -SHLIB_MAJOR= 5 NO_LINT= Index: usr.sbin/bsnmpd/modules/Makefile.inc =================================================================== RCS file: /home/ncvs/src/usr.sbin/bsnmpd/modules/Makefile.inc,v retrieving revision 1.12 diff -u -p -r1.12 Makefile.inc --- usr.sbin/bsnmpd/modules/Makefile.inc 10 Nov 2005 10:14:56 -0000 1.12 +++ usr.sbin/bsnmpd/modules/Makefile.inc 19 Mar 2007 08:35:53 -0000 @@ -1,8 +1,11 @@ # $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile.inc,v 1.12 2005/11/10 10:14:56 harti Exp $ -SHLIB_MAJOR= 4 WARNS?= 6 MANFILTER= sed -e 's%@MODPATH@%${LIBDIR}/%g' \ -e 's%@DEFPATH@%${DEFSDIR}/%g' \ -e 's%@MIBSPATH@%${BMIBSDIR}/%g' + +.if exists(${.CURDIR}/../../../../lib/Makefile.inc) +.include "${.CURDIR}/../../../../lib/Makefile.inc" +.endif Index: lib/libalias/libalias/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libalias/libalias/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- lib/libalias/libalias/Makefile 27 Sep 2006 12:30:27 -0000 1.3 +++ lib/libalias/libalias/Makefile 19 Mar 2007 08:08:52 -0000 @@ -4,7 +4,6 @@ LIB= alias SHLIBDIR?= /lib -SHLIB_MAJOR= 5 MAN= libalias.3 SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c INCS= alias.h Index: lib/libalias/modules/Makefile.inc =================================================================== RCS file: /home/ncvs/src/lib/libalias/modules/Makefile.inc,v retrieving revision 1.3 diff -u -p -r1.3 Makefile.inc --- lib/libalias/modules/Makefile.inc 8 Oct 2006 14:01:59 -0000 1.3 +++ lib/libalias/modules/Makefile.inc 19 Mar 2007 08:12:42 -0000 @@ -6,3 +6,5 @@ SHLIBDIR?= /lib LIB?= alias_${NAME} SHLIB_NAME?=libalias_${NAME}.so WARNS?= 1 + +.include "../Makefile.inc" Index: lib/libarchive/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libarchive/Makefile,v retrieving revision 1.70 diff -u -p -r1.70 Makefile --- lib/libarchive/Makefile 15 Apr 2007 00:53:38 -0000 1.70 +++ lib/libarchive/Makefile 15 Apr 2007 12:50:15 -0000 @@ -4,7 +4,10 @@ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} LDADD= -lbz2 -lz -# The libarchive version stamp. +# The libarchive version stamp. Note: FreeBSD SHLIB_MAJOR +# value is managed as part of the FreeBSD system. It has +# no real relation to the version number below. +# # Version is three numbers: # Major: Bumped ONLY when API/ABI breakage happens (see SHLIB_MAJOR) # Minor: Bumped when significant new features are added @@ -14,10 +17,6 @@ VERSION= 2.0.31 ARCHIVE_API_MAJOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/\..*//' ARCHIVE_API_MINOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/[0-9]*\.//' -e 's/\..*//' -# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. -# It has no real relation to the version number above. -SHLIB_MAJOR= 4 - CFLAGS+= -DPACKAGE_NAME=\"lib${LIB}\" CFLAGS+= -DPACKAGE_VERSION=\"${VERSION}\" CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" Index: lib/libbsm/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libbsm/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- lib/libbsm/Makefile 25 Sep 2006 11:53:58 -0000 1.5 +++ lib/libbsm/Makefile 19 Mar 2007 08:17:52 -0000 @@ -6,7 +6,6 @@ OPENBSMDIR= ${.CURDIR}/../../contrib/op LIBBSMDIR= ${OPENBSMDIR}/libbsm LIB= bsm -SHLIB_MAJOR= 1 .PATH: ${LIBBSMDIR} .PATH: ${OPENBSMDIR}/bsm Index: lib/libelf/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libelf/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- lib/libelf/Makefile 25 Dec 2006 02:22:22 -0000 1.5 +++ lib/libelf/Makefile 19 Mar 2007 08:22:44 -0000 @@ -58,8 +58,6 @@ GENSRCS= libelf_fsize.c libelf_msize.c l CLEANFILES= ${GENSRCS} CFLAGS+= -I. -I${.CURDIR} -SHLIB_MAJOR= 1 - WARNS?= 6 MAN= elf.3 \ Index: lib/librt/Makefile =================================================================== RCS file: /home/ncvs/src/lib/librt/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- lib/librt/Makefile 15 Mar 2006 10:41:58 -0000 1.2 +++ lib/librt/Makefile 19 Mar 2007 08:27:36 -0000 @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/librt/Makefile,v 1.2 2006/03/15 10:41:58 ru Exp $ LIB=rt -SHLIB_MAJOR= 1 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR} CFLAGS+=-Winline -Wall -g Index: lib/ncurses/ncurses/Makefile =================================================================== RCS file: /home/ncvs/src/lib/ncurses/ncurses/Makefile,v retrieving revision 1.89 diff -u -p -r1.89 Makefile --- lib/ncurses/ncurses/Makefile 16 Apr 2007 09:54:59 -0000 1.89 +++ lib/ncurses/ncurses/Makefile 17 Apr 2007 01:50:49 -0000 @@ -7,7 +7,6 @@ SHLIBDIR?= /lib .include "${.CURDIR}/../config.mk" LIB= ncurses${LIB_SUFFIX} -SHLIB_MAJOR= 6 NO_LINT=