From owner-p4-projects  Tue Nov 19 11:33:29 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 97A7037B401; Tue, 19 Nov 2002 11:32:47 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 07AB637B401
	for <perforce@freebsd.org>; Tue, 19 Nov 2002 11:32:47 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DC2F843E6E
	for <perforce@freebsd.org>; Tue, 19 Nov 2002 11:32:45 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAJJTlmV004095
	for <perforce@freebsd.org>; Tue, 19 Nov 2002 11:29:47 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAJJTkKX004092
	for perforce@freebsd.org; Tue, 19 Nov 2002 11:29:46 -0800 (PST)
Date: Tue, 19 Nov 2002 11:29:46 -0800 (PST)
Message-Id: <200211191929.gAJJTkKX004092@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
Subject: PERFORCE change 21264 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=21264

Change 21264 by jmallett@jmallett_dalek on 2002/11/19 11:29:00

	IFC.

Affected files ...

.. //depot/projects/mips/gnu/usr.bin/man/Makefile#2 integrate
.. //depot/projects/mips/gnu/usr.bin/man/makewhatis/Makefile#2 delete
.. //depot/projects/mips/gnu/usr.bin/man/makewhatis/makewhatis.1#2 delete
.. //depot/projects/mips/gnu/usr.bin/man/makewhatis/makewhatis.local.8#2 delete
.. //depot/projects/mips/gnu/usr.bin/man/makewhatis/makewhatis.local.sh#2 delete
.. //depot/projects/mips/gnu/usr.bin/man/makewhatis/makewhatis.perl#2 delete
.. //depot/projects/mips/include/Makefile#8 integrate
.. //depot/projects/mips/lib/libc/Makefile#3 integrate
.. //depot/projects/mips/lib/libc/Makefile.inc#3 delete
.. //depot/projects/mips/lib/libc/alpha/gen/Makefile.inc#3 integrate
.. //depot/projects/mips/lib/libc/compat-43/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/db/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/db/btree/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/db/db/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/db/hash/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/db/man/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/db/mpool/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/db/recno/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/gen/Makefile.inc#4 integrate
.. //depot/projects/mips/lib/libc/gmon/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/i386/sys/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/locale/Makefile.inc#3 integrate
.. //depot/projects/mips/lib/libc/net/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/nls/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/posix1e/Makefile.inc#4 integrate
.. //depot/projects/mips/lib/libc/quad/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/regex/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/rpc/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/sparc64/fpu/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/stdio/Makefile.inc#3 integrate
.. //depot/projects/mips/lib/libc/stdlib/Makefile.inc#3 integrate
.. //depot/projects/mips/lib/libc/stdtime/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/string/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/sys/Makefile.inc#3 integrate
.. //depot/projects/mips/lib/libc/uuid/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/uuid/uuid.h#2 delete
.. //depot/projects/mips/lib/libc/xdr/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libc/yp/Makefile.inc#2 integrate
.. //depot/projects/mips/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 integrate
.. //depot/projects/mips/libexec/rtld-elf/alpha/reloc.c#2 integrate
.. //depot/projects/mips/libexec/rtld-elf/alpha/rtld_machdep.h#2 integrate
.. //depot/projects/mips/libexec/rtld-elf/i386/reloc.c#2 integrate
.. //depot/projects/mips/libexec/rtld-elf/i386/rtld_machdep.h#2 integrate
.. //depot/projects/mips/libexec/rtld-elf/ia64/reloc.c#2 integrate
.. //depot/projects/mips/libexec/rtld-elf/ia64/rtld_machdep.h#2 integrate
.. //depot/projects/mips/libexec/rtld-elf/rtld.c#4 integrate
.. //depot/projects/mips/libexec/rtld-elf/sparc64/reloc.c#2 integrate
.. //depot/projects/mips/libexec/rtld-elf/sparc64/rtld_machdep.h#3 integrate
.. //depot/projects/mips/libexec/rtld-elf/sparc64/rtld_start.S#2 integrate
.. //depot/projects/mips/release/Makefile#9 integrate
.. //depot/projects/mips/release/ia64/boot_crunch.conf#3 integrate
.. //depot/projects/mips/release/pc98/drivers.conf#5 integrate
.. //depot/projects/mips/sbin/devd/devd.8#3 integrate
.. //depot/projects/mips/sbin/devd/devd.conf#2 integrate
.. //depot/projects/mips/sbin/devd/devd.conf.5#2 integrate
.. //depot/projects/mips/sbin/disklabel/disklabel.c#3 integrate
.. //depot/projects/mips/sbin/gbde/gbde.8#3 integrate
.. //depot/projects/mips/share/man/man7/release.7#4 integrate
.. //depot/projects/mips/share/man/man9/zone.9#2 integrate
.. //depot/projects/mips/sys/alpha/alpha/pmap.c#6 integrate
.. //depot/projects/mips/sys/conf/options#9 integrate
.. //depot/projects/mips/sys/conf/options.alpha#5 integrate
.. //depot/projects/mips/sys/conf/options.i386#5 integrate
.. //depot/projects/mips/sys/conf/options.ia64#6 integrate
.. //depot/projects/mips/sys/conf/options.pc98#5 integrate
.. //depot/projects/mips/sys/conf/options.powerpc#4 integrate
.. //depot/projects/mips/sys/conf/options.sparc64#4 integrate
.. //depot/projects/mips/sys/conf/options.x86_64#5 integrate
.. //depot/projects/mips/sys/dev/ofw/ofw_console.c#2 integrate
.. //depot/projects/mips/sys/dev/sab/sab.c#3 integrate
.. //depot/projects/mips/sys/kern/kern_clock.c#3 integrate
.. //depot/projects/mips/sys/kern/kern_fork.c#5 integrate
.. //depot/projects/mips/sys/kern/kern_shutdown.c#4 integrate
.. //depot/projects/mips/sys/kern/kern_thread.c#6 integrate
.. //depot/projects/mips/sys/net/bpf.c#4 integrate
.. //depot/projects/mips/sys/netinet/ip_input.c#6 integrate
.. //depot/projects/mips/sys/sparc64/sparc64/autoconf.c#2 integrate
.. //depot/projects/mips/sys/sys/kse.h#2 integrate
.. //depot/projects/mips/sys/sys/proc.h#7 integrate
.. //depot/projects/mips/sys/vm/swap_pager.c#3 integrate
.. //depot/projects/mips/sys/vm/uma_core.c#6 integrate
.. //depot/projects/mips/sys/vm/vm_object.c#7 integrate
.. //depot/projects/mips/sys/vm/vm_page.c#9 integrate
.. //depot/projects/mips/sys/vm/vm_page.h#5 integrate
.. //depot/projects/mips/sys/vm/vm_pageout.c#5 integrate
.. //depot/projects/mips/tools/KSE/ksetest/kse_asm.S#2 integrate
.. //depot/projects/mips/usr.bin/calendar/calendar.1#2 integrate
.. //depot/projects/mips/usr.bin/calendar/calendars/calendar.all#2 integrate
.. //depot/projects/mips/usr.bin/calendar/calendars/calendar.holiday#4 integrate
.. //depot/projects/mips/usr.bin/calendar/calendars/calendar.southafrica#1 branch
.. //depot/projects/mips/usr.bin/makewhatis/Makefile#2 integrate
.. //depot/projects/mips/usr.sbin/sysinstall/index.c#2 integrate
.. //depot/projects/mips/usr.sbin/sysinstall/install.c#5 integrate

