ncurses: Add wide-character support

The man pages already indicated wide-character support, but the
libraries weren't properly implemented.  Also removed unneeded
libmytinfo.  It was an alias for libncurses and four makefiles
referenced both.

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index 6486907..0823acd 100644 (file)
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -1982,6 +1982,9 @@ TO_REMOVE+=/usr/include/openssl/eng_int.h
 TO_REMOVE+=/usr/include/openssl/ui_locl.h
 TO_REMOVE+=/usr/include/dev/disk/mpt/mpilib/mpi_inb.h
 TO_REMOVE+=/usr/share/misc/map3270
+TO_REMOVE+=/usr/lib/libmytinfo.a
+TO_REMOVE+=/usr/lib/libmytinfo.so
+TO_REMOVE+=/usr/lib/profile/libmytinfo.a
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/libdata/stallion/2681.sys

diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile
index 83fcd0d..5506060 100644 (file)
--- a/gnu/usr.bin/dialog/Makefile
+++ b/gnu/usr.bin/dialog/Makefile
@@ -1,13 +1,12 @@
 # Makefile for dialog
 # $FreeBSD: src/gnu/usr.bin/dialog/Makefile,v 1.8.2.1 2001/04/25 12:03:34 ru Exp $
-# $DragonFly: src/gnu/usr.bin/dialog/Makefile,v 1.2 2003/06/17 04:25:45 dillon Exp $
 
 SUBDIR=        TESTS
 
 PROG=   dialog
 WARNS?=        3
 
-DPADD+= $(LIBDIALOG) $(LIBNCURSES) $(LIBMYTINFO)
-LDADD+= -ldialog -lncurses -lmytinfo
+DPADD+= $(LIBDIALOG) $(LIBNCURSES)
+LDADD+= -ldialog -lncurses
 
 .include <bsd.prog.mk>

diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index b0dee1e..d5aeb03 100644 (file)
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -1,10 +1,12 @@
-# $DragonFly: src/lib/libncurses/Makefile,v 1.7 2005/03/12 19:13:54 eirikn Exp $
-
 SUBDIR=        \
        libform \
        libmenu \
        libncurses \
        libpanel \
+       libformw \
+       libmenuw \
+       libncursesw \
+       libpanelw \
        man
 
 .include <bsd.subdir.mk>

diff --git a/lib/libncurses/Makefile.inc b/lib/libncurses/Makefile.inc
index acc8a32..0c5c0ef 100644 (file)
--- a/lib/libncurses/Makefile.inc
+++ b/lib/libncurses/Makefile.inc
@@ -1,10 +1,24 @@
-# $DragonFly: src/lib/libncurses/Makefile.inc,v 1.6 2005/09/22 11:14:44 asmodai Exp $
-
 NCURSESDIR=    ${.CURDIR}/../../../contrib/ncurses
 
-CFLAGS+=       -I${NCURSESDIR}/include/
-CFLAGS+=       -I${.CURDIR}/../include/
-CFLAGS+=       -I${.CURDIR} -I${.OBJDIR}
+.if defined (ENABLE_WIDEC)
 CFLAGS+=       -D_XOPEN_SOURCE_EXTENDED
+CFLAGS+=       -DENABLE_WIDEC
+CFLAGS+=       -DSET_NCURSES_CH_T=cchar_t
+CFLAGS+=       -DSET_NEED_WCHAR_H=1
+LIB_SUFFIX=    w
+.else
+CFLAGS+=       -DSET_NCURSES_CH_T=chtype
+CFLAGS+=       -DSET_NEED_WCHAR_H=0
+LIB_SUFFIX=
+.endif
+
+CFLAGS+=       -I.
+CFLAGS+=       -I${NCURSESDIR}/include
+CFLAGS+=       -I${NCURSESDIR}/ncurses
+CFLAGS+=       -I${.CURDIR}/../include
+CFLAGS+=       -I${.CURDIR}
+CFLAGS+=       -I${.OBJDIR}
 
 SHLIB_MAJOR=   6
+
+TERMINFO_CAPS=  ${NCURSESDIR}/include/Caps

diff --git a/lib/libncurses/include/curses.head b/lib/libncurses/include/curses.head
index c57a7fb..6801b35 100644 (file)
--- a/lib/libncurses/include/curses.head
+++ b/lib/libncurses/include/curses.head
@@ -134,7 +134,7 @@
  * of the header incompatible.
  */
 #undef NCURSES_CH_T
