PERFORCE change 93288 for review
soc-bushman
soc-bushman at FreeBSD.org
Tue Mar 14 10:27:51 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=93288
Change 93288 by soc-bushman at soc-bushman_stinger on 2006/03/14 10:26:49
versions merged + src_rel6 branch created (basically to be able to build cached without libpidfile present)
Affected files ...
.. //depot/projects/soc2005/nsswitch_cached/src/include/Makefile#6 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/Makefile#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/Versions.def#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/alpha/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/alpha/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/amd64/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/amd64/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/arm/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/arm/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/compat-43/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/compat-43/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/db/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/db/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gdtoa/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gdtoa/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/Makefile.inc#6 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/_spinlock_stub.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gmon/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gmon/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/i386/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/i386/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/ia64/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/ia64/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/un-namespace.h#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/Makefile.inc#6 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nls/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nls/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/posix1e/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/posix1e/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/powerpc/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/powerpc/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/quad/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/quad/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/regex/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/regex/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/Makefile.inc#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/softfloat/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/softfloat/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sparc64/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sparc64/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/Makefile.inc#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/Makefile.inc#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdtime/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdtime/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/string/Makefile.inc#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/string/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/Makefile.inc#7 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/uuid/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/uuid/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/xdr/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/xdr/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/yp/Makefile.inc#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/yp/Symbol.map#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/bthidd/hid.c#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/bsnmpd/Makefile#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters.ru/koi2855/Makefile#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters.ru/koi2alt/Makefile#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters/Makefile#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/add.h#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/main.c#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/perform.c#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/pkg_add.1#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/rpcbind/Makefile#4 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/Makefile#6 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/install.c#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/Makefile#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/Makefile#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/agent.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/agent.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/agents/Makefile.inc#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/agents/group.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/agents/group.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/agents/hosts.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/agents/hosts.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/agents/passwd.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/agents/passwd.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/agents/services.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/agents/services.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/cached.8#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/cached.c#1 add
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/cached.conf#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/cached.conf.5#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/cachedcli.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/cachedcli.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/cachelib.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/cachelib.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/cacheplcs.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/cacheplcs.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/config.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/config.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/debug.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/debug.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/hashtable.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/log.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/log.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/mp_rs_query.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/mp_rs_query.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/mp_ws_query.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/mp_ws_query.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/parser.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/parser.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/protocol.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/protocol.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/query.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/query.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/singletons.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/cached/singletons.h#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src_rel6/usr.sbin/cached/startup/cached#1 branch
Differences ...
==== //depot/projects/soc2005/nsswitch_cached/src/include/Makefile#6 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.254 2005/12/29 14:40:19 dfr Exp $
+# $FreeBSD: src/include/Makefile,v 1.256 2006/03/10 11:07:39 ru Exp $
#
# Doing a "make install" builds /usr/include.
@@ -72,18 +72,18 @@
INCS+= osreldate.h
-osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh \
- ${.CURDIR}/../sys/sys/param.h \
- ${.CURDIR}/Makefile
+osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh ${.CURDIR}/../sys/sys/param.h \
+ ${.CURDIR}/Makefile
@${ECHO} creating osreldate.h from newvers.sh
- @setvar PARAMFILE ${.CURDIR}/../sys/sys/param.h; \
- MAKE=${MAKE} . ${.CURDIR}/../sys/conf/newvers.sh; \
- echo "$$COPYRIGHT" > osreldate.h; \
- echo "#ifdef _KERNEL" >> osreldate.h; \
- echo '#error "<osreldate.h> cannot be used in the kernel, use <sys/param.h>"' >> osreldate.h; \
- echo "#else" >> osreldate.h; \
- echo \#'undef __FreeBSD_version' >> osreldate.h; \
- echo \#'define __FreeBSD_version' $$RELDATE >> osreldate.h; \
+ @MAKE=${MAKE}; \
+ PARAMFILE=${.CURDIR}/../sys/sys/param.h; \
+ . ${.CURDIR}/../sys/conf/newvers.sh; \
+ echo "$$COPYRIGHT" > osreldate.h; \
+ echo "#ifdef _KERNEL" >> osreldate.h; \
+ echo "#error \"<osreldate.h> cannot be used in the kernel, use <sys/param.h>\"" >> osreldate.h; \
+ echo "#else" >> osreldate.h; \
+ echo "#undef __FreeBSD_version" >> osreldate.h; \
+ echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \
echo "#endif" >> osreldate.h
.for i in ${LHDRS}
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.58 2005/12/29 04:10:52 grehan Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.59 2006/03/13 00:56:02 deischen 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
@@ -18,6 +18,8 @@
CLEANFILES+=tags
INSTALL_PIC_ARCHIVE=
PRECIOUSLIB=
+VERSION_DEF=Versions.def
+VERSION_MAP=Version.map
# Define (empty) variables so that make doesn't give substitution
# errors if the included makefiles don't change these:
@@ -97,7 +99,19 @@
cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${MACHINE_ARCH}
.endif
+${VERSION_MAP}: ${SYM_MAPS}
+ awk -v vfile=${.CURDIR}/Versions.def -f ${.CURDIR}/version_gen.awk \
+ ${SYM_MAPS} > ${.TARGET}
+
+
.include <bsd.lib.mk>
# Disable warnings in contributed sources.
CWARNFLAGS:= ${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/}
+
+.if defined(SYMVER_ENABLED)
+CFLAGS+= -DSYMBOL_VERSIONING
+LDFLAGS= -Wl,--version-script=${.OBJDIR}/${VERSION_MAP}
+
+${SHLIB_NAME}: ${VERSION_MAP}
+.endif
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/alpha/Makefile.inc#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/alpha/Makefile.inc,v 1.7 2005/01/15 05:23:56 das Exp $
+# $FreeBSD: src/lib/libc/alpha/Makefile.inc,v 1.8 2006/03/13 01:14:55 deischen Exp $
#
# Machine dependent definitions for the alpha architecture.
#
@@ -10,3 +10,4 @@
# On Alpha, long double is just double precision.
MDSRCS+=machdep_ldisd.c
+SYM_MAPS+=${.CURDIR}/alpha/Symbol.map
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/amd64/Makefile.inc#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.3 2005/01/15 05:23:57 das Exp $
+# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.4 2006/03/13 01:14:55 deischen Exp $
#
# Machine dependent definitions for the amd64 architecture.
#
@@ -11,3 +11,4 @@
# Long double is 80 bits
GDTOASRCS+=strtopx.c
MDSRCS+=machdep_ldisx.c
+SYM_MAPS+=${.CURDIR}/amd64/Symbol.map
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/arm/Makefile.inc#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/arm/Makefile.inc,v 1.3 2005/03/20 00:53:52 cognet Exp $
+# $FreeBSD: src/lib/libc/arm/Makefile.inc,v 1.4 2006/03/13 01:14:55 deischen Exp $
#
# Machine dependent definitions for the arm architecture.
#
@@ -9,3 +9,4 @@
# Long double is just double precision.
MDSRCS+=machdep_ldisd.c
+SYM_MAPS+=${.CURDIR}/arm/Symbol.map
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/compat-43/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/2/93
-# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.12 2002/11/18 09:50:54 ru Exp $
+# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.13 2006/03/13 01:14:55 deischen Exp $
# compat-43 sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43
@@ -7,6 +7,8 @@
SRCS+= creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
setrgid.c setruid.c sigcompat.c
+SYM_MAPS+=${.CURDIR}/compat-43/Symbol.map
+
MAN+= creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2
MAN+= gethostid.3 setruid.3
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/db/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
# from @(#)Makefile.inc 8.2 (Berkeley) 2/21/94
-# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $
+# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.5 2006/03/13 01:14:56 deischen Exp $
#
CFLAGS+=-D__DBINTERFACE_PRIVATE
@@ -9,3 +9,5 @@
.include "${.CURDIR}/db/man/Makefile.inc"
.include "${.CURDIR}/db/mpool/Makefile.inc"
.include "${.CURDIR}/db/recno/Makefile.inc"
+
+SYM_MAPS+=${.CURDIR}/db/Symbol.map
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gdtoa/Makefile.inc#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.8 2005/01/27 05:44:16 das Exp $
+# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.9 2006/03/13 01:14:56 deischen Exp $
# netlib gdtoa sources
.PATH: ${.CURDIR}/gdtoa
@@ -8,6 +8,8 @@
hd_init.c hexnan.c misc.c smisc.c \
strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c
+SYM_MAPS+=${.CURDIR}/gdtoa/Symbol.map
+
CFLAGS+=-I${.CURDIR}/../../contrib/gdtoa
.for src in ${GDTOASRCS}
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/Makefile.inc#6 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.124 2005/12/01 15:56:05 jhb Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.125 2006/03/13 01:14:56 deischen Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -33,6 +33,8 @@
usleep.c utime.c valloc.c vis.c wait.c wait3.c waitpid.c \
wordexp.c
+SYM_MAPS+=${.CURDIR}/gen/Symbol.map
+
# machine-dependent gen sources
.if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc)
.include "${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc"
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/_spinlock_stub.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.8 2003/03/26 04:02:24 jeff Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.9 2006/03/13 01:17:39 deischen Exp $");
#include <stdio.h>
@@ -43,7 +43,7 @@
*/
__weak_reference(_atomic_lock_stub, _atomic_lock);
__weak_reference(_spinlock_stub, _spinlock);
-__weak_reference(_spinlock_stub, _spinunlock);
+__weak_reference(_spinunlock_stub, _spinunlock);
__weak_reference(_spinlock_debug_stub, _spinlock_debug);
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gmon/Makefile.inc#3 (text+ko) ====
@@ -1,11 +1,13 @@
# from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.10 2004/05/18 22:49:15 peter Exp $
+# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.11 2006/03/13 01:14:56 deischen Exp $
# gmon sources
.PATH: ${.CURDIR}/gmon
SRCS+= gmon.c mcount.c
+SYM_MAPS+=${.CURDIR}/gmon/Symbol.map
+
MAN+= moncontrol.3
MLINKS+=moncontrol.3 monstartup.3
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/i386/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,6 @@
-# $FreeBSD: src/lib/libc/i386/Makefile.inc,v 1.1 2005/01/15 05:23:57 das Exp $
+# $FreeBSD: src/lib/libc/i386/Makefile.inc,v 1.2 2006/03/13 01:14:57 deischen Exp $
# Long double is 80 bits
GDTOASRCS+=strtopx.c
MDSRCS+=machdep_ldisx.c
+SYM_MAPS+=${.CURDIR}/i386/Symbol.map
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/ia64/Makefile.inc#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/ia64/Makefile.inc,v 1.4 2005/01/15 05:23:58 das Exp $
+# $FreeBSD: src/lib/libc/ia64/Makefile.inc,v 1.5 2006/03/13 01:14:57 deischen Exp $
#
# Machine dependent definitions for the alpha architecture.
#
@@ -11,3 +11,4 @@
# Long double is 80 bits
GDTOASRCS+=strtopx.c
MDSRCS+=machdep_ldisx.c
+SYM_MAPS+=${.CURDIR}/ia64/Symbol.map
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/un-namespace.h#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.14 2005/08/03 00:43:14 deischen Exp $
+ * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.15 2006/03/10 09:58:18 davidxu Exp $
*/
#ifndef _UN_NAMESPACE_H_
@@ -62,14 +62,40 @@
#undef nanosleep
#undef open
#undef poll
+#undef pthread_atfork
+#undef pthread_attr_destroy
+#undef pthread_attr_getdetachstate
+#undef pthread_attr_getguardsize
+#undef pthread_attr_getstackaddr
+#undef pthread_attr_getstacksize
+#undef pthread_attr_getinheritsched
+#undef pthread_attr_getschedparam
+#undef pthread_attr_getschedpolicy
+#undef pthread_attr_getscope
+#undef pthread_attr_init
+#undef pthread_attr_setdetachstate
+#undef pthread_attr_setguardsize
+#undef pthread_attr_setstackaddr
+#undef pthread_attr_setstacksize
+#undef pthread_attr_setinheritsched
+#undef pthread_attr_setschedparam
+#undef pthread_attr_setschedpolicy
+#undef pthread_attr_setscope
+#undef pthread_cancel
+#undef pthread_cleanup_pop
+#undef pthread_cleanup_push
#undef pthread_cond_broadcast
#undef pthread_cond_destroy
#undef pthread_cond_init
#undef pthread_cond_signal
#undef pthread_cond_timedwait
#undef pthread_cond_wait
+#undef pthread_detach
+#undef pthread_equal
#undef pthread_exit
#undef pthread_getspecific
+#undef pthread_join
+#undef pthread_kill
#undef pthread_key_create
#undef pthread_key_delete
#undef pthread_main_np
@@ -78,6 +104,7 @@
#undef pthread_mutex_lock
#undef pthread_mutex_trylock
#undef pthread_mutex_unlock
+#undef pthread_mutexattr_destroy
#undef pthread_mutexattr_init
#undef pthread_mutexattr_destroy
#undef pthread_mutexattr_settype
@@ -90,8 +117,11 @@
#undef pthread_rwlock_trywrlock
#undef pthread_rwlock_unlock
#undef pthread_self
+#undef pthread_setcancelstate
+#undef pthread_setcanceltype
#undef pthread_setspecific
#undef pthread_sigmask
+#undef pthread_testcancel
#undef read
#undef readv
#undef recvfrom
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/locale/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
# from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.60 2005/01/09 03:55:13 tjr Exp $
+# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.61 2006/03/13 01:14:57 deischen Exp $
# locale sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale
@@ -22,6 +22,8 @@
wcstoul.c wcstoull.c wcstoumax.c wctob.c wctomb.c wctrans.c wctype.c \
wcwidth.c
+SYM_MAPS+=${.CURDIR}/locale/Symbol.map
+
MAN+= btowc.3 \
ctype.3 digittoint.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \
isdigit.3 isgraph.3 isideogram.3 islower.3 isphonogram.3 isprint.3 \
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/Makefile.inc#6 (text+ko) ====
@@ -1,5 +1,5 @@
# from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93
-# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.55 2005/08/06 16:53:54 phk Exp $
+# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.56 2006/03/13 01:14:57 deischen Exp $
# machine-independent net sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net
@@ -21,6 +21,8 @@
res_debug.c res_init.c res_mkquery.c res_mkupdate.c res_query.c res_send.c \
res_update.c rthdr.c send.c sockatmark.c vars.c
+SYM_MAPS+=${.CURDIR}/net/Symbol.map
+
CFLAGS+=-DINET6 -I${.OBJDIR}
YFLAGS+=-p_nsyy
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/nls/Makefile.inc#3 (text+ko) ====
@@ -1,8 +1,10 @@
# from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
-# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.10 2005/02/27 22:17:47 phantom Exp $
+# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.11 2006/03/13 01:14:57 deischen Exp $
.PATH: ${.CURDIR}/nls
SRCS+= msgcat.c
+SYM_MAPS+=${.CURDIR}/nls/Symbol.map
+
MAN+= catclose.3 catgets.3 catopen.3
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/posix1e/Makefile.inc#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.17 2005/06/03 15:50:55 imp Exp $
+# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.18 2006/03/13 01:14:58 deischen Exp $
.PATH: ${.CURDIR}/posix1e
@@ -22,6 +22,8 @@
mac_get.c \
mac_set.c
+SYM_MAPS+=${.CURDIR}/posix1e/Symbol.map
+
MAN+= acl.3 \
acl_add_perm.3 \
acl_calc_mask.3 \
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/powerpc/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/lib/libc/powerpc/Makefile.inc,v 1.1 2005/01/15 05:26:32 das Exp $
+# $FreeBSD: src/lib/libc/powerpc/Makefile.inc,v 1.2 2006/03/13 01:14:58 deischen Exp $
# Long double is 64-bits
MDSRCS+=machdep_ldisd.c
-
+SYM_MAPS+=${.CURDIR}/powerpc/Symbol.map
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/quad/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
# from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/quad/Makefile.inc,v 1.9 2002/11/18 09:50:56 ru Exp $
+# $FreeBSD: src/lib/libc/quad/Makefile.inc,v 1.10 2006/03/13 01:14:58 deischen Exp $
# Quad support, if needed
.PATH: ${.CURDIR}/${MACHINE_ARCH}/quad ${.CURDIR}/quad
@@ -17,3 +17,5 @@
xordi3.c
.endif
+
+SYM_MAP+=${.CURDIR}/quad/Symbol.map
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/regex/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
# from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/regex/Makefile.inc,v 1.7 2002/11/18 09:50:56 ru Exp $
+# $FreeBSD: src/lib/libc/regex/Makefile.inc,v 1.8 2006/03/13 01:14:58 deischen Exp $
# regex sources
.PATH: ${.CURDIR}/regex
@@ -8,6 +8,8 @@
SRCS+= regcomp.c regerror.c regexec.c regfree.c
+SYM_MAPS+=${.CURDIR}/regex/Symbol.map
+
MAN+= regex.3
MAN+= re_format.7
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/Makefile.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 5.11 (Berkeley) 9/6/90
-# $FreeBSD: src/lib/libc/rpc/Makefile.inc,v 1.27 2005/09/11 20:59:52 stefanf Exp $
+# $FreeBSD: src/lib/libc/rpc/Makefile.inc,v 1.28 2006/03/13 01:14:59 deischen Exp $
.PATH: ${.CURDIR}/rpc ${.CURDIR}/.
SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
@@ -25,6 +25,8 @@
# generated sources
SRCS+= crypt_clnt.c crypt_xdr.c crypt.h
+SYM_MAPS+=${.CURDIR}/rpc/Symbol.map
+
CFLAGS+= -DBROKEN_DES -DPORTMAP -DDES_BUILTIN
CFLAGS+= -I${.CURDIR}/rpc
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/softfloat/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile.inc,v 1.3 2003/05/06 08:58:20 rearnsha Exp $
-# $FreeBSD: src/lib/libc/softfloat/Makefile.inc,v 1.2 2005/03/15 15:53:39 das Exp $
+# $FreeBSD: src/lib/libc/softfloat/Makefile.inc,v 1.3 2006/03/13 01:14:59 deischen Exp $
SOFTFLOAT_BITS?=64
.PATH: ${MACHINE_ARCH}/softfloat \
@@ -16,3 +16,5 @@
SRCS+= eqsf2.c nesf2.c gtsf2.c gesf2.c ltsf2.c lesf2.c negsf2.c \
eqdf2.c nedf2.c gtdf2.c gedf2.c ltdf2.c ledf2.c negdf2.c \
unordsf2.c unorddf2.c
+
+SYM_MAPS+= ${.CURDIR}/softfloat/Symbol.map
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sparc64/Makefile.inc#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/sparc64/Makefile.inc,v 1.4 2005/01/15 05:23:58 das Exp $
+# $FreeBSD: src/lib/libc/sparc64/Makefile.inc,v 1.5 2006/03/13 01:14:59 deischen Exp $
#
# Machine dependent definitions for the ultra sparc architecture.
#
@@ -13,3 +13,4 @@
# Long double is quad precision
GDTOASRCS+=strtopQ.c
MDSRCS+=machdep_ldisQ.c
+SYM_MAPS+=${.CURDIR}/sparc64/Symbol.map
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/Makefile.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.3 (Berkeley) 4/17/94
-# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.35 2006/01/25 12:45:24 phk Exp $
+# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.36 2006/03/13 01:14:59 deischen Exp $
# stdio sources
.PATH: ${.CURDIR}/stdio
@@ -27,6 +27,8 @@
SRCS+= xprintf_errno.c xprintf_hexdump.c xprintf_quote.c
SRCS+= xprintf_time.c xprintf_vis.c
+SYM_MAPS+= ${.CURDIR}/stdio/Symbol.map
+
MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \
flockfile.3 \
fopen.3 fputs.3 \
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/Makefile.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
# from @(#)Makefile.inc 8.3 (Berkeley) 2/4/95
-# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.50 2006/01/12 07:28:20 jasone Exp $
+# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.51 2006/03/13 01:14:59 deischen Exp $
# machine-independent stdlib sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib
@@ -13,6 +13,8 @@
strtol.c strtoll.c strtoq.c strtoul.c strtoull.c strtoumax.c strtouq.c \
system.c tdelete.c tfind.c tsearch.c twalk.c
+SYM_MAPS+= ${.CURDIR}/stdlib/Symbol.map
+
# machine-dependent stdlib sources
.if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc)
.include "${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc"
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdtime/Makefile.inc#3 (text+ko) ====
@@ -1,11 +1,13 @@
# Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
-# $FreeBSD: src/lib/libc/stdtime/Makefile.inc,v 1.14 2002/11/18 09:50:56 ru Exp $
+# $FreeBSD: src/lib/libc/stdtime/Makefile.inc,v 1.15 2006/03/13 01:15:00 deischen Exp $
.PATH: ${.CURDIR}/stdtime ${.CURDIR}/../locale
SRCS+= asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \
time32.c
+SYM_MAPS+= ${.CURDIR}/stdtime/Symbol.map
+
MAN+= ctime.3 strftime.3 strptime.3 time2posix.3
MAN+= tzfile.5
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/string/Makefile.inc#5 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.36 2005/08/25 18:26:58 andre Exp $
+# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.37 2006/03/13 01:15:00 deischen Exp $
.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string
@@ -20,6 +20,8 @@
wmemcmp.c \
wmemcpy.c wmemmove.c wmemset.c
+SYM_MAPS+= ${.CURDIR}/string/Symbol.map
+
# machine-dependent string sources
.if exists(${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc)
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/Makefile.inc#7 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
-# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.120 2006/03/01 06:25:46 davidxu Exp $
+# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.121 2006/03/13 01:15:00 deischen Exp $
# sys sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys
@@ -43,6 +43,8 @@
SRCS+= ${SASM} ${SPSEUDO}
+SYM_MAPS+= ${.CURDIR}/sys/Symbol.map
+
# Generated files
CLEANFILES+= ${SASM} ${SPSEUDO}
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/uuid/Makefile.inc#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.3 2002/11/18 09:50:57 ru Exp $
+# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.4 2006/03/13 01:15:01 deischen Exp $
# DCE 1.1 UUID implementation sources
@@ -6,6 +6,7 @@
SRCS+= uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \
uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_to_string.c
+SYM_MAPS+= ${.CURDIR}/uuid/Symbol.map
MAN+= uuid.3
MLINKS+=uuid.3 uuid_compare.3
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/xdr/Makefile.inc#3 (text+ko) ====
@@ -1,10 +1,12 @@
# @(#)Makefile 5.11 (Berkeley) 9/6/90
-# $FreeBSD: src/lib/libc/xdr/Makefile.inc,v 1.14 2002/11/18 09:50:57 ru Exp $
+# $FreeBSD: src/lib/libc/xdr/Makefile.inc,v 1.15 2006/03/13 01:15:01 deischen Exp $
.PATH: ${.CURDIR}/xdr ${.CURDIR}/.
SRCS+= xdr.c xdr_array.c xdr_float.c xdr_mem.c \
xdr_rec.c xdr_reference.c xdr_stdio.c
+SYM_MAPS+= ${.CURDIR}/xdr/Symbol.map
+
MAN+= xdr.3
MLINKS+= rpc_xdr.3 xdr_accepted_reply.3 \
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/yp/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile.inc 5.3 (Berkeley) 2/20/91
-# $FreeBSD: src/lib/libc/yp/Makefile.inc,v 1.9 2002/11/18 09:50:57 ru Exp $
+# $FreeBSD: src/lib/libc/yp/Makefile.inc,v 1.10 2006/03/13 01:15:01 deischen Exp $
# yp sources
.PATH: ${.CURDIR}/yp
@@ -7,6 +7,8 @@
SRCS+= xdryp.c yp.h yp_xdr.c yplib.c
CLEANFILES+= yp.h yp_xdr.c
+SYM_MAPS+= ${.CURDIR}/yp/Symbol.map
+
RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x
RPCGEN= rpcgen -C
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/bthidd/hid.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*
* $Id: hid.c,v 1.4 2004/11/17 21:59:42 max Exp $
- * $FreeBSD: src/usr.sbin/bluetooth/bthidd/hid.c,v 1.2 2004/11/18 18:05:15 emax Exp $
+ * $FreeBSD: src/usr.sbin/bluetooth/bthidd/hid.c,v 1.3 2006/03/13 23:59:43 emax Exp $
*/
#include <sys/consio.h>
@@ -289,7 +289,7 @@
val = 0x68;
break;
- case 0227: /* WWW Refresh */
+ case 0x227: /* WWW Refresh */
val = 0x67;
break;
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/bsnmpd/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/usr.sbin/bsnmpd/bsnmpd/Makefile,v 1.12 2005/10/04 15:03:39 harti Exp $
+# $FreeBSD: src/usr.sbin/bsnmpd/bsnmpd/Makefile,v 1.13 2006/03/13 09:23:51 harti Exp $
#
# Author: Harti Brandt <harti at freebsd.org>
@@ -25,7 +25,7 @@
CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT
CFLAGS+= -DUSE_TCPWRAPPERS -DQUADFMT='"llu"' -DQUADXFMT='"llx"'
-CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H
+CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY
DPADD= ${LIBBEGEMOT} ${LIBBSNMP}
LDADD= -lbegemot -lbsnmp -lwrap
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters.ru/koi2855/Makefile#4 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2855/Makefile,v 1.6 2006/03/08 22:28:12 gad Exp $
+# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2855/Makefile,v 1.7 2006/03/09 19:52:44 gad Exp $
PROG= koi2855
-MAN=
+NO_MAN=
CFLAGS+= -I${.CURDIR}/../../common_source
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters.ru/koi2alt/Makefile#4 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2alt/Makefile,v 1.6 2006/03/08 22:28:12 gad Exp $
+# $FreeBSD: src/usr.sbin/lpr/filters.ru/koi2alt/Makefile,v 1.7 2006/03/09 19:52:44 gad Exp $
PROG= koi2alt
-MAN=
+NO_MAN=
CFLAGS+= -I${.CURDIR}/../../common_source
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lpr/filters/Makefile#4 (text+ko) ====
@@ -1,10 +1,10 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD: src/usr.sbin/lpr/filters/Makefile,v 1.6 2006/03/08 22:28:12 gad Exp $
+# $FreeBSD: src/usr.sbin/lpr/filters/Makefile,v 1.7 2006/03/09 19:52:43 gad Exp $
BINDIR= /usr/libexec/lpr
PROG= lpf
-MAN=
+NO_MAN=
CFLAGS+= -I${.CURDIR}/../common_source
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/add.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/usr.sbin/pkg_install/add/add.h,v 1.13 2006/01/09 18:27:20 flz Exp $ */
+/* $FreeBSD: src/usr.sbin/pkg_install/add/add.h,v 1.14 2006/03/09 14:49:19 phk Exp $ */
/*
* FreeBSD install - a package for the installation and maintainance
@@ -29,6 +29,7 @@
extern Boolean PrefixRecursive;
extern Boolean NoInstall;
extern Boolean NoRecord;
+extern Boolean FailOnAlreadyInstalled;
extern Boolean KeepPackage;
extern char *Mode;
extern char *Owner;
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/main.c#4 (text+ko) ====
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.66 2006/01/09 18:27:20 flz Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.67 2006/03/09 14:49:19 phk Exp $");
#include <err.h>
#include <sys/param.h>
@@ -27,7 +27,7 @@
#include "lib.h"
#include "add.h"
-static char Options[] = "hvIRfnrp:P:SMt:C:K";
+static char Options[] = "hvIRfFnrp:P:SMt:C:K";
char *Prefix = NULL;
Boolean PrefixRecursive = FALSE;
@@ -36,6 +36,7 @@
Boolean NoRecord = FALSE;
Boolean Remote = FALSE;
Boolean KeepPackage = FALSE;
+Boolean FailOnAlreadyInstalled = TRUE;
char *Mode = NULL;
char *Owner = NULL;
@@ -132,6 +133,10 @@
Force = TRUE;
break;
+ case 'F':
+ FailOnAlreadyInstalled = FALSE;
+ break;
+
case 'K':
KeepPackage = TRUE;
break;
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/perform.c#4 (text+ko) ====
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/perform.c,v 1.79 2006/01/09 18:27:20 flz Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/perform.c,v 1.80 2006/03/09 14:49:19 phk Exp $");
#include <err.h>
#include <paths.h>
@@ -245,9 +245,9 @@
*/
if ((isinstalledpkg(Plist.name) > 0 ||
matchbyorigin(Plist.origin, NULL) != NULL) && !Force) {
- warnx("package '%s' or its older version already installed",
- Plist.name);
- code = 1;
+ warnx("package '%s' or its older version already installed%s",
+ Plist.name, FailOnAlreadyInstalled ? "" : " (ignored)");
+ code = FailOnAlreadyInstalled != FALSE;
goto success; /* close enough for government work */
}
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/pkg_add.1#4 (text+ko) ====
@@ -13,7 +13,7 @@
.\"
.\" Jordan K. Hubbard
.\"
-.\" $FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.70 2006/01/29 20:30:55 krion Exp $
+.\" $FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.71 2006/03/09 14:49:19 phk Exp $
.\"
.Dd January 9, 2006
.Dt PKG_ADD 1
@@ -23,7 +23,7 @@
.Nd a utility for installing software package distributions
.Sh SYNOPSIS
.Nm
-.Op Fl vInfrRMSK
+.Op Fl vInfFrRMSK
.Op Fl t Ar template
.Op Fl p Ar prefix
.Op Fl P Ar prefix
@@ -109,6 +109,8 @@
.Nm
will still try to find and auto-install missing prerequisite packages,
a failure to find one will not be fatal.
+.It Fl F
+Already installed packages are not an error.
.It Fl p Ar prefix
Set
.Ar prefix
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/rpcbind/Makefile#4 (text+ko) ====
@@ -1,19 +1,13 @@
# $NetBSD: Makefile,v 1.3 2000/06/20 13:56:43 fvdl Exp $
-# $FreeBSD: src/usr.sbin/rpcbind/Makefile,v 1.6 2006/03/06 10:07:52 matteo Exp $
-
-LIBCDIR= ${.CURDIR}/../../lib/libc
-LIBCRPCDIR= ${LIBCDIR}/rpc
-LIBCINCLUDE= ${LIBCDIR}/include
+# $FreeBSD: src/usr.sbin/rpcbind/Makefile,v 1.7 2006/03/10 07:58:02 deischen Exp $
-.PATH: ${LIBCRPCDIR}
PROG= rpcbind
MAN= rpcbind.8
SRCS= check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \
- rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c \
- rpc_generic.c
+ rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c
-CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DLIBWRAP
+CFLAGS+= -DPORTMAP -DLIBWRAP
.if !defined(NO_INET6)
CFLAGS+= -DINET6
==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.139 2006/03/08 18:02:31 sam Exp $
+# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.141 2006/03/11 19:00:05 sam Exp $
.if ${MACHINE_ARCH} != "ia64"
_wizard= wizard.c
@@ -45,10 +45,11 @@
# that is painful because of media changes and the structure of
# sysinstall so for now it's a priori.
#
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list