Differences ...

==== //depot/projects/mips/gnu/usr.bin/man/Makefile#2 (text+ko) ====

@@ -1,10 +1,10 @@
-# Master Makefile for man, manpath, apropos, whatis, and makewhatis
+# Master Makefile for man, manpath, apropos, and whatis
 #
 # You may distribute under the terms of the GNU General Public
 # License as specified in the README file that comes with the man 1.0
 # distribution.
 #
-# $FreeBSD: src/gnu/usr.bin/man/Makefile,v 1.5 2002/05/18 19:47:57 markm Exp $
+# $FreeBSD: src/gnu/usr.bin/man/Makefile,v 1.6 2002/11/18 10:25:27 ru Exp $
 #
 
 SUBDIR = lib man manpath apropos

==== //depot/projects/mips/include/Makefile#8 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.185 2002/10/24 15:25:37 rwatson Exp $
+# $FreeBSD: src/include/Makefile,v 1.186 2002/11/18 07:34:56 marcel Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -9,20 +9,16 @@
 CLEANFILES= osreldate.h version vers.c
 SUBDIR= arpa protocols rpcsvc rpc
 INCS=	a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h db.h \
-	dirent.h \
-	dlfcn.h elf.h elf-hints.h err.h fnmatch.h fmtmsg.h fstab.h \
-	fts.h getopt.h glob.h grp.h \
-	hesiod.h histedit.h ieeefp.h ifaddrs.h inttypes.h iso646.h kenv.h \
-	langinfo.h \
-	libgen.h limits.h link.h locale.h malloc.h memory.h monetary.h mpool.h \
-	ndbm.h netconfig.h netdb.h nl_types.h nlist.h nsswitch.h objformat.h \
-	paths.h pthread.h pthread_np.h pwd.h \
-	ranlib.h readpassphrase.h regex.h regexp.h resolv.h rune.h runetype.h \
-	search.h setjmp.h sgtty.h \
-	signal.h stab.h stdbool.h stddef.h stdio.h stdlib.h strhash.h \
-	string.h stringlist.h strings.h sysexits.h tar.h time.h timeconv.h \
-	timers.h ttyent.h ulimit.h unistd.h utime.h utmp.h vis.h wchar.h \
-	wctype.h
+	dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
+	fts.h getopt.h glob.h grp.h hesiod.h histedit.h ieeefp.h ifaddrs.h \
+	inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
+	locale.h malloc.h memory.h monetary.h mpool.h ndbm.h netconfig.h \
+	netdb.h nl_types.h nlist.h nsswitch.h objformat.h paths.h pthread.h \
+	pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \
+	resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \
+	stdbool.h stddef.h stdio.h stdlib.h strhash.h string.h stringlist.h \
+	strings.h sysexits.h tar.h time.h timeconv.h timers.h ttyent.h \
+	ulimit.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h
 
 MHDRS=	float.h floatingpoint.h stdarg.h varargs.h
 