-#define NCURSES_CH_T cchar_t
+#define NCURSES_CH_T SET_NCURSES_CH_T
 
 #if 0 && defined(_LP64)
 typedef unsigned chtype;
@@ -351,7 +351,7 @@ typedef     chtype  attr_t;         /* ...must be at least as wide as chtype */
 #include <libutf8.h>
 #endif
 
-#if 1
+#if SET_NEED_WCHAR_H
 #include <wchar.h>             /* ...to get mbstate_t, etc. */
 #endif
 

diff --git a/lib/libncurses/include/ncurses_cfg.h b/lib/libncurses/include/ncurses_cfg.h
index a1cdf82..a673c2e 100644 (file)
--- a/lib/libncurses/include/ncurses_cfg.h
+++ b/lib/libncurses/include/ncurses_cfg.h
@@ -69,6 +69,7 @@
 #define USE_LINKS 1
 #define BSD_TPUTS 1
 #define HAVE_LANGINFO_CODESET 1
+#ifdef ENABLE_WIDEC
 #define USE_WIDEC_SUPPORT 1
 #define HAVE_PUTWC 1
 #define HAVE_BTOWC 1
@@ -83,6 +84,7 @@
 #define HAVE_WCSTOMBS 1
 #define HAVE_MBSTOWCS 1
 #define NEED_WCHAR_H 1
+#endif
 #define HAVE_FSEEKO 1
 #define HAVE_CURSES_VERSION 1
 #define HAVE_HAS_KEY 1

diff --git a/lib/libncurses/libform/Makefile b/lib/libncurses/libform/Makefile
index de7da81..764956b 100644 (file)
--- a/lib/libncurses/libform/Makefile
+++ b/lib/libncurses/libform/Makefile
@@ -1,6 +1,4 @@
-# $DragonFly: src/lib/libncurses/libform/Makefile,v 1.5 2005/12/06 02:22:23 corecode Exp $
-
-LIB=    form
+LIB=    form${LIB_SUFFIX}
 
 .include "../Makefile.inc"
 
@@ -8,12 +6,12 @@ NCURSESFORMDIR= ${NCURSESDIR}/form ${.OBJDIR}
 
 .PATH: ${NCURSESFORMDIR}
 
-CFLAGS+=       -I${NCURSESDIR}/menu -I${NCURSESDIR}/ncurses
-
-TERMINFO_CAPS=  ${NCURSESDIR}/include/Caps
+CFLAGS+=       -I${NCURSESDIR}/menu
 
 ncurses_def.h:
-       sh ${NCURSESDIR}/include/MKncurses_def.sh ${NCURSESDIR}/include/ncurses_defs > ${.TARGET}
+       AWK=awk sh ${NCURSESDIR}/include/MKncurses_def.sh \
+         ${NCURSESDIR}/include/ncurses_defs > ${.TARGET}
+
 curses.h:
        cat ${.CURDIR}/../include/curses.head >$@
        sh ${NCURSESDIR}/include/MKkey_defs.sh $(TERMINFO_CAPS) >>$@
@@ -69,6 +67,8 @@ SRCS+=        \
        fty_num.c \
        fty_regex.c
 
+.if defined(ENABLE_WIDEC)
 INCS=  form.h
+.endif
 
 .include <bsd.lib.mk>

diff --git a/lib/libncurses/libformw/Makefile b/lib/libncurses/libformw/Makefile
new file mode 100644 (file)
index 0000000..a83b2bb
--- /dev/null
+++ b/lib/libncurses/libformw/Makefile
@@ -0,0 +1,3 @@
+ENABLE_WIDEC=
+
+.include "${.CURDIR}/../libform/Makefile"

diff --git a/lib/libncurses/libmenu/Makefile b/lib/libncurses/libmenu/Makefile
index 7ea2486..5baf2eb 100644 (file)
--- a/lib/libncurses/libmenu/Makefile
+++ b/lib/libncurses/libmenu/Makefile
@@ -1,6 +1,4 @@
-# $DragonFly: src/lib/libncurses/libmenu/Makefile,v 1.5 2005/12/06 02:22:23 corecode Exp $
-
-LIB=    menu
+LIB=    menu${LIB_SUFFIX}
 
 .include "../Makefile.inc"
 
@@ -8,12 +6,12 @@ NCURSESMENUDIR= ${NCURSESDIR}/menu ${.OBJDIR}
 
 .PATH: ${NCURSESMENUDIR}
 
