From owner-svn-src-projects@FreeBSD.ORG Mon Jan 12 21:30:23 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D27B01065672; Mon, 12 Jan 2009 21:30:23 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AD4D88FC0C; Mon, 12 Jan 2009 21:30:23 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0CLUNkj076860; Mon, 12 Jan 2009 21:30:23 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0CLUNes076857; Mon, 12 Jan 2009 21:30:23 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901122130.n0CLUNes076857@svn.freebsd.org> From: Sam Leffler Date: Mon, 12 Jan 2009 21:30:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187115 - in projects/vap7: etc gnu gnu/usr.bin/cc gnu/usr.bin/cvs gnu/usr.bin/gdb/kgdb gnu/usr.bin/groff/tmac gnu/usr.bin/sort lib lib/bind lib/csu lib/libarchive lib/libbluetooth lib/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jan 2009 21:30:27 -0000 Author: sam Date: Mon Jan 12 21:30:22 2009 New Revision: 187115 URL: http://svn.freebsd.org/changeset/base/187115 Log: re-merge build infrastructure sync w/ HEAD from r187106; fixes some stuff I missed the first time Modified: projects/vap7/etc/ (props changed) projects/vap7/gnu/ (props changed) projects/vap7/gnu/usr.bin/cc/ (props changed) projects/vap7/gnu/usr.bin/cvs/ (props changed) projects/vap7/gnu/usr.bin/gdb/kgdb/ (props changed) projects/vap7/gnu/usr.bin/groff/tmac/mdoc.local (props changed) projects/vap7/gnu/usr.bin/sort/ (props changed) projects/vap7/lib/ (props changed) projects/vap7/lib/Makefile projects/vap7/lib/bind/ (props changed) projects/vap7/lib/csu/ (props changed) projects/vap7/lib/libarchive/ (props changed) projects/vap7/lib/libbluetooth/ (props changed) projects/vap7/lib/libc/ (props changed) projects/vap7/lib/libc/string/ffsll.c (props changed) projects/vap7/lib/libc/string/flsll.c (props changed) projects/vap7/lib/libc_r/ (props changed) projects/vap7/lib/libcam/ (props changed) projects/vap7/lib/libdisk/ (props changed) projects/vap7/lib/libfetch/ (props changed) projects/vap7/lib/libftpio/ (props changed) projects/vap7/lib/libgeom/ (props changed) projects/vap7/lib/libgssapi/ (props changed) projects/vap7/lib/libkse/ (props changed) projects/vap7/lib/libkvm/ (props changed) projects/vap7/lib/libmagic/ (props changed) projects/vap7/lib/libthr/ (props changed) projects/vap7/lib/libutil/ (props changed) projects/vap7/libexec/ (props changed) projects/vap7/libexec/Makefile projects/vap7/libexec/rpc.rstatd/ (props changed) projects/vap7/libexec/rtld-elf/ (props changed) projects/vap7/sbin/ (props changed) projects/vap7/sbin/atacontrol/ (props changed) projects/vap7/sbin/ddb/ (props changed) projects/vap7/sbin/devfs/ (props changed) projects/vap7/sbin/dhclient/ (props changed) projects/vap7/sbin/fdisk/ (props changed) projects/vap7/sbin/fsck_ffs/ (props changed) projects/vap7/sbin/geom/ (props changed) projects/vap7/sbin/geom/class/part/ (props changed) projects/vap7/sbin/geom/misc/ (props changed) projects/vap7/sbin/ifconfig/ (props changed) projects/vap7/sbin/init/ (props changed) projects/vap7/sbin/ipfw/ (props changed) projects/vap7/sbin/md5/ (props changed) projects/vap7/sbin/mdconfig/ (props changed) projects/vap7/sbin/mksnap_ffs/ (props changed) projects/vap7/sbin/mount/ (props changed) projects/vap7/sbin/natd/ (props changed) projects/vap7/sbin/ping6/ (props changed) projects/vap7/sbin/sconfig/ (props changed) projects/vap7/share/ (props changed) projects/vap7/share/colldef/ (props changed) projects/vap7/share/examples/ (props changed) projects/vap7/share/man/man3/ (props changed) projects/vap7/share/man/man4/ (props changed) projects/vap7/share/man/man4/igb.4 (props changed) projects/vap7/share/man/man5/ (props changed) projects/vap7/share/man/man7/ (props changed) projects/vap7/share/man/man9/ (props changed) projects/vap7/share/mk/ (props changed) projects/vap7/share/sendmail/ (props changed) projects/vap7/share/syscons/ (props changed) projects/vap7/share/syscons/keymaps/ (props changed) projects/vap7/share/timedef/ (props changed) projects/vap7/share/zoneinfo/ (props changed) projects/vap7/usr.bin/ (props changed) projects/vap7/usr.bin/calendar/ (props changed) projects/vap7/usr.bin/cksum/ (props changed) projects/vap7/usr.bin/comm/ (props changed) projects/vap7/usr.bin/cpuset/ (props changed) projects/vap7/usr.bin/fetch/ (props changed) projects/vap7/usr.bin/file/ (props changed) projects/vap7/usr.bin/gzip/ (props changed) projects/vap7/usr.bin/ipcrm/ (props changed) projects/vap7/usr.bin/ipcs/ (props changed) projects/vap7/usr.bin/kdump/ (props changed) projects/vap7/usr.bin/ktrace/ (props changed) projects/vap7/usr.bin/ldd/ (props changed) projects/vap7/usr.bin/lockf/ (props changed) projects/vap7/usr.bin/logger/ (props changed) projects/vap7/usr.bin/make/ (props changed) projects/vap7/usr.bin/netstat/ (props changed) projects/vap7/usr.bin/procstat/ (props changed) projects/vap7/usr.bin/sed/ (props changed) projects/vap7/usr.bin/shar/ (props changed) projects/vap7/usr.bin/su/ (props changed) projects/vap7/usr.bin/tar/ (props changed) projects/vap7/usr.bin/top/ (props changed) projects/vap7/usr.bin/truncate/ (props changed) projects/vap7/usr.bin/truss/ (props changed) projects/vap7/usr.bin/units/ (props changed) projects/vap7/usr.bin/vmstat/ (props changed) projects/vap7/usr.bin/whereis/ (props changed) projects/vap7/usr.bin/window/ (props changed) projects/vap7/usr.bin/xargs/ (props changed) projects/vap7/usr.sbin/ (props changed) projects/vap7/usr.sbin/Makefile projects/vap7/usr.sbin/adduser/ (props changed) projects/vap7/usr.sbin/bsnmpd/modules/snmp_pf/ (props changed) projects/vap7/usr.sbin/cdcontrol/ (props changed) projects/vap7/usr.sbin/config/ (props changed) projects/vap7/usr.sbin/cron/ (props changed) projects/vap7/usr.sbin/cron/cron/ (props changed) projects/vap7/usr.sbin/extattr/ (props changed) projects/vap7/usr.sbin/freebsd-update/ (props changed) projects/vap7/usr.sbin/fwcontrol/ (props changed) projects/vap7/usr.sbin/iostat/ (props changed) projects/vap7/usr.sbin/mountd/ (props changed) projects/vap7/usr.sbin/mtree/ (props changed) projects/vap7/usr.sbin/ndiscvt/ (props changed) projects/vap7/usr.sbin/newsyslog/newsyslog.conf.5 (props changed) projects/vap7/usr.sbin/nscd/ (props changed) projects/vap7/usr.sbin/ntp/ (props changed) projects/vap7/usr.sbin/pkg_install/ (props changed) projects/vap7/usr.sbin/pmcstat/ (props changed) projects/vap7/usr.sbin/portsnap/ (props changed) projects/vap7/usr.sbin/powerd/ (props changed) projects/vap7/usr.sbin/pw/ (props changed) projects/vap7/usr.sbin/rpc.lockd/ (props changed) projects/vap7/usr.sbin/rpc.statd/ (props changed) projects/vap7/usr.sbin/rpc.yppasswdd/ (props changed) projects/vap7/usr.sbin/setfib/ (props changed) projects/vap7/usr.sbin/sysinstall/ (props changed) projects/vap7/usr.sbin/syslogd/ (props changed) projects/vap7/usr.sbin/traceroute/ (props changed) projects/vap7/usr.sbin/tzsetup/ (props changed) projects/vap7/usr.sbin/wlandebug/ (props changed) projects/vap7/usr.sbin/wpa/ (props changed) projects/vap7/usr.sbin/wpa/wpa_supplicant/ (props changed) Modified: projects/vap7/lib/Makefile ============================================================================== --- projects/vap7/lib/Makefile Mon Jan 12 21:04:22 2009 (r187114) +++ projects/vap7/lib/Makefile Mon Jan 12 21:30:22 2009 (r187115) @@ -124,7 +124,6 @@ _libmp= libmp .if ${MK_PMC} != "no" _libpmc= libpmc -_libusb20= libusb20 .endif .if ${MK_SENDMAIL} != "no" @@ -140,6 +139,7 @@ _libtelnet= libtelnet .if ${MK_USB} != "no" _libusbhid= libusbhid +_libusb20= libusb20 .endif .include Modified: projects/vap7/libexec/Makefile ============================================================================== --- projects/vap7/libexec/Makefile Mon Jan 12 21:04:22 2009 (r187114) +++ projects/vap7/libexec/Makefile Mon Jan 12 21:30:22 2009 (r187115) @@ -3,9 +3,9 @@ .include -SUBDIR= atrun \ +SUBDIR= ${_atrun} \ bootpd \ - comsat \ + ${_comsat} \ fingerd \ ftpd \ getty \ @@ -13,7 +13,7 @@ SUBDIR= atrun \ ${_mail.local} \ makekey \ ${_mknetid} \ - pppoed \ + ${_pppoed} \ pt_chown \ rbootd \ revnetgroup \ @@ -29,16 +29,28 @@ SUBDIR= atrun \ ${_smrsh} \ talkd \ tcpd \ - telnetd \ + ${_telnetd} \ tftpd \ ${_tftp-proxy} \ ${_ypxfr} +.if ${MK_AT} != "no" +_atrun= atrun +.endif + +.if ${MK_MAIL} != "no" +_comsat= comsat +.endif + .if ${MK_NIS} != "no" _mknetid= mknetid _ypxfr= ypxfr .endif +.if ${MK_NETGRAPH} != "no" +_pppoed= pppoed +.endif + .if ${MK_PF} != "no" _tftp-proxy= tftp-proxy .endif @@ -54,7 +66,11 @@ _rshd= rshd .if ${MK_SENDMAIL} != "no" _mail.local= mail.local -_smrsh= smrsh +_smrsh= smrsh +.endif + +.if ${MK_TELNET} != "no" +_telnetd= telnetd .endif .include Modified: projects/vap7/usr.sbin/Makefile ============================================================================== --- projects/vap7/usr.sbin/Makefile Mon Jan 12 21:04:22 2009 (r187114) +++ projects/vap7/usr.sbin/Makefile Mon Jan 12 21:30:22 2009 (r187115) @@ -425,7 +425,6 @@ _btxld= btxld .if ${MK_I4B} != "no" _i4b= i4b .endif -_cpucontrol= cpucontrol _kgmon= kgmon _kgzip= kgzip _lptcontrol= lptcontrol @@ -467,7 +466,6 @@ _boot0cfg= boot0cfg .if ${MK_TOOLCHAIN} != "no" _btxld= btxld .endif -_cpucontrol= cpucontrol _kgmon= kgmon _lptcontrol= lptcontrol .if ${MK_NCP} != "no"