==== //depot/projects/mips/lib/libc/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.36 2002/10/11 22:38:16 peter Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.37 2002/11/18 09:50:54 ru 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
@@ -16,10 +16,65 @@
 INSTALL_PIC_ARCHIVE=	yes
 PRECIOUSLIB=	yes
 
+# Define (empty) variables so that make doesn't give substitution
+# errors if the included makefiles don't change these:
+MDSRCS=
+MISRCS=
+MDASM=
+MIASM=
+NOASM=
+
 #
-# Include make rules that are shared with libc_r.
+# If there is a machine dependent makefile, use it:
 #
-.include "${.CURDIR}/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc"
+.endif
+
+.include "${.CURDIR}/db/Makefile.inc"
+.include "${.CURDIR}/compat-43/Makefile.inc"
+.include "${.CURDIR}/gen/Makefile.inc"
+.if ${MACHINE_ARCH} != "powerpc"
+.include "${.CURDIR}/gmon/Makefile.inc"
+.endif
+.include "${.CURDIR}/locale/Makefile.inc"
+.include "${.CURDIR}/net/Makefile.inc"
+.include "${.CURDIR}/nls/Makefile.inc"
+.include "${.CURDIR}/posix1e/Makefile.inc"
+.if !defined(NO_QUAD)
+.include "${.CURDIR}/quad/Makefile.inc"
+.endif
+.include "${.CURDIR}/regex/Makefile.inc"
+.include "${.CURDIR}/stdio/Makefile.inc"
+.include "${.CURDIR}/stdlib/Makefile.inc"
+.include "${.CURDIR}/stdtime/Makefile.inc"
+.include "${.CURDIR}/string/Makefile.inc"
+.include "${.CURDIR}/sys/Makefile.inc"
+.include "${.CURDIR}/rpc/Makefile.inc"
+.include "${.CURDIR}/uuid/Makefile.inc"
+.include "${.CURDIR}/xdr/Makefile.inc"
+.if !defined(NO_YP_LIBC)
+CFLAGS+= -DYP
+.include "${.CURDIR}/yp/Makefile.inc"
+.endif
+.if !defined(NO_HESIOD_LIBC)
+CFLAGS+= -DHESIOD
+.endif
+
+# If there are no machine dependent sources, append all the
+# machine-independent sources:
+.if empty(MDSRCS)
+SRCS+=	${MISRCS}
+.else
+# Append machine-dependent sources, then append machine-independent sources
+# for which there is no machine-dependent variant.
+SRCS+=	${MDSRCS}
+.for _src in ${MISRCS}
+.if ${MDSRCS:R:M${_src:R}} == ""
+SRCS+=	${_src}
+.endif
+.endfor
+.endif
 
 KQSRCS=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
 	lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \

==== //depot/projects/mips/lib/libc/alpha/gen/Makefile.inc#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.10 2002/11/16 06:39:10 deischen Exp $
+# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $
 
 SRCS+=	_setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S
 SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
@@ -14,34 +14,34 @@
 CLEANFILES+=	__remqu.S __remq.S __remlu.S __reml.S
 
 
-__divqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__divqu.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__divqu -DOP=div -DS=false -DWORDSIZE=64 \
 		${.ALLSRC} > ${.TARGET}
 
-__divq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__divq.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__divq -DOP=div -DS=true -DWORDSIZE=64 \
 		${.ALLSRC} > ${.TARGET}
 
-__divlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__divlu.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__divlu -DOP=div -DS=false -DWORDSIZE=32 \
 		${.ALLSRC} > ${.TARGET}
 
-__divl.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__divl.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__divl -DOP=div -DS=true -DWORDSIZE=32 \
 		${.ALLSRC} > ${.TARGET}
 
-__remqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__remqu.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__remqu -DOP=rem -DS=false -DWORDSIZE=64 \
 		${.ALLSRC} > ${.TARGET}
 
-__remq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__remq.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__remq -DOP=rem -DS=true -DWORDSIZE=64 \
 		${.ALLSRC} > ${.TARGET}
 
-__remlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__remlu.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__remlu -DOP=rem -DS=false -DWORDSIZE=32 \
 		${.ALLSRC} > ${.TARGET}
 
-__reml.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__reml.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__reml -DOP=rem -DS=true -DWORDSIZE=32 \
 		${.ALLSRC} > ${.TARGET}

==== //depot/projects/mips/lib/libc/compat-43/Makefile.inc#2 (text+ko) ====

@@ -1,13 +1,12 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/2/93
-# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.11 2001/03/27 17:26:46 ru Exp $
+# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.12 2002/11/18 09:50:54 ru Exp $
 
 # compat-43 sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/compat-43 ${.CURDIR}/../libc/compat-43
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43
 
 SRCS+=	creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
 	setrgid.c setruid.c sigcompat.c
 
-.if ${LIB} == "c"
 MAN+=	creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2
 MAN+=	gethostid.3 setruid.3
 
