libedit: Privatize the last public header.
authorzrj <rimvydas.jasinskas@gmail.com>
Tue, 30 Apr 2019 07:28:00 +0000 (10:28 +0300)
committerzrj <zrj@dragonflybsd.org>
Tue, 30 Apr 2019 10:11:43 +0000 (13:11 +0300)
Adjust all cases to include correct histedit.h header.

15 files changed:
Makefile_upgrade.inc
bin/sh/Makefile
gnu/sbin/lvm/Makefile
lib/libedit/libedit/Makefile
sbin/fsdb/Makefile
sbin/vinum/Makefile
usr.bin/bc/Makefile
usr.bin/ftp/Makefile
usr.bin/sftp/Makefile
usr.bin/tftp/Makefile
usr.bin/units/Makefile
usr.sbin/cdcontrol/Makefile
usr.sbin/lpr/Makefile.inc
usr.sbin/lpr/lpc/Makefile
usr.sbin/pppctl/Makefile

index e1d83f2..14e7ea1 100644 (file)
@@ -3646,6 +3646,7 @@ TO_REMOVE+=/usr/lib/profile/libcipher.a
 TO_REMOVE+=/usr/share/man/man3/cipher.3.gz
 TO_REMOVE+=/usr/share/man/man3/des_cipher.3.gz
 TO_REMOVE+=/usr/share/man/man3/des_setkey.3.gz
+TO_REMOVE+=/usr/include/histedit.h
 
 .if !defined(WANT_INSTALLER)
 TO_REMOVE+=/usr/sbin/dfuibe_installer
index 71fd608..2356370 100644 (file)
@@ -30,6 +30,7 @@ CFLAGS+=-DSHELL -I. -I${.CURDIR}
 CFLAGS+= -DNO_HISTORY
 # LIBEDIT is not needed here
 .else
+CFLAGS+= ${PRIVATELIB_CFLAGS}
 DPADD= ${LIBEDIT} ${LIBNCURSES}
 LDADD= ${LIBEDIT} ${LIBNCURSES}
 .endif
index 9ca6393..c885159 100644 (file)
@@ -34,9 +34,10 @@ CFLAGS+=     -Wno-stack-protector
 # Do not build readline support for the rescue version.
 #
 .if !defined(RESCUE)
-CFLAGS+=       -DREADLINE_SUPPORT -I${_SHLIBDIRPREFIX}/usr/include/priv
-LDADD+=                -lprivate_edit -lprivate_ncurses
+CFLAGS+=       -DREADLINE_SUPPORT
+CFLAGS+=       ${PRIVATELIB_CFLAGS}
 DPADD+=                ${LIBEDIT} ${LIBNCURSES}
+LDADD+=                -lprivate_edit -lprivate_ncurses
 LDFLAGS+=      ${PRIVATELIB_LDFLAGS}
 .endif
 
index 81d726a..26dd106 100644 (file)
@@ -48,6 +48,7 @@ SRCS+=                common.h emacs.h fcns.h help.h vi.h
 SRCS+=         fcns.c help.c tokenizern.c historyn.c
 
 INCS=          histedit.h
+INCSDIR=       ${INCLUDEDIR}/priv
 
 MAN=           editrc.5
 
index 4791844..bb2bc86 100644 (file)
@@ -8,8 +8,10 @@ SRCS=  fsdb.c fsdbutil.c \
        dir.c inode.c memzone.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
        pass5.c preen.c setup.c utilities.c ffs_subr.c ffs_tables.c
 CFLAGS+= -I${.CURDIR}/../fsck
-LDADD+= -lprivate_edit -lprivate_ncurses
-DPADD+=        ${LIBEDIT} ${LIBNCURSES}
+
+CFLAGS+=       ${PRIVATELIB_CFLAGS}
+DPADD+=                ${LIBEDIT} ${LIBNCURSES}
+LDADD+=                -lprivate_edit -lprivate_ncurses
 LDFLAGS+=      ${PRIVATELIB_LDFLAGS}
 
 .PATH: ${.CURDIR}/../fsck ${.CURDIR}/../../sys/vfs/ufs
