PERFORCE change 15139 for review
Robert Watson
rwatson at freebsd.org
Mon Jul 29 19:02:39 GMT 2002
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15139
Change 15139 by rwatson at rwatson_tislabs on 2002/07/29 12:02:03
Additional integ as I prepare to integ the mac tree.
Affected files ...
.. //depot/projects/trustedbsd/base/UPDATING#16 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/auth.c#4 integrate
.. //depot/projects/trustedbsd/base/etc/Makefile#19 integrate
.. //depot/projects/trustedbsd/base/etc/isdn/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/etc/mail/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/etc/sendmail/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/games/battlestar/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/games/canfield/canfield/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/games/cribbage/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/games/hack/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/games/larn/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/games/phantasia/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/games/robots/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/games/rogue/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/games/sail/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/games/snake/snake/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/gnu/lib/csu/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/gnu/lib/libdialog/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#4 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/strip/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/contrib/mm/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/font/Makefile.dev#3 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/utils/indxbib/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/rcs/rcsfreeze/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/kerberosIV/share/info/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat1x/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat20/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat21/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat22/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat3x.i386/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/lib/csu/alpha/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/lib/csu/i386-elf/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/lib/csu/i386/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/lib/csu/ia64/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/lib/csu/powerpc/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/lib/csu/sparc64/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#10 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#29 integrate
.. //depot/projects/trustedbsd/base/sbin/devfs/devfs.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_msdosfs/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/share/colldef/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/share/examples/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#10 integrate
.. //depot/projects/trustedbsd/base/share/examples/isdn/i4brunppp/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/share/examples/ses/getencstat/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/share/examples/ses/sesd/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/share/examples/ses/setencstat/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/share/examples/ses/setobjstat/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/share/info/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#10 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/firewall.7#4 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.doc.mk#6 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.files.mk#3 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.info.mk#6 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#13 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.man.mk#6 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#5 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#11 integrate
.. //depot/projects/trustedbsd/base/share/mklocale/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/share/monetdef/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/share/msgdef/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/share/numericdef/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/share/sendmail/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/share/skel/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/share/syscons/fonts/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/share/syscons/keymaps/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/share/syscons/scrnmaps/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/share/timedef/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/share/zoneinfo/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/include/_stdint.h#1 branch
.. //depot/projects/trustedbsd/base/sys/alpha/include/ansi.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/include/limits.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/arm/include/_stdint.h#1 branch
.. //depot/projects/trustedbsd/base/sys/arm/include/ansi.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/arm/include/limits.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#12 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#11 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-all.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-tape.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ctl.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/_stdint.h#1 branch
.. //depot/projects/trustedbsd/base/sys/i386/include/ansi.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/limits.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/_stdint.h#1 branch
.. //depot/projects/trustedbsd/base/sys/ia64/include/ansi.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/limits.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/netncp/ncp_conn.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/netsmb/smb_conn.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/include/_stdint.h#1 branch
.. //depot/projects/trustedbsd/base/sys/powerpc/include/ansi.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/include/limits.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/_stdint.h#1 branch
.. //depot/projects/trustedbsd/base/sys/sparc64/include/ansi.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/asmacros.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/limits.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/profile.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/locore.s#6 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/prof_machdep.c#1 branch
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/support.s#9 integrate
.. //depot/projects/trustedbsd/base/sys/sys/proc.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/sys/stdint.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/sys/vnode.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/x86_64/include/_stdint.h#1 branch
.. //depot/projects/trustedbsd/base/sys/x86_64/include/ansi.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/x86_64/include/limits.h#2 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/io.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/cap_mkdb/cap_mkdb.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/checknr/checknr.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/chkey/chkey.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/cksum/cksum.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/cksum/crc.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/cksum/crc32.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/cksum/print.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/cksum/sum1.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/cksum/sum2.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/cmp/cmp.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/cmp/misc.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/cmp/regular.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/cmp/special.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/colldef/parse.y#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/colrm/colrm.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/column/column.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/comm/comm.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.bin/compress/compress.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/compress/zopen.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/csplit/csplit.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/ctags/C.c#8 integrate
.. //depot/projects/trustedbsd/base/usr.bin/ctags/ctags.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.bin/ctags/fortran.c#8 integrate
.. //depot/projects/trustedbsd/base/usr.bin/ctags/lisp.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/ctags/print.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/ctags/tree.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.bin/ctags/yacc.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/dirname/dirname.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/doscmd/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/usr.bin/du/du.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/fetch/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/fetch/fetch.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.bin/kdump/kdump.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/locate/locate/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/login/login.c#15 integrate
.. //depot/projects/trustedbsd/base/usr.bin/mail/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/strip/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tr/tr.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/units/units.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.bin/vi/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/xinstall/xinstall.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4b.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4bctl.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4bing.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4bipr.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4bisppp.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4bq921.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4bq931.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4brbch.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4btel.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4btrc.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/iavc.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/ifpi.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/ifpi2.4#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/ifpnp.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/ihfc.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/isic.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/iwic.4#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/mailwrapper/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pcvt/keycap/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/rpc.yppasswdd/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ypserv/Makefile#4 integrate
Differences ...
==== //depot/projects/trustedbsd/base/UPDATING#16 (text+ko) ====
@@ -22,6 +22,12 @@
integrity. Re-enabling write caching can substantially improve
performance.
+20020729:
+ COPY is being deprecated. The 20010530 change was reverted, as
+ it causes far more pain than was expected, and to always compare
+ before installing, please use INSTALL="install -C" again. The
+ -C option is now silently ignored when used with the -d option.
+
20020702:
Problems with libc_r clients like KDE and GNOME have been resolved.
There are still some minor problems with some signals but the
@@ -1051,4 +1057,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.213 2002/07/03 04:23:38 julian Exp $
+$FreeBSD: src/UPDATING,v 1.214 2002/07/29 08:51:03 ru Exp $
==== //depot/projects/trustedbsd/base/crypto/openssh/auth.c#4 (text+ko) ====
@@ -24,6 +24,7 @@
#include "includes.h"
RCSID("$OpenBSD: auth.c,v 1.43 2002/05/17 14:27:55 millert Exp $");
+RCSID("$FreeBSD: src/crypto/openssh/auth.c,v 1.11 2002/07/29 00:36:24 fanf Exp $");
#ifdef HAVE_LOGIN_H
#include <login.h>
@@ -479,7 +480,7 @@
if (pw == NULL || !allowed_user(pw))
return (NULL);
#ifdef HAVE_LOGIN_CAP
- if ((lc = login_getclass(pw->pw_class)) == NULL) {
+ if ((lc = login_getpwclass(pw)) == NULL) {
debug("unable to get login class: %s", user);
return (NULL);
}
==== //depot/projects/trustedbsd/base/etc/Makefile#19 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.290 2002/07/18 12:07:44 ru Exp $
+# $FreeBSD: src/etc/Makefile,v 1.291 2002/07/29 09:40:04 ru Exp $
.if !defined(NO_SENDMAIL)
SUBDIR= sendmail
@@ -63,20 +63,20 @@
.if defined(OBJFORMAT)
echo OBJFORMAT=${OBJFORMAT} > ${DISTDIR}/${DISTRIBUTION}/etc/objformat
.endif
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \
${DISTDIR}/${DISTRIBUTION}/boot/device.hints
distribution:
cd ${.CURDIR}; \
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${BIN1} ${DESTDIR}/etc; \
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 755 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \
${BIN2} ${DESTDIR}/etc; \
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \
pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
- cd ${.CURDIR}/defaults; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ cd ${.CURDIR}/defaults; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${DEFAULTS} ${DESTDIR}/etc/defaults
cd ${.CURDIR}/periodic; ${MAKE} install
cd ${.CURDIR}/rc.d; ${MAKE} install
@@ -92,73 +92,73 @@
.endif
.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
.if !defined(NO_OPENSSH)
- cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${SSH} ${DESTDIR}/etc/ssh
.endif
- cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${SSL} ${DESTDIR}/etc/ssl
.endif
.if !defined(NO_MAKEDEV_INSTALL)
- cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 555 \
+ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 555 \
MAKEDEV.local MAKEDEV ${DESTDIR}/dev
.if !defined(NO_MAKEDEV_RUN)
cd ${DESTDIR}/dev; sh MAKEDEV all
.endif
.endif
cd ${.CURDIR}/root; \
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.cshrc ${DESTDIR}/root/.cshrc; \
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.klogin ${DESTDIR}/root/.klogin; \
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.login ${DESTDIR}/root/.login; \
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.profile ${DESTDIR}/root/.profile; \
rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile; \
ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \
ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
- cd ${.CURDIR}/mtree; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${MTREE} ${DESTDIR}/etc/mtree
- cd ${.CURDIR}/namedb; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${NAMEDB} ${DESTDIR}/etc/namedb
- cd ${.CURDIR}/ppp; ${INSTALL} ${COPY} -o root -g ${BINGRP} -m 600 \
+ cd ${.CURDIR}/ppp; ${INSTALL} -o root -g ${BINGRP} -m 600 \
${PPPCNF} ${DESTDIR}/etc/ppp
- cd ${.CURDIR}/mail; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${ETCMAIL} ${DESTDIR}/etc/mail
@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
! -f ${DESTDIR}/etc/aliases ]; then \
set -x; \
ln -s mail/aliases ${DESTDIR}/etc/aliases; \
fi
- ${INSTALL} ${COPY} -o ${BINOWN} -g operator -m 664 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
${DESTDIR}/etc/dumpdates
- ${INSTALL} ${COPY} -o nobody -g ${BINGRP} -m 644 /dev/null \
+ ${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/db/locate.database
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
${DESTDIR}/var/log/auth.log
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
${DESTDIR}/var/log/cron
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/log/lpd-errs
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \
${DESTDIR}/var/log/maillog
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/log/lastlog
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/log/messages
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
${DESTDIR}/var/log/security
- ${INSTALL} ${COPY} -o ${BINOWN} -g network -m 640 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g network -m 640 /dev/null \
${DESTDIR}/var/log/slip.log
- ${INSTALL} ${COPY} -o ${BINOWN} -g network -m 640 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g network -m 640 /dev/null \
${DESTDIR}/var/log/ppp.log
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/log/wtmp
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/run/utmp
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \
${DESTDIR}/var/crash
- cd ${.CURDIR}/..; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${FREEBSD} ${DESTDIR}/
.if !defined(NOMAN)
cd ${.CURDIR}/../share/man; ${MAKE} makedb
@@ -214,10 +214,10 @@
done
etc-examples:
- cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${BIN1} ${BIN2} nsmb.conf opieaccess \
${DESTDIR}/usr/share/examples/etc
- cd ${.CURDIR}/defaults; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ cd ${.CURDIR}/defaults; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${DEFAULTS} ${DESTDIR}/usr/share/examples/etc/defaults
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/etc/isdn/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/isdn/Makefile,v 1.7 2002/07/20 10:56:00 ru Exp $
+# $FreeBSD: src/etc/isdn/Makefile,v 1.8 2002/07/29 09:40:05 ru Exp $
I4BETCPROG= answer \
isdntel.sh \
@@ -18,10 +18,10 @@
install:
for i in ${I4BETCPROG} ; do \
- ${INSTALL} ${COPY} -o root -g wheel -m 700 $$i ${DESTDIR}/etc/isdn ; \
+ ${INSTALL} -o root -g wheel -m 700 $$i ${DESTDIR}/etc/isdn ; \
done ; \
for i in ${I4BETCFILE} ; do \
- ${INSTALL} ${COPY} -o root -g wheel -m 600 $$i ${DESTDIR}/etc/isdn ; \
+ ${INSTALL} -o root -g wheel -m 600 $$i ${DESTDIR}/etc/isdn ; \
done
# Suck in the ${COPY} definition.
==== //depot/projects/trustedbsd/base/etc/mail/Makefile#8 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/mail/Makefile,v 1.31 2002/07/18 12:07:44 ru Exp $
+# $FreeBSD: src/etc/mail/Makefile,v 1.32 2002/07/29 09:40:05 ru Exp $
#
# This Makefile provides an easy way to generate the configuration
# file and database maps for the sendmail(8) daemon.
@@ -187,7 +187,7 @@
install-cf: ${INSTALL_CF}
.if ${INSTALL_CF} != /etc/mail/sendmail.cf
- ${INSTALL} ${COPY} -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf
+ ${INSTALL} -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf
.endif
@@ -199,7 +199,7 @@
@false
.else
.if ${INSTALL_SUBMIT_CF} != /etc/mail/submit.cf
- ${INSTALL} ${COPY} -m ${SHAREMODE} ${INSTALL_SUBMIT_CF} /etc/mail/submit.cf
+ ${INSTALL} -m ${SHAREMODE} ${INSTALL_SUBMIT_CF} /etc/mail/submit.cf
.endif
.endif
==== //depot/projects/trustedbsd/base/etc/sendmail/Makefile#8 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.19 (Berkeley) 1/14/97
-# $FreeBSD: src/etc/sendmail/Makefile,v 1.20 2002/07/18 12:07:44 ru Exp $
+# $FreeBSD: src/etc/sendmail/Makefile,v 1.21 2002/07/29 09:40:06 ru Exp $
M4= m4
CHMOD= chmod
@@ -80,18 +80,18 @@
.endif
.if defined(INSTALL_CF)
.if ${INSTALL_CF} != ${DEST_CF}
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \
${DEST_CF}
.endif
.endif
.if defined(SENDMAIL_ADDITIONAL_CF)
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail
.endif
.ifndef SENDMAIL_SET_USER_ID
.if defined(INSTALL_SUBMIT_CF)
.if ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF}
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF}
.endif
.endif
@@ -103,37 +103,37 @@
@echo ">>> ERROR: Both SENDMAIL_CF and SENDMAIL_MC can not be set"
@false
.endif
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/freebsd.mc \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/freebsd.mc \
${DESTDIR}/etc/mail/freebsd.mc
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
${DESTDIR}/etc/mail/freebsd.cf
.if defined(INSTALL_CF)
.if ${INSTALL_CF} != ${DEST_CF}
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \
${DEST_CF}
.endif
.else
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
${DEST_CF}
.endif
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.mc \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.mc \
${DESTDIR}/etc/mail/freebsd.submit.mc
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \
${DESTDIR}/etc/mail/freebsd.submit.cf
.ifndef SENDMAIL_SET_USER_ID
.if defined(INSTALL_SUBMIT_CF)
.if ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF}
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF}
.endif
.else
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \
${DEST_SUBMIT_CF}
.endif
.endif
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \
${DESTDIR}/etc/mail/helpfile
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \
${DESTDIR}/var/log/sendmail.st
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/games/battlestar/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/battlestar/Makefile,v 1.9 2002/07/18 12:07:44 ru Exp $
+# $FreeBSD: src/games/battlestar/Makefile,v 1.10 2002/07/29 09:40:06 ru Exp $
PROG= battlestar
SRCS= battlestar.c com1.c com2.c com3.c com4.c com5.c com6.c com7.c \
@@ -13,7 +13,7 @@
beforeinstall:
.if !exists(${DESTDIR}/var/games/battlestar.log)
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
${DESTDIR}/var/games/battlestar.log
.endif
==== //depot/projects/trustedbsd/base/games/canfield/canfield/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/canfield/canfield/Makefile,v 1.9 2002/07/18 12:07:44 ru Exp $
+# $FreeBSD: src/games/canfield/canfield/Makefile,v 1.10 2002/07/29 09:40:06 ru Exp $
PROG= canfield
MAN= canfield.6
@@ -10,7 +10,7 @@
beforeinstall:
.if !exists(${DESTDIR}/var/games/cfscores)
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
${DESTDIR}/var/games/cfscores
.endif
==== //depot/projects/trustedbsd/base/games/cribbage/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/cribbage/Makefile,v 1.13 2002/07/18 12:07:45 ru Exp $
+# $FreeBSD: src/games/cribbage/Makefile,v 1.14 2002/07/29 09:40:06 ru Exp $
PROG= cribbage
DPADD= ${LIBCURSES} ${LIBCOMPAT}
@@ -12,7 +12,7 @@
beforeinstall:
.if !exists(${DESTDIR}/var/games/criblog)
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
${DESTDIR}/var/games/criblog
.endif
==== //depot/projects/trustedbsd/base/games/hack/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/hack/Makefile,v 1.24 2002/07/18 12:07:45 ru Exp $
+# $FreeBSD: src/games/hack/Makefile,v 1.25 2002/07/29 09:40:06 ru Exp $
PROG= hack
SRCS= alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
@@ -34,10 +34,10 @@
${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} /dev/null \
${DESTDIR}/var/games/hackdir/perm
.if !exists(${DESTDIR}/var/games/hackdir/record)
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 460 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 460 /dev/null \
${DESTDIR}/var/games/hackdir/record
.endif
# rm -f ${DESTDIR}/var/games/hackdir/bones* \
==== //depot/projects/trustedbsd/base/games/larn/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 5.12 (Berkeley) 5/30/93
-# $FreeBSD: src/games/larn/Makefile,v 1.11 2002/07/18 12:07:45 ru Exp $
+# $FreeBSD: src/games/larn/Makefile,v 1.12 2002/07/29 09:40:06 ru Exp $
# EXTRA
# Incorporates code to gather additional performance statistics
@@ -68,11 +68,11 @@
beforeinstall:
.if !exists(${DESTDIR}/var/games/larn/lscore12.0)
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \
${DESTDIR}/var/games/larn/lscore12.0
.endif
.if !exists(${DESTDIR}/var/games/larn/llog12.0)
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \
${DESTDIR}/var/games/larn/llog12.0
.endif
==== //depot/projects/trustedbsd/base/games/phantasia/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/phantasia/Makefile,v 1.19 2001/03/26 14:20:58 ru Exp $
+# $FreeBSD: src/games/phantasia/Makefile,v 1.20 2002/07/29 09:40:07 ru Exp $
PROG= phantasia
SRCS= main.c fight.c io.c interplayer.c gamesupport.c misc.c phantglobs.c
@@ -27,7 +27,7 @@
beforeinstall:
.for file in ${DATAFILES}
.if !exists(${DESTDIR}/var/games/phantasia/${file})
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 660 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 660 \
${file} ${DESTDIR}/var/games/phantasia
.endif
.endfor
==== //depot/projects/trustedbsd/base/games/robots/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/robots/Makefile,v 1.9 2002/07/18 12:07:45 ru Exp $
+# $FreeBSD: src/games/robots/Makefile,v 1.10 2002/07/29 09:40:07 ru Exp $
PROG= robots
CFLAGS+=-DMAX_PER_UID=5
@@ -12,7 +12,7 @@
beforeinstall:
.if !exists(${DESTDIR}/var/games/robots_roll)
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
${DESTDIR}/var/games/robots_roll
.endif
==== //depot/projects/trustedbsd/base/games/rogue/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/rogue/Makefile,v 1.11 2002/07/18 12:07:45 ru Exp $
+# $FreeBSD: src/games/rogue/Makefile,v 1.12 2002/07/29 09:40:07 ru Exp $
PROG= rogue
CFLAGS+=-DUNIX -fwritable-strings
@@ -13,7 +13,7 @@
beforeinstall:
.if !exists(${DESTDIR}/var/games/rogue.scores)
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
${DESTDIR}/var/games/rogue.scores
.endif
==== //depot/projects/trustedbsd/base/games/sail/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/sail/Makefile,v 1.8 2002/07/18 12:07:45 ru Exp $
+# $FreeBSD: src/games/sail/Makefile,v 1.9 2002/07/29 09:40:07 ru Exp $
PROG= sail
SRCS= main.c pl_main.c pl_1.c pl_2.c pl_3.c pl_4.c pl_5.c pl_6.c pl_7.c \
@@ -12,7 +12,7 @@
beforeinstall:
.if !exists(${DESTDIR}/var/games/saillog)
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
${DESTDIR}/var/games/saillog
.endif
==== //depot/projects/trustedbsd/base/games/snake/snake/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/snake/snake/Makefile,v 1.8 2002/07/18 12:07:45 ru Exp $
+# $FreeBSD: src/games/snake/snake/Makefile,v 1.9 2002/07/29 09:40:07 ru Exp $
PROG= snake
SRCS= snake.c move.c
@@ -11,11 +11,11 @@
beforeinstall:
.if !exists(${DESTDIR}/var/games/snakerawscores)
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
${DESTDIR}/var/games/snakerawscores
.endif
.if !exists(${DESTDIR}/var/games/snake.log)
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
${DESTDIR}/var/games/snake.log
.endif
==== //depot/projects/trustedbsd/base/gnu/lib/csu/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.14 2002/05/26 17:16:21 obrien Exp $
+# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.15 2002/07/29 09:40:07 ru Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc
CCDIR= ${.CURDIR}/../../usr.bin/cc
@@ -61,7 +61,7 @@
realinstall:
.for file in ${OBJS} ${SOBJS} ${TGTOBJS}
- ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${file} ${DESTDIR}${LIBDIR}/${file:S/.So$/S.o/}
.endfor
==== //depot/projects/trustedbsd/base/gnu/lib/libdialog/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# Makefile for libdialog
-# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.36 2002/07/18 12:07:45 ru Exp $
+# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.37 2002/07/29 09:40:08 ru Exp $
LIB= dialog
INCS= dialog.h
@@ -24,7 +24,7 @@
.if !defined(NOHTML)
afterinstall:
.for file in ${EXAMPLES}
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/TESTS/${file} ${DESTDIR}/usr/share/examples/libdialog
.endfor
.endif
==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#4 (text+ko) ====
@@ -19,7 +19,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.39 2002/07/10 06:58:25 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.40 2002/07/28 18:46:49 peter Exp $ */
/*
* This works like "remote" but, you use it like this:
@@ -415,7 +415,8 @@
#define KSYM_TRAP "calltrap"
#define KSYM_INTR "Xintr"
#define KSYM_FASTINTR "Xfastintr"
-#define KSYM_SYSCALL "Xsyscall"
+#define KSYM_OLDSYSCALL "Xlcall_syscall"
+#define KSYM_SYSCALL "Xint0x80_syscall"
/*
@@ -444,7 +445,8 @@
strlen(KSYM_INTR)) == 0 || strncmp (SYMBOL_NAME(sym),
KSYM_FASTINTR, strlen(KSYM_FASTINTR)) == 0)
frametype = tf_interrupt;
- else if (strcmp (SYMBOL_NAME(sym), KSYM_SYSCALL) == 0)
+ else if (strcmp (SYMBOL_NAME(sym), KSYM_SYSCALL) == 0 ||
+ strcmp (SYMBOL_NAME(sym), KSYM_OLDSYSCALL) == 0)
frametype = tf_syscall;
}
==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.22 2002/03/29 00:41:01 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.23 2002/07/29 09:40:08 ru Exp $
.include "../Makefile.inc0"
@@ -52,7 +52,7 @@
ln -sf ${SRCDIR}/ld/emultempl/astring.sed ${.TARGET}
afterinstall:
- ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${LDSCRIPTS:S|^|ldscripts/|} ${DESTDIR}${SCRIPTDIR}
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/strip/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/strip/Makefile,v 1.10 2002/03/20 23:05:19 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/strip/Makefile,v 1.11 2002/07/29 09:40:08 ru Exp $
.include "../Makefile.inc0"
@@ -26,7 +26,7 @@
.endif
realinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
maybe_stripped ${DESTDIR}${BINDIR}/strip
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/contrib/mm/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/groff/contrib/mm/Makefile,v 1.4 2002/07/18 12:07:46 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/contrib/mm/Makefile,v 1.5 2002/07/29 09:40:08 ru Exp $
SCRIPTS= mmroff.pl
MAN= mmroff.7
@@ -24,7 +24,7 @@
beforeinstall:
.for locale in ${LOCALE}
.if !exists(${DESTDIR}${TMACDIR}/mm/${locale})
- ${INSTALL} ${COPY} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \
+ ${INSTALL} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \
/dev/null ${DESTDIR}${TMACDIR}/mm/${locale}
.endif
.endfor
==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/font/Makefile.dev#3 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.9 2002/07/18 12:07:46 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.10 2002/07/29 09:40:08 ru Exp $
DEVICEDIR?= ${fontdir}/dev${DEV}
all: ${DEVFILES}
beforeinstall: ${DEVFILES}
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
${.ALLSRC} ${DESTDIR}${DEVICEDIR}
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/utils/indxbib/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.5 2002/07/18 12:07:46 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.6 2002/07/29 09:40:08 ru Exp $
PROG_CXX= indxbib
SRCS= indxbib.cc signal.c
@@ -7,7 +7,7 @@
CLEANFILES= ${MAN}
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
${DIST_DIR}/eign ${DESTDIR}${SHAREDIR}/dict/
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.32 2002/07/18 12:07:46 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.33 2002/07/29 09:40:09 ru Exp $
TMACOWN?= ${BINOWN}
TMACGRP?= ${BINGRP}
@@ -53,22 +53,22 @@
beforeinstall:
cd ${DIST_DIR}; \
- ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
${NORMALFILES} ${DESTDIR}${TMACDIR}
cd ${.CURDIR}; \
- ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
hyphen.us-ru ${DESTDIR}${TMACDIR}
cd ${.OBJDIR}
.for f in ${STRIPFILES} ${SPECIALFILES}
- ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
$f-s ${DESTDIR}${TMACDIR}/$f
.endfor
.for f in ${MDOCFILES}
- ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
$f-s ${DESTDIR}${MDOCDIR}/$f
.endfor
.if !exists(${DESTDIR}${TMACDIR}/man.local)
- ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
${DIST_DIR}/man.local ${DESTDIR}${TMACDIR}
.endif
==== //depot/projects/trustedbsd/base/gnu/usr.bin/rcs/rcsfreeze/Makefile#3 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/Makefile,v 1.7 2002/07/18 12:07:46 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/Makefile,v 1.8 2002/07/29 09:40:09 ru Exp $
MAN= rcsfreeze.1
afterinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/rcsfreeze.sh ${DESTDIR}${BINDIR}/rcsfreeze
.include "../../Makefile.inc"
==== //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/send-pr/Makefile,v 1.16 2002/07/18 12:07:47 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/send-pr/Makefile,v 1.17 2002/07/29 09:40:09 ru Exp $
#
# Makefile for building a standalone send-pr.
#
@@ -29,7 +29,7 @@
# called from /usr/src/etc/Makefile
etc-gnats-freefall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 0644 \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0644 \
${.CURDIR}/categories ${DESTDIR}/etc/gnats/freefall
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/base/kerberosIV/share/info/Makefile#3 (text+ko) ====
@@ -1,15 +1,15 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
-# $FreeBSD: src/kerberosIV/share/info/Makefile,v 1.2 2002/07/18 12:07:47 ru Exp $
+# $FreeBSD: src/kerberosIV/share/info/Makefile,v 1.3 2002/07/29 09:40:09 ru Exp $
NOOBJ= noobj
all clean cleandir depend lint tags:
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \
${DESTDIR}${BINDIR}/info/dir-tmpl
if [ ! -f ${DESTDIR}${BINDIR}/info/dir ]; then \
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \
${DESTDIR}${BINDIR}/info/dir ; \
fi
==== //depot/projects/trustedbsd/base/lib/compat/compat1x/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/compat/compat1x/Makefile,v 1.13 2001/09/21 11:32:40 ru Exp $
+# $FreeBSD: src/lib/compat/compat1x/Makefile,v 1.14 2002/07/29 09:40:09 ru Exp $
DISTRIBUTION= compat1x
@@ -20,7 +20,7 @@
.endfor
beforeinstall:
- ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
${DESTDIR}${LIBCOMPATDIR}/aout
>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list