@@ -16,4 +15,3 @@
 
 MLINKS+=sigsetmask.2 sigblock.2
 MLINKS+=sigsetmask.2 sigmask.2
-.endif

==== //depot/projects/mips/lib/libc/db/Makefile.inc#2 (text+ko) ====

@@ -1,11 +1,11 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 2/21/94
-# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.3 1999/08/27 23:58:15 peter Exp $
+# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $
 #
 CFLAGS+=-D__DBINTERFACE_PRIVATE
 
-.include "${.CURDIR}/../libc/db/btree/Makefile.inc"
-.include "${.CURDIR}/../libc/db/db/Makefile.inc"
-.include "${.CURDIR}/../libc/db/hash/Makefile.inc"
-.include "${.CURDIR}/../libc/db/man/Makefile.inc"
-.include "${.CURDIR}/../libc/db/mpool/Makefile.inc"
-.include "${.CURDIR}/../libc/db/recno/Makefile.inc"
+.include "${.CURDIR}/db/btree/Makefile.inc"
+.include "${.CURDIR}/db/db/Makefile.inc"
+.include "${.CURDIR}/db/hash/Makefile.inc"
+.include "${.CURDIR}/db/man/Makefile.inc"
+.include "${.CURDIR}/db/mpool/Makefile.inc"
+.include "${.CURDIR}/db/recno/Makefile.inc"

==== //depot/projects/mips/lib/libc/db/btree/Makefile.inc#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 7/14/94
-# $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.3 1999/08/27 23:58:16 peter Exp $
+# $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/db/btree
+.PATH: ${.CURDIR}/db/btree
 
 SRCS+=	bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \
 	bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \

==== //depot/projects/mips/lib/libc/db/db/Makefile.inc#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.3 1999/08/27 23:58:17 peter Exp $
+# $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/db/db
+.PATH: ${.CURDIR}/db/db
 
 SRCS+=	db.c

==== //depot/projects/mips/lib/libc/db/hash/Makefile.inc#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.4 2001/05/15 07:08:17 ru Exp $
+# $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.5 2002/11/18 09:50:54 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/db/hash
+.PATH: ${.CURDIR}/db/hash
 
 SRCS+=	hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \
 	hash_page.c ndbm.c

==== //depot/projects/mips/lib/libc/db/man/Makefile.inc#2 (text+ko) ====

@@ -1,9 +1,8 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.10 2001/03/27 17:26:46 ru Exp $
+# $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/db/man
+.PATH: ${.CURDIR}/db/man
 
-.if ${LIB} == "c"
 MAN+=	btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3
 
 MLINKS+= dbm.3 dbm_clearerr.3
@@ -17,4 +16,3 @@
 MLINKS+= dbm.3 dbm_open.3
 MLINKS+= dbm.3 dbm_store.3
 MLINKS+= dbopen.3 db.3
-.endif

==== //depot/projects/mips/lib/libc/db/mpool/Makefile.inc#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.3 1999/08/27 23:58:23 peter Exp $
+# $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/db/mpool
+.PATH: ${.CURDIR}/db/mpool
 
 SRCS+=	mpool.c

==== //depot/projects/mips/lib/libc/db/recno/Makefile.inc#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.3 1999/08/27 23:58:25 peter Exp $
+# $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/db/recno
+.PATH: ${.CURDIR}/db/recno
 
 SRCS+=	rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \
 	rec_seq.c rec_utils.c

==== //depot/projects/mips/lib/libc/gen/Makefile.inc#4 (text+ko) ====

@@ -1,8 +1,8 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.97 2002/10/28 00:15:43 wollman Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.98 2002/11/18 09:50:55 ru Exp $
 
 # machine-independent gen sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
 
 SRCS+=  __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \
 	alarm.c arc4random.c assert.c basename.c check_utility_compat.c \
@@ -32,11 +32,10 @@
 	valloc.c vis.c wait.c wait3.c waitpid.c
 
 # machine-dependent gen sources
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc)
-.include "${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc"
 .endif
 
-.if ${LIB} == "c"
 MAN+=	alarm.3 arc4random.3 \
 	basename.3 check_utility_compat.3 clock.3 \
 	confstr.3 ctermid.3 daemon.3 \
@@ -132,4 +131,3 @@
 MLINKS+=tzset.3 tzsetwall.3
 MLINKS+=unvis.3 strunvis.3 unvis.3 strunvisx.3
 MLINKS+=vis.3 strvis.3 vis.3 strvisx.3
-.endif

==== //depot/projects/mips/lib/libc/gmon/Makefile.inc#2 (text+ko) ====

@@ -1,16 +1,14 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.8 2001/03/27 17:26:47 ru Exp $
+# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.9 2002/11/18 09:50:55 ru Exp $
 
 # gmon sources
-.PATH: ${.CURDIR}/../libc/gmon
+.PATH: ${.CURDIR}/gmon
 
 SRCS+=	gmon.c mcount.c
 
-.if ${LIB} == "c"
 MAN+=	moncontrol.3
 
 MLINKS+=moncontrol.3 monstartup.3
-.endif
 
 # mcount cannot be compiled with profiling
 mcount.po: mcount.o