-CFLAGS+=       -I${NCURSESDIR}/menu -I${NCURSESDIR}/ncurses
-
-TERMINFO_CAPS=  ${NCURSESDIR}/include/Caps
+CFLAGS+=       -I${NCURSESDIR}/menu
 
 ncurses_def.h:
-       sh ${NCURSESDIR}/include/MKncurses_def.sh ${NCURSESDIR}/include/ncurses_defs > ${.TARGET}
+       AWK=awk sh ${NCURSESDIR}/include/MKncurses_def.sh \
+         ${NCURSESDIR}/include/ncurses_defs > ${.TARGET}
+
 curses.h:
        cat ${.CURDIR}/../include/curses.head >$@
        sh ${NCURSESDIR}/include/MKkey_defs.sh $(TERMINFO_CAPS) >>$@
@@ -55,6 +53,8 @@ SRCS+=        \
        m_userptr.c \
        m_win.c
 
+.if defined(ENABLE_WIDEC)
 INCS=  menu.h eti.h
+.endif
 
 .include <bsd.lib.mk>

diff --git a/lib/libncurses/libmenuw/Makefile b/lib/libncurses/libmenuw/Makefile
new file mode 100644 (file)
index 0000000..95a290a
--- /dev/null
+++ b/lib/libncurses/libmenuw/Makefile
@@ -0,0 +1,3 @@
+ENABLE_WIDEC=
+
+.include "${.CURDIR}/../libmenu/Makefile"

diff --git a/lib/libncurses/libncurses/Makefile b/lib/libncurses/libncurses/Makefile
index 1c2c2b6..65d54de 100644 (file)
--- a/lib/libncurses/libncurses/Makefile
+++ b/lib/libncurses/libncurses/Makefile
@@ -1,4 +1,4 @@
-LIB=    ncurses
+LIB=    ncurses${LIB_SUFFIX}
 
 .include "../Makefile.inc"
 
@@ -7,39 +7,38 @@ NCURSESSERIALDIR=${NCURSESDIR}/ncurses/tty
 NCURSESTINFODIR=${NCURSESDIR}/ncurses/tinfo
 NCURSESTRACEDIR=${NCURSESDIR}/ncurses/trace
 NCURSESWCHARDIR=${NCURSESDIR}/ncurses/widechar
-.PATH: ${NCURSESBASEDIR} ${NCURSESSERIALDIR} ${NCURSESTINFODIR} \
-       ${NCURSESTRACEDIR} ${NCURSESWCHARDIR} ${.OBJDIR} ${.CURDIR}/../include \
-       ${NCURSESDIR}/include/
+.PATH: ${NCURSESBASEDIR} ${NCURSESSERIALDIR} ${NCURSESTINFODIR} ${NCURSESTRACEDIR} \
+       ${.OBJDIR} ${.CURDIR}/../include ${NCURSESDIR}/include/
 
-CFLAGS+=       -I${NCURSESDIR}/ncurses/
 CFLAGS+=       -DTRACE
 CFLAGS+=       -DUSE_GETCAP
 CFLAGS+=       -DDRAGONFLY_NATIVE
 
-TERMINFO_CAPS=  ${NCURSESDIR}/include/Caps
 ncurses_def.h:
-       sh ${NCURSESDIR}/include/MKncurses_def.sh ${NCURSESDIR}/include/ncurses_defs > ${.TARGET}
+       AWK=awk sh ${NCURSESDIR}/include/MKncurses_def.sh \
+         ${NCURSESDIR}/include/ncurses_defs > ${.TARGET}
+
 curses.h: $(TERMINFO_CAPS) \
                curses.head \
                ${NCURSESDIR}/include/curses.tail \
                ${NCURSESDIR}/include//MKkey_defs.sh
        cat  ${.CURDIR}/../include/curses.head >$@
        AWK=awk sh ${NCURSESDIR}/include/MKkey_defs.sh $(TERMINFO_CAPS) >>$@
-       sh -c 'if test "cchar_t" = "cchar_t" ; then cat ${NCURSESDIR}/include/curses.wide >>$@ ; fi'
+.if defined(ENABLE_WIDEC)
+       cat ${NCURSESDIR}/include/curses.wide >>$@
+.endif
        cat ${NCURSESDIR}/include/curses.tail >>$@
 
