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.257
retrieving revision 1.261
diff -u -p -r1.257 -r1.261
--- src/share/mk/bsd.prog.mk	2011/01/17 18:05:52	1.257
+++ src/share/mk/bsd.prog.mk	2011/03/07 19:05:03	1.261
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.257 2011/01/17 18:05:52 pooka Exp $
+#	$NetBSD: bsd.prog.mk,v 1.261 2011/03/07 19:05:03 jmmv Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -53,12 +53,15 @@ LDFLAGS+=	${PIE_LDFLAGS}
 .endif
 
 ##### Default values
+.if !defined(HOSTLIB)
 .if empty(CPPFLAGS:M-nostdinc)
 CPPFLAGS+=	${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
 .endif
 .if empty(CXXFLAGS:M-nostdinc++)
 CXXFLAGS+=	${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
 .endif
+.endif
+
 CFLAGS+=	${COPTS}
 OBJCFLAGS+=	${OBJCOPTS}
 MKDEP_SUFFIXES?=	.o .ln
@@ -99,7 +102,7 @@ LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
 	fetch form fl g2c gcc gnumalloc gssapi hdb heimntlm hx509 intl ipsec \
 	kadm5clnt kadm5srv kafs krb5 kvm l lber ldap ldap_r lua \
 	m magic menu objc ossaudio pam pcap pci pmc posix pthread pthread_dbg \
-	puffs radius resolv rmt roken rpcsvc rt rump rumpuser skey sl ss \
+	puffs radius resolv rmt roken rpcsvc rt rump rumpuser saslc skey sl ss \
 	ssh ssl termcap usbhid util wrap y z bind9 dns lwres isccfg isccc isc \
 	\
 	rumpfs_cd9660fs rumpfs_efs rumpfs_ext2fs rumpfs_ffs rumpfs_hfs \
@@ -110,6 +113,11 @@ LIB${_lib:tu}=	${DESTDIR}/usr/lib/lib${_
 .MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
 .endif
 .endfor
+# atf-c and atf-c++ are special cases because we cannot use [-+] as part of
+# make(1) variable names.  Just define them here.
+LIBATF_C=	${DESTDIR}/usr/lib/libatf-c.a
+LIBATF_CXX=	${DESTDIR}/usr/lib/libatf-c++.a
+.MADE:		${LIBATF_C} ${LIBATF_CXX}
 
 # PAM applications, if linked statically, need more libraries
 .if (${MKPIC} == "no")
@@ -254,7 +262,8 @@ _APPEND_SRCS=	no
 .if !defined(RUMPPRG)
 .  if defined(PROG_CXX) && !defined(PROGS_CXX)
 PROGS_CXX=	${PROG_CXX}
-.  elif defined(PROG) && !defined(PROGS)
+.  endif
+.  if defined(PROG) && !defined(PROGS)
 PROGS=		${PROG}
 .  endif
 .endif