==== //depot/projects/mips/lib/libc/i386/sys/Makefile.inc#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.24 2002/05/23 23:51:57 jake Exp $
+# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.25 2002/11/18 09:50:55 ru Exp $
 
 SRCS+=	i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \
 	i386_set_ldt.c i386_set_watch.c i386_vm86.c
@@ -14,11 +14,9 @@
 
 PSEUDO=	_getlogin.o _exit.o
 
-.if ${LIB} == "c"
 MAN+=	i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2
 MAN+=	i386_set_watch.3
 
 MLINKS+=i386_get_ioperm.2 i386_set_ioperm.2
 MLINKS+=i386_get_ldt.2 i386_set_ldt.2
 MLINKS+=i386_set_watch.3 i386_clr_watch.3
-.endif

==== //depot/projects/mips/lib/libc/locale/Makefile.inc#3 (text+ko) ====

@@ -1,8 +1,8 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.41 2002/10/10 22:56:18 tjr Exp $
+# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.42 2002/11/18 09:50:55 ru Exp $
 
 # locale sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale
 
 SRCS+=	big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \
 	isctype.c iswctype.c \
@@ -18,7 +18,6 @@
 	wcstoul.c wcstoull.c wcstoumax.c wctob.c wctomb.c wctrans.c wctype.c \
 	wcwidth.c
 
-.if ${LIB} == "c"
 MAN+=	btowc.3 \
 	ctype.3 digittoint.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \
 	isdigit.3 isgraph.3 islower.3 isprint.3 ispunct.3 isspace.3 \
@@ -55,4 +54,3 @@
 	wcstol.3 wcstoimax.3 wcstol.3 wcstoumax.3
 MLINKS+=wctrans.3 towctrans.3
 MLINKS+=wctype.3 iswctype.3
-.endif

==== //depot/projects/mips/lib/libc/net/Makefile.inc#2 (text+ko) ====

@@ -1,8 +1,8 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 9/5/93
-# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.44 2002/07/15 19:58:56 ume Exp $
+# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.45 2002/11/18 09:50:55 ru Exp $
 
 # machine-independent net sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net ${.CURDIR}/../libc/net
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net
 
 SRCS+=	addr2ascii.c ascii2addr.c base64.c ether_addr.c getaddrinfo.c \
 	gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
@@ -37,11 +37,10 @@
 		sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET}
 
 # machine-dependent net sources
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc)
-.include "${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc"
 .endif
 
-.if ${LIB} == "c"
 MAN+=	addr2ascii.3 byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 \
 	getifaddrs.3 getipnodebyname.3 \
 	getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 hesiod.3 \
@@ -100,4 +99,3 @@
 	resolver.3 res_search.3 resolver.3 res_send.3 resolver.3 dn_skipname.3 \
 	resolver.3 ns_get16.3 resolver.3 ns_get32.3 \
 	resolver.3 ns_put16.3 resolver.3 ns_put32.3
-.endif

==== //depot/projects/mips/lib/libc/nls/Makefile.inc#2 (text+ko) ====

@@ -1,10 +1,8 @@
 #	from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
-# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.7 2001/03/27 17:26:48 ru Exp $
+# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.8 2002/11/18 09:50:55 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/nls
+.PATH: ${.CURDIR}/nls
 
 SRCS+=	msgcat.c
 
-.if ${LIB} == "c"
 MAN+=	catclose.3 catgets.3 catopen.3
-.endif

==== //depot/projects/mips/lib/libc/posix1e/Makefile.inc#4 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.12 2002/11/06 03:38:47 rwatson Exp $
+# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.13 2002/11/18 09:50:56 ru Exp $
 
 MAINTAINER=	rwatson@FreeBSD.org
 
-.PATH: ${.CURDIR}/../libc/posix1e
+.PATH: ${.CURDIR}/posix1e
 
 SRCS+=	acl_calc_mask.c			\
 	acl_copy.c			\
@@ -24,8 +24,6 @@
 	mac_get.c			\
 	mac_set.c
 
-.if ${LIB} == "c"
-
 MAN+=	acl.3				\
 	acl_add_perm.3			\
 	acl_calc_mask.3			\
@@ -81,5 +79,3 @@
 	mac_set.3 mac_set_proc.3		\
 	mac_text.3 mac_from_text.3		\
 	mac_text.3 mac_to_text.3
-
-.endif

==== //depot/projects/mips/lib/libc/quad/Makefile.inc#2 (text+ko) ====

@@ -1,8 +1,8 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/quad/Makefile.inc,v 1.8 1999/08/28 00:00:27 peter Exp $
+# $FreeBSD: src/lib/libc/quad/Makefile.inc,v 1.9 2002/11/18 09:50:56 ru Exp $
 
 # Quad support, if needed
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/quad ${.CURDIR}/../libc/quad
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/quad ${.CURDIR}/quad
 
 .if ${MACHINE_ARCH} == "i386"
 

==== //depot/projects/mips/lib/libc/regex/Makefile.inc#2 (text+ko) ====

@@ -1,17 +1,15 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/regex/Makefile.inc,v 1.6 2001/03/27 17:26:51 ru Exp $
+# $FreeBSD: src/lib/libc/regex/Makefile.inc,v 1.7 2002/11/18 09:50:56 ru Exp $
 
 # regex sources
