From owner-p4-projects@FreeBSD.ORG Wed Jul 21 06:41:42 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79E021065678; Wed, 21 Jul 2010 06:41:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C253106566C for ; Wed, 21 Jul 2010 06:41:42 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 286D48FC1D for ; Wed, 21 Jul 2010 06:41:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o6L6fgjI090443 for ; Wed, 21 Jul 2010 06:41:42 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6L6fgPG090441 for perforce@freebsd.org; Wed, 21 Jul 2010 06:41:42 GMT (envelope-from bfiedler@FreeBSD.org) Date: Wed, 21 Jul 2010 06:41:42 GMT Message-Id: <201007210641.o6L6fgPG090441@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181250 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jul 2010 06:41:42 -0000 http://p4web.freebsd.org/@@181250?ac=10 Change 181250 by bfiedler@freebsd-home on 2010/07/21 06:41:23 Add mdocml to contrib Affected files ... .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/ChangeLog.xsl#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/Makefile#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/arch.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/arch.in#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/att.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/att.in#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/chars.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/chars.h#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/chars.in#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/compat.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/config.h.post#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/config.h.pre#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/example.style.css#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/external.png#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/html.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/html.h#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/index.css#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/index.sgml#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/lib.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/lib.in#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/libman.h#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/libmandoc.h#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/libmdoc.h#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/main.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/main.h#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/man.3#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/man.7#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/man.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/man.h#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/man_action.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/man_argv.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/man_hash.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/man_html.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/man_macro.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/man_term.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/man_validate.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mandoc.1#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mandoc.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mandoc.h#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mandoc_char.7#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc.3#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc.7#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc.h#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc_action.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc_argv.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc_hash.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc_html.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc_macro.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc_strings.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc_term.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc_validate.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/msec.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/msec.in#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/out.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/out.h#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/roff.3#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/roff.7#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/roff.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/roff.h#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/st.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/st.in#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/style.css#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/term.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/term.h#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/test-strlcat.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/test-strlcpy.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/tree.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/vol.c#1 add .. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/vol.in#1 add .. //depot/projects/soc2010/bsdtextproc/src/gnu/usr.bin/Makefile#2 edit .. //depot/projects/soc2010/bsdtextproc/src/share/mk/bsd.man.mk#2 edit .. //depot/projects/soc2010/bsdtextproc/src/usr.bin/Makefile#2 edit .. //depot/projects/soc2010/bsdtextproc/src/usr.bin/mandoc/Makefile#1 add Differences ... ==== //depot/projects/soc2010/bsdtextproc/src/gnu/usr.bin/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2010/bsdtextproc/src/share/mk/bsd.man.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.man.mk,v 1.57 2007/03/12 13:54:52 ru Exp $ +# $FreeBSD$ # # The include file handles installing manual pages and # their links. @@ -57,7 +57,8 @@ CATDIR= ${MANDIR:H:S/$/\/cat/} CATEXT= .cat -MROFF_CMD?= groff -Tascii -mtty-char -man -t +# XXX tbl support? +MROFF_CMD?= mandoc -Tascii -mandoc #-fstrict MCOMPRESS_CMD?= ${COMPRESS_CMD} MCOMPRESS_EXT?= ${COMPRESS_EXT} @@ -242,9 +243,9 @@ manlint: ${__page}lint ${__page}lint: ${__page} .if defined(MANFILTER) - ${MANFILTER} < ${.ALLSRC} | ${MROFF_CMD} -ww -z + ${MANFILTER} < ${.ALLSRC} | ${MROFF_CMD} -Tlint -Wall -fign-errors || true .else - ${MROFF_CMD} -ww -z ${.ALLSRC} + ${MROFF_CMD} -Tlint -Wall -fign-errors ${.ALLSRC} || true .endif .endfor .endif ==== //depot/projects/soc2010/bsdtextproc/src/usr.bin/Makefile#2 (text+ko) ==== @@ -1,409 +1,58 @@ -# From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.335 2010/06/09 19:57:20 rdivacky Exp $ +# $FreeBSD$ .include -# XXX MISSING: deroff diction graph learn plot -# spell spline struct xsend -# XXX Use GNU versions: apropos diff grep ld man patch whatis -# Moved to secure: bdes -# +SUBDIR= ${_binutils} \ + ${_cc} \ + ${_cvs} \ + dialog \ + diff \ + diff3 \ + ${_dtc} \ + ${_gdb} \ + ${_gperf} \ + ${_grep} \ + ${_groff} \ + patch \ + ${_rcs} \ + sdiff \ + send-pr \ + sort \ + ${_texinfo} -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 \ - ${_clang} \ - cmp \ - col \ - ${_colcrt} \ - colldef \ - colrm \ - column \ - comm \ - ${_compile_et} \ - compress \ - ${_cpio} \ - cpuset \ - csplit \ - ${_csup} \ - ${_ctags} \ - cut \ - ${_dc} \ - ${_dig} \ - dirname \ - du \ - ee \ - elf2aout \ - elfdump \ - enigma \ - env \ - expand \ - false \ - fetch \ - file \ - ${_file2c} \ - find \ - finger \ - fmt \ - fold \ - ${_from} \ - fstat \ - fsync \ - ftp \ - gcore \ - gencat \ - getconf \ - getent \ - getopt \ - ${_gprof} \ - gzip \ - head \ - ${_hesinfo} \ - hexdump \ - ${_host} \ - id \ - ${_indent} \ - ipcrm \ - ipcs \ - join \ - jot \ - kdump \ - keylogin \ - keylogout \ - killall \ - ktrace \ - ktrdump \ - lam \ - last \ - lastcomm \ - ldd \ - leave \ - less \ - lessecho \ - lesskey \ - ${_lex} \ - limits \ - locale \ - ${_locate} \ - lock \ - lockf \ - logger \ - login \ - logins \ - logname \ - look \ - lorder \ - lsvfs \ - lzmainfo \ - m4 \ - ${_mail} \ - ${_make} \ - ${_makewhatis} \ - mesg \ - minigzip \ - ministat \ - mkdep \ - mkfifo \ - mklocale \ - ${_mkstr} \ - mktemp \ - mkuzip \ - ${_msgs} \ - mt \ - ${_nc} \ - ncal \ - ${_ncplist} \ - ${_ncplogin} \ - netstat \ - newgrp \ - ${_newkey} \ - nfsstat \ - nice \ - nl \ - nohup \ - ${_nslookup} \ - ${_nsupdate} \ - opieinfo \ - opiekey \ - opiepasswd \ - pagesize \ - passwd \ - paste \ - pathchk \ - perror \ - pr \ - 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 \ - su \ - systat \ - tabs \ - tail \ - talk \ - tar \ - tcopy \ - tee \ - ${_telnet} \ - tftp \ - time \ - tip \ - top \ - touch \ - tput \ - tr \ - true \ - truncate \ - ${_truss} \ - tset \ - tsort \ - tty \ - ${_ul} \ - uname \ - unexpand \ - ${_unifdef} \ - uniq \ - unzip \ - units \ - unvis \ - ${_usbhidaction} \ - ${_usbhidctl} \ - users \ - uudecode \ - uuencode \ - ${_vacation} \ - ${_vgrind} \ - vi \ - vis \ - vmstat \ - w \ - wall \ - wc \ - what \ - whereis \ - which \ - who \ - whois \ - write \ - wtmpcvt \ - xargs \ - xinstall \ - ${_xlint} \ - ${_xstr} \ - xz \ - xzdec \ - ${_yacc} \ - yes \ - ${_ypcat} \ - ${_ypmatch} \ - ${_ypwhich} - -.if ${MACHINE_ARCH} != "arm" -_truss= truss +.if ${MK_CXX} != "no" +_gperf= gperf +.if ${MK_GROFF} != "no" +_groff= groff .endif - -# NB: keep these sorted by MK_* knobs - -.if ${MK_AT} != "no" -_at= at .endif -.if ${MK_ATM} != "no" -_atm= atm +.if ${MK_CVS} != "no" +_cvs= cvs .endif -.if ${MK_MAN_UTILS} != "no" -_catman= catman +.if ${MK_FDT} != "no" +_dtc= dtc .endif -.if ${MK_BIND_UTILS} != "no" -_dig= dig -_host= host -_nslookup= nslookup -_nsupdate= nsupdate +.if ${MK_GNU_GREP} != "no" +_grep= grep .endif -.if ${MK_BLUETOOTH} != "no" -_bluetooth= bluetooth +.if ${MK_INFO} != "no" +_texinfo= texinfo .endif -.if ${MK_BSD_CPIO} != "no" -_cpio= cpio -.endif - -.if ${MK_CALENDAR} != "no" -_calendar= calendar -.endif - -.if ${MK_CLANG} != "no" -_clang= clang -.endif - -.if ${MK_HESIOD} != "no" -_hesinfo= hesinfo +.if ${MK_RCS} != "no" +_rcs= rcs .endif -.if ${MK_OPENSSL} != "no" -_bc= bc -_chkey= chkey -_dc= dc -_newkey= newkey -.if ${MK_LIBTHR} != "no" -_csup= csup -.endif -.endif - -.if ${MK_LOCATE} != "no" -_locate= locate -.endif - -# XXX msgs? -.if ${MK_MAIL} != "no" -_biff= biff -_from= from -_mail= mail -_msgs= msgs -.endif - -.if ${MK_MAKE} != "no" -_make= make -.endif - -.if ${MK_MAN_UTILS} != "no" -_makewhatis= makewhatis -.endif - -.if ${MK_NETCAT} != "no" -_nc= nc -.endif - -.if ${MK_NIS} != "no" -_ypcat= ypcat -_ypmatch= ypmatch -_ypwhich= ypwhich -.endif - -.if ${MK_QUOTAS} != "no" -_quota= quota -.endif - -.if ${MK_RCMDS} != "no" -_rlogin= rlogin -_rsh= rsh -_ruptime= ruptime -_rwho= rwho -.endif - -.if ${MK_SENDMAIL} != "no" -_vacation= vacation -.endif - -.if ${MK_TELNET} != "no" -_telnet= telnet -.endif - -.if ${MK_TEXTPROC} != "no" -_checknr= checknr -_colcrt= colcrt -_ul= 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 -# XXX maybe under textproc? -_vgrind= vgrind -_yacc= yacc -.endif - -.if ${MK_USB} != "no" -_usbhidaction= usbhidaction -_usbhidctl= usbhidctl -.endif - -.if ${MACHINE_ARCH} == "i386" -.if ${MK_NCP} != "no" -_ncplist= ncplist -_ncplogin= ncplogin -.endif -_smbutil= smbutil -.endif - -.if ${MACHINE_ARCH} == "ia64" -_smbutil= smbutil -.endif - -.if ${MACHINE_ARCH} == "amd64" -.if ${MK_NCP} != "no" -_ncplist= ncplist -_ncplogin= ncplogin +_binutils= binutils +_cc= cc +.if ${MK_GDB} != "no" +_gdb= gdb .endif -_smbutil= smbutil -.endif - -.if ${MACHINE_ARCH} == "powerpc" -_smbutil= smbutil -.endif - -.if ${MACHINE_ARCH} == "sparc64" -_smbutil= smbutil .endif .include