37 files changed, 74 insertions, 0 deletions

diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index 1fc41bfe20d0f..fdcbd601e5c95 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -24,6 +24,8 @@ SRCS+=	ops_nullfs.c ops_pcfs.c ops_tfs.c ops_ufs.c ops_umapfs.c
 SRCS+=	ops_unionfs.c opts.c readdir.c restart.c rpc_fwd.c sched.c
 SRCS+=	srvr_amfs_auto.c srvr_nfs.c
 
+NO_PIE=	yes
+
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \
 	 -I${DESTDIR}/usr/include/rpcsvc
 
diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
index 74fc7492f5245..40257c308b98d 100644
--- a/usr.sbin/amd/amq/Makefile
+++ b/usr.sbin/amd/amq/Makefile
@@ -17,4 +17,6 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq
 DPADD=	${LIBAMU}
 LDADD=	${LIBAMU}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/fixmount/Makefile b/usr.sbin/amd/fixmount/Makefile
index 7f96a456dfe43..1838fb29ba330 100644
--- a/usr.sbin/amd/fixmount/Makefile
+++ b/usr.sbin/amd/fixmount/Makefile
@@ -18,4 +18,6 @@ SRCS+=	checkmount_bsd44.c
 DPADD=	${LIBAMU} ${LIBRPCSVC}
 LDADD=	${LIBAMU} -lrpcsvc
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile
index 1695a469f980f..83becb2c5b3de 100644
--- a/usr.sbin/amd/fsinfo/Makefile
+++ b/usr.sbin/amd/fsinfo/Makefile
@@ -13,6 +13,8 @@ SRCS=	fsi_gram.y fsi_lex.l
 SRCS+=	fsi_analyze.c fsi_dict.c fsi_util.c fsinfo.c wr_atab.c 
 SRCS+=	wr_bparam.c wr_dumpset.c wr_exportfs.c wr_fstab.c
 
+NO_PIE=	yes
+
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/fsinfo
 
 DPADD=	${LIBAMU}
diff --git a/usr.sbin/amd/hlfsd/Makefile b/usr.sbin/amd/hlfsd/Makefile
index 5b863dd5adcd9..dca94da6bb95b 100644
--- a/usr.sbin/amd/hlfsd/Makefile
+++ b/usr.sbin/amd/hlfsd/Makefile
@@ -16,4 +16,6 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/amd/hlfsd
 DPADD=	${LIBAMU}
 LDADD=	${LIBAMU}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile
index 57fd6a5f0bdc7..bed9e30c9b910 100644
--- a/usr.sbin/amd/mk-amd-map/Makefile
+++ b/usr.sbin/amd/mk-amd-map/Makefile
@@ -13,4 +13,6 @@ MAN=	mk-amd-map.8
 DPADD=	${LIBAMU}
 LDADD=	${LIBAMU}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/pawd/Makefile b/usr.sbin/amd/pawd/Makefile
index c6bb1cc37a0bf..612acedf7a8ae 100644
--- a/usr.sbin/amd/pawd/Makefile
+++ b/usr.sbin/amd/pawd/Makefile
@@ -17,4 +17,6 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq
 DPADD=	${LIBAMU}
 LDADD=	${LIBAMU}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/wire-test/Makefile b/usr.sbin/amd/wire-test/Makefile
index a07e6902fe768..f96076863735b 100644
--- a/usr.sbin/amd/wire-test/Makefile
+++ b/usr.sbin/amd/wire-test/Makefile
@@ -13,4 +13,6 @@ MAN=	wire-test.8
 DPADD=	${LIBAMU}
 LDADD=	${LIBAMU}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile
index 32cf99d5edac7..8df8fa1c39fe6 100644
--- a/usr.sbin/btxld/Makefile
+++ b/usr.sbin/btxld/Makefile
@@ -4,4 +4,6 @@ PROG=	btxld
 MAN=	btxld.8
 SRCS=	btxld.c elfh.c
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile
index d9a1d247d41ec..c7762f180b643 100644
--- a/usr.sbin/cron/cron/Makefile
+++ b/usr.sbin/cron/cron/Makefile
@@ -11,4 +11,6 @@ LDADD=	${LIBCRON} ${MINUSLPAM} -lutil
 
 WARNS?=	2
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile
index 829128e5729e9..cd9600ae8184f 100644
--- a/usr.sbin/cron/crontab/Makefile
+++ b/usr.sbin/cron/crontab/Makefile
@@ -15,4 +15,6 @@ CFLAGS+= -I${.CURDIR}/../cron
 DPADD=	${LIBCRON} ${LIBMD} ${LIBUTIL}
 LDADD=	${LIBCRON} -lmd -lutil
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/crunch/crunchgen/Makefile b/usr.sbin/crunch/crunchgen/Makefile
index 8d0a78b190276..7b07f2bd2a2aa 100644
--- a/usr.sbin/crunch/crunchgen/Makefile
+++ b/usr.sbin/crunch/crunchgen/Makefile
@@ -4,6 +4,8 @@ PROG=	crunchgen
 SRCS=	crunchgen.c crunched_skel.c
 CLEANFILES+= crunched_skel.c
 