-.PATH: ${.CURDIR}/../libc/regex
+.PATH: ${.CURDIR}/regex
 
 CFLAGS+=-DPOSIX_MISTAKE
 
 SRCS+=	regcomp.c regerror.c regexec.c regfree.c
 
-.if ${LIB} == "c"
 MAN+=	regex.3
 MAN+=	re_format.7
 
 MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3
 MLINKS+=regexec.3 regfree.3
-.endif

==== //depot/projects/mips/lib/libc/rpc/Makefile.inc#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #	@(#)Makefile    5.11 (Berkeley) 9/6/90
-# $FreeBSD: src/lib/libc/rpc/Makefile.inc,v 1.23 2002/08/19 23:06:00 bde Exp $
+# $FreeBSD: src/lib/libc/rpc/Makefile.inc,v 1.24 2002/11/18 09:50:56 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/rpc ${.CURDIR}/.
+.PATH: ${.CURDIR}/rpc ${.CURDIR}/.
 SRCS+=	auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
 	clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \
 	clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \

==== //depot/projects/mips/lib/libc/sparc64/fpu/Makefile.inc#2 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/lib/libc/sparc64/fpu/Makefile.inc,v 1.4 2002/05/06 23:24:16 obrien Exp $
+# $FreeBSD: src/lib/libc/sparc64/fpu/Makefile.inc,v 1.5 2002/11/18 09:50:56 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/sparc64/fpu
+.PATH: ${.CURDIR}/sparc64/fpu
 
 CFLAGS+= -I${.CURDIR}/sparc64/sys
 

==== //depot/projects/mips/lib/libc/stdio/Makefile.inc#3 (text+ko) ====

@@ -1,8 +1,8 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 4/17/94
-# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.27 2002/11/04 03:23:56 alfred Exp $
+# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.28 2002/11/18 09:50:56 ru Exp $
 
 # stdio sources
-.PATH: ${.CURDIR}/../libc/stdio
+.PATH: ${.CURDIR}/stdio
 
 SRCS+=	_flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \
 	fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \
@@ -21,7 +21,6 @@
 	vswprintf.c vswscanf.c vwprintf.c vwscanf.c wbuf.c wprintf.c wscanf.c \
 	wsetup.c
 
-.if ${LIB} == "c"
 MAN+=	fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetws.3 fopen.3 fputs.3 \
 	fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 getwc.3 mktemp.3 \
 	printf.3 putc.3 putwc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 \
@@ -54,4 +53,3 @@
 	wprintf.3 vwprintf.3 wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3
 MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vwscanf.3 \
 	wscanf.3 vswscanf.3 wscanf.3 vfwscanf.3
-.endif

==== //depot/projects/mips/lib/libc/stdlib/Makefile.inc#3 (text+ko) ====

@@ -1,8 +1,8 @@
 #	from @(#)Makefile.inc	8.3 (Berkeley) 2/4/95
-# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.40 2002/10/16 14:29:22 robert Exp $
+# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.41 2002/11/18 09:50:56 ru Exp $
 
 # machine-independent stdlib sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib ${.CURDIR}/../libc/stdlib
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib
 
 MISRCS+=_Exit.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \
 	bsearch.c calloc.c div.c exit.c getenv.c getopt.c getopt_long.c \
@@ -14,11 +14,10 @@
 	system.c tdelete.c tfind.c tsearch.c twalk.c
 
 # machine-dependent stdlib sources
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib/Makefile.inc)
-.include "${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc"
 .endif
 
-.if ${LIB} == "c"
 MAN+=	abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \
 	div.3 exit.3 getenv.3 getopt.3 getopt_long.3 getsubopt.3 hcreate.3 \
 	imaxabs.3 imaxdiv.3 insque.3 labs.3 ldiv.3 llabs.3 lldiv.3 \
@@ -39,4 +38,3 @@
 MLINKS+=strtoul.3 strtoull.3 strtoul.3 strtouq.3 strtoul.3 strtoumax.3
 MLINKS+=malloc.3 calloc.3 malloc.3 free.3 malloc.3 realloc.3 malloc.3 reallocf.3
 MLINKS+=tsearch.3 tdelete.3 tsearch.3 tfind.3 tsearch.3 twalk.3
-.endif

==== //depot/projects/mips/lib/libc/stdtime/Makefile.inc#2 (text+ko) ====

@@ -1,12 +1,11 @@
 #	Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
-# $FreeBSD: src/lib/libc/stdtime/Makefile.inc,v 1.13 2001/10/28 19:54:49 dillon Exp $
+# $FreeBSD: src/lib/libc/stdtime/Makefile.inc,v 1.14 2002/11/18 09:50:56 ru Exp $
 
-.PATH:	${.CURDIR}/../libc/stdtime ${.CURDIR}/../locale
+.PATH:	${.CURDIR}/stdtime ${.CURDIR}/../locale
 
 SRCS+=	asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \
 	time32.c
 
-.if ${LIB} == "c"
 MAN+=	ctime.3 strftime.3 strptime.3 time2posix.3
 MAN+=	tzfile.5
 