index acac4cb..f41c287 100644 (file)
@@ -5,11 +5,14 @@ SRCS= v.c list.c vinumparser.c vinumutil.c vext.h commands.c
 MAN=   vinum.8
 WARNS?=        2
 
-CFLAGS+=       -I${.CURDIR}/../../lib/libedit -I${.CURDIR}/../../sys
-DPADD=         ${LIBEDIT} ${LIBNCURSES} ${LIBDEVSTAT}
-LDADD=         -lprivate_edit -lprivate_ncurses -ldevstat
+# for <dev/raid/vinum/vinumhdr.h>
+CFLAGS+=       -I${.CURDIR}/../../sys
+DPADD=         ${LIBDEVSTAT}
+LDADD=         -ldevstat
 
-CFLAGS+=       -I${_SHLIBDIRPREFIX}/usr/include/priv
+CFLAGS+=       ${PRIVATELIB_CFLAGS}
+DPADD+=                ${LIBEDIT} ${LIBNCURSES}
+LDADD+=                -lprivate_edit -lprivate_ncurses
 LDFLAGS+=      ${PRIVATELIB_LDFLAGS}
 
 .include <bsd.prog.mk>
index 8f1652f..ece3c80 100644 (file)
@@ -5,6 +5,7 @@ SRCS=           bc.y scan.l tty.c y.tab.h
 CFLAGS+=       -I. -I${.CURDIR}
 WARNS?=                3
 
+CFLAGS+=       ${PRIVATELIB_CFLAGS}
 DPADD=         ${LIBEDIT} ${LIBNCURSES}
 LDADD=         -lprivate_edit -lprivate_ncurses
 LDFLAGS+=      ${PRIVATELIB_LDFLAGS}
index 51a919e..a7aed7a 100644 (file)
@@ -20,13 +20,19 @@ CFLAGS+=-I${.CURDIR} -I${.OBJDIR} -I${CONTRIBDIR} \
 # Avoid symbol conflict with ncurses(lib_trace.c:void trace(unsigned))
 CFLAGS+=-Dtrace=ftp_trace
 
-LDADD= -lprivate_edit -lprivate_ncurses -lutil
-DPADD= ${LIBEDIT} ${LIBNCURSES} ${LIBUTIL}
+LDADD= -lutil
+DPADD= ${LIBUTIL}
 
+# for <termcap.h>
 CFLAGS+=       -I${_SHLIBDIRPREFIX}/usr/include/priv/ncurses
+
+LDADD+=                -lprivate_edit -lprivate_ncurses
+DPADD+=                ${LIBEDIT} ${LIBNCURSES}
+
+CFLAGS+=       ${PRIVATELIB_CFLAGS}
 LDFLAGS+=      ${PRIVATELIB_LDFLAGS}
 
-CFLAGS+=       -DWITH_SSL -I${.CURDIR}/../../crypto/libressl/include
+CFLAGS+=       -DWITH_SSL
 LDADD+=                -lprivate_ssl -lprivate_crypto
 DPADD+=                ${LIBSSL} ${LIBCRYPTO}
 
index 9dc0ac3..008b9ad 100644 (file)
@@ -7,10 +7,14 @@ SRCS+=        progressmeter.c sftp-client.c sftp-common.c sftp-glob.c
 WARNS?=        3
 
 CFLAGS+=       -I${.CURDIR}/../../lib/libssh -I${.CURDIR}/../../crypto/openssh
-CFLAGS+=       -I${.CURDIR}/../../crypto/libressl/include
 
-DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBEDIT} ${LIBNCURSES}
-LDADD= -lprivate_ssh -lprivate_crypto -lutil -lz -lprivate_edit -lprivate_ncurses
-LDFLAGS+=      -rpath /usr/lib/priv ${PRIVATELIB_LDFLAGS}
+DPADD=         ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
+LDADD=         -lprivate_ssh -lprivate_crypto -lutil -lz
+
+CFLAGS+=       ${PRIVATELIB_CFLAGS}
+LDFLAGS+=      ${PRIVATELIB_LDFLAGS}
+
+DPADD+=                ${LIBEDIT} ${LIBNCURSES}
+LDADD+=                -lprivate_edit -lprivate_ncurses
 
 .include <bsd.prog.mk>