+NO_PIE=	yes
+
 crunched_skel.c: crunched_main.c
 	sh -e ${.CURDIR}/mkskel.sh ${.CURDIR}/crunched_main.c >crunched_skel.c
 
diff --git a/usr.sbin/crunch/crunchide/Makefile b/usr.sbin/crunch/crunchide/Makefile
index 2a6c50068d7fa..c959a3e1b9b32 100644
--- a/usr.sbin/crunch/crunchide/Makefile
+++ b/usr.sbin/crunch/crunchide/Makefile
@@ -3,6 +3,8 @@
 PROG=   crunchide
 SRCS=	crunchide.c
 
+NO_PIE=	yes
+
 TARGET_ARCH?=	${MACHINE_ARCH}
 
 .if ${TARGET_ARCH} == i386 && ${MACHINE_ARCH} == i386
diff --git a/usr.sbin/editmap/Makefile b/usr.sbin/editmap/Makefile
index 92d8392bf1f84..8b4562cf11632 100644
--- a/usr.sbin/editmap/Makefile
+++ b/usr.sbin/editmap/Makefile
@@ -33,6 +33,8 @@ DPADD+=${SENDMAIL_DPADD}
 LDADD+=${SENDMAIL_LDADD}
 LDFLAGS+=${SENDMAIL_LDFLAGS}
 
+NO_PIE=	yes
+
 sm_os.h:
 	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
diff --git a/usr.sbin/fifolog/fifolog_create/Makefile b/usr.sbin/fifolog/fifolog_create/Makefile
index 8b59b25ed2518..38a66233d35bc 100644
--- a/usr.sbin/fifolog/fifolog_create/Makefile
+++ b/usr.sbin/fifolog/fifolog_create/Makefile
@@ -12,6 +12,8 @@ MLINKS=	fifolog.1 fifolog_create.1 \
 	fifolog.1 fifolog_reader.1 \
 	fifolog.1 fifolog_writer.1
 
+NO_PIE=	yes
+
 regress:
 	rm -f /tmp/fifolog.?
 	./${PROG} /tmp/fifolog.0
diff --git a/usr.sbin/fifolog/fifolog_reader/Makefile b/usr.sbin/fifolog/fifolog_reader/Makefile
index c88f10e952959..dfbb73f0ce3c5 100644
--- a/usr.sbin/fifolog/fifolog_reader/Makefile
+++ b/usr.sbin/fifolog/fifolog_reader/Makefile
@@ -9,6 +9,8 @@ MAN=
 DPADD=	${LIBFIFOLOG} ${LIBUTIL} ${LIBZ}
 LDADD=	${LIBFIFOLOG} -lutil -lz
 
+NO_PIE=	yes
+
 regress:
 	./${PROG} /tmp/fifolog.0
 	./${PROG} -t /tmp/fifolog.0
diff --git a/usr.sbin/fifolog/fifolog_writer/Makefile b/usr.sbin/fifolog/fifolog_writer/Makefile
index 9d802c7eb3ee2..3e6e37790aac2 100644
--- a/usr.sbin/fifolog/fifolog_writer/Makefile
+++ b/usr.sbin/fifolog/fifolog_writer/Makefile
@@ -9,6 +9,8 @@ MAN=
 DPADD=	${LIBFIFOLOG} ${LIBUTIL} ${LIBZ}
 LDADD=	${LIBFIFOLOG} -lutil -lz
 
+NO_PIE=	yes
+
 regress:
 	date | ./${PROG} -z 0 /tmp/fifolog.0
 	lptest 65 | ./${PROG} -z 9 /tmp/fifolog.1
diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
index de4988815016a..686bac436e1ee 100644
--- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile
+++ b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
@@ -14,4 +14,6 @@ DPADD+= ${LIBEVENT}
 
 WARNS?=	3
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile
index ffffffbb2bd19..1ea2254f958e9 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/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index 35fa52ab138a6..65a8010ecda4d 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -16,4 +16,6 @@ WARNS?=	0
 DPADD=	${LIBLPR} ${LIBEDIT} ${LIBTERMCAP}
 LDADD=	${LIBLPR} -ledit -ltermcap
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile
index 0d7d93ef79d9b..bd3e25a8b545e 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 4df437e06c326..1c2504b899e5a 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 1894b0089c043..cfeebb059d0ce 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 44bc93ac27ecb..bd7e321b55016 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 bd895a71a3054..3a157c9258cae 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>
diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile
index bd72fc6c5b76f..a3cd5623b3f06 100644
--- a/usr.sbin/mailstats/Makefile
+++ b/usr.sbin/mailstats/Makefile
@@ -31,6 +31,8 @@ DPADD+=	${SENDMAIL_DPADD}
 LDADD+=	${SENDMAIL_LDADD}
 LDFLAGS+= ${SENDMAIL_LDFLAGS}
 
