PERFORCE change 80779 for review
Sam Leffler
sam at FreeBSD.org
Fri Jul 22 18:32:17 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=80779
Change 80779 by sam at sam_ebb on 2005/07/22 18:31:23
IFC @ 80778
Affected files ...
.. //depot/projects/wifi/etc/Makefile#7 integrate
.. //depot/projects/wifi/etc/defaults/rc.conf#17 integrate
.. //depot/projects/wifi/etc/rc.d/bgfsck#2 integrate
.. //depot/projects/wifi/etc/rc.d/power_profile#4 integrate
.. //depot/projects/wifi/gnu/lib/libdialog/Makefile#4 integrate
.. //depot/projects/wifi/gnu/lib/libg2c/Makefile#3 integrate
.. //depot/projects/wifi/gnu/lib/libobjc/Makefile#6 integrate
.. //depot/projects/wifi/gnu/lib/libreadline/Makefile.inc#2 integrate
.. //depot/projects/wifi/gnu/lib/libregex/Makefile#3 integrate
.. //depot/projects/wifi/gnu/lib/libstdc++/Makefile#5 integrate
.. //depot/projects/wifi/kerberos5/lib/Makefile.inc#2 integrate
.. //depot/projects/wifi/lib/Makefile.inc#2 integrate
.. //depot/projects/wifi/lib/libalias/Makefile#4 integrate
.. //depot/projects/wifi/lib/libarchive/Makefile#12 integrate
.. //depot/projects/wifi/lib/libbegemot/Makefile#3 integrate
.. //depot/projects/wifi/lib/libbluetooth/Makefile#2 integrate
.. //depot/projects/wifi/lib/libbsnmp/Makefile.inc#3 integrate
.. //depot/projects/wifi/lib/libbz2/Makefile#2 integrate
.. //depot/projects/wifi/lib/libc_r/Makefile#4 integrate
.. //depot/projects/wifi/lib/libcrypt/Makefile#4 integrate
.. //depot/projects/wifi/lib/libdevstat/Makefile#2 integrate
.. //depot/projects/wifi/lib/libdevstat/devstat.h#2 integrate
.. //depot/projects/wifi/lib/libedit/Makefile#2 integrate
.. //depot/projects/wifi/lib/libexpat/Makefile#2 integrate
.. //depot/projects/wifi/lib/libfetch/Makefile#3 integrate
.. //depot/projects/wifi/lib/libftpio/Makefile#2 integrate
.. //depot/projects/wifi/lib/libgpib/Makefile#2 integrate
.. //depot/projects/wifi/lib/libipsec/Makefile#3 integrate
.. //depot/projects/wifi/lib/libkiconv/Makefile#2 integrate
.. //depot/projects/wifi/lib/libmagic/Makefile#4 integrate
.. //depot/projects/wifi/lib/libmp/Makefile#2 integrate
.. //depot/projects/wifi/lib/libncp/Makefile#3 integrate
.. //depot/projects/wifi/lib/libncurses/Makefile#4 integrate
.. //depot/projects/wifi/lib/libnetgraph/Makefile#2 integrate
.. //depot/projects/wifi/lib/libngatm/Makefile#2 integrate
.. //depot/projects/wifi/lib/libopie/Makefile#3 integrate
.. //depot/projects/wifi/lib/libpam/Makefile.inc#3 integrate
.. //depot/projects/wifi/lib/libpthread/Makefile#3 integrate
.. //depot/projects/wifi/lib/libradius/Makefile#3 integrate
.. //depot/projects/wifi/lib/libsdp/Makefile#2 integrate
.. //depot/projects/wifi/lib/libsmb/Makefile#4 integrate
.. //depot/projects/wifi/lib/libtacplus/Makefile#2 integrate
.. //depot/projects/wifi/lib/libthr/Makefile#7 integrate
.. //depot/projects/wifi/lib/libthread_db/Makefile#2 integrate
.. //depot/projects/wifi/lib/libugidfw/Makefile#3 integrate
.. //depot/projects/wifi/lib/libusbhid/Makefile#3 integrate
.. //depot/projects/wifi/lib/libutil/Makefile#2 integrate
.. //depot/projects/wifi/lib/libvgl/Makefile#2 integrate
.. //depot/projects/wifi/lib/libwrap/Makefile#4 integrate
.. //depot/projects/wifi/lib/libypclnt/Makefile#2 integrate
.. //depot/projects/wifi/lib/msun/Makefile#11 integrate
.. //depot/projects/wifi/secure/lib/libcrypto/Makefile#6 integrate
.. //depot/projects/wifi/secure/lib/libssh/Makefile#6 integrate
.. //depot/projects/wifi/secure/lib/libssl/Makefile#4 integrate
.. //depot/projects/wifi/share/man/man4/kbdmux.4#2 integrate
.. //depot/projects/wifi/share/man/man9/vhold.9#3 integrate
.. //depot/projects/wifi/sys/amd64/amd64/mp_machdep.c#9 integrate
.. //depot/projects/wifi/sys/amd64/conf/NOTES#13 integrate
.. //depot/projects/wifi/sys/amd64/include/atomic.h#5 integrate
.. //depot/projects/wifi/sys/amd64/include/bus_dma.h#5 integrate
.. //depot/projects/wifi/sys/conf/files.amd64#16 integrate
.. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#14 integrate
.. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#14 integrate
.. //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.c#6 integrate
.. //depot/projects/wifi/sys/dev/ath/if_ath.c#91 integrate
.. //depot/projects/wifi/sys/dev/awi/awi.c#10 integrate
.. //depot/projects/wifi/sys/dev/vx/if_vx.c#5 integrate
.. //depot/projects/wifi/sys/i386/bios/smapi_bios.S#2 integrate
.. //depot/projects/wifi/sys/net/if_var.h#14 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211.c#25 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211.h#11 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#14 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#56 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#44 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#28 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#55 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_node.h#26 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#48 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#31 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#19 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_var.h#31 integrate
.. //depot/projects/wifi/sys/netgraph/ng_base.c#15 integrate
.. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#13 integrate
.. //depot/projects/wifi/sys/nfsclient/nfs_node.c#10 integrate
.. //depot/projects/wifi/sys/nfsclient/nfsnode.h#9 integrate
.. //depot/projects/wifi/usr.sbin/bsnmpd/modules/Makefile.inc#3 integrate
.. //depot/projects/wifi/usr.sbin/kbdcontrol/kbdcontrol.1#5 integrate
.. //depot/projects/wifi/usr.sbin/ndiscvt/ndisgen.sh#2 integrate
Differences ...
==== //depot/projects/wifi/etc/Makefile#7 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.344 2005/07/15 14:52:29 ru Exp $
+# $FreeBSD: src/etc/Makefile,v 1.345 2005/07/22 10:35:35 ru Exp $
.if !defined(NO_SENDMAIL)
SUBDIR= sendmail
@@ -86,6 +86,10 @@
.endif
distribution:
+.if !defined(DESTDIR)
+ @echo "set DESTDIR before running \"make ${.TARGET}\""
+ @false
+.endif
cd ${.CURDIR}; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${BIN1} ${DESTDIR}/etc; \
==== //depot/projects/wifi/etc/defaults/rc.conf#17 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.253 2005/07/21 15:17:54 pav Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.254 2005/07/22 00:38:55 obrien Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -482,10 +482,10 @@
devfs_system_ruleset="" # The name of a ruleset to apply to /dev
devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to
# apply (must be mounted already, i.e. fstab(5))
-performance_cx_lowest="HIGH" # Online CPU idle state
-performance_cpu_freq="NONE" # Online CPU frequency
-economy_cx_lowest="HIGH" # Offline CPU idle state
-economy_cpu_freq="NONE" # Offline CPU frequency
+performance_cx_lowest="HIGH" # Online CPU idle state
+performance_cpu_freq="NONE" # Online CPU frequency
+economy_cx_lowest="HIGH" # Offline CPU idle state
+economy_cpu_freq="NONE" # Offline CPU frequency
virecover_enable="YES" # Perform housekeeping for the vi(1) editor
ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot
bsdextended_script="/etc/rc.bsdextended" # Default mac_bsdextended(4)
==== //depot/projects/wifi/etc/rc.d/bgfsck#2 (text+ko) ====
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/bgfsck,v 1.6 2004/10/07 13:55:25 mtm Exp $
+# $FreeBSD: src/etc/rc.d/bgfsck,v 1.7 2005/07/22 00:57:37 obrien Exp $
#
# PROVIDE: bgfsck
-# REQUIRE: cron devfs
+# REQUIRE: cron devfs syslogd
# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/wifi/etc/rc.d/power_profile#4 (text+ko) ====
@@ -5,11 +5,13 @@
#
# Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance)
#
-# $FreeBSD: src/etc/rc.d/power_profile,v 1.7 2005/02/26 20:17:07 njl Exp $
+# $FreeBSD: src/etc/rc.d/power_profile,v 1.8 2005/07/22 00:57:04 obrien Exp $
#
# PROVIDE: power_profile
+# REQUIRE: mountcritlocal syslogd
# KEYWORD: nojail nostart
+# BEFORE: NETWORKING
. /etc/rc.subr
==== //depot/projects/wifi/gnu/lib/libdialog/Makefile#4 (text+ko) ====
@@ -1,11 +1,11 @@
# Makefile for libdialog
-# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.42 2005/04/22 18:57:32 trhodes Exp $
+# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.43 2005/07/22 17:18:57 kensmith Exp $
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
==== //depot/projects/wifi/gnu/lib/libg2c/Makefile#3 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.15 2004/12/21 09:33:45 ru Exp $
+# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.16 2005/07/22 17:18:57 kensmith Exp $
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
==== //depot/projects/wifi/gnu/lib/libobjc/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.26 2005/05/01 01:59:48 peter Exp $
+# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.27 2005/07/22 17:18:58 kensmith Exp $
OBJCDIR=${.CURDIR}/../../../contrib/libobjc
GCCDIR= ${.CURDIR}/../../../contrib/gcc
@@ -6,7 +6,7 @@
.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 \
==== //depot/projects/wifi/gnu/lib/libreadline/Makefile.inc#2 (text+ko) ====
@@ -1,6 +1,6 @@
-# $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.11 2004/10/18 08:29:47 ache Exp $
+# $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.12 2005/07/22 17:18:58 kensmith Exp $
-SHLIB_MAJOR=5
+SHLIB_MAJOR=6
RL_LIBRARY_VERSION=5.0
SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
==== //depot/projects/wifi/gnu/lib/libregex/Makefile#3 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.31 2005/05/10 11:37:37 tjr Exp $
+# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.32 2005/07/22 17:18:58 kensmith Exp $
SUBDIR= doc
LIB= gnuregex
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
SRCS= gnuregex.c
INCSGROUPS= INCS WRINCS PXINCS
==== //depot/projects/wifi/gnu/lib/libstdc++/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.55 2005/04/22 18:57:32 trhodes Exp $
+# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.56 2005/07/22 17:18:58 kensmith Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc
SRCDIR= ${.CURDIR}/../../../contrib/libstdc++
@@ -9,7 +9,7 @@
${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
==== //depot/projects/wifi/kerberos5/lib/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/kerberos5/lib/Makefile.inc,v 1.6 2003/10/09 19:48:45 nectar Exp $
+# $FreeBSD: src/kerberos5/lib/Makefile.inc,v 1.7 2005/07/22 17:18:58 kensmith Exp $
-SHLIB_MAJOR?= 7
+SHLIB_MAJOR?= 8
.include "../Makefile.inc"
==== //depot/projects/wifi/lib/Makefile.inc#2 (text+ko) ====
@@ -1,3 +1,3 @@
-# $FreeBSD: src/lib/Makefile.inc,v 1.2 2002/09/28 00:25:28 peter Exp $
+# $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?= 2
+SHLIB_MAJOR?= 3
==== //depot/projects/wifi/lib/libalias/Makefile#4 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/lib/libalias/Makefile,v 1.30 2005/05/04 12:49:44 glebius Exp $
+# $FreeBSD: src/lib/libalias/Makefile,v 1.31 2005/07/22 17:18:59 kensmith Exp $
.PATH: ${.CURDIR}/../../sys/netinet/libalias
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 \
==== //depot/projects/wifi/lib/libarchive/Makefile#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.36 2005/06/04 22:30:36 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.37 2005/07/22 17:18:59 kensmith Exp $
#
# Use "make distfile" to build a conventional tar.gz archive
@@ -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}\"
==== //depot/projects/wifi/lib/libbegemot/Makefile#3 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/lib/libbegemot/Makefile,v 1.2 2004/11/04 08:25:03 ru Exp $
+# $FreeBSD: src/lib/libbegemot/Makefile,v 1.3 2005/07/22 17:18:59 kensmith Exp $
LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot
.PATH: ${LIBBEGEMOT_DIR}
LIB= begemot
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SHLIBDIR?= /lib
# WARNS?= 6
==== //depot/projects/wifi/lib/libbluetooth/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# $Id: Makefile,v 1.5 2003/07/22 18:38:04 max Exp $
-# $FreeBSD: src/lib/libbluetooth/Makefile,v 1.1 2003/10/12 22:04:18 emax Exp $
+# $FreeBSD: src/lib/libbluetooth/Makefile,v 1.2 2005/07/22 17:18:59 kensmith Exp $
LIB= bluetooth
MAN= bluetooth.3
@@ -7,7 +7,7 @@
WARNS?= 2
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SRCS= bluetooth.c
INCS= bluetooth.h
==== //depot/projects/wifi/lib/libbsnmp/Makefile.inc#3 (text+ko) ====
@@ -1,6 +1,6 @@
-# $FreeBSD: src/lib/libbsnmp/Makefile.inc,v 1.5 2004/10/24 15:32:30 ru Exp $
+# $FreeBSD: src/lib/libbsnmp/Makefile.inc,v 1.6 2005/07/22 17:18:59 kensmith Exp $
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
WARNS?= 6
NO_WERROR=
INCSDIR= ${INCLUDEDIR}/bsnmp
==== //depot/projects/wifi/lib/libbz2/Makefile#2 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/lib/libbz2/Makefile,v 1.5 2003/06/14 19:32:51 obrien Exp $
+# $FreeBSD: src/lib/libbz2/Makefile,v 1.6 2005/07/22 17:18:59 kensmith Exp $
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
==== //depot/projects/wifi/lib/libc_r/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc_r/Makefile,v 1.41 2004/12/21 09:33:46 ru Exp $
+# $FreeBSD: src/lib/libc_r/Makefile,v 1.42 2005/07/22 17:19:00 kensmith 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
@@ -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
==== //depot/projects/wifi/lib/libcrypt/Makefile#4 (text+ko) ====
@@ -1,8 +1,8 @@
#
-# $FreeBSD: src/lib/libcrypt/Makefile,v 1.35 2004/12/21 10:16:00 ru Exp $
+# $FreeBSD: src/lib/libcrypt/Makefile,v 1.36 2005/07/22 17:19:00 kensmith Exp $
#
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
LIB= crypt
SHLIBDIR?= /lib
==== //depot/projects/wifi/lib/libdevstat/Makefile#2 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/lib/libdevstat/Makefile,v 1.14 2004/02/05 22:44:22 ru Exp $
+# $FreeBSD: src/lib/libdevstat/Makefile,v 1.15 2005/07/22 17:19:00 kensmith Exp $
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
==== //depot/projects/wifi/lib/libdevstat/devstat.h#2 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libdevstat/devstat.h,v 1.10 2003/03/18 17:05:27 phk Exp $
+ * $FreeBSD: src/lib/libdevstat/devstat.h,v 1.11 2005/07/22 17:19:00 kensmith Exp $
*/
#ifndef _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 */
==== //depot/projects/wifi/lib/libedit/Makefile#2 (text+ko) ====
@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.19 2000/08/15 12:01:40 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libedit/Makefile,v 1.28 2003/08/18 15:25:38 obrien Exp $
+# $FreeBSD: src/lib/libedit/Makefile,v 1.29 2005/07/22 17:19:00 kensmith Exp $
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 \
==== //depot/projects/wifi/lib/libexpat/Makefile#2 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/lib/libexpat/Makefile,v 1.4 2003/08/17 08:28:44 gordon Exp $
+# $FreeBSD: src/lib/libexpat/Makefile,v 1.5 2005/07/22 17:19:00 kensmith Exp $
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
==== //depot/projects/wifi/lib/libfetch/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libfetch/Makefile,v 1.44 2004/12/21 10:16:00 ru Exp $
+# $FreeBSD: src/lib/libfetch/Makefile,v 1.45 2005/07/22 17:19:00 kensmith Exp $
LIB= fetch
CFLAGS+= -I.
@@ -18,7 +18,7 @@
CSTD?= c99
WARNS?= 2
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
ftperr.h: ftp.errors
@echo "static struct fetcherr _ftp_errlist[] = {" > ${.TARGET}
==== //depot/projects/wifi/lib/libftpio/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/lib/libftpio/Makefile,v 1.13 2002/09/28 00:25:29 peter Exp $
+# $FreeBSD: src/lib/libftpio/Makefile,v 1.14 2005/07/22 17:19:01 kensmith Exp $
LIB= ftpio
-SHLIB_MAJOR= 5
+SHLIB_MAJOR= 6
SRCS= ftpio.c ftperr.c
INCS= ftpio.h
==== //depot/projects/wifi/lib/libgpib/Makefile#2 (text+ko) ====
@@ -1,8 +1,8 @@
-# $FreeBSD: src/lib/libgpib/Makefile,v 1.1 2005/02/06 16:45:20 phk Exp $
+# $FreeBSD: src/lib/libgpib/Makefile,v 1.2 2005/07/22 17:19:01 kensmith Exp $
LIB = gpib
SHLIBDIR ?= /lib
-SHLIB_MAJOR = 0
+SHLIB_MAJOR = 1
NO_MAN = sorry
SRCS = ibfoo.c
INCS = gpib.h
==== //depot/projects/wifi/lib/libipsec/Makefile#3 (text+ko) ====
@@ -25,11 +25,11 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/lib/libipsec/Makefile,v 1.16 2004/12/21 10:49:25 ru Exp $
+# $FreeBSD: src/lib/libipsec/Makefile,v 1.17 2005/07/22 17:19:01 kensmith Exp $
LIB= ipsec
SHLIBDIR?= /lib
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
CFLAGS+=-I. -I${.CURDIR}
CFLAGS+=-DIPSEC_DEBUG -DIPSEC
.if !defined(NO_INET6)
==== //depot/projects/wifi/lib/libkiconv/Makefile#2 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/lib/libkiconv/Makefile,v 1.2 2003/12/08 08:32:19 fjoe Exp $
+# $FreeBSD: src/lib/libkiconv/Makefile,v 1.3 2005/07/22 17:19:01 kensmith Exp $
LIB= kiconv
SHLIBDIR?= /lib
SRCS= xlat16_iconv.c xlat16_sysctl.c
SRCS+= quirks.c
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
MAN= kiconv.3
==== //depot/projects/wifi/lib/libmagic/Makefile#4 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/lib/libmagic/Makefile,v 1.6 2005/01/28 17:01:54 ru Exp $
+# $FreeBSD: src/lib/libmagic/Makefile,v 1.7 2005/07/22 17:19:01 kensmith Exp $
# Copyright (c) David E. O'Brien, 2000-2004
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 \
==== //depot/projects/wifi/lib/libmp/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/lib/libmp/Makefile,v 1.9 2004/07/28 05:44:07 kan Exp $
+# $FreeBSD: src/lib/libmp/Makefile,v 1.10 2005/07/22 17:19:01 kensmith Exp $
LIB= mp
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
MAN= libmp.3
INCS= mp.h
SRCS= mpasbn.c
==== //depot/projects/wifi/lib/libncp/Makefile#3 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/lib/libncp/Makefile,v 1.5 2004/12/21 08:47:02 ru Exp $
+# $FreeBSD: src/lib/libncp/Makefile,v 1.6 2005/07/22 17:19:02 kensmith Exp $
NCPLIB=${.CURDIR}
LIB= ncp
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
NO_MAN=
==== //depot/projects/wifi/lib/libncurses/Makefile#4 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/lib/libncurses/Makefile,v 1.78 2004/12/21 12:05:10 ru Exp $
+# $FreeBSD: src/lib/libncurses/Makefile,v 1.79 2005/07/22 17:19:02 kensmith Exp $
NCURSES=${.CURDIR}/../../contrib/ncurses
LIB= ncurses
SHLIBDIR?= /lib
-SHLIB_MAJOR=5
+SHLIB_MAJOR=6
# Should be elsewhere
AWK?= awk
==== //depot/projects/wifi/lib/libnetgraph/Makefile#2 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/lib/libnetgraph/Makefile,v 1.10 2004/01/28 00:11:42 ru Exp $
+# $FreeBSD: src/lib/libnetgraph/Makefile,v 1.11 2005/07/22 17:19:02 kensmith Exp $
# $Whistle: Makefile,v 1.4 1999/01/17 03:41:02 julian Exp $
LIB= netgraph
WARNS?= 3
MAN= netgraph.3
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SRCS= sock.c msg.c debug.c
INCS= netgraph.h
==== //depot/projects/wifi/lib/libngatm/Makefile#2 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/lib/libngatm/Makefile,v 1.5 2004/07/08 17:09:55 harti Exp $
+# $FreeBSD: src/lib/libngatm/Makefile,v 1.6 2005/07/22 17:19:02 kensmith Exp $
#
# Author: Harti Brandt <harti at 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
==== //depot/projects/wifi/lib/libopie/Makefile#3 (text+ko) ====
@@ -1,10 +1,10 @@
# Makefile for libopie
#
-# $FreeBSD: src/lib/libopie/Makefile,v 1.20 2005/04/22 18:57:31 trhodes Exp $
+# $FreeBSD: src/lib/libopie/Makefile,v 1.21 2005/07/22 17:19:02 kensmith Exp $
#
OPIE_DIST?= ${.CURDIR}/../../contrib/opie
DIST_DIR= ${OPIE_DIST}/${.CURDIR:T}
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
KEYFILE?= \"/etc/opiekeys\"
==== //depot/projects/wifi/lib/libpam/Makefile.inc#3 (text+ko) ====
@@ -22,11 +22,11 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/lib/libpam/Makefile.inc,v 1.16 2005/06/17 08:14:42 des Exp $
+# $FreeBSD: src/lib/libpam/Makefile.inc,v 1.17 2005/07/22 17:19:02 kensmith Exp $
.ifdef PAM_DEBUG
DEBUG_FLAGS+= -DDEBUG
.endif
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 3
PAM_MOD_DIR= ${LIBDIR}
==== //depot/projects/wifi/lib/libpthread/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libpthread/Makefile,v 1.53 2004/10/24 15:32:32 ru Exp $
+# $FreeBSD: src/lib/libpthread/Makefile,v 1.54 2005/07/22 17:19:03 kensmith 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
@@ -12,7 +12,7 @@
.else
LIB=pthread
.endif
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
CFLAGS+=-DPTHREAD_KERNEL
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
-I${.CURDIR}/../../include
==== //depot/projects/wifi/lib/libradius/Makefile#3 (text+ko) ====
@@ -22,13 +22,13 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/lib/libradius/Makefile,v 1.11 2004/12/21 10:16:00 ru Exp $
+# $FreeBSD: src/lib/libradius/Makefile,v 1.12 2005/07/22 17:19:03 kensmith Exp $
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)
==== //depot/projects/wifi/lib/libsdp/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# $Id: Makefile,v 1.2 2003/09/07 20:34:19 max Exp $
-# $FreeBSD: src/lib/libsdp/Makefile,v 1.3 2004/01/25 21:33:58 emax Exp $
+# $FreeBSD: src/lib/libsdp/Makefile,v 1.4 2005/07/22 17:19:03 kensmith Exp $
LIB= sdp
MAN= sdp.3
@@ -7,7 +7,7 @@
WARNS?= 2
CFLAGS+= -I${.CURDIR}
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SRCS= search.c service.c session.c util.c
INCS= sdp.h
==== //depot/projects/wifi/lib/libsmb/Makefile#4 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/lib/libsmb/Makefile,v 1.7 2004/12/21 08:47:03 ru Exp $
+# $FreeBSD: src/lib/libsmb/Makefile,v 1.8 2005/07/22 17:19:03 kensmith Exp $
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 \
==== //depot/projects/wifi/lib/libtacplus/Makefile#2 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/lib/libtacplus/Makefile,v 1.6 2004/02/05 22:44:23 ru Exp $
+# $FreeBSD: src/lib/libtacplus/Makefile,v 1.7 2005/07/22 17:19:03 kensmith Exp $
LIB= tacplus
SRCS= taclib.c
@@ -30,7 +30,7 @@
CFLAGS+= -Wall
DPADD= ${LIBMD}
LDADD= -lmd
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
MAN= libtacplus.3 tacplus.conf.5
.include <bsd.lib.mk>
==== //depot/projects/wifi/lib/libthr/Makefile#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthr/Makefile,v 1.13 2005/06/11 15:27:56 rwatson Exp $
+# $FreeBSD: src/lib/libthr/Makefile,v 1.14 2005/07/22 17:19:03 kensmith 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
@@ -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
==== //depot/projects/wifi/lib/libthread_db/Makefile#2 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/lib/libthread_db/Makefile,v 1.5 2004/08/16 03:30:16 davidxu Exp $
+# $FreeBSD: src/lib/libthread_db/Makefile,v 1.6 2005/07/22 17:19:03 kensmith Exp $
.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
==== //depot/projects/wifi/lib/libugidfw/Makefile#3 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/lib/libugidfw/Makefile,v 1.6 2005/03/28 09:38:43 pjd Exp $
+# $FreeBSD: src/lib/libugidfw/Makefile,v 1.7 2005/07/22 17:19:04 kensmith Exp $
LIB= ugidfw
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SRCS= ugidfw.c
INCS= ugidfw.h
==== //depot/projects/wifi/lib/libusbhid/Makefile#3 (text+ko) ====
@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $
-# $FreeBSD: src/lib/libusbhid/Makefile,v 1.9 2005/06/04 10:58:37 schweikh Exp $
+# $FreeBSD: src/lib/libusbhid/Makefile,v 1.10 2005/07/22 17:19:04 kensmith Exp $
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 \
==== //depot/projects/wifi/lib/libutil/Makefile#2 (text+ko) ====
@@ -1,8 +1,8 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libutil/Makefile,v 1.56 2004/05/24 22:19:27 pjd Exp $
+# $FreeBSD: src/lib/libutil/Makefile,v 1.57 2005/07/22 17:19:04 kensmith Exp $
LIB= util
-SHLIB_MAJOR= 4
+SHLIB_MAJOR= 5
SHLIBDIR?= /lib
CFLAGS+=-DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../libc/gen/
CFLAGS+=-DINET6
==== //depot/projects/wifi/lib/libvgl/Makefile#2 (text+ko) ====
@@ -1,6 +1,6 @@
-# $FreeBSD: src/lib/libvgl/Makefile,v 1.10 2002/09/28 00:25:32 peter Exp $
+# $FreeBSD: src/lib/libvgl/Makefile,v 1.11 2005/07/22 17:19:04 kensmith Exp $
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
==== //depot/projects/wifi/lib/libwrap/Makefile#4 (text+ko) ====
@@ -1,9 +1,9 @@
#
-# $FreeBSD: src/lib/libwrap/Makefile,v 1.16 2004/12/21 10:49:26 ru Exp $
+# $FreeBSD: src/lib/libwrap/Makefile,v 1.17 2005/07/22 17:19:04 kensmith Exp $
#
LIB= wrap
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
INCS= tcpd.h
MAN= hosts_access.3
MAN+= hosts_access.5 hosts_options.5
==== //depot/projects/wifi/lib/libypclnt/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/lib/libypclnt/Makefile,v 1.12 2004/02/04 09:53:29 ru Exp $
+# $FreeBSD: src/lib/libypclnt/Makefile,v 1.13 2005/07/22 17:19:04 kensmith Exp $
LIB= ypclnt
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SRCS= ypclnt_connect.c \
ypclnt_error.c \
ypclnt_free.c \
==== //depot/projects/wifi/lib/msun/Makefile#11 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 5.1beta 93/09/24
-# $FreeBSD: src/lib/msun/Makefile,v 1.71 2005/04/17 19:57:52 ache Exp $
+# $FreeBSD: src/lib/msun/Makefile,v 1.72 2005/07/22 17:19:05 kensmith Exp $
#
# ====================================================
# Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -26,7 +26,7 @@
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 \
==== //depot/projects/wifi/secure/lib/libcrypto/Makefile#6 (text+ko) ====
@@ -1,8 +1,8 @@
-# $FreeBSD: src/secure/lib/libcrypto/Makefile,v 1.73 2005/02/25 06:04:09 nectar Exp $
+# $FreeBSD: src/secure/lib/libcrypto/Makefile,v 1.74 2005/07/22 17:19:05 kensmith Exp $
LIB= crypto
SHLIBDIR?= /lib
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
NO_LINT=
==== //depot/projects/wifi/secure/lib/libssh/Makefile#6 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/secure/lib/libssh/Makefile,v 1.34 2005/06/07 09:31:26 des Exp $
+# $FreeBSD: src/secure/lib/libssh/Makefile,v 1.35 2005/07/22 17:19:05 kensmith Exp $
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 \
==== //depot/projects/wifi/secure/lib/libssl/Makefile#4 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.21 2004/12/21 09:33:45 ru Exp $
+# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.22 2005/07/22 17:19:05 kensmith Exp $
LIB= ssl
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
NO_LINT=
==== //depot/projects/wifi/share/man/man4/kbdmux.4#2 (text+ko) ====
@@ -1,5 +1,5 @@
.\" $Id: kbdmux.4,v 1.1 2005/07/14 20:32:10 max Exp $
-.\" $FreeBSD: src/share/man/man4/kbdmux.4,v 1.1 2005/07/14 23:04:22 emax Exp $
+.\" $FreeBSD: src/share/man/man4/kbdmux.4,v 1.2 2005/07/21 22:47:34 markus Exp $
.\"
.Dd July 12, 2005
.Os
@@ -12,16 +12,16 @@
.Sh DESCRIPTION
The
.Nm
-keyboard driver provides support for basic keyboard multiplexer.
-It is built around the idea of
-.Dq super keyboard ,
-that is
+keyboard driver provides support for basic keyboard multiplexing.
+It is built around the idea of a
+.Dq super keyboard .
.Nm
-is a keyboard that consumes input from all slave keyboards attached to it.
+acts as a master keyboard consuming input from all slave keyboards attached to
+it.
.Pp
Slave keyboards can be attached to or detached from the
.Nm
-keyboard driver with
+keyboard driver with the
.Xr kbdcontrol 1
utility.
.Sh SEE ALSO
@@ -30,7 +30,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list