@@ -15,4 +14,3 @@
 	ctime.3 ctime_r.3 ctime.3 localtime_r.3 ctime.3 gmtime_r.3 \
 	ctime.3 asctime_r.3
 MLINKS+=time2posix.3 posix2time.3
-.endif

==== //depot/projects/mips/lib/libc/string/Makefile.inc#2 (text+ko) ====

@@ -1,9 +1,9 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.31 2002/10/04 03:18:26 tjr Exp $
+# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.32 2002/11/18 09:50:56 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/string ${.CURDIR}/../libc/string
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string
 
-CFLAGS+= -I${.CURDIR}/../libc/locale
+CFLAGS+= -I${.CURDIR}/locale
 
 # machine-independent string sources
 MISRCS+=bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \
@@ -21,11 +21,10 @@
 
 
 # machine-dependent string sources
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/string/Makefile.inc)
-.include "${.CURDIR}/../libc/${MACHINE_ARCH}/string/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc"
 .endif
 
-.if ${LIB} == "c"
 MAN+=	bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \
 	memcmp.3 memcpy.3 memmove.3 memset.3 rindex.3 strcasecmp.3 strcat.3 \
 	strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strdup.3 strerror.3 \
@@ -54,4 +53,3 @@
 	wmemchr.3 wcsncpy.3 wmemchr.3 wcspbrk.3 \
 	wmemchr.3 wcsrchr.3 wmemchr.3 wcsspn.3 \
 	wmemchr.3 wcsstr.3
-.endif

==== //depot/projects/mips/lib/libc/sys/Makefile.inc#3 (text+ko) ====

@@ -1,8 +1,8 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
-# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.97 2002/10/08 17:43:40 archie Exp $
+# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.98 2002/11/18 09:50:57 ru Exp $
 
 # sys sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys ${.CURDIR}/../libc/sys
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys
 
 # Include the generated makefile containing the *complete* list
 # of syscall names in MIASM.
@@ -13,8 +13,8 @@
 # MDASM names override the default syscall names in MIASM.
 # NOASM will prevent the default syscall code from being generated.
 #
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/sys/Makefile.inc)
-.include "${.CURDIR}/../libc/${MACHINE_ARCH}/sys/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc"
 .endif
 
 # Sources common to both syscall interfaces:
@@ -53,7 +53,6 @@
 	printf '#include "SYS.h"\nPSEUDO(${.PREFIX:S/_//})\n' \
 	    > ${.TARGET}
 
-.if ${LIB} == "c"
 MAN+=	_exit.2 accept.2 access.2 acct.2 adjtime.2 \
 	aio_cancel.2 aio_error.2 aio_read.2 aio_return.2 \
 	aio_suspend.2 aio_waitcomplete.2 aio_write.2 \
@@ -142,4 +141,3 @@
 MLINKS+=sched_setparam.2 sched_getparam.2
 MLINKS+=sched_setscheduler.2 sched_getscheduler.2
 .endif
-.endif

==== //depot/projects/mips/lib/libc/uuid/Makefile.inc#2 (text+ko) ====

@@ -1,15 +1,12 @@
-# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.1 2002/10/30 03:51:00 marcel Exp $
+# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.3 2002/11/18 09:50:57 ru Exp $
 
 # DCE 1.1 UUID implementation sources
 
-.PATH: ${.CURDIR}/../libc/uuid
+.PATH: ${.CURDIR}/uuid
 
 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
 
-INCS+=	uuid.h
-
-.if ${LIB} == "c"
 MAN+=	uuid.3
 MLINKS+=uuid.3 uuid_compare.3
 MLINKS+=uuid.3 uuid_create.3
@@ -19,4 +16,3 @@
 MLINKS+=uuid.3 uuid_hash.3
 MLINKS+=uuid.3 uuid_is_nil.3
 MLINKS+=uuid.3 uuid_to_string.3
-.endif

==== //depot/projects/mips/lib/libc/xdr/Makefile.inc#2 (text+ko) ====

@@ -1,11 +1,10 @@
 #	@(#)Makefile	5.11 (Berkeley) 9/6/90
-# $FreeBSD: src/lib/libc/xdr/Makefile.inc,v 1.13 2002/08/15 12:31:01 bde Exp $
+# $FreeBSD: src/lib/libc/xdr/Makefile.inc,v 1.14 2002/11/18 09:50:57 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/xdr ${.CURDIR}/.
+.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
 
-.if ${LIB} == "c"
 MAN+=	xdr.3
 
 MLINKS+=	rpc_xdr.3 xdr_accepted_reply.3 \
@@ -47,4 +46,3 @@
 		xdr.3 xdr_vector.3 \
 		xdr.3 xdr_void.3 \
                 xdr.3 xdr_wrapstring.3
-.endif

==== //depot/projects/mips/lib/libc/yp/Makefile.inc#2 (text+ko) ====

@@ -1,8 +1,8 @@
 #	from: @(#)Makefile.inc	5.3 (Berkeley) 2/20/91
