diff options
author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.sbin/lpr | |
parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz |
Merge head from 7/28
Diffstat (limited to 'usr.sbin/lpr')
-rw-r--r-- | usr.sbin/lpr/chkprintcap/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/lpr/chkprintcap/chkprintcap.8 | 2 | ||||
-rw-r--r-- | usr.sbin/lpr/lpc/Makefile | 6 | ||||
-rw-r--r-- | usr.sbin/lpr/lpc/Makefile.depend | 2 | ||||
-rw-r--r-- | usr.sbin/lpr/lpd/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/lpr/lpq/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/lpr/lpr/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/lpr/lprm/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/lpr/pac/Makefile | 2 |
9 files changed, 18 insertions, 4 deletions
diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile index ffffffb..1ea2254 100644 --- a/usr.sbin/lpr/chkprintcap/Makefile +++ b/usr.sbin/lpr/chkprintcap/Makefile @@ -11,4 +11,6 @@ CFLAGS+= -I${.CURDIR}/../common_source DPADD= ${LIBLPR} LDADD= ${LIBLPR} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.8 b/usr.sbin/lpr/chkprintcap/chkprintcap.8 index c2524a1..b415462 100644 --- a/usr.sbin/lpr/chkprintcap/chkprintcap.8 +++ b/usr.sbin/lpr/chkprintcap/chkprintcap.8 @@ -88,7 +88,7 @@ capability in the database (default 1, which corresponds to user The .Nm utility was written by -.An Garrett A. Wollman Aq wollman@lcs.mit.edu . +.An Garrett A. Wollman Aq Mt wollman@lcs.mit.edu . .Sh BUGS Not enough sanity-checking is done. At a minimum, the ownership and diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile index 35fa52a..7f228d6 100644 --- a/usr.sbin/lpr/lpc/Makefile +++ b/usr.sbin/lpr/lpc/Makefile @@ -13,7 +13,9 @@ CFLAGS+= -I${.CURDIR}/../common_source WARNS?= 0 -DPADD= ${LIBLPR} ${LIBEDIT} ${LIBTERMCAP} -LDADD= ${LIBLPR} -ledit -ltermcap +DPADD= ${LIBLPR} ${LIBEDIT} ${LIBTERMCAPW} +LDADD= ${LIBLPR} -ledit -ltermcapw + +NO_PIE= yes .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/lpc/Makefile.depend b/usr.sbin/lpr/lpc/Makefile.depend index 4db2287..fbbafd5 100644 --- a/usr.sbin/lpr/lpc/Makefile.depend +++ b/usr.sbin/lpr/lpc/Makefile.depend @@ -11,7 +11,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libedit \ - lib/ncurses/ncurses \ + lib/ncurses/ncursesw \ usr.sbin/lpr/common_source \ diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile index 0d7d93e..bd3e25a 100644 --- a/usr.sbin/lpr/lpd/Makefile +++ b/usr.sbin/lpr/lpd/Makefile @@ -12,4 +12,6 @@ WARNS?= 1 DPADD= ${LIBLPR} LDADD= ${LIBLPR} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile index 4df437e..1c2504b 100644 --- a/usr.sbin/lpr/lpq/Makefile +++ b/usr.sbin/lpr/lpq/Makefile @@ -13,4 +13,6 @@ CFLAGS+= -I${.CURDIR}/../common_source DPADD= ${LIBLPR} LDADD= ${LIBLPR} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile index 1894b00..cfeebb0 100644 --- a/usr.sbin/lpr/lpr/Makefile +++ b/usr.sbin/lpr/lpr/Makefile @@ -18,4 +18,6 @@ WARNS?= 2 DPADD= ${LIBLPR} LDADD= ${LIBLPR} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile index 44bc93a..bd7e321 100644 --- a/usr.sbin/lpr/lprm/Makefile +++ b/usr.sbin/lpr/lprm/Makefile @@ -15,4 +15,6 @@ CFLAGS+= -I${.CURDIR}/../common_source DPADD= ${LIBLPR} LDADD= ${LIBLPR} +NO_PIE= yes + .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile index bd895a7..3a157c9 100644 --- a/usr.sbin/lpr/pac/Makefile +++ b/usr.sbin/lpr/pac/Makefile @@ -11,4 +11,6 @@ CFLAGS+= -I${.CURDIR}/../common_source DPADD= ${LIBLPR} LDADD= ${LIBLPR} +NO_PIE= yes + .include <bsd.prog.mk> |