-#curses.h: curses.head curses.tail
-#      cat ${.CURDIR}/../include/curses.head >$@
-#      sh ${NCURSESDIR}/include/MKkey_defs.sh $(TERMINFO_CAPS) >>$@
-#      cat ${NCURSESDIR}/include/curses.wide >>$@
-#      cat ${NCURSESDIR}/include/curses.tail >>$@
 term.h: MKterm.h.awk ncurses_cfg.h
        awk -f ${.CURDIR}/../include/MKterm.h.awk ${TERMINFO_CAPS} > $@
        sh ${NCURSESDIR}/include/edit_cfg.sh ${.CURDIR}/../include/ncurses_cfg.h $@
+
 hashsize.h:
        sh ${NCURSESDIR}/include/MKhashsize.sh ${TERMINFO_CAPS} >$@
+
 parametrized.h:
        sh ${NCURSESDIR}/include/MKparametrized.sh ${TERMINFO_CAPS} >$@
+
 init_keytry.h: make_keys keys.list
        ./make_keys keys.list > $@
 
@@ -51,10 +50,10 @@ keys.list:
 
 names.c: ${NCURSESTINFODIR}/MKnames.awk
        awk -f ${NCURSESTINFODIR}/MKnames.awk bigstrings=$(USE_BIG_STRINGS) ${TERMINFO_CAPS} >$@
-       #cat namehdr boolnames boolfnames numnames numfnames strnames strfnames nameftr >names.c
-       #cat namehdr boolcodes numcodes strcodes codeftr >codes.c
+
 codes.c: ${NCURSESTINFODIR}/MKcodes.awk
        awk -f ${NCURSESTINFODIR}/MKcodes.awk bigstrings=$(USE_BIG_STRINGS) ${TERMINFO_CAPS} >$@
+
 comp_captab.c: make_hash
        sh -e ${NCURSESTINFODIR}/MKcaptab.sh awk 0 ${NCURSESTINFODIR}/MKcaptab.awk ${TERMINFO_CAPS} > $@
 
@@ -248,6 +247,8 @@ SRCS+=      \
        visbuf.c \
 
 # Widechar
+.if defined(ENABLE_WIDEC)
+.PATH: ${NCURSESWCHARDIR}
 SRCS+= \
        charable.c \
        lib_add_wch.c \
@@ -269,6 +270,7 @@ SRCS+=      \
        lib_vline_set.c \
        lib_wacs.c \
        lib_wunctrl.c
+.endif
 
 # Generated
 SRCS+= \
@@ -281,43 +283,44 @@ SRCS+=    \
        names.c \
        unctrl.c
 
-SYMLINKS+=libncurses.a ${LIBDIR}/libcurses.a
-SYMLINKS+=libncurses.a ${LIBDIR}/libtinfo.a
-SYMLINKS+=libncurses.a ${LIBDIR}/libmytinfo.a
-SYMLINKS+=libncurses.a ${LIBDIR}/libtermlib.a
-SYMLINKS+=libncurses.a ${LIBDIR}/libtermcap.a
+SYMLINKS+=libncurses${LIB_SUFFIX}.a ${LIBDIR}/libcurses${LIB_SUFFIX}.a
+SYMLINKS+=libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermcap${LIB_SUFFIX}.a
+SYMLINKS+=libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermlib${LIB_SUFFIX}.a
+SYMLINKS+=libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtinfo${LIB_SUFFIX}.a
 .if !defined(NOPIC)
 # no need for major at all, it's an ld-time redirection only
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libcurses.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtermcap.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtermlib.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libmytinfo.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtinfo.so
+SYMLINKS+=libncurses${LIB_SUFFIX}.so ${SHLIBDIR}/libcurses${LIB_SUFFIX}.so
+SYMLINKS+=libncurses${LIB_SUFFIX}.so ${SHLIBDIR}/libtermcap${LIB_SUFFIX}.so
+SYMLINKS+=libncurses${LIB_SUFFIX}.so ${SHLIBDIR}/libtermlib${LIB_SUFFIX}.so
+SYMLINKS+=libncurses${LIB_SUFFIX}.so ${SHLIBDIR}/libtinfo${LIB_SUFFIX}.so
 .endif
 .if !defined(NOPROFILE)
