Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v
rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.300
retrieving revision 1.311.2.2
diff -u -p -r1.300 -r1.311.2.2
--- src/share/mk/bsd.prog.mk	2016/08/20 11:23:33	1.300
+++ src/share/mk/bsd.prog.mk	2018/06/25 07:25:37	1.311.2.2
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.300 2016/08/20 11:23:33 christos Exp $
+#	$NetBSD: bsd.prog.mk,v 1.311.2.2 2018/06/25 07:25:37 pgoyette Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -7,6 +7,12 @@
 .include <bsd.shlib.mk>
 .include <bsd.gcc.mk>
 
+##### Sanitizer specific flags.
+
+CFLAGS+=	${SANITIZERFLAGS}
+CXXFLAGS+=	${SANITIZERFLAGS}
+LDFLAGS+=	${SANITIZERFLAGS}
+
 #
 # Definitions and targets shared among all programs built by a single
 # Makefile.
@@ -114,10 +120,8 @@ LIBCRTI=	${DESTDIR}/usr/lib/${MLIBDIR:D$
 	compat \
 	crypt \
 	crypto \
-	crypto_idea \
-	crypto_mdc2 \
-	crypto_rc5 \
 	curses \
+	cxx \
 	dbm \
 	des \
 	dns \
@@ -155,6 +159,7 @@ LIBCRTI=	${DESTDIR}/usr/lib/${MLIBDIR:D$
 	m \
 	magic \
 	menu \
+	netpgpverify \
 	objc \
 	ossaudio \
 	pam \
@@ -163,7 +168,6 @@ LIBCRTI=	${DESTDIR}/usr/lib/${MLIBDIR:D$
 	pmc \
 	posix \
 	pthread \
-	pthread_dbg \
 	puffs \
 	quota \
 	radius \
@@ -212,17 +216,31 @@ LIB${_lib:tu}=	${DESTDIR}/usr/lib/lib${_
 .endif
 .endfor
 
+.if (${MKKERBEROS} != "no")
+LIBKRB5_LDADD+= -lkrb5
+LIBKRB5_DPADD+= ${LIBKRB5}
+# Kerberos5 applications, if linked statically, need more libraries
+LIBKRB5_STATIC_LDADD+= \
+	-lhx509 -lcrypto -lasn1 -lcom_err -lroken \
+	-lwind -lheimbase -lsqlite3 -lcrypt -lutil
+LIBKRB5_STATIC_DPADD+= \
+	${LIBHX509} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \
+	${LIBWIND} ${LIBHEIMBASE} ${LIBSQLITE3} ${LIBCRYPT}  ${LIBUTIL}
+. if (${MKPIC} == "no")
+LIBKRB5_LDADD+= ${LIBKRB5_STATIC_LDADD}
+LIBKRB5_DPADD+= ${LIBKRB5_STATIC_DPADD}
+. endif
+.endif
+
 # PAM applications, if linked statically, need more libraries
 .if (${MKPIC} == "no")
-.if (${MKCRYPTO} != "no")
 PAM_STATIC_LDADD+= -lssh
 PAM_STATIC_DPADD+= ${LIBSSH}
-.endif
 .if (${MKKERBEROS} != "no")
 PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \
-	-lroken -lcom_err -lheimbase -lcrypto
+	-lroken -lcom_err -lheimbase -lcrypto -lsqlite3
 PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \
-	${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO}
+	${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} ${LIBSQLITE3}
 .endif
 .if (${MKSKEY} != "no")
 PAM_STATIC_LDADD+= -lskey
@@ -248,6 +266,7 @@ PAM_STATIC_DPADD=
 	Xaw \
 	Xdmcp \
 	Xext \
+	Xfont2 \
 	Xfont \
 	Xft \
 	Xi \
@@ -352,8 +371,8 @@ SRCS.rump.${PROG}=	${PROG}.c ${PROG}_rum
 .  endif
 .   if (${MKRUMP} != "no")
 DPSRCS+=		${PROG}_rumpops.c ${RUMPSRCS}
-LDADD.rump.${PROG}+=	-lrumpclient
-DPADD.rump.${PROG}+=	${LIBRUMPCLIENT}
+LDADD.rump.${PROG}+=	${LDADD.rump} -lrumpclient
+DPADD.rump.${PROG}+=	${DPADD.rump} ${LIBRUMPCLIENT}
 MAN.rump.${PROG}=	# defined but feeling empty
 _RUMPINSTALL.rump.${PROG}=# defined
 .   endif
@@ -435,7 +454,8 @@ _CCLINK.${_P}=	${CXX} ${_CCLINKFLAGS}
 BINDIR.${_P}?=		${BINDIR}
 PROGNAME.${_P}?=	${_P}
 
-.if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG) && !commands(${_P})
+.if ${MKDEBUG:Uno} != "no" && !defined(NODEBUG) && !commands(${_P}) && \
+    empty(SRCS.${_P}:M*.sh)
 _PROGDEBUG.${_P}:=	${PROGNAME.${_P}}.debug
 .endif
 
@@ -448,7 +468,10 @@ PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
 _DPADD.${_P}=		${DPADD}    ${DPADD.${_P}}
 _LDADD.${_P}=		${LDADD}    ${LDADD.${_P}}
 _LDFLAGS.${_P}=		${LDFLAGS}  ${LDFLAGS.${_P}}
+.if ${MKSANITIZER} != "yes"
+# Sanitizers don't support static build.
 _LDSTATIC.${_P}=	${LDSTATIC} ${LDSTATIC.${_P}}
+.endif
 
 ##### Build and install rules
 .if !empty(_APPEND_SRCS:M[Yy][Ee][Ss])