diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/Makefile | 1 | ||||
| -rwxr-xr-x | usr.bin/man/man.sh | 19 | ||||
| -rw-r--r-- | usr.bin/mandoc/Makefile | 15 | ||||
| -rw-r--r-- | usr.bin/preconv/Makefile | 9 |
4 files changed, 16 insertions, 28 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 88628fb..2e54cdf 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -133,7 +133,6 @@ SUBDIR= ${_addr2line} \ pathchk \ perror \ pr \ - preconv \ printenv \ printf \ procstat \ diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 2531c9a..de03f40 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -279,7 +279,7 @@ man_check_for_so() { # Usage: man_display_page # Display either the manpage or catpage depending on the use_cat variable man_display_page() { - local IFS pipeline preconv_enc testline + local IFS pipeline testline # We are called with IFS set to colon. This causes really weird # things to happen for the variables that have spaces in them. @@ -311,21 +311,8 @@ man_display_page() { return fi - case "${manpage}" in - *.${man_charset}/*) - case "$man_charset" in - ISO8859-1) preconv_enc="latin-1" ;; - ISO8859-15) preconv_enc="latin-1" ;; - UTF-8) preconv_enc="utf-8" ;; - esac - ;; - esac - - if [ -n "$preconv_enc" ]; then - pipeline="preconv -e $preconv_enc |" - fi - testline="$pipeline mandoc -Tlint -Werror 2>/dev/null" - pipeline="$pipeline mandoc -Tlocale | $MANPAGER" + testline="mandoc -Tlint -Werror 2>/dev/null" + pipeline="mandoc -Tlocale | $MANPAGER" if ! eval "$cattool $manpage | $testline" ;then if which -s groff; then diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile index ef3c05f..a5d871b 100644 --- a/usr.bin/mandoc/Makefile +++ b/usr.bin/mandoc/Makefile @@ -15,7 +15,9 @@ HTML_SRCS= eqn_html.c \ man_html.c \ mdoc_html.c \ tbl_html.c + MAN_SRCS= mdoc_man.c + TERM_SRCS= eqn_term.c \ man_term.c \ mdoc_term.c \ @@ -23,6 +25,7 @@ TERM_SRCS= eqn_term.c \ term_ascii.c \ term_ps.c \ tbl_term.c + SRCS= ${HTML_SRCS} \ ${MAN_SRCS} \ ${TERM_SRCS} \ @@ -30,8 +33,16 @@ SRCS= ${HTML_SRCS} \ out.c \ tree.c +APROPOS_SRCS= mansearch.c \ + mansearch_const.c \ + manpath.c + +SRCS+= ${APROPOS_SRCS} + WARNS?= 3 -CFLAGS+= -DHAVE_CONFIG_H -LIBADD= mandoc +CFLAGS+= -DHAVE_CONFIG_H \ + -I${.CURDIR}/../../lib/libohash/ \ + -I${.CURDIR}/../../contrib/sqlite3 +LIBADD= mandoc ohash sqlite3 .include <bsd.prog.mk> diff --git a/usr.bin/preconv/Makefile b/usr.bin/preconv/Makefile deleted file mode 100644 index 40b53c8..0000000 --- a/usr.bin/preconv/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -.PATH: ${.CURDIR}/../../contrib/mdocml - -PROG= preconv - -WARNS?= 5 - -.include <bsd.prog.mk> |
