PERFORCE change 81027 for review
Peter Wemm
peter at FreeBSD.org
Wed Jul 27 01:30:07 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=81027
Change 81027 by peter at peter_daintree on 2005/07/27 01:30:02
Back out bogus library major version change.
Back out getaddrinfo ABI change.
Affected files ...
.. //depot/projects/hammer/gnu/lib/libdialog/Makefile#8 edit
.. //depot/projects/hammer/gnu/lib/libg2c/Makefile#8 edit
.. //depot/projects/hammer/gnu/lib/libobjc/Makefile#13 edit
.. //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#8 edit
.. //depot/projects/hammer/gnu/lib/libregex/Makefile#10 edit
.. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#25 edit
.. //depot/projects/hammer/include/netdb.h#13 edit
.. //depot/projects/hammer/kerberos5/lib/Makefile.inc#6 edit
.. //depot/projects/hammer/lib/Makefile.inc#4 edit
.. //depot/projects/hammer/lib/libalias/Makefile#13 edit
.. //depot/projects/hammer/lib/libarchive/Makefile#25 edit
.. //depot/projects/hammer/lib/libbegemot/Makefile#4 edit
.. //depot/projects/hammer/lib/libbluetooth/Makefile#3 edit
.. //depot/projects/hammer/lib/libbsnmp/Makefile.inc#7 edit
.. //depot/projects/hammer/lib/libbz2/Makefile#5 edit
.. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#24 edit
.. //depot/projects/hammer/lib/libc_r/Makefile#11 edit
.. //depot/projects/hammer/lib/libcrypt/Makefile#8 edit
.. //depot/projects/hammer/lib/libdevstat/Makefile#8 edit
.. //depot/projects/hammer/lib/libdevstat/devstat.h#4 edit
.. //depot/projects/hammer/lib/libedit/Makefile#5 edit
.. //depot/projects/hammer/lib/libexpat/Makefile#5 edit
.. //depot/projects/hammer/lib/libfetch/Makefile#12 edit
.. //depot/projects/hammer/lib/libftpio/Makefile#4 edit
.. //depot/projects/hammer/lib/libgpib/Makefile#3 edit
.. //depot/projects/hammer/lib/libipsec/Makefile#7 edit
.. //depot/projects/hammer/lib/libkiconv/Makefile#4 edit
.. //depot/projects/hammer/lib/libmagic/Makefile#6 edit
.. //depot/projects/hammer/lib/libmp/Makefile#5 edit
.. //depot/projects/hammer/lib/libncp/Makefile#5 edit
.. //depot/projects/hammer/lib/libncurses/Makefile#17 edit
.. //depot/projects/hammer/lib/libnetgraph/Makefile#5 edit
.. //depot/projects/hammer/lib/libngatm/Makefile#7 edit
.. //depot/projects/hammer/lib/libopie/Makefile#8 edit
.. //depot/projects/hammer/lib/libpam/Makefile.inc#10 edit
.. //depot/projects/hammer/lib/libpthread/Makefile#18 edit
.. //depot/projects/hammer/lib/libradius/Makefile#9 edit
.. //depot/projects/hammer/lib/libsdp/Makefile#5 edit
.. //depot/projects/hammer/lib/libsmb/Makefile#7 edit
.. //depot/projects/hammer/lib/libtacplus/Makefile#6 edit
.. //depot/projects/hammer/lib/libthr/Makefile#13 edit
.. //depot/projects/hammer/lib/libthread_db/Makefile#6 edit
.. //depot/projects/hammer/lib/libugidfw/Makefile#7 edit
.. //depot/projects/hammer/lib/libusbhid/Makefile#6 edit
.. //depot/projects/hammer/lib/libutil/Makefile#9 edit
.. //depot/projects/hammer/lib/libvgl/Makefile#4 edit
.. //depot/projects/hammer/lib/libwrap/Makefile#9 edit
.. //depot/projects/hammer/lib/libypclnt/Makefile#6 edit
.. //depot/projects/hammer/lib/msun/Makefile#29 edit
.. //depot/projects/hammer/secure/lib/libcrypto/Makefile#18 edit
.. //depot/projects/hammer/secure/lib/libssh/Makefile#12 edit
.. //depot/projects/hammer/secure/lib/libssl/Makefile#9 edit
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile.inc#4 edit
Differences ...
==== //depot/projects/hammer/gnu/lib/libdialog/Makefile#8 (text+ko) ====
@@ -5,7 +5,7 @@
INCS= dialog.h
MAN= dialog.3
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 4
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
==== //depot/projects/hammer/gnu/lib/libg2c/Makefile#8 (text+ko) ====
@@ -5,7 +5,7 @@
.PATH: ${SRCDIR} ${SRCDIR}/libU77 ${SRCDIR}/libF77 ${SRCDIR}/libI77
LIB= g2c
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
# Traditional FORTRAN Library members defined in libF77
==== //depot/projects/hammer/gnu/lib/libobjc/Makefile#13 (text+ko) ====
@@ -6,7 +6,7 @@
.PATH: ${OBJCDIR}/objc ${OBJCDIR}
LIB= objc
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
NO_MAN=
SRCS= archive.c class.c encoding.c gc.c hash.c init.c misc.c \
==== //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#8 (text+ko) ====
@@ -1,6 +1,6 @@
# $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.12 2005/07/22 17:18:58 kensmith Exp $
-SHLIB_MAJOR=6
+SHLIB_MAJOR=5
RL_LIBRARY_VERSION=5.0
SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
==== //depot/projects/hammer/gnu/lib/libregex/Makefile#10 (text+ko) ====
@@ -3,7 +3,7 @@
SUBDIR= doc
LIB= gnuregex
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 2
SRCS= gnuregex.c
INCSGROUPS= INCS WRINCS PXINCS
==== //depot/projects/hammer/gnu/lib/libstdc++/Makefile#25 (text+ko) ====
@@ -9,7 +9,7 @@
${SUPDIR} ${GCCDIR}
LIB= stdc++
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 4
CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include
==== //depot/projects/hammer/include/netdb.h#13 (text+ko) ====
@@ -63,6 +63,8 @@
#include <sys/cdefs.h>
#include <sys/_types.h>
+#include <machine/_limits.h>
+#include <machine/endian.h>
#ifndef _SIZE_T_DECLARED
typedef __size_t size_t;
@@ -123,12 +125,29 @@
int p_proto; /* protocol # */
};
+/*
+ * Note: ai_addrlen used to be a size_t, per RFC 2553.
+ * In XNS5.2, and subsequently in POSIX-2001 and RFC 3493 it was
+ * changed to a socklen_t.
+ * To accomodate for this while preserving binary compatibility with the
+ * old interface, we prepend or append 32 bits of padding, depending on
+ * the (LP64) architecture's endianness.
+ *
+ * This should be deleted the next time the libc major number is
+ * incremented.
+ */
struct addrinfo {
int ai_flags; /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
int ai_family; /* PF_xxx */
int ai_socktype; /* SOCK_xxx */
int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
+#if __LONG_BIT == 64 && _BYTE_ORDER == _BIG_ENDIAN
+ uint32_t __ai_pad0; /* ABI compatibility */
+#endif
socklen_t ai_addrlen; /* length of ai_addr */
+#if __LONG_BIT == 64 && _BYTE_ORDER == _LITTLE_ENDIAN
+ uint32_t __ai_pad0; /* ABI compatibility */
+#endif
char *ai_canonname; /* canonical name for hostname */
struct sockaddr *ai_addr; /* binary address */
struct addrinfo *ai_next; /* next structure in linked list */
==== //depot/projects/hammer/kerberos5/lib/Makefile.inc#6 (text+ko) ====
@@ -1,5 +1,5 @@
# $FreeBSD: src/kerberos5/lib/Makefile.inc,v 1.7 2005/07/22 17:18:58 kensmith Exp $
-SHLIB_MAJOR?= 8
+SHLIB_MAJOR?= 7
.include "../Makefile.inc"
==== //depot/projects/hammer/lib/Makefile.inc#4 (text+ko) ====
@@ -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?= 3
+SHLIB_MAJOR?= 2
==== //depot/projects/hammer/lib/libalias/Makefile#13 (text+ko) ====
@@ -4,7 +4,7 @@
LIB= alias
SHLIBDIR?= /lib
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 4
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 \
==== //depot/projects/hammer/lib/libarchive/Makefile#25 (text+ko) ====
@@ -9,7 +9,7 @@
LIB= archive
VERSION= 1.02.026
ARCHIVE_API_FEATURE= 2
-ARCHIVE_API_VERSION= 2
+ARCHIVE_API_VERSION= 1
SHLIB_MAJOR= ${ARCHIVE_API_VERSION}
CFLAGS+= -DPACKAGE_NAME=\"lib${LIB}\"
CFLAGS+= -DPACKAGE_VERSION=\"${VERSION}\"
==== //depot/projects/hammer/lib/libbegemot/Makefile#4 (text+ko) ====
@@ -5,7 +5,7 @@
.PATH: ${LIBBEGEMOT_DIR}
LIB= begemot
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
SHLIBDIR?= /lib
# WARNS?= 6
==== //depot/projects/hammer/lib/libbluetooth/Makefile#3 (text+ko) ====
@@ -7,7 +7,7 @@
WARNS?= 2
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
SRCS= bluetooth.c
INCS= bluetooth.h
==== //depot/projects/hammer/lib/libbsnmp/Makefile.inc#7 (text+ko) ====
@@ -1,6 +1,6 @@
# $FreeBSD: src/lib/libbsnmp/Makefile.inc,v 1.6 2005/07/22 17:18:59 kensmith Exp $
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 2
WARNS?= 6
NO_WERROR=
INCSDIR= ${INCLUDEDIR}/bsnmp
==== //depot/projects/hammer/lib/libbz2/Makefile#5 (text+ko) ====
@@ -4,7 +4,7 @@
.PATH: ${BZ2DIR}
LIB= bz2
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
SRCS= bzlib.c blocksort.c compress.c crctable.c decompress.c \
huffman.c randtable.c
INCS= bzlib.h
==== //depot/projects/hammer/lib/libc/net/getaddrinfo.c#24 (text+ko) ====
@@ -1352,6 +1352,9 @@
memset(ai->ai_addr, 0, (size_t)afd->a_socklen);
ai->ai_addr->sa_len = afd->a_socklen;
ai->ai_addrlen = afd->a_socklen;
+#if __LONG_BIT == 64
+ ai->__ai_pad0 = 0; /* ABI compatibility */
+#endif
ai->ai_addr->sa_family = ai->ai_family = afd->a_af;
p = (char *)(void *)(ai->ai_addr);
#ifdef FAITH
==== //depot/projects/hammer/lib/libc_r/Makefile#11 (text+ko) ====
@@ -8,7 +8,7 @@
# (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the
# system call stubs.
LIB=c_r
-SHLIB_MAJOR= 6
+SHLIB_MAJOR= 5
CFLAGS+=-DPTHREAD_KERNEL
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/uthread \
-I${.CURDIR}/../../include
==== //depot/projects/hammer/lib/libcrypt/Makefile#8 (text+ko) ====
@@ -2,7 +2,7 @@
# $FreeBSD: src/lib/libcrypt/Makefile,v 1.36 2005/07/22 17:19:00 kensmith Exp $
#
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 2
LIB= crypt
SHLIBDIR?= /lib
==== //depot/projects/hammer/lib/libdevstat/Makefile#8 (text+ko) ====
@@ -3,7 +3,7 @@
LIB= devstat
SHLIBDIR?= /lib
# Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented.
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 4
SRCS= devstat.c
INCS= devstat.h
==== //depot/projects/hammer/lib/libdevstat/devstat.h#4 (text+ko) ====
@@ -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 6
+#define DEVSTAT_USER_API_VER 5
#define DEVSTAT_ERRBUF_SIZE 2048 /* size of the devstat library error string */
==== //depot/projects/hammer/lib/libedit/Makefile#5 (text+ko) ====
@@ -3,7 +3,7 @@
# $FreeBSD: src/lib/libedit/Makefile,v 1.29 2005/07/22 17:19:00 kensmith Exp $
LIB= edit
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 4
SHLIBDIR?= /lib
OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \
==== //depot/projects/hammer/lib/libexpat/Makefile#5 (text+ko) ====
@@ -4,7 +4,7 @@
LIB= bsdxml
SHLIBDIR?= /lib
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
SRCS= xmlparse.c xmlrole.c xmltok.c
INCS= bsdxml.h
MAN= libbsdxml.3
==== //depot/projects/hammer/lib/libfetch/Makefile#12 (text+ko) ====
@@ -18,7 +18,7 @@
CSTD?= c99
WARNS?= 2
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 3
ftperr.h: ftp.errors
@echo "static struct fetcherr _ftp_errlist[] = {" > ${.TARGET}
==== //depot/projects/hammer/lib/libftpio/Makefile#4 (text+ko) ====
@@ -1,7 +1,7 @@
# $FreeBSD: src/lib/libftpio/Makefile,v 1.14 2005/07/22 17:19:01 kensmith Exp $
LIB= ftpio
-SHLIB_MAJOR= 6
+SHLIB_MAJOR= 5
SRCS= ftpio.c ftperr.c
INCS= ftpio.h
==== //depot/projects/hammer/lib/libgpib/Makefile#3 (text+ko) ====
@@ -2,7 +2,7 @@
LIB = gpib
SHLIBDIR ?= /lib
-SHLIB_MAJOR = 1
+SHLIB_MAJOR = 0
NO_MAN = sorry
SRCS = ibfoo.c
INCS = gpib.h
==== //depot/projects/hammer/lib/libipsec/Makefile#7 (text+ko) ====
@@ -29,7 +29,7 @@
LIB= ipsec
SHLIBDIR?= /lib
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
CFLAGS+=-I. -I${.CURDIR}
CFLAGS+=-DIPSEC_DEBUG -DIPSEC
.if !defined(NO_INET6)
==== //depot/projects/hammer/lib/libkiconv/Makefile#4 (text+ko) ====
@@ -5,7 +5,7 @@
SRCS= xlat16_iconv.c xlat16_sysctl.c
SRCS+= quirks.c
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
MAN= kiconv.3
==== //depot/projects/hammer/lib/libmagic/Makefile#6 (text+ko) ====
@@ -5,7 +5,7 @@
.PATH: ${CONTRDIR}
LIB= magic
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
MAN= libmagic.3 magic.5
SRCS= apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c \
==== //depot/projects/hammer/lib/libmp/Makefile#5 (text+ko) ====
@@ -1,7 +1,7 @@
# $FreeBSD: src/lib/libmp/Makefile,v 1.10 2005/07/22 17:19:01 kensmith Exp $
LIB= mp
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 4
MAN= libmp.3
INCS= mp.h
SRCS= mpasbn.c
==== //depot/projects/hammer/lib/libncp/Makefile#5 (text+ko) ====
@@ -4,7 +4,7 @@
LIB= ncp
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
NO_MAN=
==== //depot/projects/hammer/lib/libncurses/Makefile#17 (text+ko) ====
@@ -4,7 +4,7 @@
LIB= ncurses
SHLIBDIR?= /lib
-SHLIB_MAJOR=6
+SHLIB_MAJOR=5
# Should be elsewhere
AWK?= awk
==== //depot/projects/hammer/lib/libnetgraph/Makefile#5 (text+ko) ====
@@ -5,7 +5,7 @@
WARNS?= 3
MAN= netgraph.3
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
SRCS= sock.c msg.c debug.c
INCS= netgraph.h
==== //depot/projects/hammer/lib/libngatm/Makefile#7 (text+ko) ====
@@ -3,7 +3,7 @@
# Author: Harti Brandt <harti at freebsd.org>
#
LIB= ngatm
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
MAN= libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3
WARNS?= 6
==== //depot/projects/hammer/lib/libopie/Makefile#8 (text+ko) ====
@@ -4,7 +4,7 @@
#
OPIE_DIST?= ${.CURDIR}/../../contrib/opie
DIST_DIR= ${OPIE_DIST}/${.CURDIR:T}
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 3
KEYFILE?= \"/etc/opiekeys\"
==== //depot/projects/hammer/lib/libpam/Makefile.inc#10 (text+ko) ====
@@ -28,5 +28,5 @@
DEBUG_FLAGS+= -DDEBUG
.endif
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 2
PAM_MOD_DIR= ${LIBDIR}
==== //depot/projects/hammer/lib/libpthread/Makefile#18 (text+ko) ====
@@ -12,7 +12,7 @@
.else
LIB=pthread
.endif
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
CFLAGS+=-DPTHREAD_KERNEL
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
-I${.CURDIR}/../../include
==== //depot/projects/hammer/lib/libradius/Makefile#9 (text+ko) ====
@@ -28,7 +28,7 @@
SRCS= radlib.c
INCS= radlib.h radlib_vs.h
CFLAGS+= -Wall
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
MAN= libradius.3 radius.conf.5
.if defined(NO_CRYPT) || defined(NO_OPENSSL)
==== //depot/projects/hammer/lib/libsdp/Makefile#5 (text+ko) ====
@@ -7,7 +7,7 @@
WARNS?= 2
CFLAGS+= -I${.CURDIR}
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
SRCS= search.c service.c session.c util.c
INCS= sdp.h
==== //depot/projects/hammer/lib/libsmb/Makefile#7 (text+ko) ====
@@ -4,7 +4,7 @@
.PATH: ${CONTRIBDIR}/lib/smb
LIB= smb
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
NO_MAN=
SRCS= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \
==== //depot/projects/hammer/lib/libtacplus/Makefile#6 (text+ko) ====
@@ -30,7 +30,7 @@
CFLAGS+= -Wall
DPADD= ${LIBMD}
LDADD= -lmd
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
MAN= libtacplus.3 tacplus.conf.5
.include <bsd.lib.mk>
==== //depot/projects/hammer/lib/libthr/Makefile#13 (text+ko) ====
@@ -8,7 +8,7 @@
# (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the
# system call stubs.
LIB=thr
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
CFLAGS+=-DPTHREAD_KERNEL
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
-I${.CURDIR}/../../include
==== //depot/projects/hammer/lib/libthread_db/Makefile#6 (text+ko) ====
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}
LIB= thread_db
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
SRCS= thread_db.c
SRCS+= libpthread_db.c libpthread_md.c
SRCS+= libc_r_db.c libc_r_md.c
==== //depot/projects/hammer/lib/libugidfw/Makefile#7 (text+ko) ====
@@ -1,7 +1,7 @@
# $FreeBSD: src/lib/libugidfw/Makefile,v 1.7 2005/07/22 17:19:04 kensmith Exp $
LIB= ugidfw
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
SRCS= ugidfw.c
INCS= ugidfw.h
==== //depot/projects/hammer/lib/libusbhid/Makefile#6 (text+ko) ====
@@ -4,7 +4,7 @@
LIB= usbhid
MAN= usbhid.3
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
MLINKS= usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \
usbhid.3 hid_dispose_report_desc.3 \
==== //depot/projects/hammer/lib/libutil/Makefile#9 (text+ko) ====
@@ -2,7 +2,7 @@
# $FreeBSD: src/lib/libutil/Makefile,v 1.57 2005/07/22 17:19:04 kensmith Exp $
LIB= util
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 4
SHLIBDIR?= /lib
CFLAGS+=-DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../libc/gen/
CFLAGS+=-DINET6
==== //depot/projects/hammer/lib/libvgl/Makefile#4 (text+ko) ====
@@ -1,6 +1,6 @@
# $FreeBSD: src/lib/libvgl/Makefile,v 1.11 2005/07/22 17:19:04 kensmith Exp $
LIB= vgl
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 3
CFLAGS+=-Wall -I${.CURDIR}
SRCS= main.c simple.c bitmap.c text.c mouse.c keyboard.c
INCS= vgl.h
==== //depot/projects/hammer/lib/libwrap/Makefile#9 (text+ko) ====
@@ -3,7 +3,7 @@
#
LIB= wrap
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 3
INCS= tcpd.h
MAN= hosts_access.3
MAN+= hosts_access.5 hosts_options.5
==== //depot/projects/hammer/lib/libypclnt/Makefile#6 (text+ko) ====
@@ -1,7 +1,7 @@
# $FreeBSD: src/lib/libypclnt/Makefile,v 1.13 2005/07/22 17:19:04 kensmith Exp $
LIB= ypclnt
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
SRCS= ypclnt_connect.c \
ypclnt_error.c \
ypclnt_free.c \
==== //depot/projects/hammer/lib/msun/Makefile#29 (text+ko) ====
@@ -26,7 +26,7 @@
LIB= m
SHLIBDIR?= /lib
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 3
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 \
==== //depot/projects/hammer/secure/lib/libcrypto/Makefile#18 (text+ko) ====
@@ -2,7 +2,7 @@
LIB= crypto
SHLIBDIR?= /lib
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 3
NO_LINT=
==== //depot/projects/hammer/secure/lib/libssh/Makefile#12 (text+ko) ====
@@ -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= 3
+SHLIB_MAJOR= 2
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 \
==== //depot/projects/hammer/secure/lib/libssl/Makefile#9 (text+ko) ====
@@ -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= 4
+SHLIB_MAJOR= 3
NO_LINT=
==== //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile.inc#4 (text+ko) ====
@@ -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= 4
+SHLIB_MAJOR= 3
WARNS?= 6
INCSDIR= ${INCLUDEDIR}/bsnmp
More information about the p4-projects
mailing list