PERFORCE change 34264 for review
Peter Wemm
peter at FreeBSD.org
Wed Jul 9 12:39:35 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=34264
Change 34264 by peter at peter_daintree on 2003/07/09 12:38:41
IFC @34262
Affected files ...
.. //depot/projects/hammer/MAINTAINERS#10 integrate
.. //depot/projects/hammer/Makefile#10 integrate
.. //depot/projects/hammer/Makefile.inc1#23 integrate
.. //depot/projects/hammer/bin/rmail/Makefile#2 integrate
.. //depot/projects/hammer/bin/sh/alias.c#2 integrate
.. //depot/projects/hammer/bin/sh/cd.c#2 integrate
.. //depot/projects/hammer/bin/sh/exec.c#3 integrate
.. //depot/projects/hammer/bin/sh/exec.h#2 integrate
.. //depot/projects/hammer/bin/sh/expand.c#7 integrate
.. //depot/projects/hammer/bin/sh/input.c#2 integrate
.. //depot/projects/hammer/bin/sh/jobs.c#7 integrate
.. //depot/projects/hammer/bin/sh/memalloc.c#3 integrate
.. //depot/projects/hammer/bin/sh/nodes.c.pat#3 integrate
.. //depot/projects/hammer/bin/sh/output.c#3 integrate
.. //depot/projects/hammer/bin/sh/parser.c#5 integrate
.. //depot/projects/hammer/bin/sh/redir.c#3 integrate
.. //depot/projects/hammer/bin/sh/var.c#4 integrate
.. //depot/projects/hammer/contrib/cvs/src/main.c#4 integrate
.. //depot/projects/hammer/contrib/groff/tmac/doc.tmac#6 integrate
.. //depot/projects/hammer/etc/Makefile#14 integrate
.. //depot/projects/hammer/etc/mail/Makefile#3 integrate
.. //depot/projects/hammer/etc/mtree/BSD.local.dist#8 integrate
.. //depot/projects/hammer/etc/mtree/BSD.usr.dist#8 integrate
.. //depot/projects/hammer/etc/rc.d/ypbind#5 integrate
.. //depot/projects/hammer/etc/rc.d/yppasswdd#4 integrate
.. //depot/projects/hammer/etc/rc.d/ypserv#5 integrate
.. //depot/projects/hammer/etc/rc.d/ypset#5 integrate
.. //depot/projects/hammer/etc/rc.d/ypupdated#4 integrate
.. //depot/projects/hammer/etc/rc.d/ypxfrd#5 integrate
.. //depot/projects/hammer/etc/rc.shutdown#3 integrate
.. //depot/projects/hammer/etc/sendmail/Makefile#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/cvs/lib/config.h.proto#2 integrate
.. //depot/projects/hammer/include/Makefile#14 integrate
.. //depot/projects/hammer/lib/libc/locale/setlocale.c#5 integrate
.. //depot/projects/hammer/lib/libc/locale/setlocale.h#3 integrate
.. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#5 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfwscanf.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdio/wprintf.3#3 integrate
.. //depot/projects/hammer/lib/libc/stdio/wscanf.3#3 integrate
.. //depot/projects/hammer/lib/libmilter/Makefile#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_attr_get_np.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#9 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_getschedparam.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_info.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_join.c#6 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#16 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_mutex_prioceiling.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#13 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigaction.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigmask.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigpending.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#7 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#7 integrate
.. //depot/projects/hammer/lib/libsm/Makefile#2 integrate
.. //depot/projects/hammer/lib/libsmdb/Makefile#2 integrate
.. //depot/projects/hammer/lib/libsmutil/Makefile#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#6 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_detach.c#5 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#7 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_gc.c#6 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_init.c#7 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_join.c#6 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#7 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#12 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#8 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_spinlock.c#5 integrate
.. //depot/projects/hammer/libexec/ftpd/ftpcmd.y#6 integrate
.. //depot/projects/hammer/libexec/ftpd/ftpd.c#7 integrate
.. //depot/projects/hammer/libexec/mail.local/Makefile#2 integrate
.. //depot/projects/hammer/libexec/rtld-elf/sparc64/rtld_machdep.h#5 integrate
.. //depot/projects/hammer/libexec/rtld-elf/sparc64/rtld_start.S#4 integrate
.. //depot/projects/hammer/libexec/smrsh/Makefile#2 integrate
.. //depot/projects/hammer/release/Makefile#32 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#33 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#9 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#9 integrate
.. //depot/projects/hammer/sbin/devd/devd.cc#5 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#9 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#11 integrate
.. //depot/projects/hammer/share/colldef/Makefile#6 integrate
.. //depot/projects/hammer/share/colldef/hy_AM.ARMSCII-8.src#1 branch
.. //depot/projects/hammer/share/colldef/map.ARMSCII-8#1 branch
.. //depot/projects/hammer/share/doc/psd/21.ipc/3.t#3 integrate
.. //depot/projects/hammer/share/doc/psd/21.ipc/4.t#2 integrate
.. //depot/projects/hammer/share/doc/smm/08.sendmailop/Makefile#3 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#12 integrate
.. //depot/projects/hammer/share/man/man4/divert.4#3 integrate
.. //depot/projects/hammer/share/man/man4/wi.4#10 integrate
.. //depot/projects/hammer/share/man/man5/Makefile#4 integrate
.. //depot/projects/hammer/share/man/man5/config.5#1 branch
.. //depot/projects/hammer/share/man/man5/make.conf.5#11 integrate
.. //depot/projects/hammer/share/man/man5/utmp.5#3 integrate
.. //depot/projects/hammer/share/man/man7/build.7#2 integrate
.. //depot/projects/hammer/share/man/man7/security.7#4 integrate
.. //depot/projects/hammer/share/misc/pci_vendors#7 integrate
.. //depot/projects/hammer/share/mklocale/Makefile#6 integrate
.. //depot/projects/hammer/share/mklocale/hy_AM.ARMSCII-8.src#1 branch
.. //depot/projects/hammer/share/monetdef/Makefile#5 integrate
.. //depot/projects/hammer/share/monetdef/hy_AM.ARMSCII-8.src#1 branch
.. //depot/projects/hammer/share/msgdef/Makefile#5 integrate
.. //depot/projects/hammer/share/msgdef/hy_AM.ARMSCII-8.src#1 branch
.. //depot/projects/hammer/share/numericdef/Makefile#5 integrate
.. //depot/projects/hammer/share/numericdef/hy_AM.ARMSCII-8.src#1 branch
.. //depot/projects/hammer/share/sendmail/Makefile#3 integrate
.. //depot/projects/hammer/share/syscons/fonts/INDEX.fonts#3 integrate
.. //depot/projects/hammer/share/syscons/fonts/Makefile#2 integrate
.. //depot/projects/hammer/share/syscons/fonts/armscii8-8x14.fnt#1 branch
.. //depot/projects/hammer/share/syscons/fonts/armscii8-8x16.fnt#1 branch
.. //depot/projects/hammer/share/syscons/fonts/armscii8-8x8.fnt#1 branch
.. //depot/projects/hammer/share/syscons/fonts/haik8-8x14.fnt#1 branch
.. //depot/projects/hammer/share/syscons/fonts/haik8-8x16.fnt#1 branch
.. //depot/projects/hammer/share/syscons/fonts/haik8-8x8.fnt#1 branch
.. //depot/projects/hammer/share/syscons/keymaps/INDEX.keymaps#5 integrate
.. //depot/projects/hammer/share/syscons/keymaps/Makefile#6 integrate
.. //depot/projects/hammer/share/syscons/keymaps/hy.armscii-8.kbd#1 branch
.. //depot/projects/hammer/share/syscons/keymaps/norwegian.iso.kbd#2 integrate
.. //depot/projects/hammer/share/syscons/scrnmaps/Makefile#2 integrate
.. //depot/projects/hammer/share/syscons/scrnmaps/armscii8-2haik8#1 branch
.. //depot/projects/hammer/share/timedef/Makefile#5 integrate
.. //depot/projects/hammer/share/timedef/hy_AM.ARMSCII-8.src#1 branch
.. //depot/projects/hammer/sys/alpha/alpha/pmap.c#14 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#25 integrate
.. //depot/projects/hammer/sys/conf/NOTES#21 integrate
.. //depot/projects/hammer/sys/conf/files#22 integrate
.. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#2 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#11 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/aac/aacvar.h#5 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_isab.c#1 branch
.. //depot/projects/hammer/sys/dev/em/if_em.h#11 integrate
.. //depot/projects/hammer/sys/dev/en/midway.c#13 integrate
.. //depot/projects/hammer/sys/dev/firewire/firewire.c#15 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwdma.c#3 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci.c#12 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#12 integrate
.. //depot/projects/hammer/sys/dev/firewire/sbp.c#17 integrate
.. //depot/projects/hammer/sys/dev/pci/isa_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/ich.c#7 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/feeder.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/feeder.h#2 integrate
.. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/hid.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/hid.h#2 integrate
.. //depot/projects/hammer/sys/dev/usb/if_axe.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/if_cue.c#7 integrate
.. //depot/projects/hammer/sys/dev/usb/ohci.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/ohcireg.h#2 integrate
.. //depot/projects/hammer/sys/dev/usb/ucom.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/udbp.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/udbp.h#2 integrate
.. //depot/projects/hammer/sys/dev/usb/ufm.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/uftdi.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/ugen.c#6 integrate
.. //depot/projects/hammer/sys/dev/usb/uhci.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/uhcireg.h#2 integrate
.. //depot/projects/hammer/sys/dev/usb/uhcivar.h#3 integrate
.. //depot/projects/hammer/sys/dev/usb/uhid.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/uhub.c#2 integrate
.. //depot/projects/hammer/sys/dev/usb/ukbd.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/umass.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/umct.c#2 integrate
.. //depot/projects/hammer/sys/dev/usb/ums.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/uplcom.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/urio.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_mem.h#2 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_port.h#4 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_subr.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#14 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi.c#2 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi.h#2 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi_util.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi_util.h#3 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdivar.h#2 integrate
.. //depot/projects/hammer/sys/dev/usb/uscanner.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/uvisor.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/uvscom.c#4 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#11 integrate
.. //depot/projects/hammer/sys/dev/zs/zs.c#2 integrate
.. //depot/projects/hammer/sys/geom/geom_dump.c#14 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#13 integrate
.. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#9 integrate
.. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#12 integrate
.. //depot/projects/hammer/sys/ia64/ia64/db_trace.c#6 integrate
.. //depot/projects/hammer/sys/ia64/ia64/unwind.c#5 integrate
.. //depot/projects/hammer/sys/ia64/include/unwind.h#4 integrate
.. //depot/projects/hammer/sys/isa/isa_common.c#10 integrate
.. //depot/projects/hammer/sys/isa/isavar.h#3 integrate
.. //depot/projects/hammer/sys/isa/psm.c#9 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#13 integrate
.. //depot/projects/hammer/sys/kern/kern_prot.c#6 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#19 integrate
.. //depot/projects/hammer/sys/kern/kern_thr.c#11 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#32 integrate
.. //depot/projects/hammer/sys/kern/kern_umtx.c#5 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#9 integrate
.. //depot/projects/hammer/sys/kern/subr_param.c#4 integrate
.. //depot/projects/hammer/sys/kern/sys_pipe.c#8 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#15 integrate
.. //depot/projects/hammer/sys/modules/acpi/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/geom/geom_mbr/Makefile#2 integrate
.. //depot/projects/hammer/sys/net/if_vlan.c#6 integrate
.. //depot/projects/hammer/sys/net/if_vlan_var.h#4 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw.h#6 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#12 integrate
.. //depot/projects/hammer/sys/pci/if_dc.c#15 integrate
.. //depot/projects/hammer/sys/pci/if_dcreg.h#8 integrate
.. //depot/projects/hammer/sys/pci/if_xl.c#16 integrate
.. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#7 integrate
.. //depot/projects/hammer/sys/security/mac_ifoff/mac_ifoff.c#6 integrate
.. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#7 integrate
.. //depot/projects/hammer/sys/security/mac_test/mac_test.c#10 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#14 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#16 integrate
.. //depot/projects/hammer/sys/sys/pipe.h#3 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#11 integrate
.. //depot/projects/hammer/sys/vm/vm_contig.c#8 integrate
.. //depot/projects/hammer/sys/vm/vm_mmap.c#8 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.c#19 integrate
.. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#4 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#9 integrate
.. //depot/projects/hammer/usr.bin/login/login.1#3 integrate
.. //depot/projects/hammer/usr.bin/make/cond.c#6 integrate
.. //depot/projects/hammer/usr.bin/talk/display.c#3 integrate
.. //depot/projects/hammer/usr.bin/talk/get_iface.c#2 integrate
.. //depot/projects/hammer/usr.bin/vacation/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/config/config.y#3 integrate
.. //depot/projects/hammer/usr.sbin/daemon/daemon.c#2 integrate
.. //depot/projects/hammer/usr.sbin/editmap/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/fdcontrol/fdcontrol.8#3 integrate
.. //depot/projects/hammer/usr.sbin/jail/jail.c#5 integrate
.. //depot/projects/hammer/usr.sbin/jexec/jexec.c#2 integrate
.. //depot/projects/hammer/usr.sbin/lpr/lpd/lpd.c#2 integrate
.. //depot/projects/hammer/usr.sbin/mailstats/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/mailwrapper/mailwrapper.c#2 integrate
.. //depot/projects/hammer/usr.sbin/makemap/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/mtest/mtest.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pppctl/pppctl.c#2 integrate
.. //depot/projects/hammer/usr.sbin/praliases/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/repquota/repquota.8#3 integrate
.. //depot/projects/hammer/usr.sbin/repquota/repquota.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rtprio/rtprio.c#2 integrate
.. //depot/projects/hammer/usr.sbin/rwhod/rwhod.8#2 integrate
.. //depot/projects/hammer/usr.sbin/rwhod/rwhod.c#2 integrate
.. //depot/projects/hammer/usr.sbin/sendmail/Makefile#6 integrate
.. //depot/projects/hammer/usr.sbin/timed/timed/timed.c#2 integrate
.. //depot/projects/hammer/usr.sbin/timed/timedc/cmds.c#3 integrate
Differences ...
==== //depot/projects/hammer/MAINTAINERS#10 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.72 2003/06/16 16:12:05 obrien Exp $
+$FreeBSD: src/MAINTAINERS,v 1.73 2003/07/07 03:54:02 gshapiro Exp $
subsystem login notes
-----------------------------
@@ -86,7 +86,6 @@
stating your preferences here instead.
bin/dd/Makefile:MAINTAINER= green at FreeBSD.org
-bin/rmail/Makefile:MAINTAINER= gshapiro at FreeBSD.org
contrib/cvs/FREEBSD-upgrade:MAINTAINER= peter at FreeBSD.org
games/fortune/datfiles/Makefile:MAINTAINER= jkh at FreeBSD.org
gnu/usr.bin/cvs/Makefile:MAINTAINER= peter at FreeBSD.org
@@ -98,14 +97,8 @@
gnu/usr.bin/cvs/libdiff/Makefile:MAINTAINER= peter at FreeBSD.org
gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch at FreeBSD.org
lib/libc/posix1e/Makefile.inc:MAINTAINER= rwatson at FreeBSD.org
-lib/libmilter/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-lib/libsm/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-lib/libsmdb/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-lib/libsmutil/Makefile:MAINTAINER= gshapiro at FreeBSD.org
lib/libusbhid/Makefile:MAINTAINER= n_hibma at FreeBSD.ORG
lib/libz/Makefile:MAINTAINER= peter at FreeBSD.org
-libexec/mail.local/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-libexec/smrsh/Makefile:MAINTAINER= gshapiro at FreeBSD.org
sbin/dhclient/Makefile.inc:MAINTAINER= murray at FreeBSD.org
sbin/ffsinfo/Makefile:MAINTAINER= tomsoft at FreeBSD.ORG, chm at FreeBSD.ORG
sbin/growfs/Makefile:MAINTAINER= tomsoft at FreeBSD.ORG, chm at FreeBSD.ORG
@@ -114,8 +107,6 @@
sbin/ipfstat/Makefile:MAINTAINER= darrenr at freebsd.org
sbin/ipmon/Makefile:MAINTAINER= darrenr at freebsd.org
sbin/ipnat/Makefile:MAINTAINER= darrenr at freebsd.org
-share/doc/smm/08.sendmailop/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-share/sendmail/Makefile:MAINTAINER= gshapiro at FreeBSD.org
sys/boot/i386/cdboot/Makefile:MAINTAINER= jhb at FreeBSD.org
sys/boot/i386/pxeldr/Makefile:MAINTAINER= jhb at FreeBSD.org
sys/compat/svr4/Makefile:MAINTAINER= newton at freebsd.org
@@ -146,18 +137,12 @@
sys/modules/uscanner/Makefile:MAINTAINER= n_hibma at freebsd.org
usr.bin/chat/Makefile:MAINTAINER= peter at freebsd.org
usr.bin/locate/Makefile:MAINTAINER= wosch at FreeBSD.org
-usr.bin/vacation/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-usr.sbin/editmap/Makefile:MAINTAINER= gshapiro at FreeBSD.org
usr.sbin/inetd/Makefile:MAINTAINER= dwmalone at FreeBSD.org
usr.sbin/ipftest/Makefile:MAINTAINER= darrenr at freebsd.org
usr.sbin/ipresend/Makefile:MAINTAINER= darrenr at freebsd.org
usr.sbin/ipsend/Makefile:MAINTAINER= darrenr at freebsd.org
usr.sbin/iptest/Makefile:MAINTAINER= darrenr at freebsd.org
-usr.sbin/mailstats/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-usr.sbin/makemap/Makefile:MAINTAINER= gshapiro at FreeBSD.org
usr.sbin/ntp/doc/Makefile:MAINTAINER= sheldonh at FreeBSD.org
usr.sbin/pppd/Makefile:MAINTAINER= peter at freebsd.org
usr.sbin/pppstats/Makefile:MAINTAINER= peter at freebsd.org
-usr.sbin/praliases/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-usr.sbin/sendmail/Makefile:MAINTAINER= gshapiro at FreeBSD.org
usr.sbin/zic/Makefile:MAINTAINER= wollman at FreeBSD.org
==== //depot/projects/hammer/Makefile#10 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.282 2003/06/22 21:56:22 ru Exp $
+# $FreeBSD: src/Makefile,v 1.284 2003/07/04 17:35:26 ru Exp $
#
# The user-driven targets are:
#
@@ -83,9 +83,10 @@
PATH= /sbin:/bin:/usr/sbin:/usr/bin
MAKEOBJDIRPREFIX?= /usr/obj
MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
-_MAKE= PATH=${PATH} \
+BINMAKE= \
`if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \
- -m ${.CURDIR}/share/mk -f Makefile.inc1
+ -m ${.CURDIR}/share/mk
+_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1
#
# Handle the user-driven targets, using the source relative mk files.
==== //depot/projects/hammer/Makefile.inc1#23 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.374 2003/07/02 19:26:19 gordon Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.377 2003/07/08 01:24:21 obrien Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -373,11 +373,11 @@
#
installcheck:
.if !defined(NO_SENDMAIL)
- @if ! `grep -q '^smmsp:' /etc/passwd`; then \
+ @if ! `id -u smmsp > /dev/null`; then \
echo "ERROR: Required smmsp user is missing, see /usr/src/UPDATING."; \
false; \
fi
- @if ! `grep -q '^smmsp:' /etc/group`; then \
+ @if ! `id -g smmsp > /dev/null`; then \
echo "ERROR: Required smmsp group is missing, see /usr/src/UPDATING."; \
false; \
fi
@@ -652,22 +652,22 @@
.endif
.endif
-.if ( ${BOOTSTRAPPING} < 450005 || \
- ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034 ))
+.if ${BOOTSTRAPPING} < 450005 || \
+ ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034
_uudecode= usr.bin/uudecode
.endif
-.if ( ${BOOTSTRAPPING} < 430002 || \
- ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500019 ))
+.if ${BOOTSTRAPPING} < 430002 || \
+ ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500019
_xargs= usr.bin/xargs
.endif
-.if ( ${BOOTSTRAPPING} < 430002 || \
- ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500018 ))
+.if ${BOOTSTRAPPING} < 430002 || \
+ ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500018
_yacc= usr.bin/yacc
.endif
-.if exists(${.CURDIR}/rescue) && defined(RESCUE) && \
+.if defined(RESCUE) && \
${BOOTSTRAPPING} < 501100
_crunchgen= usr.sbin/crunch/crunchgen
.endif
@@ -752,9 +752,9 @@
_btxld= usr.sbin/btxld
.endif
-.if (exists(${.CURDIR}/rescue) && defined(RESCUE) || \
+.if (defined(RESCUE) || \
defined(RELEASEDIR)) && \
- ( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 )
+ (${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101)
_crunchide= usr.sbin/crunch/crunchide
.endif
==== //depot/projects/hammer/bin/rmail/Makefile#2 (text+ko) ====
@@ -1,7 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/rmail/Makefile,v 1.17 2002/02/17 22:05:05 gshapiro Exp $
-
-MAINTAINER= gshapiro at FreeBSD.org
+# $FreeBSD: src/bin/rmail/Makefile,v 1.18 2003/07/07 03:54:02 gshapiro Exp $
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/rmail
==== //depot/projects/hammer/bin/sh/alias.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.16 2002/06/30 05:15:03 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.17 2003/07/05 15:18:44 dds Exp $");
#include <stdlib.h>
#include "shell.h"
@@ -54,7 +54,7 @@
#define ATABSIZE 39
-struct alias *atab[ATABSIZE];
+STATIC struct alias *atab[ATABSIZE];
STATIC void setalias(char *, char *);
STATIC int unalias(char *);
==== //depot/projects/hammer/bin/sh/cd.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.32 2002/07/25 10:57:39 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.33 2003/07/05 15:18:44 dds Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -74,8 +74,8 @@
STATIC char *getcomponent(void);
STATIC int updatepwd(char *);
-char *curdir = NULL; /* current working directory */
-char *prevdir; /* previous working directory */
+STATIC char *curdir = NULL; /* current working directory */
+STATIC char *prevdir; /* previous working directory */
STATIC char *cdcomppath;
int
==== //depot/projects/hammer/bin/sh/exec.c#3 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.22 2002/10/01 11:48:18 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.23 2003/07/05 15:18:44 dds Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -599,7 +599,7 @@
* entry.
*/
-struct tblentry **lastcmdentry;
+STATIC struct tblentry **lastcmdentry;
STATIC struct tblentry *
==== //depot/projects/hammer/bin/sh/exec.h#2 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)exec.h 8.3 (Berkeley) 6/8/95
- * $FreeBSD: src/bin/sh/exec.h,v 1.10 2002/02/02 06:50:46 imp Exp $
+ * $FreeBSD: src/bin/sh/exec.h,v 1.11 2003/07/05 15:18:44 dds Exp $
*/
/* values of cmdtype */
@@ -64,7 +64,6 @@
void hashcd(void);
void changepath(const char *);
void deletefuncs(void);
-void getcmdentry(char *, struct cmdentry *);
void addcmdentry(char *, struct cmdentry *);
void defun(char *, union node *);
int unsetfunc(char *);
==== //depot/projects/hammer/bin/sh/expand.c#7 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.43 2003/05/31 06:27:57 fenner Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.44 2003/07/05 15:18:44 dds Exp $");
#include <sys/types.h>
#include <sys/time.h>
@@ -90,11 +90,11 @@
};
-char *expdest; /* output of current string */
-struct nodelist *argbackq; /* list of back quote expressions */
-struct ifsregion ifsfirst; /* first struct in list of ifs regions */
-struct ifsregion *ifslastp; /* last struct in list */
-struct arglist exparg; /* holds expanded arg list */
+STATIC char *expdest; /* output of current string */
+STATIC struct nodelist *argbackq; /* list of back quote expressions */
+STATIC struct ifsregion ifsfirst; /* first struct in list of ifs regions */
+STATIC struct ifsregion *ifslastp; /* last struct in list */
+STATIC struct arglist exparg; /* holds expanded arg list */
STATIC void argstr(char *, int);
STATIC char *exptilde(char *, int);
@@ -1055,7 +1055,7 @@
* should be escapes. The results are stored in the list exparg.
*/
-char *expdir;
+STATIC char *expdir;
STATIC void
==== //depot/projects/hammer/bin/sh/input.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.19 2002/07/24 02:06:07 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.20 2003/07/05 15:18:44 dds Exp $");
#include <stdio.h> /* defines BUFSIZ */
#include <fcntl.h>
@@ -102,7 +102,7 @@
char *parsenextc; /* copy of parsefile->nextc */
MKINIT struct parsefile basepf; /* top level input file */
char basebuf[BUFSIZ]; /* buffer for top level input file */
-struct parsefile *parsefile = &basepf; /* current input file */
+STATIC struct parsefile *parsefile = &basepf; /* current input file */
int init_editline = 0; /* editline library initialized? */
int whichprompt; /* 1 == PS1, 2 == PS2 */
==== //depot/projects/hammer/bin/sh/jobs.c#7 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.63 2003/03/17 11:28:56 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.64 2003/07/05 15:18:44 dds Exp $");
#include <fcntl.h>
#include <signal.h>
@@ -76,12 +76,12 @@
#include "mystring.h"
-struct job *jobtab; /* array of jobs */
-int njobs; /* size of array */
+STATIC struct job *jobtab; /* array of jobs */
+STATIC int njobs; /* size of array */
MKINIT pid_t backgndpid = -1; /* pid of last background process */
#if JOBS
-struct job *jobmru; /* most recently used job list */
-pid_t initialpgrp; /* pgrp of shell on invocation */
+STATIC struct job *jobmru; /* most recently used job list */
+STATIC pid_t initialpgrp; /* pgrp of shell on invocation */
#endif
int in_waitcmd = 0; /* are we in waitcmd()? */
int in_dowait = 0; /* are we in dowait()? */
==== //depot/projects/hammer/bin/sh/memalloc.c#3 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.24 2003/02/24 08:07:05 marcel Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.25 2003/07/05 15:18:44 dds Exp $");
#include <sys/param.h>
#include "shell.h"
@@ -113,8 +113,8 @@
};
#define SPACE(sp) ((char*)(sp) + ALIGN(sizeof(struct stack_block)))
-struct stack_block *stackp;
-struct stackmark *markp;
+STATIC struct stack_block *stackp;
+STATIC struct stackmark *markp;
char *stacknxt;
int stacknleft;
int sstrnleft;
==== //depot/projects/hammer/bin/sh/nodes.c.pat#3 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nodes.c.pat 8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.13 2003/02/24 08:07:05 marcel Exp $
+ * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.14 2003/07/05 15:18:44 dds Exp $
*/
#include <sys/param.h>
@@ -49,10 +49,10 @@
#include "mystring.h"
-int funcblocksize; /* size of structures in function */
-int funcstringsize; /* size of strings in node */
-pointer funcblock; /* block to allocate function from */
-char *funcstring; /* block to allocate strings from */
+STATIC int funcblocksize; /* size of structures in function */
+STATIC int funcstringsize; /* size of strings in node */
+STATIC pointer funcblock; /* block to allocate function from */
+STATIC char *funcstring; /* block to allocate strings from */
%SIZES
==== //depot/projects/hammer/bin/sh/output.c#3 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.17 2002/10/01 13:41:13 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.18 2003/07/05 15:18:44 dds Exp $");
/*
* Shell output routines. We use our own output routines because:
@@ -161,7 +161,7 @@
out1c('\'');
}
-char out_junk[16];
+STATIC char out_junk[16];
void
emptyoutbuf(struct output *dest)
==== //depot/projects/hammer/bin/sh/parser.c#5 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.48 2002/10/06 06:35:51 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.49 2003/07/05 15:18:44 dds Exp $");
#include <stdlib.h>
@@ -84,19 +84,19 @@
-struct heredoc *heredoclist; /* list of here documents to read */
-int parsebackquote; /* nonzero if we are inside backquotes */
-int doprompt; /* if set, prompt the user */
-int needprompt; /* true if interactive and at start of line */
-int lasttoken; /* last token read */
+STATIC struct heredoc *heredoclist; /* list of here documents to read */
+STATIC int parsebackquote; /* nonzero if we are inside backquotes */
+STATIC int doprompt; /* if set, prompt the user */
+STATIC int needprompt; /* true if interactive and at start of line */
+STATIC int lasttoken; /* last token read */
MKINIT int tokpushback; /* last token pushed back */
-char *wordtext; /* text of last word returned by readtoken */
+STATIC char *wordtext; /* text of last word returned by readtoken */
MKINIT int checkkwd; /* 1 == check for kwds, 2 == also eat newlines */
-struct nodelist *backquotelist;
-union node *redirnode;
-struct heredoc *heredoc;
-int quoteflag; /* set if (part of) last token was quoted */
-int startlinno; /* line # where last token started */
+STATIC struct nodelist *backquotelist;
+STATIC union node *redirnode;
+STATIC struct heredoc *heredoc;
+STATIC int quoteflag; /* set if (part of) last token was quoted */
+STATIC int startlinno; /* line # where last token started */
/* XXX When 'noaliases' is set to one, no alias expansion takes place. */
static int noaliases = 0;
==== //depot/projects/hammer/bin/sh/redir.c#3 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.23 2002/09/29 12:38:25 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.24 2003/07/05 15:18:44 dds Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -84,7 +84,7 @@
* background commands, where we want to redirect fd0 to /dev/null only
* if it hasn't already been redirected.
*/
-int fd0_redirected = 0;
+STATIC int fd0_redirected = 0;
STATIC void openredirect(union node *, char[10 ]);
STATIC int openhere(union node *);
==== //depot/projects/hammer/bin/sh/var.c#4 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.24 2003/05/05 22:49:22 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.25 2003/07/05 15:18:44 dds Exp $");
#include <unistd.h>
#include <stdlib.h>
@@ -93,9 +93,9 @@
struct var vps1;
struct var vps2;
struct var vvers;
-struct var voptind;
+STATIC struct var voptind;
-const struct varinit varinit[] = {
+STATIC const struct varinit varinit[] = {
#ifndef NO_HISTORY
{ &vhistsize, VSTRFIXED|VTEXTFIXED|VUNSET, "HISTSIZE=",
sethistsize },
@@ -121,7 +121,7 @@
NULL }
};
-struct var *vartab[VTABSIZE];
+STATIC struct var *vartab[VTABSIZE];
STATIC struct var **hashvar(char *);
STATIC int varequal(char *, char *);
==== //depot/projects/hammer/contrib/cvs/src/main.c#4 (text+ko) ====
@@ -10,7 +10,7 @@
* Credit to Dick Grune, Vrije Universiteit, Amsterdam, for writing
* the shell-script CVS system that this is based on.
*
- * $FreeBSD: src/contrib/cvs/src/main.c,v 1.22 2002/12/02 03:17:48 peter Exp $
+ * $FreeBSD: src/contrib/cvs/src/main.c,v 1.23 2003/07/07 19:15:36 obrien Exp $
*/
#include <assert.h>
@@ -110,7 +110,7 @@
{
{ "add", "ad", "new", add, CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
{ "admin", "adm", "rcs", admin, CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
- { "annotate", "ann", NULL, annotate, CVS_CMD_USES_WORK_DIR },
+ { "annotate", "ann", "blame", annotate, CVS_CMD_USES_WORK_DIR },
{ "checkout", "co", "get", checkout, 0 },
{ "commit", "ci", "com", commit, CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
{ "diff", "di", "dif", diff, CVS_CMD_USES_WORK_DIR },
==== //depot/projects/hammer/contrib/groff/tmac/doc.tmac#6 (text+ko) ====
@@ -2696,10 +2696,8 @@
. nr doc-display-ft-stack\n[doc-display-depth] \n[.f]
. nr doc-display-ps-stack\n[doc-display-depth] \n[.ps]
.
-. ie t \{\
-. nop \*[doc-Li-font]\c
+. ie t \
. ta T 9n
-. \}
. el \
. ta T 8n
. nf
@@ -2747,6 +2745,10 @@
. if !\n[doc-is-compact] \
. sp \n[doc-display-vertical]u
.
+. if "\*[doc-display-type-stack\n[doc-display-depth]]"literal" \
+. if t \
+. nop \*[doc-Li-font]\c
+.
. if !\n[cR] \
. ne 2v
.
==== //depot/projects/hammer/etc/Makefile#14 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.314 2003/06/10 01:22:30 ache Exp $
+# $FreeBSD: src/etc/Makefile,v 1.315 2003/07/06 19:23:31 gshapiro Exp $
.if !defined(NO_SENDMAIL)
SUBDIR= sendmail
@@ -45,8 +45,12 @@
PPPCNF= ppp.conf
+.if defined(NO_SENDMAIL)
+ETCMAIL=mailer.conf aliases
+.else
ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
mailertable.sample aliases
+.endif
# Special top level files for FreeBSD
FREEBSD=COPYRIGHT
==== //depot/projects/hammer/etc/mail/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/mail/Makefile,v 1.33 2003/02/08 21:55:31 gshapiro Exp $
+# $FreeBSD: src/etc/mail/Makefile,v 1.35 2003/07/06 19:17:04 gshapiro Exp $
#
# This Makefile provides an easy way to generate the configuration
# file and database maps for the sendmail(8) daemon.
@@ -44,16 +44,19 @@
# This Makefile uses `<HOSTNAME>.mc' as the default MTA .mc file. This
# can be changed by defining SENDMAIL_MC in /etc/make.conf, e.g.:
#
-# SENDMAIL_MC=/etc/mail/myconfig.mc
+# SENDMAIL_MC=/etc/mail/myconfig.mc
#
# If '<HOSTNAME>.mc' does not exist, it is created using 'freebsd.mc'
# as a template.
#
-# It also uses 'freebsd.submit.mc' as the default mail submission .mc file.
-# This can be changed by defining SENDMAIL_SUBMIT_MC in /etc/make.conf,
-# e.g.:
+# It also uses '<HOSTNAME>.submit.mc' as the default mail submission .mc
+# file. This can be changed by defining SENDMAIL_SUBMIT_MC in
+# /etc/make.conf, e.g.:
+#
+# SENDMAIL_SUBMIT_MC=/etc/mail/mysubmit.mc
#
-# SENDMAIL_SUBMIT_MC=/etc/mail/mysubmit.mc
+# If '<HOSTNAME>.submit.mc' does not exist, it is created using
+# 'freebsd.submit.mc' as a template.
# ------------------------------------------------------------------------
#
# The Makefile knows about the following maps:
@@ -69,7 +72,13 @@
cp freebsd.mc ${SENDMAIL_MC}
.endif
-SENDMAIL_SUBMIT_MC?= freebsd.submit.mc
+.ifndef SENDMAIL_SUBMIT_MC
+SENDMAIL_SUBMIT_MC!= hostname
+SENDMAIL_SUBMIT_MC:= ${SENDMAIL_SUBMIT_MC}.submit.mc
+
+${SENDMAIL_SUBMIT_MC}:
+ cp freebsd.submit.mc ${SENDMAIL_SUBMIT_MC}
+.endif
INSTALL_CF= ${SENDMAIL_MC:R}.cf
@@ -105,7 +114,7 @@
SENDMAIL_MAP_PERMS?= 0640
# Set a reasonable default
-.MAIN: all
+.MAIN: all
#
# ------------------------------------------------------------------------
@@ -131,16 +140,16 @@
#
.for _f in ${SENDMAIL_MAP_SRC}
.if (exists(${_f}.sample) && !exists(${_f}))
-${_f}: ${_f}.sample
+${_f}: ${_f}.sample
sed -e 's/^/#/' < ${.OODATE} > ${.TARGET}
.endif
-${_f}.db: ${_f}
+${_f}.db: ${_f}
${MAKEMAP} ${SENDMAIL_MAP_TYPE} ${.TARGET} < ${.OODATE}
chmod ${SENDMAIL_MAP_PERMS} ${.TARGET}
.endfor
-userdb.db: userdb
+userdb.db: userdb
${MAKEMAP} btree ${.TARGET} < ${.OODATE}
chmod ${SENDMAIL_MAP_PERMS} ${.TARGET}
@@ -153,18 +162,18 @@
#
# M4(1) is used to generate the .cf file from the .mc file.
#
-.SUFFIXES: .cf .mc
+.SUFFIXES: .cf .mc
-.mc.cf: ${M4FILES}
+.mc.cf: ${M4FILES}
${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \
- ${SENDMAIL_CF_DIR}/m4/cf.m4 ${@:R}.mc > ${.TARGET}
+ ${SENDMAIL_CF_DIR}/m4/cf.m4 ${@:R}.mc > ${.TARGET}
#
# Aliases are handled separately since they normally reside in /etc
# and can be rebuild without the help of makemap.
#
.for _f in ${SENDMAIL_ALIASES}
-${_f}.db: ${_f}
+${_f}.db: ${_f}
${SENDMAIL} -bi -OAliasFile=${.ALLSRC}
chmod ${SENDMAIL_MAP_PERMS} ${.TARGET}
.endfor
@@ -173,13 +182,13 @@
# ------------------------------------------------------------------------
#
-all: cf maps aliases
+all: cf maps aliases
clean:
depend:
-cf: ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
+cf: ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
.ifdef SENDMAIL_SET_USER_ID
install: install-cf
@@ -187,13 +196,13 @@
install: install-cf install-submit-cf
.endif
-install-cf: ${INSTALL_CF}
+install-cf: ${INSTALL_CF}
.if ${INSTALL_CF} != /etc/mail/sendmail.cf
${INSTALL} -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf
.endif
-install-submit-cf: ${INSTALL_SUBMIT_CF}
+install-submit-cf: ${INSTALL_SUBMIT_CF}
.ifdef SENDMAIL_SET_USER_ID
@echo ">>> ERROR: You should not create a submit.cf file if you are using a"
@echo " set-user-ID sendmail binary (SENDMAIL_SET_USER_ID is set"
@@ -205,9 +214,9 @@
.endif
.endif
-aliases: ${SENDMAIL_ALIASES:%=%.db}
+aliases: ${SENDMAIL_ALIASES:%=%.db}
-maps: ${SENDMAIL_MAP_OBJ}
+maps: ${SENDMAIL_MAP_OBJ}
start start-mta start-mspq:
@if [ -r ${SENDMAIL_START_SCRIPT} ]; then \
==== //depot/projects/hammer/etc/mtree/BSD.local.dist#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.97 2003/06/06 22:34:43 ache Exp $
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.98 2003/07/05 11:41:10 ache Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -363,6 +363,8 @@
..
hu_HU.ISO8859-2
..
+ hy_AM.ARMSCII-8
+ ..
is_IS.ISO8859-1
..
is_IS.ISO8859-15
==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.275 2003/06/06 22:34:43 ache Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.276 2003/07/05 11:41:10 ache Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -425,6 +425,8 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list