-# $FreeBSD: src/lib/libc/yp/Makefile.inc,v 1.8 1999/08/28 00:02:58 peter Exp $
+# $FreeBSD: src/lib/libc/yp/Makefile.inc,v 1.9 2002/11/18 09:50:57 ru Exp $
 
 # yp sources
-.PATH: ${.CURDIR}/../libc/yp
+.PATH: ${.CURDIR}/yp
 
 SRCS+=	xdryp.c yp.h yp_xdr.c yplib.c
 CLEANFILES+=	yp.h yp_xdr.c

==== //depot/projects/mips/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/thr_enter_uts.S,v 1.1 2002/10/30 06:07:18 mini Exp $");
+__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/thr_enter_uts.S,v 1.2 2002/11/18 02:02:08 davidxu Exp $");
 
 /*
  * Where do we define these?
@@ -36,9 +36,9 @@
 #define	MC_LEN_OFFSET		80	/* offset to mc_len from mcontext */
 #define	MC_FP_CW_OFFSET		96	/* offset to FP control word */
 #define	MC_OWNEDFP_OFFSET	88	/* offset to mc_ownedfp from mcontext */
-#define	KM_STACK_SP_OFFSET	32	/* offset to km_stack.ss_sp */
-#define	KM_STACK_SIZE_OFFSET	36	/* offset to km_stack.ss_sp */
-#define	KM_FUNC_OFFSET		28	/* offset to km_func */
+#define	KM_STACK_SP_OFFSET	36	/* offset to km_stack.ss_sp */
+#define	KM_STACK_SIZE_OFFSET	40	/* offset to km_stack.ss_sp */
+#define	KM_FUNC_OFFSET		32	/* offset to km_func */
 
 /*
  * int _thread_enter_uts(kse_thr_mailbox *tm, kse_mailbox *km);

==== //depot/projects/mips/libexec/rtld-elf/alpha/reloc.c#2 (text+ko) ====

@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/libexec/rtld-elf/alpha/reloc.c,v 1.16 2002/06/18 05:42:33 dillon Exp $
+ * $FreeBSD: src/libexec/rtld-elf/alpha/reloc.c,v 1.17 2002/11/18 22:08:49 tmm Exp $
  */
 
 /*
@@ -252,7 +252,7 @@
 		return -1;
 	    reloc_jmpslot(where,
 	      (Elf_Addr)(defobj->relocbase + def->st_value),
-	      defobj);
+	      defobj, obj, rel);
 	}
     } else {
 	const Elf_Rela *relalim;
@@ -272,7 +272,7 @@
 		return -1;
 	    reloc_jmpslot(where,
 	      (Elf_Addr)(defobj->relocbase + def->st_value),
-	      defobj);
+	      defobj, obj, (Elf_Rel *)rela);
 	}
     }
     obj->jmpslots_done = true;
@@ -281,7 +281,8 @@
 
 /* Fixup the jump slot at "where" to transfer control to "target". */
 Elf_Addr
-reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const Obj_Entry *obj)
+reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const Obj_Entry *obj,
+              const Obj_Entry *refobj, const Elf_Rel *rel)
 {
     Elf_Addr stubaddr;
 

==== //depot/projects/mips/libexec/rtld-elf/alpha/rtld_machdep.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/libexec/rtld-elf/alpha/rtld_machdep.h,v 1.7 2002/02/18 02:24:10 peter Exp $
+ * $FreeBSD: src/libexec/rtld-elf/alpha/rtld_machdep.h,v 1.8 2002/11/18 22:08:49 tmm Exp $
  */
 
 #ifndef RTLD_MACHDEP_H
@@ -35,7 +35,9 @@
 #define rtld_dynamic(obj)	(&_DYNAMIC)
 
 Elf_Addr reloc_jmpslot(Elf_Addr *, Elf_Addr,
-		       const struct Struct_Obj_Entry *obj);
+		       const struct Struct_Obj_Entry *,
+		       const struct Struct_Obj_Entry *,
+		       const Elf_Rel *);
 
 #define make_function_pointer(def, defobj) \
 	((defobj)->relocbase + (def)->st_value)

==== //depot/projects/mips/libexec/rtld-elf/i386/reloc.c#2 (text+ko) ====

@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.10 2002/06/10 21:15:50 dillon Exp $
+ * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.11 2002/11/18 22:08:49 tmm Exp $
  */
 
 /*
@@ -259,7 +259,7 @@
 	if (def == NULL)
 	    return -1;
 	target = (Elf_Addr)(defobj->relocbase + def->st_value);
-	reloc_jmpslot(where, target, defobj);
+	reloc_jmpslot(where, target, defobj, obj, rel);
     }
     obj->jmpslots_done = true;
     return 0;

==== //depot/projects/mips/libexec/rtld-elf/i386/rtld_machdep.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/libexec/rtld-elf/i386/rtld_machdep.h,v 1.7 2002/06/24 23:19:18 jdp Exp $
+ * $FreeBSD: src/libexec/rtld-elf/i386/rtld_machdep.h,v 1.8 2002/11/18 22:08:49 tmm Exp $
  */
 
 #ifndef RTLD_MACHDEP_H

>>> TRUNCATED FOR MAIL (1000 lines) <<<

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message