From owner-p4-projects@FreeBSD.ORG Sat Mar 10 03:01:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A5F916A406; Sat, 10 Mar 2007 03:01:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B828C16A400 for ; Sat, 10 Mar 2007 03:01:24 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A6E5F13C467 for ; Sat, 10 Mar 2007 03:01:24 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l2A31OFs017964 for ; Sat, 10 Mar 2007 03:01:24 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l2A31EMY017880 for perforce@freebsd.org; Sat, 10 Mar 2007 03:01:14 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 10 Mar 2007 03:01:14 GMT Message-Id: <200703100301.l2A31EMY017880@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 115650 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Mar 2007 03:01:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=115650 Change 115650 by mjacob@mjexp on 2007/03/10 03:01:09 IFC Affected files ... .. //depot/projects/mjexp/Makefile.inc1#6 integrate .. //depot/projects/mjexp/bin/df/df.c#2 integrate .. //depot/projects/mjexp/etc/defaults/rc.conf#7 integrate .. //depot/projects/mjexp/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_acl_basic.c#1 branch .. //depot/projects/mjexp/lib/libarchive/test/test_acl_pax.c#1 branch .. //depot/projects/mjexp/lib/libc/regex/engine.c#4 integrate .. //depot/projects/mjexp/lib/libc/regex/grot/tests#2 integrate .. //depot/projects/mjexp/lib/libc/resolv/res_send.c#5 integrate .. //depot/projects/mjexp/lib/libc/sys/getsockopt.2#3 integrate .. //depot/projects/mjexp/lib/libc/sys/shutdown.2#3 integrate .. //depot/projects/mjexp/lib/libelf/gelf.h#3 integrate .. //depot/projects/mjexp/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/mjexp/lib/ncurses/Makefile#2 integrate .. //depot/projects/mjexp/lib/ncurses/Makefile.inc#2 integrate .. //depot/projects/mjexp/lib/ncurses/config.mk#2 integrate .. //depot/projects/mjexp/lib/ncurses/form/Makefile#3 integrate .. //depot/projects/mjexp/lib/ncurses/formw/Makefile#1 branch .. //depot/projects/mjexp/lib/ncurses/menu/Makefile#3 integrate .. //depot/projects/mjexp/lib/ncurses/menuw/Makefile#1 branch .. //depot/projects/mjexp/lib/ncurses/ncurses/Makefile#4 integrate .. //depot/projects/mjexp/lib/ncurses/ncurses/ncurses_cfg.h#3 integrate .. //depot/projects/mjexp/lib/ncurses/ncursesw/Makefile#1 branch .. //depot/projects/mjexp/lib/ncurses/panel/Makefile#3 integrate .. //depot/projects/mjexp/lib/ncurses/panelw/Makefile#1 branch .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/mjexp/sbin/geom/class/eli/geli.8#2 integrate .. //depot/projects/mjexp/sbin/geom/class/eli/geom_eli.c#4 integrate .. //depot/projects/mjexp/sbin/ifconfig/af_ipx.c#3 integrate .. //depot/projects/mjexp/sbin/mdmfs/mdmfs.c#4 integrate .. //depot/projects/mjexp/sbin/mount_nfs/mount_nfs.8#4 integrate .. //depot/projects/mjexp/sbin/mount_nfs/mount_nfs.c#4 integrate .. //depot/projects/mjexp/sbin/restore/tape.c#4 integrate .. //depot/projects/mjexp/share/man/man4/ipw.4#3 integrate .. //depot/projects/mjexp/share/man/man4/iwi.4#3 integrate .. //depot/projects/mjexp/share/man/man5/fs.5#3 integrate .. //depot/projects/mjexp/share/man/man5/rc.conf.5#8 integrate .. //depot/projects/mjexp/share/man/man9/Makefile#12 integrate .. //depot/projects/mjexp/share/man/man9/bus_dma.9#3 integrate .. //depot/projects/mjexp/share/man/man9/condvar.9#2 integrate .. //depot/projects/mjexp/share/man/man9/extattr.9#3 integrate .. //depot/projects/mjexp/share/man/man9/lock.9#2 integrate .. //depot/projects/mjexp/share/man/man9/mi_switch.9#2 integrate .. //depot/projects/mjexp/share/man/man9/mtx_pool.9#2 integrate .. //depot/projects/mjexp/share/man/man9/mutex.9#4 integrate .. //depot/projects/mjexp/share/man/man9/rwlock.9#3 integrate .. //depot/projects/mjexp/share/man/man9/sleep.9#5 integrate .. //depot/projects/mjexp/share/man/man9/sleepqueue.9#3 integrate .. //depot/projects/mjexp/share/man/man9/sx.9#2 integrate .. //depot/projects/mjexp/share/man/man9/thread_exit.9#2 integrate .. //depot/projects/mjexp/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/mjexp/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/mjexp/sys/amd64/amd64/intr_machdep.c#6 integrate .. //depot/projects/mjexp/sys/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/mjexp/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/mjexp/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/mjexp/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/mjexp/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/mjexp/sys/amd64/include/apicvar.h#5 integrate .. //depot/projects/mjexp/sys/amd64/include/intr_machdep.h#7 integrate .. //depot/projects/mjexp/sys/amd64/include/smp.h#2 integrate .. //depot/projects/mjexp/sys/arm/at91/at91.c#5 integrate .. //depot/projects/mjexp/sys/arm/sa11x0/sa11x0.c#4 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425_npe.c#5 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425_pci.c#4 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/mjexp/sys/conf/files.sparc64#7 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/mjexp/sys/dev/arcmsr/arcmsr.c#7 integrate .. //depot/projects/mjexp/sys/dev/arcmsr/arcmsr.h#4 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/mjexp/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/mjexp/sys/dev/fb/creator.c#3 integrate .. //depot/projects/mjexp/sys/dev/isp/isp.c#15 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#12 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_library.h#3 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#16 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_stds.h#2 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_target.c#7 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_target.h#5 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_tpublic.h#5 integrate .. //depot/projects/mjexp/sys/dev/isp/ispmbox.h#7 integrate .. //depot/projects/mjexp/sys/dev/isp/ispreg.h#5 integrate .. //depot/projects/mjexp/sys/dev/isp/ispvar.h#6 integrate .. //depot/projects/mjexp/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/mjexp/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/mjexp/sys/dev/ppbus/ppbconf.c#3 integrate .. //depot/projects/mjexp/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/emu10kx-pcm.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/mjexp/sys/dev/sym/sym_hipd.c#5 integrate .. //depot/projects/mjexp/sys/dev/zs/z8530reg.h#2 delete .. //depot/projects/mjexp/sys/dev/zs/z8530var.h#3 delete .. //depot/projects/mjexp/sys/dev/zs/zs.c#4 delete .. //depot/projects/mjexp/sys/dev/zs/zs_macio.c#3 delete .. //depot/projects/mjexp/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/mjexp/sys/i386/i386/io_apic.c#5 integrate .. //depot/projects/mjexp/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/mjexp/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/mjexp/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/mjexp/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/nexus.c#6 integrate .. //depot/projects/mjexp/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/mjexp/sys/i386/i386/trap.c#4 integrate .. //depot/projects/mjexp/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/mjexp/sys/i386/include/apicvar.h#5 integrate .. //depot/projects/mjexp/sys/i386/include/intr_machdep.h#7 integrate .. //depot/projects/mjexp/sys/i386/include/smp.h#2 integrate .. //depot/projects/mjexp/sys/ia64/ia64/busdma_machdep.c#3 integrate .. //depot/projects/mjexp/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_acct.c#6 integrate .. //depot/projects/mjexp/sys/kern/kern_alq.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_clock.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_jail.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_kse.c#6 integrate .. //depot/projects/mjexp/sys/kern/kern_lock.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_sx.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_synch.c#10 integrate .. //depot/projects/mjexp/sys/kern/kern_thread.c#6 integrate .. //depot/projects/mjexp/sys/kern/sched_core.c#4 integrate .. //depot/projects/mjexp/sys/kern/sched_ule.c#12 integrate .. //depot/projects/mjexp/sys/kern/subr_prf.c#4 integrate .. //depot/projects/mjexp/sys/kern/subr_smp.c#2 integrate .. //depot/projects/mjexp/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/mjexp/sys/net/bridgestp.c#6 integrate .. //depot/projects/mjexp/sys/net/bridgestp.h#5 integrate .. //depot/projects/mjexp/sys/net/ethernet.h#5 integrate .. //depot/projects/mjexp/sys/net/if_bridge.c#7 integrate .. //depot/projects/mjexp/sys/net80211/_ieee80211.h#5 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_input.c#5 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/mjexp/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/mjexp/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/mjexp/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/mjexp/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/mjexp/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/nexus.c#2 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/pic_if.m#2 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/trap.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/central/central.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/fhc/fhc.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/fhc/fhc_central.c#2 delete .. //depot/projects/mjexp/sys/sparc64/fhc/fhc_nexus.c#2 delete .. //depot/projects/mjexp/sys/sparc64/fhc/fhcvar.h#2 delete .. //depot/projects/mjexp/sys/sparc64/include/bus_private.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/include/iommureg.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/include/nexusvar.h#2 delete .. //depot/projects/mjexp/sys/sparc64/include/ofw_nexus.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/include/ofw_upa.h#2 delete .. //depot/projects/mjexp/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/mjexp/sys/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/bus_machdep.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/nexus.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/sc_machdep.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/upa.c#4 integrate .. //depot/projects/mjexp/sys/sys/buf.h#4 integrate .. //depot/projects/mjexp/sys/sys/extattr.h#3 integrate .. //depot/projects/mjexp/sys/sys/lock.h#5 integrate .. //depot/projects/mjexp/sys/sys/mutex.h#5 integrate .. //depot/projects/mjexp/sys/sys/param.h#11 integrate .. //depot/projects/mjexp/sys/sys/proc.h#9 integrate .. //depot/projects/mjexp/sys/sys/rwlock.h#4 integrate .. //depot/projects/mjexp/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/mjexp/sys/sys/sx.h#2 integrate .. //depot/projects/mjexp/sys/sys/systm.h#9 integrate .. //depot/projects/mjexp/sys/ufs/ufs/extattr.h#2 integrate .. //depot/projects/mjexp/sys/vm/vm_fault.c#4 integrate .. //depot/projects/mjexp/tools/regression/netinet/ipbroadcast/ipbroadcast.c#2 integrate .. //depot/projects/mjexp/usr.bin/brandelf/brandelf.1#2 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.freebsd#6 integrate .. //depot/projects/mjexp/usr.bin/fstat/fstat.c#2 integrate .. //depot/projects/mjexp/usr.bin/ipcrm/ipcrm.1#2 integrate .. //depot/projects/mjexp/usr.bin/make/globals.h#2 integrate .. //depot/projects/mjexp/usr.bin/make/job.c#2 integrate .. //depot/projects/mjexp/usr.bin/make/job.h#2 integrate .. //depot/projects/mjexp/usr.bin/make/main.c#2 integrate .. //depot/projects/mjexp/usr.bin/make/make.1#3 integrate .. //depot/projects/mjexp/usr.bin/make/make.h#2 integrate .. //depot/projects/mjexp/usr.bin/make/parse.c#2 integrate .. //depot/projects/mjexp/usr.bin/mkuzip/mkuzip.c#2 integrate .. //depot/projects/mjexp/usr.bin/tar/bsdtar_platform.h#3 integrate .. //depot/projects/mjexp/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#2 integrate .. //depot/projects/mjexp/usr.sbin/cron/lib/entry.c#2 integrate .. //depot/projects/mjexp/usr.sbin/crunch/crunchide/crunchide.c#2 integrate .. //depot/projects/mjexp/usr.sbin/daemon/daemon.8#2 integrate .. //depot/projects/mjexp/usr.sbin/daemon/daemon.c#2 integrate .. //depot/projects/mjexp/usr.sbin/kbdmap/kbdmap.c#2 integrate .. //depot/projects/mjexp/usr.sbin/lpr/lpd/recvjob.c#2 integrate .. //depot/projects/mjexp/usr.sbin/mtest/Makefile#2 integrate .. //depot/projects/mjexp/usr.sbin/mtest/mtest.8#2 integrate .. //depot/projects/mjexp/usr.sbin/mtest/mtest.c#2 integrate .. //depot/projects/mjexp/usr.sbin/ndp/ndp.c#3 integrate .. //depot/projects/mjexp/usr.sbin/pkg_install/lib/url.c#2 integrate .. //depot/projects/mjexp/usr.sbin/sade/termcap.c#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/termcap.c#2 integrate .. //depot/projects/mjexp/usr.sbin/traceroute6/traceroute6.c#2 integrate Differences ... ==== //depot/projects/mjexp/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.569 2007/03/01 15:42:23 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.570 2007/03/09 12:11:56 rafan Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -441,7 +441,7 @@ .for _dir in usr.bin/lex/lib cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} obj .endfor -.for _dir in lib/ncurses/ncurses lib/libmagic +.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= build-tools .endfor @@ -921,6 +921,7 @@ bin/sh \ ${_rescue} \ lib/ncurses/ncurses \ + lib/ncurses/ncursesw \ ${_share} \ ${_aicasm} \ usr.bin/awk \ @@ -1008,7 +1009,8 @@ lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ - lib/ncurses/ncurses lib/libopie lib/libpam \ + lib/ncurses/ncurses lib/ncurses/ncursesw \ + lib/libopie lib/libpam \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ==== //depot/projects/mjexp/bin/df/df.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.66 2006/09/20 20:55:02 csjp Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.67 2007/03/08 06:10:17 will Exp $"); #include #include @@ -93,7 +93,7 @@ return (a > b ? a : b); } -static int aflag = 0, cflag, hflag, iflag, kflag, nflag; +static int aflag = 0, cflag, hflag, iflag, kflag, lflag = 0, nflag; static struct ufs_args mdev; int @@ -159,6 +159,7 @@ if (vfslist != NULL) errx(1, "-l and -t are mutually exclusive."); vfslist = makevfslist(makenetvfslist()); + lflag = 1; break; case 'm': putenv("BLOCKSIZE=1m"); @@ -168,6 +169,8 @@ nflag = 1; break; case 't': + if (lflag) + errx(1, "-l and -t are mutually exclusive."); if (vfslist != NULL) errx(1, "only one -t option may be specified"); fstype = optarg; ==== //depot/projects/mjexp/etc/defaults/rc.conf#7 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.305 2007/03/03 06:36:32 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.306 2007/03/06 13:13:53 yar Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -42,10 +42,10 @@ powerd_flags="" # Flags to powerd (if enabled). tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never tmpsize="20m" # Size of mfs /tmp if created -tmpmfs_flags="-S -M" # Extra mdmfs options for the mfs /tmp +tmpmfs_flags="-S" # Extra mdmfs options for the mfs /tmp varmfs="AUTO" # Set to YES to always create an mfs /var, NO to never varsize="32m" # Size of mfs /var if created -varmfs_flags="-S -M" # Extra mount options for the mfs /var +varmfs_flags="-S" # Extra mount options for the mfs /var populate_var="AUTO" # Set to YES to always (re)populate /var, NO to never cleanvar_enable="YES" # Clean the /var directory local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. ==== //depot/projects/mjexp/lib/libarchive/archive_entry.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.38 2007/03/01 06:22:34 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.39 2007/03/08 06:07:07 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -1032,7 +1032,7 @@ entry->acl_p = entry->acl_p->next; if (entry->acl_p == NULL) { entry->acl_state = 0; - return (ARCHIVE_WARN); + return (ARCHIVE_EOF); /* End of ACL entries. */ } *type = entry->acl_p->type; *permset = entry->acl_p->permset; ==== //depot/projects/mjexp/lib/libarchive/test/Makefile#2 (text+ko) ==== @@ -1,6 +1,8 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.1 2007/03/03 07:37:37 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.2 2007/03/08 06:09:27 kientzle Exp $ TESTS= \ + test_acl_basic.c \ + test_acl_pax.c \ test_archive_api_feature.c \ test_bad_fd.c \ test_read_data_large.c \ ==== //depot/projects/mjexp/lib/libc/regex/engine.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.19 2007/03/05 03:07:36 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.20 2007/03/05 09:43:55 delphij Exp $"); /* * The matching engine and friends. This file is #included by regexec.c @@ -103,10 +103,11 @@ /* === engine.c === */ static int matcher(struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags); static char *dissect(struct match *m, char *start, char *stop, sopno startst, sopno stopst); -static char *backref(struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev); +static char *backref(struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev, int); static char *fast(struct match *m, char *start, char *stop, sopno startst, sopno stopst); static char *slow(struct match *m, char *start, char *stop, sopno startst, sopno stopst); static states step(struct re_guts *g, sopno start, sopno stop, states bef, wint_t ch, states aft); +#define MAX_RECURSION 100 #define BOL (OUT-1) #define EOL (BOL-1) #define BOLEOL (BOL-2) @@ -298,7 +299,7 @@ return(REG_ESPACE); } NOTE("backref dissect"); - dp = backref(m, m->coldp, endp, gf, gl, (sopno)0); + dp = backref(m, m->coldp, endp, gf, gl, (sopno)0, 0); } if (dp != NULL) break; @@ -321,7 +322,7 @@ } #endif NOTE("backoff dissect"); - dp = backref(m, m->coldp, endp, gf, gl, (sopno)0); + dp = backref(m, m->coldp, endp, gf, gl, (sopno)0, 0); } assert(dp == NULL || dp == endp); if (dp != NULL) /* found a shorter one */ @@ -553,13 +554,14 @@ == char *stop, sopno startst, sopno stopst, sopno lev); */ static char * /* == stop (success) or NULL (failure) */ -backref(m, start, stop, startst, stopst, lev) +backref(m, start, stop, startst, stopst, lev, rec) struct match *m; char *start; char *stop; sopno startst; sopno stopst; sopno lev; /* PLUS nesting level */ +int rec; { int i; sopno ss; /* start sop of current subRE */ @@ -674,7 +676,7 @@ return(NULL); assert(m->pmatch[i].rm_so != -1); len = m->pmatch[i].rm_eo - m->pmatch[i].rm_so; - if (len == 0) + if (len == 0 && rec++ > MAX_RECURSION) return(NULL); assert(stop - m->beginp >= len); if (sp > stop - len) @@ -684,28 +686,28 @@ return(NULL); while (m->g->strip[ss] != SOP(O_BACK, i)) ss++; - return(backref(m, sp+len, stop, ss+1, stopst, lev)); + return(backref(m, sp+len, stop, ss+1, stopst, lev, rec)); break; case OQUEST_: /* to null or not */ - dp = backref(m, sp, stop, ss+1, stopst, lev); + dp = backref(m, sp, stop, ss+1, stopst, lev, rec); if (dp != NULL) return(dp); /* not */ - return(backref(m, sp, stop, ss+OPND(s)+1, stopst, lev)); + return(backref(m, sp, stop, ss+OPND(s)+1, stopst, lev, rec)); break; case OPLUS_: assert(m->lastpos != NULL); assert(lev+1 <= m->g->nplus); m->lastpos[lev+1] = sp; - return(backref(m, sp, stop, ss+1, stopst, lev+1)); + return(backref(m, sp, stop, ss+1, stopst, lev+1, rec)); break; case O_PLUS: if (sp == m->lastpos[lev]) /* last pass matched null */ - return(backref(m, sp, stop, ss+1, stopst, lev-1)); + return(backref(m, sp, stop, ss+1, stopst, lev-1, rec)); /* try another pass */ m->lastpos[lev] = sp; - dp = backref(m, sp, stop, ss-OPND(s)+1, stopst, lev); + dp = backref(m, sp, stop, ss-OPND(s)+1, stopst, lev, rec); if (dp == NULL) - return(backref(m, sp, stop, ss+1, stopst, lev-1)); + return(backref(m, sp, stop, ss+1, stopst, lev-1, rec)); else return(dp); break; @@ -714,7 +716,7 @@ esub = ss + OPND(s) - 1; assert(OP(m->g->strip[esub]) == OOR1); for (;;) { /* find first matching branch */ - dp = backref(m, sp, stop, ssub, esub, lev); + dp = backref(m, sp, stop, ssub, esub, lev, rec); if (dp != NULL) return(dp); /* that one missed, try next one */ @@ -735,7 +737,7 @@ assert(0 < i && i <= m->g->nsub); offsave = m->pmatch[i].rm_so; m->pmatch[i].rm_so = sp - m->offp; - dp = backref(m, sp, stop, ss+1, stopst, lev); + dp = backref(m, sp, stop, ss+1, stopst, lev, rec); if (dp != NULL) return(dp); m->pmatch[i].rm_so = offsave; @@ -746,7 +748,7 @@ assert(0 < i && i <= m->g->nsub); offsave = m->pmatch[i].rm_eo; m->pmatch[i].rm_eo = sp - m->offp; - dp = backref(m, sp, stop, ss+1, stopst, lev); + dp = backref(m, sp, stop, ss+1, stopst, lev, rec); if (dp != NULL) return(dp); m->pmatch[i].rm_eo = offsave; ==== //depot/projects/mjexp/lib/libc/regex/grot/tests#2 (text+ko) ==== @@ -1,5 +1,5 @@ # regular expression test set -# $FreeBSD: src/lib/libc/regex/grot/tests,v 1.2 2000/07/09 18:14:39 dcs Exp $ +# $FreeBSD: src/lib/libc/regex/grot/tests,v 1.3 2007/03/05 09:44:41 delphij Exp $ # Lines are at least three fields, separated by one or more tabs. "" stands # for an empty field. First field is an RE. Second field is flags. If # C flag given, regcomp() is expected to fail, and the third field is the @@ -165,6 +165,30 @@ \(a\)\1bc*d b aabcccd aabcccd \(a\)\1bc*[ce]d b aabcccd aabcccd ^\(a\)\1b\(c\)*cd$ b aabcccd aabcccd +\(b*\)\(a*\1\)* b ab a +\([^_]*\)\(_*\1\)* b foo_foo_bar_bar_bar_baz foo_foo foo,_foo +\([^_]*\)\(_*\1\)* b bar_bar_bar_baz bar_bar_bar bar,_bar +\([^_]*\)\(_*\1\)* b foo_bar_baz foo foo +\(.*\)\1 b "" "" +\(.*\)\1 b a "" +\(.*\)\1 b aa aa +\(.*\)\1 b aaa aa +\(.*\)\1 b aaaa aaaa +\([^_]*\)\1 b "" "" +\([^_]*\)\1 b a "" +\([^_]*\)\1 b aa aa +\([^_]*\)\1 b aaa aa +\([^_]*\)\1 b aaaa aaaa +foo\(.*\)bar\1 b foolbarl foolbarl l +foo\(.*\)bar\1 b foobar foobar "" +\(\(.\)b\)*\1 b aba +\(\(.\)b\)*\1 b abba +\(\(.\)b\)*\1 b abbba +\(\(.\)b\)*\1 b abbbba bbbb bb,b +\(\(.\)b\)*\1 b abbbbba abbbbb bb,b +\(\(.\)b\)*\1 b abbbbbba abbbbb bb,b +\(\(.\)b\)*\1 b abbbbbbbbbbbbbba abbbbbbbbbbbbb bb,b +\(\(.\)b\)*\1 b abbbbbbbbbbbbbbba abbbbbbbbbbbbbbb bb,b # ordinary repetitions ab*c & abc abc ==== //depot/projects/mjexp/lib/libc/resolv/res_send.c#5 (text) ==== @@ -69,7 +69,7 @@ static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.9 2006/10/16 23:00:50 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.6 2007/01/09 00:28:04 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.7 2007/03/05 19:39:51 jhb Exp $"); /* * Send query to name server and wait for reply. @@ -124,10 +124,8 @@ #define EXT(res) ((res)->_u._ext) -#ifndef USE_POLL +#if !defined(USE_POLL) && !defined(USE_KQUEUE) static const int highestFD = FD_SETSIZE - 1; -#else -static int highestFD = 0; #endif /* Forward. */ @@ -305,10 +303,6 @@ #endif char abuf[NI_MAXHOST]; -#ifdef USE_POLL - highestFD = sysconf(_SC_OPEN_MAX) - 1; -#endif - /* No name servers or res_init() failure */ if (statp->nscount == 0 || EXT(statp).ext == NULL) { errno = ESRCH; @@ -659,10 +653,12 @@ res_nclose(statp); statp->_vcsock = _socket(nsap->sa_family, SOCK_STREAM, 0); +#if !defined(USE_POLL) && !defined(USE_KQUEUE) if (statp->_vcsock > highestFD) { res_nclose(statp); errno = ENOTSOCK; } +#endif if (statp->_vcsock < 0) { switch (errno) { case EPROTONOSUPPORT: @@ -837,10 +833,12 @@ if (EXT(statp).nssocks[ns] == -1) { EXT(statp).nssocks[ns] = _socket(nsap->sa_family, SOCK_DGRAM, 0); +#if !defined(USE_POLL) && !defined(USE_KQUEUE) if (EXT(statp).nssocks[ns] > highestFD) { res_nclose(statp); errno = ENOTSOCK; } +#endif if (EXT(statp).nssocks[ns] < 0) { switch (errno) { case EPROTONOSUPPORT: ==== //depot/projects/mjexp/lib/libc/sys/getsockopt.2#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)getsockopt.2 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/lib/libc/sys/getsockopt.2,v 1.36 2007/01/11 18:45:41 maxim Exp $ +.\" $FreeBSD: src/lib/libc/sys/getsockopt.2,v 1.38 2007/03/09 19:43:42 bms Exp $ .\" -.Dd January 11, 2007 +.Dd March 8, 2007 .Dt GETSOCKOPT 2 .Os .Sh NAME @@ -165,6 +165,7 @@ for the socket .It Dv SO_TIMESTAMP Ta "enables reception of a timestamp with datagrams" .It Dv SO_BINTIME Ta "enables reception of a timestamp with datagrams" +.It Dv SO_ACCEPTCONN Ta "get listening status of the socket (get only)" .It Dv SO_TYPE Ta "get the type of the socket (get only)" .It Dv SO_ERROR Ta "get and clear error on the socket (get only)" .El @@ -408,11 +409,17 @@ .Ed .Pp Finally, +.Dv SO_ACCEPTCONN , .Dv SO_TYPE and .Dv SO_ERROR are options used only with .Fn getsockopt . +.Dv SO_ACCEPTCONN +returns whether the socket is currently accepting connections, +that is, whether or not the +.Xr listen 2 +system call was invoked on the socket. .Dv SO_TYPE returns the type of the socket, such as .Dv SOCK_STREAM ; @@ -453,6 +460,7 @@ .El .Sh SEE ALSO .Xr ioctl 2 , +.Xr listen 2 , .Xr recvmsg 2 , .Xr socket 2 , .Xr getprotoent 3 , ==== //depot/projects/mjexp/lib/libc/sys/shutdown.2#3 (text+ko) ==== @@ -1,3 +1,4 @@ +.\" Copyright (c) 2007 Bruce M. Simpson. .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -26,14 +27,14 @@ .\" SUCH DAMAGE. .\" .\" @(#)shutdown.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/shutdown.2,v 1.16 2007/01/09 00:28:15 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/shutdown.2,v 1.22 2007/03/07 13:34:49 bms Exp $ .\" -.Dd February 27, 2001 +.Dd March 5, 2007 .Dt SHUTDOWN 2 .Os .Sh NAME .Nm shutdown -.Nd shut down part of a full-duplex connection +.Nd disable sends and/or receives on a socket .Sh LIBRARY .Lb libc .Sh SYNOPSIS @@ -44,22 +45,77 @@ .Sh DESCRIPTION The .Fn shutdown -system call causes all or part of a full-duplex connection on -the socket associated with the file descriptor -.Fa s -to be shut down. +system call disables sends or receives on a socket. The .Fa how argument specifies the type of shutdown. Possible values are: -.Bl -tag -width SHUT_RDWR +.Bl -tag -width ".Dv SHUT_RDWR" .It Dv SHUT_RD -further receives will be disallowed. +Further receives will be disallowed. .It Dv SHUT_WR -further sends will be disallowed. +Further sends will be disallowed. +This may cause actions specific to the protocol family of the socket +.Fa s +to happen; see +.Sx IMPLEMENTATION NOTES . .It Dv SHUT_RDWR -further sends and receives will be disallowed. +Further sends and receives will be disallowed. +Implies +.Dv SHUT_WR . +.El +.Pp +If the file descriptor +.Fa s +is associated with a +.Dv SOCK_STREAM +socket, all or part of the full-duplex connection will be shut down. +.\" +.Sh IMPLEMENTATION NOTES +The following protocol specific actions apply to the use of +.Dv SHUT_WR +(and potentially also +.Dv SHUT_RDWR ) , +based on the properties of the socket associated with the file descriptor +.Fa s . +.Bl -column ".Dv PF_INET6" ".Dv SOCK_STREAM" ".Dv IPPROTO_SCTP" +.It Sy Domain Ta Sy Type Ta Sy Protocol Ta Sy Return value and action +.It Dv PF_INET Ta Dv SOCK_DGRAM Ta Dv IPPROTO_SCTP Ta +Return \-1. +The global variable +.Va errno +will be set to +.Er EOPNOTSUPP . +.It Dv PF_INET Ta Dv SOCK_DGRAM Ta Dv IPPROTO_UDP Ta +Return 0. +ICMP messages will +.Em not +be generated. +.It Dv PF_INET Ta Dv SOCK_STREAM Ta Dv IPPROTO_SCTP Ta +Return 0. +Send queued data and tear down association. +.It Dv PF_INET Ta Dv SOCK_STREAM Ta Dv IPPROTO_TCP Ta +Return 0. +Send queued data, wait for ACK, then send FIN. +.It Dv PF_INET6 Ta Dv SOCK_DGRAM Ta Dv IPPROTO_SCTP Ta +Return \-1. +The global variable +.Va errno +will be set to +.Er EOPNOTSUPP . +.It Dv PF_INET6 Ta Dv SOCK_DGRAM Ta Dv IPPROTO_UDP Ta +Return 0. +ICMP messages will +.Em not +be generated. +.It Dv PF_INET6 Ta Dv SOCK_STREAM Ta Dv IPPROTO_SCTP Ta +Return 0. +Send queued data and tear down association. +.It Dv PF_INET6 Ta Dv SOCK_STREAM Ta Dv IPPROTO_TCP Ta +Return 0. +Send queued data, wait for ACK, then send FIN. .El +.\" .Sh RETURN VALUES .Rv -std shutdown .Sh ERRORS @@ -75,8 +131,16 @@ The .Fa how argument is invalid. +.It Bq Er EOPNOTSUPP +The socket associated with the file descriptor +.Fa s +does not support this operation. .It Bq Er ENOTCONN -The socket is not connected. +The +.Fa s +argument specifies a +.Dv SOCK_STREAM +socket which is not connected. .It Bq Er ENOTSOCK The .Fa s @@ -84,7 +148,9 @@ .El .Sh SEE ALSO .Xr connect 2 , -.Xr socket 2 +.Xr socket 2 , +.Xr inet 4 , +.Xr inet6 4 .Sh STANDARDS The .Fn shutdown @@ -102,3 +168,24 @@ .Dv SHUT_RDWR constants appeared in .St -p1003.1g-2000 . +.Sh AUTHORS +.An -nosplit +This manual page was updated by +.An Bruce M. Simpson Aq bms@FreeBSD.org +to reflect how +.Fn shutdown +behaves with +.Dv PF_INET +and +.Dv PF_INET6 +sockets. +.Sh BUGS +The ICMP +.Dq Li "port unreachable" +message should be generated in response to +datagrams received on a local port to which +.Fa s +is bound +after +.Fn shutdown +is called. ==== //depot/projects/mjexp/lib/libelf/gelf.h#3 (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/libelf/gelf.h,v 1.2 2006/12/18 05:40:01 jkoshy Exp $ + * $FreeBSD: src/lib/libelf/gelf.h,v 1.3 2007/03/08 04:01:30 jkoshy Exp $ */ #ifndef _GELF_H_ @@ -56,6 +56,22 @@ typedef Elf64_Syminfo GElf_Syminfo; /* Symbol information */ #endif +#define GELF_M_INFO ELF64_M_INFO +#define GELF_M_SIZE ELF64_M_SIZE +#define GELF_M_SYM ELF64_M_SYM + +#define GELF_R_INFO ELF64_R_INFO +#define GELF_R_SYM ELF64_R_SYM +#define GELF_R_TYPE ELF64_R_TYPE +#define GELF_R_TYPE_DATA ELF64_R_TYPE_DATA +#define GELF_R_TYPE_ID ELF64_R_TYPE_ID +#define GELF_R_TYPE_INFO ELF64_R_TYPE_INFO + +#define GELF_ST_BIND ELF64_ST_BIND +#define GELF_ST_INFO ELF64_ST_INFO +#define GELF_ST_TYPE ELF64_ST_TYPE +#define GELF_ST_VISIBILITY ELF64_ST_VISIBILITY + __BEGIN_DECLS long gelf_checksum(Elf *_elf); size_t gelf_fsize(Elf *_elf, Elf_Type _type, size_t _count, ==== //depot/projects/mjexp/lib/libpthread/thread/thr_kern.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.122 2006/12/18 17:08:07 peadar Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.124 2007/03/05 19:00:49 brian Exp $"); #include #include @@ -228,6 +228,10 @@ __sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); _thread_active_threads = 1; + curthread->kse->k_kcb->kcb_kmbx.km_curthread = NULL; + curthread->attr.flags &= ~PTHREAD_SCOPE_PROCESS; + curthread->attr.flags |= PTHREAD_SCOPE_SYSTEM; + /* * Enter a loop to remove and free all threads other than * the running thread from the active thread list: @@ -310,13 +314,6 @@ inited = 0; } - /* - * After a fork(), the leftover thread goes back to being - * scope process. - */ - curthread->attr.flags &= ~PTHREAD_SCOPE_SYSTEM; - curthread->attr.flags |= PTHREAD_SCOPE_PROCESS; - /* We're no longer part of any lists */ curthread->tlflags = 0; ==== //depot/projects/mjexp/lib/ncurses/Makefile#2 (text+ko) ==== @@ -1,5 +1,6 @@ -# $FreeBSD: src/lib/ncurses/Makefile,v 1.1 2007/01/20 07:46:44 rafan Exp $ +# $FreeBSD: src/lib/ncurses/Makefile,v 1.2 2007/03/09 12:11:56 rafan Exp $ -SUBDIR= ncurses form menu panel +SUBDIR= ncurses form menu panel \ + ncursesw formw menuw panelw .include ==== //depot/projects/mjexp/lib/ncurses/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,5 @@ +# $FreeBSD: src/lib/ncurses/Makefile.inc,v 1.2 2007/03/09 09:54:07 rafan Exp $ + # This is to include src/lib/Makefile.inc -# $FreeBSD: src/lib/ncurses/Makefile.inc,v 1.1 2007/01/20 07:46:44 rafan Exp $ .include "../Makefile.inc" ==== //depot/projects/mjexp/lib/ncurses/config.mk#2 (text+ko) ==== @@ -1,10 +1,17 @@ +# $FreeBSD: src/lib/ncurses/config.mk,v 1.3 2007/03/09 12:11:56 rafan Exp $ + # This Makefile is shared by libncurses, libform, libmenu, libpanel. -# -# $FreeBSD: src/lib/ncurses/config.mk,v 1.1 2007/01/20 07:46:44 rafan Exp $ NCURSES_DIR= ${.CURDIR}/../../../contrib/ncurses +.if defined(ENABLE_WIDEC) +LIB_SUFFIX= w +CFLAGS+= -D_XOPEN_SOURCE_EXTENDED -DENABLE_WIDEC +NCURSES_CFG_H= ${.CURDIR}/../ncurses/ncurses_cfg.h +.else +LIB_SUFFIX= NCURSES_CFG_H= ${.CURDIR}/ncurses_cfg.h +.endif CFLAGS+= -I. .if exists(${.OBJDIR}/../ncurses${LIB_SUFFIX}) ==== //depot/projects/mjexp/lib/ncurses/form/Makefile#3 (text+ko) ==== @@ -1,165 +1,164 @@ -# Makefile for libform -# $FreeBSD: src/lib/ncurses/form/Makefile,v 1.11 2007/01/20 07:46:44 rafan Exp $ +# $FreeBSD: src/lib/ncurses/form/Makefile,v 1.13 2007/03/09 12:11:56 rafan Exp $ + +.include "${.CURDIR}/../config.mk" -.include "${.CURDIR}/../config.mk" +SRCDIR= ${NCURSES_DIR}/form -SRCDIR= ${NCURSES_DIR}/form +LIB= form${LIB_SUFFIX} -LIB= form -DPADD= ${LIBNCURSES} -LDADD= -lncurses +.PATH: ${SRCDIR} +SRCS= \ + ncurses_def.h \ + fld_arg.c \ + fld_attr.c \ + fld_current.c \ + fld_def.c \ + fld_dup.c \ + fld_ftchoice.c \ + fld_ftlink.c \ + fld_info.c \ + fld_just.c \ + fld_link.c \ + fld_max.c \ + fld_move.c \ + fld_newftyp.c \ + fld_opts.c \ + fld_pad.c \ + fld_page.c \ + fld_stat.c \ + fld_type.c \ + fld_user.c \ + frm_cursor.c \ + frm_data.c \ + frm_def.c \ + frm_driver.c \ + frm_hook.c \ + frm_opts.c \ + frm_page.c \ + frm_post.c \ + frm_req_name.c \ + frm_scale.c \ + frm_sub.c \ + frm_user.c \ + frm_win.c \ + fty_alnum.c \ + fty_alpha.c \ + fty_enum.c \ + fty_int.c \ + fty_ipv4.c \ + fty_num.c \ + fty_regex.c -.PATH: ${SRCDIR} -SRCS= \ - ncurses_def.h \ - fld_arg.c \ - fld_attr.c \ - fld_current.c \ >>> TRUNCATED FOR MAIL (1000 lines) <<<