PERFORCE change 114855 for review
Matt Jacob
mjacob at FreeBSD.org
Fri Feb 23 06:27:44 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=114855
Change 114855 by mjacob at mjexp on 2007/02/23 06:26:50
IFC
Affected files ...
.. //depot/projects/mjexp/UPDATING#7 integrate
.. //depot/projects/mjexp/bin/expr/expr.y#2 integrate
.. //depot/projects/mjexp/etc/devd.conf#3 integrate
.. //depot/projects/mjexp/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate
.. //depot/projects/mjexp/lib/libc/net/Makefile.inc#4 integrate
.. //depot/projects/mjexp/lib/libc/net/sctp_bindx.3#1 branch
.. //depot/projects/mjexp/lib/libc/net/sctp_connectx.3#1 branch
.. //depot/projects/mjexp/lib/libc/net/sctp_freepaddrs.3#1 branch
.. //depot/projects/mjexp/lib/libc/net/sctp_getaddrlen.3#1 branch
.. //depot/projects/mjexp/lib/libc/net/sctp_getassocid.3#1 branch
.. //depot/projects/mjexp/lib/libc/net/sctp_getpaddrs.3#1 branch
.. //depot/projects/mjexp/lib/libc/net/sctp_opt_info.3#1 branch
.. //depot/projects/mjexp/lib/libc/net/sctp_recvmsg.3#1 branch
.. //depot/projects/mjexp/lib/libc/net/sctp_send.3#1 branch
.. //depot/projects/mjexp/lib/libc/net/sctp_sendmsg.3#1 branch
.. //depot/projects/mjexp/lib/libc/net/sctp_sys_calls.c#2 integrate
.. //depot/projects/mjexp/lib/libc/stdlib/malloc.c#4 integrate
.. //depot/projects/mjexp/lib/libc/sys/Makefile.inc#3 integrate
.. //depot/projects/mjexp/lib/libc/sys/ntp_adjtime.2#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/sctp_generic_recvmsg.2#1 branch
.. //depot/projects/mjexp/lib/libc/sys/sctp_generic_sendmsg.2#1 branch
.. //depot/projects/mjexp/lib/libc/sys/sctp_peeloff.2#1 branch
.. //depot/projects/mjexp/lib/libelf/libelf_allocate.c#2 integrate
.. //depot/projects/mjexp/lib/libwrap/Makefile#2 integrate
.. //depot/projects/mjexp/release/Makefile#6 integrate
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/Makefile#2 integrate
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/Makefile.inc#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/amd64/Makefile#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/article.sgml#1 branch
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/i386/Makefile#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/pc98/Makefile#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/powerpc/Makefile#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/powerpc/article.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/powerpc/proc-powerpc.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/sparc64/Makefile#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 delete
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/readme/article.sgml#3 integrate
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate
.. //depot/projects/mjexp/release/doc/share/examples/Makefile.relnotesng#3 integrate
.. //depot/projects/mjexp/release/doc/share/misc/man2hwnotes.pl#2 integrate
.. //depot/projects/mjexp/release/doc/share/mk/doc.relnotes.mk#2 integrate
.. //depot/projects/mjexp/release/doc/share/sgml/Makefile#2 integrate
.. //depot/projects/mjexp/sbin/geom/class/eli/geom_eli.c#3 integrate
.. //depot/projects/mjexp/sbin/ifconfig/ifgroup.c#2 integrate
.. //depot/projects/mjexp/sbin/ifconfig/ifieee80211.c#5 integrate
.. //depot/projects/mjexp/sbin/ipfw/ipfw.8#4 integrate
.. //depot/projects/mjexp/sbin/mdconfig/mdconfig.8#2 integrate
.. //depot/projects/mjexp/sbin/mdconfig/mdconfig.c#2 integrate
.. //depot/projects/mjexp/sbin/mdmfs/mdmfs.8#5 integrate
.. //depot/projects/mjexp/sbin/mdmfs/mdmfs.c#3 integrate
.. //depot/projects/mjexp/share/dict/web2a#2 integrate
.. //depot/projects/mjexp/share/man/man4/Makefile#8 integrate
.. //depot/projects/mjexp/share/man/man4/altq.4#5 integrate
.. //depot/projects/mjexp/share/man/man4/man4.i386/ndis.4#3 integrate
.. //depot/projects/mjexp/share/man/man4/sctp.4#1 branch
.. //depot/projects/mjexp/share/man/man4/snd_hda.4#6 integrate
.. //depot/projects/mjexp/share/man/man4/snd_sbc.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/vge.4#2 integrate
.. //depot/projects/mjexp/share/man/man9/Makefile#8 integrate
.. //depot/projects/mjexp/share/man/man9/VFS_VPTOFH.9#2 delete
.. //depot/projects/mjexp/share/man/man9/VOP_VPTOFH.9#1 branch
.. //depot/projects/mjexp/share/man/man9/firmware.9#3 integrate
.. //depot/projects/mjexp/share/man/man9/mbuf.9#3 integrate
.. //depot/projects/mjexp/share/man/man9/priv.9#3 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/pmap.c#5 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/uma_machdep.c#2 integrate
.. //depot/projects/mjexp/sys/arm/arm/elf_trampoline.c#5 integrate
.. //depot/projects/mjexp/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/mjexp/sys/arm/conf/EP80219#4 integrate
.. //depot/projects/mjexp/sys/arm/conf/IQ31244#3 integrate
.. //depot/projects/mjexp/sys/arm/conf/SIMICS#3 integrate
.. //depot/projects/mjexp/sys/cam/cam_xpt.c#6 integrate
.. //depot/projects/mjexp/sys/cam/cam_xpt.h#4 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#6 integrate
.. //depot/projects/mjexp/sys/conf/options.arm#4 integrate
.. //depot/projects/mjexp/sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx.seq#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-all.c#4 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-all.h#3 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-card.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-cbus.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#6 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-disk.c#3 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-disk.h#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-queue.c#4 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-raid.h#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-usb.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/atapi-cd.c#3 integrate
.. //depot/projects/mjexp/sys/dev/ata/atapi-cd.h#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/atapi-fd.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/atapi-fd.h#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ata/atapi-tape.h#2 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp.c#12 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#14 integrate
.. //depot/projects/mjexp/sys/dev/iwi/if_iwi.c#8 integrate
.. //depot/projects/mjexp/sys/dev/iwi/if_iwireg.h#3 integrate
.. //depot/projects/mjexp/sys/dev/iwi/if_iwivar.h#3 integrate
.. //depot/projects/mjexp/sys/dev/mii/brgphy.c#7 integrate
.. //depot/projects/mjexp/sys/dev/mii/miidevs#7 integrate
.. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#7 integrate
.. //depot/projects/mjexp/sys/dev/mxge/if_mxge_var.h#4 integrate
.. //depot/projects/mjexp/sys/dev/pccard/pccarddevs#2 integrate
.. //depot/projects/mjexp/sys/dev/pccbb/pccbb.c#3 integrate
.. //depot/projects/mjexp/sys/dev/pccbb/pccbb_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/pci/pci.c#11 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#8 integrate
.. //depot/projects/mjexp/sys/dev/syscons/fire/fire_saver.c#2 integrate
.. //depot/projects/mjexp/sys/dev/syscons/logo/logo_saver.c#2 integrate
.. //depot/projects/mjexp/sys/dev/syscons/rain/rain_saver.c#2 integrate
.. //depot/projects/mjexp/sys/dev/syscons/warp/warp_saver.c#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/umass.c#5 integrate
.. //depot/projects/mjexp/sys/dev/vge/if_vge.c#3 integrate
.. //depot/projects/mjexp/sys/fs/ntfs/ntfs_vfsops.c#3 integrate
.. //depot/projects/mjexp/sys/fs/procfs/procfs_ioctl.c#3 integrate
.. //depot/projects/mjexp/sys/geom/geom_disk.c#3 integrate
.. //depot/projects/mjexp/sys/i386/i386/db_trace.c#4 integrate
.. //depot/projects/mjexp/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/mjexp/sys/ia64/ia64/pmap.c#5 integrate
.. //depot/projects/mjexp/sys/ia64/ia64/uma_machdep.c#2 integrate
.. //depot/projects/mjexp/sys/kern/kern_jail.c#4 integrate
.. //depot/projects/mjexp/sys/kern/kern_resource.c#6 integrate
.. //depot/projects/mjexp/sys/kern/subr_witness.c#6 integrate
.. //depot/projects/mjexp/sys/kern/sysv_ipc.c#4 integrate
.. //depot/projects/mjexp/sys/kern/sysv_msg.c#5 integrate
.. //depot/projects/mjexp/sys/kern/sysv_shm.c#3 integrate
.. //depot/projects/mjexp/sys/kern/uipc_usrreq.c#7 integrate
.. //depot/projects/mjexp/sys/kern/vfs_bio.c#7 integrate
.. //depot/projects/mjexp/sys/kern/vfs_default.c#4 integrate
.. //depot/projects/mjexp/sys/kern/vfs_init.c#3 integrate
.. //depot/projects/mjexp/sys/kern/vfs_syscalls.c#7 integrate
.. //depot/projects/mjexp/sys/net/if.c#5 integrate
.. //depot/projects/mjexp/sys/net/if_ethersubr.c#6 integrate
.. //depot/projects/mjexp/sys/net/if_ppp.c#5 integrate
.. //depot/projects/mjexp/sys/netatalk/at_control.c#3 integrate
.. //depot/projects/mjexp/sys/netinet/in_pcb.c#6 integrate
.. //depot/projects/mjexp/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_input.c#5 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/mjexp/sys/netinet/udp.h#2 integrate
.. //depot/projects/mjexp/sys/netinet/udp_usrreq.c#7 integrate
.. //depot/projects/mjexp/sys/netinet/udp_var.h#2 integrate
.. //depot/projects/mjexp/sys/netinet6/udp6_usrreq.c#4 integrate
.. //depot/projects/mjexp/sys/nfsclient/nfs_socket.c#5 integrate
.. //depot/projects/mjexp/sys/powerpc/powerpc/cpu.c#3 integrate
.. //depot/projects/mjexp/sys/security/audit/audit_arg.c#5 integrate
.. //depot/projects/mjexp/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate
.. //depot/projects/mjexp/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate
.. //depot/projects/mjexp/sys/sys/mount.h#6 integrate
.. //depot/projects/mjexp/sys/sys/priv.h#2 integrate
.. //depot/projects/mjexp/sys/ufs/ffs/README.softupdates#2 delete
.. //depot/projects/mjexp/sys/ufs/ffs/ffs_alloc.c#5 integrate
.. //depot/projects/mjexp/sys/ufs/ffs/ffs_extern.h#4 integrate
.. //depot/projects/mjexp/sys/ufs/ffs/ffs_softdep.c#3 integrate
.. //depot/projects/mjexp/sys/ufs/ffs/ffs_vnops.c#5 integrate
.. //depot/projects/mjexp/sys/ufs/ufs/ufs_quota.c#6 integrate
.. //depot/projects/mjexp/sys/vm/vm_object.c#5 integrate
.. //depot/projects/mjexp/sys/vm/vm_page.c#7 integrate
.. //depot/projects/mjexp/sys/vm/vm_page.h#3 integrate
.. //depot/projects/mjexp/usr.bin/netstat/mcast.c#2 integrate
.. //depot/projects/mjexp/usr.bin/netstat/mroute.c#2 integrate
.. //depot/projects/mjexp/usr.bin/netstat/mroute6.c#2 integrate
.. //depot/projects/mjexp/usr.bin/tar/tree.c#3 integrate
.. //depot/projects/mjexp/usr.bin/tar/write.c#6 integrate
.. //depot/projects/mjexp/usr.sbin/sysinstall/cdrom.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/sysinstall/install.cfg#2 integrate
.. //depot/projects/mjexp/usr.sbin/sysinstall/sysinstall.8#2 integrate
Differences ...
==== //depot/projects/mjexp/UPDATING#7 (text+ko) ====
@@ -21,6 +21,19 @@
developers choose to disable these features on build machines
to maximize performance.
+20070218:
+ The following build error may appear when upgrading from an old
+ -current (usr.sbin/bsnmpd/modules/snmp_bridge, depend stage):
+ line 31: '(' expected at begin of node
+ context: " TruthValue ENUM (
+ *** Error code 1
+ If so, run "make install" in usr.sbin/bsnmpd/gensnmptree. (It
+ should probably be a build tool). In the same module, you may
+ also get the error:
+ ...snmp_bridge/bridge_sys.c:39:27:
+ net/bridgestp.h: No such file or directory
+ If so, run "cp src/sys/net/bridgestp.h /usr/include/net".
+
20070214:
The output of netstat -r has changed. Without -n, we now only
print a "network name" without the prefix length if the network
@@ -730,4 +743,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.473 2007/02/14 14:17:01 bms Exp $
+$FreeBSD: src/UPDATING,v 1.474 2007/02/19 22:49:43 njl Exp $
==== //depot/projects/mjexp/bin/expr/expr.y#2 (text+ko) ====
@@ -5,7 +5,7 @@
*
* Largely rewritten by J.T. Conklin (jtc at wimsey.com)
*
- * $FreeBSD: src/bin/expr/expr.y,v 1.24 2005/01/10 08:39:22 imp Exp $
+ * $FreeBSD: src/bin/expr/expr.y,v 1.25 2007/02/18 19:48:58 ceri Exp $
*/
#include <sys/types.h>
@@ -539,7 +539,7 @@
/* special case: first operand is 0, no overflow possible */
if (a == 0)
return 0;
- /* cerify that result of division matches second operand */
+ /* verify that result of division matches second operand */
if (r / a != b)
return 1;
return 0;
@@ -637,7 +637,7 @@
int eval;
struct val *v;
- /* coerce to both arguments to strings */
+ /* coerce both arguments to strings */
to_string(a);
to_string(b);
==== //depot/projects/mjexp/etc/devd.conf#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.34 2007/02/14 08:13:54 joerg Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.35 2007/02/15 16:38:10 imp Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -155,7 +155,8 @@
# Don't even try to second guess what to do about drivers that don't
# match here. Instead, pass it off to syslog. Commented out for the
-# moment, as pnpinfo isn't set in devd yet.
+# moment, as the pnpinfo variable isn't set in devd yet. Individual
+# variables within the bus supplied pnpinfo are set.
nomatch 0 {
# action "logger Unknown device: $pnpinfo $location $bus";
};
==== //depot/projects/mjexp/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.15 2006/02/07 02:29:55 davidxu Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.16 2007/02/20 18:10:13 emaste Exp $ */
/* FreeBSD libthread_db assisted debugging support.
Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
@@ -961,18 +961,21 @@
err = td_thr_getgregs_p (&th, gregset);
if (err != TD_OK)
error ("%s: td_thr_getgregs %s", __func__, thread_db_err_str (err));
- err = td_thr_getfpregs_p (&th, &fpregset);
+#ifdef PT_GETXMMREGS
+ err = td_thr_getxmmregs_p (&th, xmmregs);
if (err != TD_OK)
- error ("%s: td_thr_getfpgregs %s", __func__, thread_db_err_str (err));
+ {
+#endif
+ err = td_thr_getfpregs_p (&th, &fpregset);
+ if (err != TD_OK)
+ error ("%s: td_thr_getfpgregs %s", __func__, thread_db_err_str (err));
+#ifdef PT_GETXMMREGS
+ }
+#endif
supply_register (regno, old_value);
}
fill_gregset (gregset, regno);
- fill_fpregset (&fpregset, regno);
-#ifdef PT_GETXMMREGS
- i387_fill_fxsave (xmmregs, regno);
-#endif
-
err = td_thr_setgregs_p (&th, gregset);
if (err != TD_OK)
error ("Cannot store general-purpose registers for thread %d: Thread ID=%d, %s",
@@ -980,11 +983,13 @@
thread_db_err_str (err));
#ifdef PT_GETXMMREGS
+ i387_fill_fxsave (xmmregs, regno);
err = td_thr_setxmmregs_p (&th, xmmregs);
if (err == TD_OK)
return;
#endif
+ fill_fpregset (&fpregset, regno);
err = td_thr_setfpregs_p (&th, &fpregset);
if (err != TD_OK)
error ("Cannot store floating-point registers for thread %d: Thread ID=%d, %s",
==== //depot/projects/mjexp/lib/libc/net/Makefile.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
# from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93
-# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.63 2006/12/15 12:01:50 rrs Exp $
+# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.64 2007/02/22 14:32:38 rrs Exp $
# machine-independent net sources
.PATH: ${.CURDIR}/net
@@ -51,7 +51,10 @@
inet.3 inet_net.3 \
inet6_opt_init.3 inet6_option_space.3 inet6_rth_space.3 \
inet6_rthdr_space.3 linkaddr.3 \
- nsdispatch.3 rcmd.3 rcmdsh.3 resolver.3 sockatmark.3
+ nsdispatch.3 rcmd.3 rcmdsh.3 resolver.3 sockatmark.3 \
+ sctp_bindx.3 sctp_connectx.3 sctp_freepaddrs.3 \
+ sctp_getaddrlen.3 sctp_getassocid.3 sctp_getpaddrs.3 \
+ sctp_opt_info.3 sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3 \
MLINKS+=addr2ascii.3 ascii2addr.3
MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \
@@ -81,6 +84,10 @@
inet.3 inet_network.3 inet.3 inet_ntoa.3 \
inet.3 inet_ntop.3 inet.3 inet_pton.3 \
inet.3 network.3 inet.3 ntoa.3
+MLINKS+= sctp_send.3 sctp_sendx.3
+MLINKS+= sctp_sendmsg.3 sctp_sendmsgx.3
+MLINKS+= sctp_freepaddrs.3 sctp_freeladdrs.3
+MLINKS+= sctp_getpaddrs.3 sctp_getladdrs.3
MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3
MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \
inet6_opt_init.3 inet6_opt_find.3 \
==== //depot/projects/mjexp/lib/libc/net/sctp_sys_calls.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.2 2006/12/16 06:03:43 rodrigc Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.5 2007/02/22 14:48:12 rrs Exp $");
#include <stdio.h>
#include <string.h>
#include <errno.h>
@@ -54,14 +54,20 @@
(*(const u_int32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
#endif
+
#define SCTP_CONTROL_VEC_SIZE_SND 8192
#define SCTP_CONTROL_VEC_SIZE_RCV 16384
+#define SCTP_STACK_BUF_SIZE 2048
+#define SCTP_SMALL_IOVEC_SIZE 2
#ifdef SCTP_DEBUG_PRINT_ADDRESS
+
+#define SCTP_STRING_BUF_SZ 256
+
static void
SCTPPrintAnAddress(struct sockaddr *a)
{
- char stringToPrint[256];
+ char stringToPrint[SCTP_STRING_BUF_SZ];
u_short prt;
char *srcaddr, *txt;
@@ -79,8 +85,8 @@
txt = "IPv6 Address: ";
} else if (a->sa_family == AF_LINK) {
int i;
- char tbuf[200];
- u_char adbuf[200];
+ char tbuf[SCTP_STRING_BUF_SZ];
+ u_char adbuf[SCTP_STRING_BUF_SZ];
struct sockaddr_dl *dl;
dl = (struct sockaddr_dl *)a;
@@ -101,10 +107,6 @@
printf(":");
}
printf("\n");
- /*
- * u_short sdl_route[16]; *//* source routing
- * information
- */
return;
} else {
return;
@@ -164,7 +166,7 @@
int
sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt)
{
- char buf[2048];
+ char buf[SCTP_STACK_BUF_SIZE];
int i, ret, cnt, *aa;
char *cpto;
const struct sockaddr *at;
@@ -298,14 +300,14 @@
asoc = id;
siz = sizeof(sctp_assoc_t);
if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_REMOTE_ADDR_SIZE,
- &asoc, &siz) != 0) {
+ &asoc, &siz) != 0) {
errno = ENOMEM;
return (-1);
}
/* size required is returned in 'asoc' */
- siz = (uint32_t) asoc;
+ siz = (size_t)asoc;
siz += sizeof(struct sctp_getaddresses);
- addrs = calloc((unsigned long)1, (unsigned long)siz);
+ addrs = calloc(1, siz);
if (addrs == NULL) {
errno = ENOMEM;
return (-1);
@@ -314,7 +316,7 @@
addrs->sget_assoc_id = id;
/* Now lets get the array of addresses */
if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_PEER_ADDRESSES,
- addrs, (socklen_t *) & siz) != 0) {
+ addrs, &siz) != 0) {
free(addrs);
errno = ENOMEM;
return (-1);
@@ -370,7 +372,7 @@
}
siz = size_of_addresses + sizeof(struct sockaddr_storage);
siz += sizeof(struct sctp_getaddresses);
- addrs = calloc((unsigned long)1, (unsigned long)siz);
+ addrs = calloc(1, siz);
if (addrs == NULL) {
errno = ENOMEM;
return (-1);
@@ -379,7 +381,7 @@
addrs->sget_assoc_id = id;
/* Now lets get the array of addresses */
if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDRESSES, addrs,
- (socklen_t *) & siz) != 0) {
+ &siz) != 0) {
free(addrs);
errno = ENOMEM;
return (-1);
@@ -436,7 +438,7 @@
ssize_t sz;
struct msghdr msg;
struct sctp_sndrcvinfo *s_info;
- struct iovec iov[2];
+ struct iovec iov[SCTP_SMALL_IOVEC_SIZE];
char controlVector[SCTP_CONTROL_VEC_SIZE_RCV];
struct cmsghdr *cmsg;
struct sockaddr *who = NULL;
@@ -547,7 +549,7 @@
#else
ssize_t sz;
struct msghdr msg;
- struct iovec iov[2];
+ struct iovec iov[SCTP_SMALL_IOVEC_SIZE];
struct sctp_sndrcvinfo *s_info;
char controlVector[SCTP_CONTROL_VEC_SIZE_SND];
struct cmsghdr *cmsg;
@@ -595,6 +597,20 @@
int add_len, len, no_end_cx = 0;
struct sockaddr *at;
+
+#ifdef SYS_sctp_generic_sendmsg
+ if (addrcnt < SCTP_SMALL_IOVEC_SIZE) {
+ socklen_t l;
+
+ /*
+ * Quick way, we don't need to do a connectx so lets use the
+ * syscall directly.
+ */
+ l = addrs->sa_len;
+ return (syscall(SYS_sctp_generic_sendmsg, sd,
+ msg, msg_len, addrs, l, sinfo, flags));
+ }
+#endif
len = sizeof(int);
at = addrs;
cnt = 0;
@@ -617,10 +633,6 @@
errno = EINVAL;
return (-1);
}
- if (len > 2048) {
- /* Never enough memory */
- return (E2BIG);
- }
buf = malloc(len);
if (buf == NULL) {
return (ENOMEM);
@@ -693,7 +705,7 @@
{
#ifdef SYS_sctp_generic_recvmsg
- struct iovec iov[2];
+ struct iovec iov[SCTP_SMALL_IOVEC_SIZE];
iov[0].iov_base = dbuf;
iov[0].iov_len = len;
@@ -704,7 +716,7 @@
ssize_t sz;
int sinfo_found = 0;
struct msghdr msg;
- struct iovec iov[2];
+ struct iovec iov[SCTP_SMALL_IOVEC_SIZE];
char controlVector[SCTP_CONTROL_VEC_SIZE_RCV];
struct cmsghdr *cmsg;
@@ -826,3 +838,9 @@
}
#endif
+
+
+#undef SCTP_CONTROL_VEC_SIZE_SND
+#undef SCTP_CONTROL_VEC_SIZE_RCV
+#undef SCTP_STACK_BUF_SIZE
+#undef SCTP_SMALL_IOVEC_SIZE
==== //depot/projects/mjexp/lib/libc/stdlib/malloc.c#4 (text+ko) ====
@@ -185,7 +185,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.139 2007/01/31 22:54:19 jasone Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.140 2007/02/22 19:10:30 jasone Exp $");
#include "libc_private.h"
#ifdef MALLOC_DEBUG
@@ -1029,8 +1029,8 @@
malloc_mutex_unlock(&brk_mtx);
base_chunk = brk_cur;
base_next_addr = base_chunk;
- base_past_addr = (void *)((uintptr_t)base_chunk +
- incr);
+ base_past_addr = (void *)((uintptr_t)base_chunk
+ + incr);
#ifdef MALLOC_STATS
base_total += incr;
#endif
@@ -1042,8 +1042,8 @@
#endif
/*
- * Don't worry about chunk alignment here, since base_chunk doesn't really
- * need to be aligned.
+ * Don't worry about chunk alignment here, since base_chunk doesn't
+ * really need to be aligned.
*/
base_chunk = pages_map(NULL, chunk_size);
if (base_chunk == NULL)
@@ -1067,8 +1067,12 @@
malloc_mutex_lock(&base_mtx);
- /* Make sure there's enough space for the allocation. */
- if ((uintptr_t)base_next_addr + csize > (uintptr_t)base_past_addr) {
+ /*
+ * Make sure there's enough space for the allocation.
+ * base_chunk_alloc() does not guarantee that a newly allocated chunk
+ * is >= size, so loop here, rather than only trying once.
+ */
+ while ((uintptr_t)base_next_addr + csize > (uintptr_t)base_past_addr) {
if (base_chunk_alloc(csize)) {
ret = NULL;
goto RETURN;
@@ -1299,6 +1303,36 @@
}
}
+ /*
+ * Try to over-allocate, but allow the OS to place the allocation
+ * anywhere. Beware of size_t wrap-around.
+ */
+ if (size + chunk_size > size) {
+ if ((ret = pages_map(NULL, size + chunk_size)) != NULL) {
+ size_t offset = CHUNK_ADDR2OFFSET(ret);
+
+ /*
+ * Success. Clean up unneeded leading/trailing space.
+ */
+ if (offset != 0) {
+ /* Leading space. */
+ pages_unmap(ret, chunk_size - offset);
+
+ ret = (void *)((uintptr_t)ret + (chunk_size -
+ offset));
+
+ /* Trailing space. */
+ pages_unmap((void *)((uintptr_t)ret + size),
+ offset);
+ } else {
+ /* Trailing space only. */
+ pages_unmap((void *)((uintptr_t)ret + size),
+ chunk_size);
+ }
+ goto RETURN;
+ }
+ }
+
#ifdef USE_BRK
/*
* Try to create allocations in brk, in order to make full use of
@@ -1342,36 +1376,6 @@
}
#endif
- /*
- * Try to over-allocate, but allow the OS to place the allocation
- * anywhere. Beware of size_t wrap-around.
- */
- if (size + chunk_size > size) {
- if ((ret = pages_map(NULL, size + chunk_size)) != NULL) {
- size_t offset = CHUNK_ADDR2OFFSET(ret);
-
- /*
- * Success. Clean up unneeded leading/trailing space.
- */
- if (offset != 0) {
- /* Leading space. */
- pages_unmap(ret, chunk_size - offset);
-
- ret = (void *)((uintptr_t)ret + (chunk_size -
- offset));
-
- /* Trailing space. */
- pages_unmap((void *)((uintptr_t)ret + size),
- offset);
- } else {
- /* Trailing space only. */
- pages_unmap((void *)((uintptr_t)ret + size),
- chunk_size);
- }
- goto RETURN;
- }
- }
-
/* All strategies for allocation failed. */
ret = NULL;
RETURN:
==== //depot/projects/mjexp/lib/libc/sys/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
-# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.122 2006/10/12 13:46:33 ru Exp $
+# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.123 2007/02/22 14:32:38 rrs Exp $
# sys sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys
@@ -84,6 +84,7 @@
sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigqueue.2 \
sigreturn.2 sigstack.2 sigsuspend.2 sigwait.2 sigwaitinfo.2 \
socket.2 socketpair.2 stat.2 statfs.2 \
+ sctp_generic_recvmsg.2 sctp_generic_sendmsg.2 sctp_peeloff.2 \
swapon.2 symlink.2 sync.2 sysarch.2 syscall.2 \
timer_create.2 timer_delete.2 timer_settime.2 \
truncate.2 umask.2 undelete.2 \
==== //depot/projects/mjexp/lib/libc/sys/ntp_adjtime.2#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/lib/libc/sys/ntp_adjtime.2,v 1.2 2003/06/20 21:14:59 imp Exp $
+.\" $FreeBSD: src/lib/libc/sys/ntp_adjtime.2,v 1.3 2007/02/17 01:54:00 trhodes Exp $
.\"
.Dd April 1, 2003
.Dt NTP_ADJTIME 2
@@ -137,7 +137,7 @@
.El
.Sh ERRORS
The
-.Fn ntp_gettime
+.Fn ntp_adjtime
system call may return
.Er EPERM
if the caller
==== //depot/projects/mjexp/lib/libelf/libelf_allocate.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/libelf_allocate.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_allocate.c,v 1.2 2007/02/21 08:14:22 dumbbell Exp $");
#include <sys/errno.h>
@@ -191,7 +191,7 @@
d = _libelf_release_data(d);
}
- STAILQ_FOREACH_SAFE(d, &s->s_data, d_next, td) {
+ STAILQ_FOREACH_SAFE(d, &s->s_rawdata, d_next, td) {
assert((d->d_flags & LIBELF_F_MALLOCED) == 0);
STAILQ_REMOVE(&s->s_rawdata, d, _Elf_Data, d_next);
d = _libelf_release_data(d);
==== //depot/projects/mjexp/lib/libwrap/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/lib/libwrap/Makefile,v 1.18 2006/03/17 18:54:28 ru Exp $
+# $FreeBSD: src/lib/libwrap/Makefile,v 1.19 2007/02/20 23:12:04 n_hibma Exp $
#
.include <bsd.own.mk>
@@ -9,8 +9,10 @@
INCS= tcpd.h
MAN= hosts_access.3
MAN+= hosts_access.5 hosts_options.5
-MLINKS= hosts_access.3 hosts_ctl.3 hosts_access.3 request_init.3 \
- hosts_access.3 request_set.3
+MLINKS= hosts_access.3 hosts_ctl.3 \
+ hosts_access.3 request_init.3 \
+ hosts_access.3 request_set.3 \
+ hosts_access.3 hosts.allow.5 \
.PATH: ${.CURDIR}/../../contrib/tcp_wrappers
==== //depot/projects/mjexp/release/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.920 2007/02/01 15:12:44 kensmith Exp $
+# $FreeBSD: src/release/Makefile,v 1.921 2007/02/16 02:28:15 bmah Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -159,8 +159,8 @@
AUTO_KEYBOARD_DETECT?= 0
.if !defined(NODOC)
-DIST_DOCS_ARCH_INDEP= readme relnotes errata
-DIST_DOCS_ARCH_DEP= installation hardware
+DIST_DOCS_ARCH_INDEP= hardware readme relnotes errata
+DIST_DOCS_ARCH_DEP= installation
.endif
# Things which without too much trouble can be considered variables
==== //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/Makefile#2 (text+ko) ====
@@ -1,13 +1,30 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.10 2007/02/19 02:46:12 bmah Exp $
RELN_ROOT?= ${.CURDIR}/../..
-SUBDIR= amd64
-SUBDIR+= ia64
-SUBDIR+= i386
-SUBDIR+= pc98
-SUBDIR+= powerpc
-SUBDIR+= sparc64
+.ifdef NO_LANGCODE_IN_DESTDIR
+DESTDIR?= ${DOCDIR}/hardware
+.else
+DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/hardware
+.endif
+
+DOC?= article
+FORMATS?= html
+INSTALL_COMPRESSED?= gz
+INSTALL_ONLY_COMPRESSED?=
+
+JADEFLAGS+= -V %generate-article-toc%
+
+# SGML content
+SRCS+= article.sgml
+SRCS+= ${DEV-AUTODIR}/catalog-auto
+SRCS+= ${DEV-AUTODIR}/dev-auto.sgml
+
+CATALOGS+= -c ${DEV-AUTODIR}/catalog-auto
+
+URL_RELPREFIX?= ../../../..
+
+HWNOTES_MI= 1
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
==== //depot/projects/mjexp/release/doc/en_US.ISO8859-1/readme/article.sgml#3 (text+ko) ====
@@ -12,7 +12,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.38 2006/12/28 21:12:57 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.39 2007/02/16 04:07:31 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -340,13 +340,11 @@
</itemizedlist>
<note>
- <para>Several of these documents (in particular,
- <filename>HARDWARE.TXT</filename> and
- <filename>INSTALL.TXT</filename>) contain information that
- is specific to a particular hardware architecture. For
- example, the alpha hardware notes contain information not
- applicable to the &i386;, and vice versa. The architecture
- for which each document applies will be listed in that
+ <para>There are various versions of
+ <filename>INSTALL.TXT</filename>, each containing information
+ specific to a particular hardware architecture.
+ The architecture
+ to which each document applies will be listed in that
document's title.</para>
</note>
==== //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 (text+ko) ====
@@ -30,7 +30,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.998 2007/02/10 19:55:18 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.999 2007/02/22 05:31:39 delphij Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -1759,7 +1759,8 @@
to 4.17.</para>
<para>The GNU version of <application>gzip</application> has been
- replaced with a version of gzip imported from NetBSD.</para>
+ replaced with a modified version of gzip ported from NetBSD.
+ &merged;</para>
<para><application>netcat</application> has been updated from the
version in a 4 February 2005 OpenBSD snapshot to the version
==== //depot/projects/mjexp/release/doc/share/examples/Makefile.relnotesng#3 (text+ko) ====
@@ -1,14 +1,14 @@
# -*- makefile -*-
#
-# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.14 2006/12/06 18:07:40 bmah Exp $
+# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.15 2007/02/16 02:22:02 bmah Exp $
#
# Sample makefile for rendering and uploading RELNOTESng files outside
# the build tree.
#
ARCHS= amd64 ia64 i386 pc98 powerpc sparc64
-MULTITEXTS= installation hardware
-UNITEXTS= readme relnotes errata
+MULTITEXTS= installation
+UNITEXTS= hardware readme relnotes errata
IMAGEDIR= .imagedir
RHOST= freefall.freebsd.org
==== //depot/projects/mjexp/release/doc/share/misc/man2hwnotes.pl#2 (text+ko) ====
@@ -25,7 +25,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.13 2006/07/28 20:23:03 simon Exp $
+# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.14 2007/02/16 02:10:12 bmah Exp $
#
# Parse the list of supported hardware out of section 4 manual pages
@@ -40,7 +40,7 @@
# arguments to the .It command, only the argument will be printed.
# Usage:
-# man2hwnotes.pl [-l] [-d 0-6] [-a <archlist file>] [-o <outputfile>]
+# man2hwnotes.pl [-cl] [-d 0-6] [-a <archlist file>] [-o <outputfile>]
# <manualpage> [<manualpage> ...]
use strict;
@@ -55,6 +55,7 @@
my %archlist;
# Globals
+my $compat_mode = 0; # Enable compat for old Hardware Notes style
my $debuglevel = 0;
my $only_list_out = 0; # Should only lists be generated in the output?
my @out_lines; # Single lines
@@ -62,10 +63,13 @@
# Getopt
my %options = ();
-if (!getopts("a:d:lo:",\%options)) {
+if (!getopts("a:cd:lo:",\%options)) {
die("$!: Invalid command line arguments in ", __LINE__, "\n");
}
+if (defined($options{c})) {
+ $compat_mode = 1;
+}
if (defined($options{d})) {
$debuglevel = $options{d};
}
@@ -367,9 +371,17 @@
$entity_name = add_txt_ent(${$mdocvars}{parabuf});
${$mdocvars}{parabuf} = "";
if(defined($archlist{${$mdocvars}{Nm}})) {
- $para_arch = ' arch="' . $archlist{${$mdocvars}{Nm}} . '"';
+ if ($compat_mode) {
+ $para_arch = ' arch="' . $archlist{${$mdocvars}{Nm}} . '"';
+ } else {
+ $para_arch = '[' . $archlist{${$mdocvars}{Nm}} . '] ';
+ }
+ }
+ if ($compat_mode) {
+ $out = "<para".$para_arch.">&".$entity_name.";</para>";
+ } else {
+ $out = "<para>".$para_arch."&".$entity_name.";</para>";
}
- $out = "<para".$para_arch.">&".$entity_name.";</para>";
dlog(4, "Flushing parabuf");
add_sgmltag($mdocvars, $out);
@@ -384,8 +396,12 @@
$entity_name = add_txt_ent(${$mdocvars}{parabuf});
${$mdocvars}{parabuf} = "";
- if(defined($archlist{${$mdocvars}{Nm}})) {
- $para_arch = ' arch="' . $archlist{${$mdocvars}{Nm}} . '"';
+ if ($compat_mode) {
+ if(defined($archlist{${$mdocvars}{Nm}})) {
+ $para_arch = ' arch="' . $archlist{${$mdocvars}{Nm}} . '"';
+ }
+ } else {
+ $listitem = "<listitem><para>&".$entity_name.";</para></listitem>";
}
$listitem = "<listitem><para".$para_arch.">&".$entity_name.";</para></listitem>";
dlog(4, "Adding '$listitem' to out_dev");
==== //depot/projects/mjexp/release/doc/share/mk/doc.relnotes.mk#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/doc/share/mk/doc.relnotes.mk,v 1.13 2004/08/08 09:23:49 hrs Exp $
+# $FreeBSD: src/release/doc/share/mk/doc.relnotes.mk,v 1.14 2007/02/16 02:10:12 bmah Exp $
DOC_PREFIX?= ${RELN_ROOT}/../../../doc
@@ -43,9 +43,14 @@
CLEANFILES+= ${DEV-AUTODIR}/dev-auto.sgml ${DEV-AUTODIR}/catalog-auto
MAN2HWNOTES_CMD=${RELN_ROOT}/share/misc/man2hwnotes.pl
+.if defined(HWNOTES_MI)
+MAN2HWNOTES_FLAGS=
+.else
+MAN2HWNOTES_FLAGS= -c
+.endif
# Dependency that the article makefiles can use to pull in
# dev-auto.sgml.
${DEV-AUTODIR}/catalog-auto ${DEV-AUTODIR}/dev-auto.sgml: ${MAN4PAGES} \
${ARCHLIST} ${MAN2HWNOTES_CMD}
- cd ${RELN_ROOT}/share/sgml && make dev-auto.sgml
+ cd ${RELN_ROOT}/share/sgml && make MAN2HWNOTES_FLAGS=${MAN2HWNOTES_FLAGS} dev-auto.sgml
==== //depot/projects/mjexp/release/doc/share/sgml/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/doc/share/sgml/Makefile,v 1.2 2004/08/08 09:23:49 hrs Exp $
+# $FreeBSD: src/release/doc/share/sgml/Makefile,v 1.3 2007/02/16 02:10:12 bmah Exp $
RELN_ROOT?= ${.CURDIR}/../..
@@ -6,7 +6,7 @@
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
dev-auto.sgml: ${MAN4PAGES} ${ARCHLIST} ${MAN2HWNOTES_CMD} catalog-auto
- ${PERL} ${MAN2HWNOTES_CMD} -a ${ARCHLIST} -o ${.TARGET} ${MAN4PAGES}
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list