From owner-svn-src-user@FreeBSD.ORG Thu Mar 4 20:52:15 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFA791065672; Thu, 4 Mar 2010 20:52:15 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9D3838FC21; Thu, 4 Mar 2010 20:52:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o24KqFYK085559; Thu, 4 Mar 2010 20:52:15 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o24KqFvn085551; Thu, 4 Mar 2010 20:52:15 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201003042052.o24KqFvn085551@svn.freebsd.org> From: Warner Losh Date: Thu, 4 Mar 2010 20:52:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204733 - user/imp/tbemd/usr.bin X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Mar 2010 20:52:15 -0000 Author: imp Date: Thu Mar 4 20:52:15 2010 New Revision: 204733 URL: http://svn.freebsd.org/changeset/base/204733 Log: Move to Makefile.arch for usr.bin Added: user/imp/tbemd/usr.bin/Makefile.amd64 user/imp/tbemd/usr.bin/Makefile.arm user/imp/tbemd/usr.bin/Makefile.i386 user/imp/tbemd/usr.bin/Makefile.ia64 user/imp/tbemd/usr.bin/Makefile.powerpc user/imp/tbemd/usr.bin/Makefile.sparc64 Modified: user/imp/tbemd/usr.bin/Makefile Modified: user/imp/tbemd/usr.bin/Makefile ============================================================================== --- user/imp/tbemd/usr.bin/Makefile Thu Mar 4 20:41:11 2010 (r204732) +++ user/imp/tbemd/usr.bin/Makefile Thu Mar 4 20:52:15 2010 (r204733) @@ -11,47 +11,28 @@ SUBDIR= alias \ apply \ - ${_ar} \ asa \ - ${_at} \ - ${_atm} \ awk \ banner \ basename \ - ${_bc} \ - ${_biff} \ - ${_bluetooth} \ brandelf \ bsdiff \ bzip2 \ bzip2recover \ - ${_c89} \ - ${_c99} \ - ${_calendar} \ cap_mkdb \ - ${_catman} \ chat \ - ${_checknr} \ - ${_chkey} \ chpass \ cksum \ cmp \ col \ - ${_colcrt} \ colldef \ colrm \ column \ comm \ - ${_compile_et} \ compress \ - ${_cpio} \ cpuset \ csplit \ - ${_csup} \ - ${_ctags} \ cut \ - ${_dc} \ - ${_dig} \ dirname \ du \ ee \ @@ -63,12 +44,10 @@ SUBDIR= alias \ false \ fetch \ file \ - ${_file2c} \ find \ finger \ fmt \ fold \ - ${_from} \ fstat \ fsync \ ftp \ @@ -77,14 +56,10 @@ SUBDIR= alias \ getconf \ getent \ getopt \ - ${_gprof} \ gzip \ head \ - ${_hesinfo} \ hexdump \ - ${_host} \ id \ - ${_indent} \ ipcrm \ ipcs \ join \ @@ -103,10 +78,8 @@ SUBDIR= alias \ less \ lessecho \ lesskey \ - ${_lex} \ limits \ locale \ - ${_locate} \ lock \ lockf \ logger \ @@ -117,8 +90,6 @@ SUBDIR= alias \ lorder \ lsvfs \ m4 \ - ${_mail} \ - ${_make} \ makewhatis \ mesg \ minigzip \ @@ -126,24 +97,16 @@ SUBDIR= alias \ mkdep \ mkfifo \ mklocale \ - ${_mkstr} \ mktemp \ mkuzip \ - ${_msgs} \ mt \ - ${_nc} \ ncal \ - ${_ncplist} \ - ${_ncplogin} \ netstat \ newgrp \ - ${_newkey} \ nfsstat \ nice \ nl \ nohup \ - ${_nslookup} \ - ${_nsupdate} \ opieinfo \ opiekey \ opiepasswd \ @@ -156,26 +119,19 @@ SUBDIR= alias \ printenv \ printf \ procstat \ - ${_quota} \ renice \ rev \ revoke \ - ${_rlogin} \ - ${_rpcgen} \ rpcinfo \ rs \ - ${_rsh} \ rup \ - ${_ruptime} \ rusers \ rwall \ - ${_rwho} \ script \ sed \ seq \ shar \ showmount \ - ${_smbutil} \ sockstat \ split \ stat \ @@ -187,7 +143,6 @@ SUBDIR= alias \ tar \ tcopy \ tee \ - ${_telnet} \ tftp \ time \ tip \ @@ -197,25 +152,19 @@ SUBDIR= alias \ tr \ true \ truncate \ - ${_truss} \ + truss \ tset \ tsort \ tty \ - ${_ul} \ uname \ unexpand \ - ${_unifdef} \ uniq \ unzip \ units \ unvis \ - ${_usbhidaction} \ - ${_usbhidctl} \ users \ uudecode \ uuencode \ - ${_vacation} \ - ${_vgrind} \ vi \ vis \ vmstat \ @@ -231,167 +180,133 @@ SUBDIR= alias \ wtmpcvt \ xargs \ xinstall \ - ${_xlint} \ - ${_xstr} \ - ${_yacc} \ - yes \ - ${_ypcat} \ - ${_ypmatch} \ - ${_ypwhich} - -.if ${MACHINE_CPUARCH} != "arm" -_truss= truss -.endif + yes # NB: keep these sorted by MK_* knobs .if ${MK_AT} != "no" -_at= at +SUBDIR+= at .endif .if ${MK_ATM} != "no" -_atm= atm +SUBDIR+= atm .endif .if ${MK_MAN} != "no" -_catman= catman +SUBDIR+= catman .endif .if ${MK_BIND_UTILS} != "no" -_dig= dig -_host= host -_nslookup= nslookup -_nsupdate= nsupdate +SUBDIR+= dig +SUBDIR+= host +SUBDIR+= nslookup +SUBDIR+= nsupdate .endif .if ${MK_BLUETOOTH} != "no" -_bluetooth= bluetooth +SUBDIR+= bluetooth .endif .if ${MK_BSD_CPIO} != "no" -_cpio= cpio +SUBDIR+= cpio .endif .if ${MK_CALENDAR} != "no" -_calendar= calendar +SUBDIR+= calendar .endif .if ${MK_HESIOD} != "no" -_hesinfo= hesinfo +SUBDIR+= hesinfo .endif .if ${MK_OPENSSL} != "no" -_bc= bc -_chkey= chkey -_dc= dc -_newkey= newkey +SUBDIR+= bc +SUBDIR+= chkey +SUBDIR+= dc +SUBDIR+= newkey .if ${MK_LIBTHR} != "no" -_csup= csup +SUBDIR+= csup .endif .endif .if ${MK_LOCATE} != "no" -_locate= locate +SUBDIR+= locate .endif # XXX msgs? .if ${MK_MAIL} != "no" -_biff= biff -_from= from -_mail= mail -_msgs= msgs +SUBDIR+= biff +SUBDIR+= from +SUBDIR+= mail +SUBDIR+= msgs .endif .if ${MK_MAKE} != "no" -_make= make +SUBDIR+= make .endif .if ${MK_NETCAT} != "no" -_nc= nc +SUBDIR+= nc .endif .if ${MK_NIS} != "no" -_ypcat= ypcat -_ypmatch= ypmatch -_ypwhich= ypwhich +SUBDIR+= ypcat +SUBDIR+= ypmatch +SUBDIR+= ypwhich .endif .if ${MK_QUOTAS} != "no" -_quota= quota +SUBDIR+= quota .endif .if ${MK_RCMDS} != "no" -_rlogin= rlogin -_rsh= rsh -_ruptime= ruptime -_rwho= rwho +SUBDIR+= rlogin +SUBDIR+= rsh +SUBDIR+= ruptime +SUBDIR+= rwho .endif .if ${MK_SENDMAIL} != "no" -_vacation= vacation +SUBDIR+= vacation .endif .if ${MK_TELNET} != "no" -_telnet= telnet +SUBDIR+= telnet .endif .if ${MK_TEXTPROC} != "no" -_checknr= checknr -_colcrt= colcrt -_ul= ul +SUBDIR+= checknr +SUBDIR+= colcrt +SUBDIR+= ul .endif .if ${MK_TOOLCHAIN} != "no" -_ar= ar -_c89= c89 -_c99= c99 -_compile_et= compile_et -_ctags= ctags -_file2c= file2c -_gprof= gprof -_indent= indent -_lex= lex -_mkstr= mkstr -_rpcgen= rpcgen -_unifdef= unifdef -_xlint= xlint -_xstr= xstr +SUBDIR+= ar +SUBDIR+= c89 +SUBDIR+= c99 +SUBDIR+= compile_et +SUBDIR+= ctags +SUBDIR+= file2c +SUBDIR+= gprof +SUBDIR+= indent +SUBDIR+= lex +SUBDIR+= mkstr +SUBDIR+= rpcgen +SUBDIR+= unifdef +SUBDIR+= xlint +SUBDIR+= xstr # XXX maybe under textproc? -_vgrind= vgrind -_yacc= yacc +SUBDIR+= vgrind +SUBDIR+= yacc .endif .if ${MK_USB} != "no" -_usbhidaction= usbhidaction -_usbhidctl= usbhidctl -.endif - -.if ${MACHINE_CPUARCH} == "i386" -.if ${MK_NCP} != "no" -_ncplist= ncplist -_ncplogin= ncplogin -.endif -_smbutil= smbutil -.endif - -.if ${MACHINE_CPUARCH} == "ia64" -_smbutil= smbutil -.endif - -.if ${MACHINE_CPUARCH} == "amd64" -.if ${MK_NCP} != "no" -_ncplist= ncplist -_ncplogin= ncplogin -.endif -_smbutil= smbutil +SUBDIR+= usbhidaction +SUBDIR+= usbhidctl .endif -.if ${MACHINE_CPUARCH} == "powerpc" -_smbutil= smbutil -.endif +.include -.if ${MACHINE_CPUARCH} == "sparc64" -_smbutil= smbutil -.endif +SUBDIR:= ${SUBDIR:O} .include Added: user/imp/tbemd/usr.bin/Makefile.amd64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/imp/tbemd/usr.bin/Makefile.amd64 Thu Mar 4 20:52:15 2010 (r204733) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +.if ${MK_NCP} != "no" +SUBDIR+= ncplist +SUBDIR+= ncplogin +.endif +SUBDIR+= smbutil Added: user/imp/tbemd/usr.bin/Makefile.arm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/imp/tbemd/usr.bin/Makefile.arm Thu Mar 4 20:52:15 2010 (r204733) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR:= ${SUBDIR:Ntruss} Added: user/imp/tbemd/usr.bin/Makefile.i386 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/imp/tbemd/usr.bin/Makefile.i386 Thu Mar 4 20:52:15 2010 (r204733) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +.if ${MK_NCP} != "no" +SUBDIR+= ncplist +SUBDIR+= ncplogin +.endif +SUBDIR+= smbutil Added: user/imp/tbemd/usr.bin/Makefile.ia64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/imp/tbemd/usr.bin/Makefile.ia64 Thu Mar 4 20:52:15 2010 (r204733) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR+= smbutil Added: user/imp/tbemd/usr.bin/Makefile.powerpc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/imp/tbemd/usr.bin/Makefile.powerpc Thu Mar 4 20:52:15 2010 (r204733) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR+= smbutil Added: user/imp/tbemd/usr.bin/Makefile.sparc64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/imp/tbemd/usr.bin/Makefile.sparc64 Thu Mar 4 20:52:15 2010 (r204733) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR+= smbutil