+NO_PIE=	yes
+
 sm_os.h:
 	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile
index 62531488128e6..0e03fd3e35af7 100644
--- a/usr.sbin/makefs/Makefile
+++ b/usr.sbin/makefs/Makefile
@@ -38,4 +38,6 @@ LDADD+=		${LIBNETBSD}
 DPADD+=  ${LIBSBUF} ${LIBUTIL}
 LDADD+=  -lsbuf -lutil
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile
index 80cafcbcfdbae..2c2eef555c7b5 100644
--- a/usr.sbin/makemap/Makefile
+++ b/usr.sbin/makemap/Makefile
@@ -34,6 +34,8 @@ DPADD+=${SENDMAIL_DPADD}
 LDADD+=${SENDMAIL_LDADD}
 LDFLAGS+=${SENDMAIL_LDFLAGS}
 
+NO_PIE=	yes
+
 sm_os.h:
 	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile
index 9d24c0c4f92fd..e09f3c410febc 100644
--- a/usr.sbin/nmtree/Makefile
+++ b/usr.sbin/nmtree/Makefile
@@ -23,4 +23,6 @@ LDADD+=		${LIBNETBSD}
 LINKS=		${BINDIR}/mtree ${BINDIR}/nmtree
 MLINKS=		mtree.8 nmtree.8
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile
index 78308fae0ac8f..50753508461d6 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile
+++ b/usr.sbin/ntp/ntp-keygen/Makefile
@@ -21,4 +21,6 @@ DPADD+=	${LIBMD} ${LIBCRYPTO}
 LDADD+=	-lmd -lcrypto
 .endif
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index 87b2d72b85441..3422ad2ad0de3 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -4,6 +4,8 @@ MAN=
 
 .include <src.opts.mk>
 
+NO_PIE=	yes
+
 .PATH: ${.CURDIR}/../../../contrib/ntp/ntpd
 
 PROG=	ntpd
diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile
index f55ec92bc5d91..ea0fe1e4b2f8d 100644
--- a/usr.sbin/ntp/ntpdate/Makefile
+++ b/usr.sbin/ntp/ntpdate/Makefile
@@ -13,6 +13,8 @@ LDADD=	${LIBNTP} -lm -lmd -lrt
 
 CLEANFILES+= .version version.c
 
+NO_PIE=	yes
+
 version.c: 
 	sh -e ${.CURDIR}/../scripts/mkver ntpdate
 
diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile
index 81d2671078af9..d4ea36f31e492 100644
--- a/usr.sbin/ntp/ntpdc/Makefile
+++ b/usr.sbin/ntp/ntpdc/Makefile
@@ -22,6 +22,8 @@ CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
 
 CLEANFILES+= .version version.c
 
+NO_PIE=	yes
+
 version.c:
 	sh -e ${.CURDIR}/../scripts/mkver ntpdc
 
diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile
index eb4297341d1c3..7fcdd2be3b2db 100644
--- a/usr.sbin/ntp/ntpq/Makefile
+++ b/usr.sbin/ntp/ntpq/Makefile
@@ -24,6 +24,8 @@ CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
 
 CLEANFILES+= .version version.c
 
+NO_PIE=	yes
+
 version.c:
 	sh -e ${.CURDIR}/../scripts/mkver ntpq
 
diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile
index d3bf7a74cfd90..af3f9051e8754 100644
--- a/usr.sbin/ntp/ntptime/Makefile
+++ b/usr.sbin/ntp/ntptime/Makefile
@@ -10,4 +10,6 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
 DPADD=	${LIBNTP}
 LDADD=	${LIBNTP}
 
+NO_PIE=	yes
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile
index 120028d6997b0..e1a9a2a793840 100644
--- a/usr.sbin/praliases/Makefile
+++ b/usr.sbin/praliases/Makefile
@@ -34,6 +34,8 @@ LDFLAGS+=${SENDMAIL_LDFLAGS}
 DPADD+=	${SENDMAIL_DPADD}
 LDADD+=	${SENDMAIL_LDADD}
 
+NO_PIE=	yes
+
 sm_os.h:
 	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index 893b6fd0d70a2..ffd22bd06a3bd 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -7,6 +7,8 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 SMDIR=	${SENDMAIL_DIR}/src
 .PATH: ${SMDIR}
 
+NO_PIE=	yes
+
 BINDIR=	/usr/libexec/sendmail
 
 PROG=	sendmail