index a4a7125..500ac8e 100644 (file)
@@ -2,9 +2,12 @@
 
 PROG=  tftp
 SRCS=  main.c tftp.c tftpsubs.c
-DPADD= ${LIBEDIT} ${LIBNCURSES}
-LDADD= -lprivate_edit -lprivate_ncurses
-LDFLAGS+=      ${PRIVATELIB_LDFLAGS}
+
 NO_WARRAY_BOUNDS=
 
+CFLAGS+=       ${PRIVATELIB_CFLAGS}
+DPADD+=                ${LIBEDIT} ${LIBNCURSES}
+LDADD+=                -lprivate_edit -lprivate_ncurses
+LDFLAGS+=      ${PRIVATELIB_LDFLAGS}
+
 .include <bsd.prog.mk>
index 348f1ee..d014b7b 100644 (file)
@@ -6,8 +6,9 @@ FILES=  units.lib
 FILESDIR=      ${SHAREDIR}/misc
 .endif
 
-LDADD+=        -lprivate_edit -lprivate_ncurses
-DPADD+=        ${LIBEDIT} ${LIBNCURSES}
+CFLAGS+=       ${PRIVATELIB_CFLAGS}
+DPADD+=                ${LIBEDIT} ${LIBNCURSES}
+LDADD+=                -lprivate_edit -lprivate_ncurses
 LDFLAGS+=      ${PRIVATELIB_LDFLAGS}
 
 .include <bsd.prog.mk>
index b0697ba..28f5441 100644 (file)
@@ -2,8 +2,9 @@
 
 PROG= cdcontrol
 
-DPADD= ${LIBEDIT} ${LIBNCURSES}
-LDADD= -lprivate_edit -lprivate_ncurses
+CFLAGS+=       ${PRIVATELIB_CFLAGS}
+DPADD+=                ${LIBEDIT} ${LIBNCURSES}
+LDADD+=                -lprivate_edit -lprivate_ncurses
 LDFLAGS+=      ${PRIVATELIB_LDFLAGS}
 
 .include <bsd.prog.mk>
index 034f0a5..db55299 100644 (file)
@@ -1,5 +1,4 @@
 # $FreeBSD: src/usr.sbin/lpr/Makefile.inc,v 1.5.2.2 2002/02/01 01:03:39 gad Exp $
-# $DragonFly: src/usr.sbin/lpr/Makefile.inc,v 1.3 2008/10/29 18:18:04 swildner Exp $
 
 CFLAGS+= -DINET6
 WARNS?=         2
index cec1e2d..9f9dd33 100644 (file)
@@ -5,14 +5,18 @@
 
 PROG=  lpc
 MAN=   lpc.8
-SRCS=  lpc.c cmds.c cmdtab.c movejobs.c 
+SRCS=  lpc.c cmds.c cmdtab.c movejobs.c
 BINGRP=        daemon
 BINMODE= 2555
 
 CFLAGS+= -I${.CURDIR}/../common_source
 
-DPADD= ${LIBLPR} ${LIBEDIT} ${LIBNCURSES}
-LDADD= ${LIBLPR} -lprivate_edit -lprivate_ncurses
+DPADD= ${LIBLPR}
+LDADD= ${LIBLPR}
+
+CFLAGS+=       ${PRIVATELIB_CFLAGS}
+DPADD+=                ${LIBEDIT} ${LIBNCURSES}
+LDADD+=                -lprivate_edit -lprivate_ncurses
 LDFLAGS+=      ${PRIVATELIB_LDFLAGS}
 
 .include <bsd.prog.mk>
index 6114be1..bd29760 100644 (file)
@@ -3,8 +3,10 @@
 PROG=  pppctl
 MAN=   pppctl.8
 WARNS?=        2
-LDADD+= -lprivate_edit -lprivate_ncurses
-DPADD+= ${LIBEDIT} ${LIBNCURSES}
+
+CFLAGS+=       ${PRIVATELIB_CFLAGS}
+DPADD+=                ${LIBEDIT} ${LIBNCURSES}
+LDADD+=                -lprivate_edit -lprivate_ncurses
 LDFLAGS+=      ${PRIVATELIB_LDFLAGS}
 
 .include <bsd.prog.mk>