Module Name: src Committed By: plunky Date: Tue May 12 18:07:55 UTC 2009
Modified Files: src/distrib/sets/lists/base: md.amd64 md.sparc64 shl.elf shl.mi src/distrib/sets/lists/comp: md.amd64 md.sparc64 mi shl.mi src/lib: Makefile src/share/mk: bsd.README bsd.hostprog.mk bsd.prog.mk src/share/tmac: doc2html Removed Files: src/lib/libsdp: Makefile sdp-int.h sdp.3 sdp.h search.c service.c session.c shlib_version util.c Log Message: remove libsdp as improved functionality has been enabled in libbluetooth. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.172 -r1.173 src/distrib/sets/lists/base/shl.elf cvs rdiff -u -r1.471 -r1.472 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1257 -r1.1258 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.136 -r1.137 src/lib/Makefile cvs rdiff -u -r1.3 -r0 src/lib/libsdp/Makefile src/lib/libsdp/search.c cvs rdiff -u -r1.1 -r0 src/lib/libsdp/sdp-int.h src/lib/libsdp/sdp.3 \ src/lib/libsdp/service.c src/lib/libsdp/util.c cvs rdiff -u -r1.4 -r0 src/lib/libsdp/sdp.h cvs rdiff -u -r1.2 -r0 src/lib/libsdp/session.c src/lib/libsdp/shlib_version cvs rdiff -u -r1.249 -r1.250 src/share/mk/bsd.README cvs rdiff -u -r1.55 -r1.56 src/share/mk/bsd.hostprog.mk cvs rdiff -u -r1.241 -r1.242 src/share/mk/bsd.prog.mk cvs rdiff -u -r1.60 -r1.61 src/share/tmac/doc2html Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.47 src/distrib/sets/lists/base/md.amd64:1.48 --- src/distrib/sets/lists/base/md.amd64:1.47 Tue May 12 10:05:07 2009 +++ src/distrib/sets/lists/base/md.amd64 Tue May 12 18:07:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.47 2009/05/12 10:05:07 plunky Exp $ +# $NetBSD: md.amd64,v 1.48 2009/05/12 18:07:54 plunky Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./usr/bin/fdformat base-util-bin @@ -176,8 +176,6 @@ ./usr/lib/i386/librumpuser.so.0.0 base-compat-shlib compat,pic ./usr/lib/i386/librumpvfs.so.0 base-compat-shlib compat,pic ./usr/lib/i386/librumpvfs.so.0.0 base-compat-shlib compat,pic -./usr/lib/i386/libsdp.so.3 base-compat-shlib compat,pic -./usr/lib/i386/libsdp.so.3.0 base-compat-shlib compat,pic ./usr/lib/i386/libskey.so.2 base-compat-shlib compat,pic,skey ./usr/lib/i386/libskey.so.2.0 base-compat-shlib compat,pic,skey ./usr/lib/i386/libsl.so.4 base-compat-shlib compat,pic,kerberos Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.42 src/distrib/sets/lists/base/md.sparc64:1.43 --- src/distrib/sets/lists/base/md.sparc64:1.42 Tue May 12 10:05:07 2009 +++ src/distrib/sets/lists/base/md.sparc64 Tue May 12 18:07:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.42 2009/05/12 10:05:07 plunky Exp $ +# $NetBSD: md.sparc64,v 1.43 2009/05/12 18:07:54 plunky Exp $ ./sbin/edlabel base-sysutil-root ./usr/bin/fdformat base-util-bin ./usr/lib/sparc base-compat-lib compat @@ -173,8 +173,6 @@ ./usr/lib/sparc/librumpuser.so.0.0 base-compat-shlib compat,pic ./usr/lib/sparc/librumpvfs.so.0 base-compat-shlib compat,pic ./usr/lib/sparc/librumpvfs.so.0.0 base-compat-shlib compat,pic -./usr/lib/sparc/libsdp.so.3 base-compat-shlib compat,pic -./usr/lib/sparc/libsdp.so.3.0 base-compat-shlib compat,pic ./usr/lib/sparc/libskey.so.2 base-compat-shlib compat,pic ./usr/lib/sparc/libskey.so.2.0 base-compat-shlib compat,pic ./usr/lib/sparc/libsl.so.4 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/shl.elf diff -u src/distrib/sets/lists/base/shl.elf:1.172 src/distrib/sets/lists/base/shl.elf:1.173 --- src/distrib/sets/lists/base/shl.elf:1.172 Fri May 8 17:50:56 2009 +++ src/distrib/sets/lists/base/shl.elf Tue May 12 18:07:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.elf,v 1.172 2009/05/08 17:50:56 christos Exp $ +# $NetBSD: shl.elf,v 1.173 2009/05/12 18:07:54 plunky Exp $ # # Note: Do not mark "old" major and major.minor shared libraries as # "obsolete"; just remove the entry, as third-party applications @@ -268,8 +268,6 @@ ./usr/lib/librumpuser.so.0 base-rump-shlib ./usr/lib/librumpvfs.so base-rump-shlib ./usr/lib/librumpvfs.so.0 base-rump-shlib -./usr/lib/libsdp.so base-sys-shlib -./usr/lib/libsdp.so.3 base-sys-shlib ./usr/lib/libskey.so base-sys-shlib skey ./usr/lib/libskey.so.2 base-sys-shlib skey ./usr/lib/libsl.so base-krb5-shlib kerberos Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.471 src/distrib/sets/lists/base/shl.mi:1.472 --- src/distrib/sets/lists/base/shl.mi:1.471 Tue May 12 10:05:07 2009 +++ src/distrib/sets/lists/base/shl.mi Tue May 12 18:07:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.471 2009/05/12 10:05:07 plunky Exp $ +# $NetBSD: shl.mi,v 1.472 2009/05/12 18:07:54 plunky Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -141,7 +141,6 @@ ./usr/lib/librumpnet_virtif.so.0.0 base-rump-shlib ./usr/lib/librumpuser.so.0.0 base-rump-shlib ./usr/lib/librumpvfs.so.0.0 base-rump-shlib -./usr/lib/libsdp.so.3.0 base-sys-shlib ./usr/lib/libskey.so.2.0 base-sys-shlib skey ./usr/lib/libsl.so.4.0 base-krb5-shlib kerberos ./usr/lib/libss.so.6.0 base-krb5-shlib kerberos Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.47 src/distrib/sets/lists/comp/md.amd64:1.48 --- src/distrib/sets/lists/comp/md.amd64:1.47 Fri Apr 17 21:33:38 2009 +++ src/distrib/sets/lists/comp/md.amd64 Tue May 12 18:07:55 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.47 2009/04/17 21:33:38 dyoung Exp $ +# $NetBSD: md.amd64,v 1.48 2009/05/12 18:07:55 plunky Exp $ ./usr/include/amd64 comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -617,10 +617,10 @@ ./usr/lib/i386/librumpvfs.so comp-sys-shlib compat,pic ./usr/lib/i386/librumpvfs_p.a comp-c-proflib compat,profile ./usr/lib/i386/librumpvfs_pic.a comp-c-piclib compat,pic -./usr/lib/i386/libsdp.a comp-c-lib compat -./usr/lib/i386/libsdp.so comp-sys-shlib compat,pic -./usr/lib/i386/libsdp_p.a comp-c-proflib compat,profile -./usr/lib/i386/libsdp_pic.a comp-c-piclib compat,pic +./usr/lib/i386/libsdp.a comp-obsolete obsolete +./usr/lib/i386/libsdp.so comp-obsolete obsolete +./usr/lib/i386/libsdp_p.a comp-obsolete obsolete +./usr/lib/i386/libsdp_pic.a comp-obsolete obsolete ./usr/lib/i386/libskey.a comp-c-lib compat,skey ./usr/lib/i386/libskey.so comp-sys-shlib compat,pic,skey ./usr/lib/i386/libskey_p.a comp-c-proflib compat,profile,skey Index: src/distrib/sets/lists/comp/md.sparc64 diff -u src/distrib/sets/lists/comp/md.sparc64:1.42 src/distrib/sets/lists/comp/md.sparc64:1.43 --- src/distrib/sets/lists/comp/md.sparc64:1.42 Fri Apr 17 20:38:04 2009 +++ src/distrib/sets/lists/comp/md.sparc64 Tue May 12 18:07:55 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.42 2009/04/17 20:38:04 dyoung Exp $ +# $NetBSD: md.sparc64,v 1.43 2009/05/12 18:07:55 plunky Exp $ ./usr/include/ieeefp.h comp-c-include ./usr/include/sparc comp-c-include ./usr/include/sparc/_G_config.h comp-obsolete obsolete @@ -516,10 +516,10 @@ ./usr/lib/sparc/librumpvfs.so base-sys-shlib compat,pic ./usr/lib/sparc/librumpvfs_p.a comp-c-proflib compat,profile ./usr/lib/sparc/librumpvfs_pic.a comp-c-piclib compat,pic -./usr/lib/sparc/libsdp.a comp-c-lib compat -./usr/lib/sparc/libsdp.so base-sys-shlib compat,pic -./usr/lib/sparc/libsdp_p.a comp-c-proflib compat,profile -./usr/lib/sparc/libsdp_pic.a comp-c-piclib compat,pic +./usr/lib/sparc/libsdp.a comp-obsolete obsolete +./usr/lib/sparc/libsdp.so base-obsolete obsolete +./usr/lib/sparc/libsdp_p.a comp-obsolete obsolete +./usr/lib/sparc/libsdp_pic.a comp-obsolete obsolete ./usr/lib/sparc/libskey.a comp-c-lib compat ./usr/lib/sparc/libskey.so base-sys-shlib compat,pic ./usr/lib/sparc/libskey_p.a comp-c-proflib compat,profile Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1257 src/distrib/sets/lists/comp/mi:1.1258 --- src/distrib/sets/lists/comp/mi:1.1257 Tue May 12 10:05:07 2009 +++ src/distrib/sets/lists/comp/mi Tue May 12 18:07:55 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1257 2009/05/12 10:05:07 plunky Exp $ +# $NetBSD: mi,v 1.1258 2009/05/12 18:07:55 plunky Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2580,9 +2580,9 @@ ./usr/lib/librumpvfs.a comp-c-lib ./usr/lib/librumpvfs_g.a -unknown- debuglib ./usr/lib/librumpvfs_p.a comp-c-proflib profile -./usr/lib/libsdp.a comp-c-lib -./usr/lib/libsdp_g.a -unknown- debuglib -./usr/lib/libsdp_p.a comp-c-proflib profile +./usr/lib/libsdp.a comp-obsolete obsolete +./usr/lib/libsdp_g.a -unknown- obsolete +./usr/lib/libsdp_p.a comp-obsolete obsolete ./usr/lib/libskey.a comp-c-lib skey ./usr/lib/libskey_g.a -unknown- debuglib,skey ./usr/lib/libskey_p.a comp-c-proflib profile,skey @@ -3580,7 +3580,7 @@ ./usr/libdata/lint/llib-lrpcsvc.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lrt.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lrumpuser.ln comp-c-lintlib lint -./usr/libdata/lint/llib-lsdp.ln comp-c-lintlib lint +./usr/libdata/lint/llib-lsdp.ln comp-obsolete obsolete ./usr/libdata/lint/llib-lskey.ln comp-c-lintlib lint,skey ./usr/libdata/lint/llib-lsm.ln comp-obsolete obsolete ./usr/libdata/lint/llib-lssh.ln comp-c-lintlib lint,crypto Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.80 src/distrib/sets/lists/comp/shl.mi:1.81 --- src/distrib/sets/lists/comp/shl.mi:1.80 Sat May 2 01:15:54 2009 +++ src/distrib/sets/lists/comp/shl.mi Tue May 12 18:07:55 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.80 2009/05/02 01:15:54 pooka Exp $ +# $NetBSD: shl.mi,v 1.81 2009/05/12 18:07:55 plunky Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -104,7 +104,7 @@ ./usr/lib/librumpnet_virtif_pic.a comp-c-piclib ./usr/lib/librumpuser_pic.a comp-c-piclib ./usr/lib/librumpvfs_pic.a comp-c-piclib -./usr/lib/libsdp_pic.a comp-c-piclib +./usr/lib/libsdp_pic.a comp-obsolete obsolete ./usr/lib/libskey_pic.a comp-c-piclib skey ./usr/lib/libsl_pic.a comp-c-piclib kerberos ./usr/lib/libss_pic.a comp-c-piclib kerberos Index: src/lib/Makefile diff -u src/lib/Makefile:1.136 src/lib/Makefile:1.137 --- src/lib/Makefile:1.136 Fri May 8 17:47:22 2009 +++ src/lib/Makefile Tue May 12 18:07:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.136 2009/05/08 17:47:22 christos Exp $ +# $NetBSD: Makefile,v 1.137 2009/05/12 18:07:54 plunky Exp $ # from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91 .include <bsd.own.mk> @@ -8,7 +8,7 @@ libcompat libcrypt \ libcurses libevent libintl libkvm libl libm \ libossaudio libpcap libpci libpmc libposix libprop libpthread \ - libpthread_dbg libpuffs libresolv librmt librpcsvc librt libsdp \ + libpthread_dbg libpuffs libresolv librmt librpcsvc librt \ libterm libusbhid libutil libwrap liby libz # libform and libmenu need libcurses Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.249 src/share/mk/bsd.README:1.250 --- src/share/mk/bsd.README:1.249 Fri Apr 10 16:16:12 2009 +++ src/share/mk/bsd.README Tue May 12 18:07:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.249 2009/04/10 16:16:12 apb Exp $ +# $NetBSD: bsd.README,v 1.250 2009/05/12 18:07:54 plunky Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -1318,7 +1318,6 @@ LIBROKEN?= ${DESTDIR}/usr/lib/libroken.a LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a LIBRT?= ${DESTDIR}/usr/lib/librt.a - LIBSDP?= ${DESTDIR}/usr/lib/libsdp.a LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a LIBSL?= ${DESTDIR}/usr/lib/libsl.a LIBSS?= ${DESTDIR}/usr/lib/libss.a Index: src/share/mk/bsd.hostprog.mk diff -u src/share/mk/bsd.hostprog.mk:1.55 src/share/mk/bsd.hostprog.mk:1.56 --- src/share/mk/bsd.hostprog.mk:1.55 Fri Apr 10 16:16:12 2009 +++ src/share/mk/bsd.hostprog.mk Tue May 12 18:07:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.hostprog.mk,v 1.55 2009/04/10 16:16:12 apb Exp $ +# $NetBSD: bsd.hostprog.mk,v 1.56 2009/05/12 18:07:54 plunky Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .include <bsd.init.mk> @@ -47,7 +47,6 @@ LIBRUMPNET?= /usr/lib/librumpnet.a LIBRUMPUSER?= /usr/lib/librumpuser.a LIBRUMPVFS?= /usr/lib/librumpvfs.a -LIBSDP?= /usr/lib/libsdp.a LIBSKEY?= /usr/lib/libskey.a LIBSSP?= /usr/lib/libssp.a LIBSTDCXX?= /usr/lib/libstdc++.a Index: src/share/mk/bsd.prog.mk diff -u src/share/mk/bsd.prog.mk:1.241 src/share/mk/bsd.prog.mk:1.242 --- src/share/mk/bsd.prog.mk:1.241 Fri Apr 10 16:16:12 2009 +++ src/share/mk/bsd.prog.mk Tue May 12 18:07:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.241 2009/04/10 16:16:12 apb Exp $ +# $NetBSD: bsd.prog.mk,v 1.242 2009/05/12 18:07:54 plunky Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .ifndef HOSTPROG @@ -95,7 +95,7 @@ fetch form fl g2c gcc gnumalloc gssapi hdb heimntlm hx509 intl ipsec \ kadm5clnt kadm5srv kafs krb5 kvm l lber ldap ldap_r \ m magic menu objc ossaudio pam pcap pci pmc posix pthread pthread_dbg \ - puffs radius resolv rmt roken rpcsvc rt rump rumpuser sdp skey sl ss \ + puffs radius resolv rmt roken rpcsvc rt rump rumpuser skey sl ss \ ssh ssl termcap usbhid util wrap y z bind9 dns lwres isccfg isccc isc \ \ rumpfs_cd9660fs rumpfs_efs rumpfs_ext2fs rumpfs_ffs rumpfs_hfs \ Index: src/share/tmac/doc2html diff -u src/share/tmac/doc2html:1.60 src/share/tmac/doc2html:1.61 --- src/share/tmac/doc2html:1.60 Fri May 1 17:52:27 2009 +++ src/share/tmac/doc2html Tue May 12 18:07:54 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: doc2html,v 1.60 2009/05/01 17:52:27 perry Exp $ +.\" $NetBSD: doc2html,v 1.61 2009/05/12 18:07:54 plunky Exp $ .\" .\" Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -596,7 +596,6 @@ .if "\\$1"libpthread" \&POSIX Thread Library (libpthread, -lpthread) .if "\\$1"libresolv" \&DNS Resolver Library (libresolv, -lresolv) .if "\\$1"librt" \&POSIX Real-time Library (librt, -lrt) -.if "\\$1"libsdp" \&Service Discovery Protocol Library (libsdp, -lsdp) .if "\\$1"libtermcap" \&Termcap Access Library (libtermcap, -ltermcap) .if "\\$1"libusbhid" \&USB Human Interface Devices Library (libusbhid, -lusbhid) .if "\\$1"libutil" \&System Utilities Library (libutil, -lutil)