-SYMLINKS+=libncurses.a ${PROFLIBDIR}/libcurses.a
-SYMLINKS+=libncurses.a ${PROFLIBDIR}/libtermcap.a
-SYMLINKS+=libncurses.a ${PROFLIBDIR}/libtermlib.a
-SYMLINKS+=libncurses.a ${PROFLIBDIR}/libmytinfo.a
-SYMLINKS+=libncurses.a ${PROFLIBDIR}/libtinfo.a
+SYMLINKS+=libncurses${LIB_SUFFIX}.a ${PROFLIBDIR}/libcurses${LIB_SUFFIX}.a
+SYMLINKS+=libncurses${LIB_SUFFIX}.a ${PROFLIBDIR}/libtermcap${LIB_SUFFIX}.a
+SYMLINKS+=libncurses${LIB_SUFFIX}.a ${PROFLIBDIR}/libtermlib${LIB_SUFFIX}.a
+SYMLINKS+=libncurses${LIB_SUFFIX}.a ${PROFLIBDIR}/libtinfo${LIB_SUFFIX}.a
 .endif
 
-INCS=  term.h ${.CURDIR}/../include/termcap.h \
+XINCS= term.h ${.CURDIR}/../include/termcap.h \
        ${.CURDIR}/../include/unctrl.h curses.h \
        ${.CURDIR}/../include/ncurses_dll.h
+
+.if defined(ENABLE_WIDEC)
+INCS= ${XINCS}
 INCSLINKS=curses.h ${INCLUDEDIR}/ncurses.h
+.endif
 
 # Make the generated files depend on the headers, otherwise
 # the make depend step cannot run -j parallel due to not yet
 # knowing what the actual dependencies are.
 #
-codes.c: ${INCS}
-comp_captab.c: ${INCS}
-expanded.c: ${INCS}
-fallback.c: ${INCS}
-lib_gen.c: ${INCS}
-lib_keyname.c: ${INCS}
-names.c: ${INCS}
-unctrl.c: ${INCS}
+codes.c: ${XINCS}
+comp_captab.c: ${XINCS}
+expanded.c: ${XINCS}
+fallback.c: ${XINCS}
+lib_gen.c: ${XINCS}
+lib_keyname.c: ${XINCS}
+names.c: ${XINCS}
+unctrl.c: ${XINCS}
 
 .include <bsd.lib.mk>

diff --git a/lib/libncurses/libncursesw/Makefile b/lib/libncurses/libncursesw/Makefile
new file mode 100644 (file)
index 0000000..d34d040
--- /dev/null
+++ b/lib/libncurses/libncursesw/Makefile
@@ -0,0 +1,5 @@
+ENABLE_WIDEC=
+
+.PATH: ${.CURDIR}/../libncurses
+
+.include "${.CURDIR}/../libncurses/Makefile"

diff --git a/lib/libncurses/libpanel/Makefile b/lib/libncurses/libpanel/Makefile
index 3b9c2dd..111efa6 100644 (file)
--- a/lib/libncurses/libpanel/Makefile
+++ b/lib/libncurses/libpanel/Makefile
@@ -1,6 +1,4 @@
-# $DragonFly: src/lib/libncurses/libpanel/Makefile,v 1.5 2005/12/06 02:22:23 corecode Exp $
-
-LIB=    panel
+LIB=    panel${LIB_SUFFIX}
 
 .include "../Makefile.inc"
 
@@ -8,12 +6,12 @@ NCURSESPANELDIR=${NCURSESDIR}/panel ${.OBJDIR}
 
 .PATH: ${NCURSESPANELDIR}
 
-CFLAGS+=       -I${NCURSESDIR}/menu -I${NCURSESDIR}/ncurses
-
-TERMINFO_CAPS=  ${NCURSESDIR}/include/Caps
+CFLAGS+=       -I${NCURSESDIR}/menu
 
 ncurses_def.h:
-       sh ${NCURSESDIR}/include/MKncurses_def.sh ${NCURSESDIR}/include/ncurses_defs > ${.TARGET}
+       AWK=awk sh ${NCURSESDIR}/include/MKncurses_def.sh \
+         ${NCURSESDIR}/include/ncurses_defs > ${.TARGET}
+
 curses.h:
        cat ${.CURDIR}/../include/curses.head >$@
        sh ${NCURSESDIR}/include/MKkey_defs.sh $(TERMINFO_CAPS) >>$@

diff --git a/lib/libncurses/libpanelw/Makefile b/lib/libncurses/libpanelw/Makefile
new file mode 100644 (file)
index 0000000..0aaceba
--- /dev/null
+++ b/lib/libncurses/libpanelw/Makefile
@@ -0,0 +1,3 @@
+ENABLE_WIDEC=
+
+.include "${.CURDIR}/../libpanel/Makefile"

diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 6ae787a..c3dff0c 100644 (file)
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -24,6 +24,7 @@ LIBCRYPT?=    ${DESTDIR}${LIBDIR}/libcrypt.a
 LIBCRYPTO?=    ${DESTDIR}${LIBDIR}/libcrypto.a # XXX in secure dist, not base
 LIBCRYPTSETUP?=        ${DESTDIR}${LIBDIR}/libcryptsetup.a
 LIBCURSES?=    ${DESTDIR}${LIBDIR}/libcurses.a
+LIBCURSESW?=   ${DESTDIR}${LIBDIR}/libcursesw.a
 LIBDEVATTR?=   ${DESTDIR}${LIBDIR}/libdevattr.a
 LIBDEVINFO?=   ${DESTDIR}${LIBDIR}/libdevinfo.a
 LIBDEVMAPPER?= ${DESTDIR}${LIBDIR}/libdevmapper.a
@@ -57,7 +58,7 @@ LIBMENU?=     ${DESTDIR}${LIBDIR}/libmenu.a
 .if !defined(NO_SENDMAIL)
 LIBMILTER?=    ${DESTDIR}${LIBDIR}/libmilter.a
 .endif
-LIBMYTINFO?=   ${DESTDIR}${LIBDIR}/libmytinfo.a
+LIBMYTINFO?=   "don't use LIBMYTINFO, use LIBNCURSES"
 LIBNCP?=       ${DESTDIR}${LIBDIR}/libncp.a
 LIBNCURSES?=   ${DESTDIR}${LIBDIR}/libncurses.a
 LIBNETGRAPH?=  ${DESTDIR}${LIBDIR}/libnetgraph.a

diff --git a/usr.sbin/stallion/stlstats/Makefile b/usr.sbin/stallion/stlstats/Makefile
index f64d69c..725ad54 100644 (file)
--- a/usr.sbin/stallion/stlstats/Makefile
+++ b/usr.sbin/stallion/stlstats/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD: src/usr.sbin/stallion/stlstats/Makefile,v 1.6.2.2 2001/04/25 12:10:59 ru Exp $
-# $DragonFly: src/usr.sbin/stallion/stlstats/Makefile,v 1.2 2003/06/17 04:30:03 dillon Exp $
 
 PROG=  stlstats
 MAN=   stlstats.8
 MANSUBDIR=/i386
 WARNS?= 2
 
-DPADD= ${LIBNCURSES} ${LIBMYTINFO}
-LDADD= -lncurses -lmytinfo
+DPADD= ${LIBNCURSES}
+LDADD= -lncurses
 
 .include <bsd.prog.mk>

diff --git a/usr.sbin/stallion/stlstty/Makefile b/usr.sbin/stallion/stlstty/Makefile
index 9655d52..990a146 100644 (file)
--- a/usr.sbin/stallion/stlstty/Makefile
+++ b/usr.sbin/stallion/stlstty/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD: src/usr.sbin/stallion/stlstty/Makefile,v 1.1.2.1 2001/08/30 12:29:56 murray Exp $
-# $DragonFly: src/usr.sbin/stallion/stlstty/Makefile,v 1.2 2003/06/17 04:30:03 dillon Exp $
 
 PROG=  stlstty
 MAN=   stlstty.8
 MANSUBDIR=/i386
 WARNS?= 3
 
-DPADD= ${LIBNCURSES} ${LIBMYTINFO}
-LDADD= -lncurses -lmytinfo
+DPADD= ${LIBNCURSES}
+LDADD= -lncurses
 
 .include <bsd.prog.mk>

diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile
index 8edde07..5eb2846 100644 (file)
--- a/usr.sbin/tzsetup/Makefile
+++ b/usr.sbin/tzsetup/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD: src/usr.sbin/tzsetup/Makefile,v 1.10.2.1 2001/04/25 12:11:07 ru Exp $
-# $DragonFly: src/usr.sbin/tzsetup/Makefile,v 1.2 2003/06/17 04:30:03 dillon Exp $
 
 PROG=  tzsetup
 MAN=   tzsetup.8
 CFLAGS+=       -I${.CURDIR}
-LDADD+=        -ldialog -lncurses -lmytinfo
-DPADD+=        ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO}
+LDADD+=        -ldialog -lncurses
+DPADD+=        ${LIBDIALOG} ${LIBNCURSES}
 WARNS?=        2
 
 .include <bsd.prog.mk>