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.208
retrieving revision 1.214
diff -u -p -r1.208 -r1.214
--- src/share/mk/bsd.prog.mk	2006/01/20 16:54:11	1.208
+++ src/share/mk/bsd.prog.mk	2006/06/19 15:44:44	1.214
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.208 2006/01/20 16:54:11 christos Exp $
+#	$NetBSD: bsd.prog.mk,v 1.214 2006/06/19 15:44:44 gdamore Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -19,6 +19,7 @@ clean:		cleanprog
 COPTS+=     ${COPTS.${PROG}}
 CPPFLAGS+=  ${CPPFLAGS.${PROG}}
 CXXFLAGS+=  ${CXXFLAGS.${PROG}}
+OBJCOPTS+=  ${OBJCOPTS.${PROG}}
 LDADD+=     ${LDADD.${PROG}}
 LDFLAGS+=   ${LDFLAGS.${PROG}}
 LDSTATIC+=  ${LDSTATIC.${PROG}}
@@ -27,6 +28,7 @@ LDSTATIC+=  ${LDSTATIC.${PROG}}
 CPPFLAGS+=	${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
 CXXFLAGS+=	${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
 CFLAGS+=	${COPTS}
+OBJCFLAGS+=	${OBJCOPTS}
 MKDEP_SUFFIXES?=	.o .ln
 
 # ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o
@@ -59,13 +61,13 @@ LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
 #	etc..
 
 .for _lib in \
-	asn1 bsdmalloc bz2 c c_pic cdk com_err compat crypt \
+	asn1 bluetooth bsdmalloc bz2 c c_pic cdk com_err compat crypt \
 	crypto crypto_idea crypto_mdc2 crypto_rc5 \
 	curses dbm des edit event \
 	form fl g2c gcc gnumalloc gssapi hdb intl ipsec \
-	kadm kadm5clnt kadm5srv kafs kdb krb krb5 kstream kvm l \
+	kadm5clnt kadm5srv kafs krb5 kvm l \
 	m magic menu objc ossaudio pam pcap pci pmc posix pthread pthread_dbg \
-	radius resolv rmt roken rpcsvc rt skey sl ss ssh ssl termcap \
+	radius resolv rmt roken rpcsvc rt sdp skey sl ss ssh ssl termcap \
 	usbhid util wrap y z
 .ifndef LIB${_lib:tu}
 LIB${_lib:tu}=	${DESTDIR}/usr/lib/lib${_lib}.a
@@ -80,8 +82,8 @@ PAM_STATIC_LDADD+= -lssh
 PAM_STATIC_DPADD+= ${LIBSSH}
 .endif
 .if (${MKKERBEROS} != "no")
-PAM_STATIC_LDADD+= -lkafs -lkrb -lkrb5 -lasn1 -lroken -lcom_err -lcrypto
-PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB} ${LIBKRB5} ${LIBASN1} ${LIBROKEN} \
+PAM_STATIC_LDADD+= -lkafs -lkrb5 -lasn1 -lroken -lcom_err -lcrypto
+PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBASN1} ${LIBROKEN} \
 	${LIBCOM_ERR} ${LIBCRYPTO}
 .endif
 .if (${MKSKEY} != "no")
@@ -116,14 +118,14 @@ LIB${_lib:tu}=	${DESTDIR}/usr/X11R6/lib/
 .if defined(SHAREDSTRINGS)
 CLEANFILES+=strings
 .c.o:
-	${CC} -E ${CFLAGS} ${.IMPSRC} | xstr -c -
-	@${CC} ${CFLAGS} -c x.c -o ${.TARGET}
+	${CC} -E ${CPPFLAGS} ${CFLAGS} ${.IMPSRC} | xstr -c -
+	@${CC} ${CPPFLAGS} ${CFLAGS} -c x.c -o ${.TARGET}
 	@rm -f x.c
 
 .cc.o .cpp.o .cxx.o .C.o:
-	${CXX} -E ${CXXFLAGS} ${.IMPSRC} | xstr -c -
+	${CXX} -E ${CPPFLAGS} ${CXXFLAGS} ${.IMPSRC} | xstr -c -
 	@mv -f x.c x.cc
-	@${CXX} ${CXXFLAGS} -c x.cc -o ${.TARGET}
+	@${CXX} ${CPPFLAGS} ${CXXFLAGS} -c x.cc -o ${.TARGET}
 	@rm -f x.cc
 .endif
 
@@ -239,7 +241,7 @@ proginstall:: ${DESTDIR}${BINDIR}/${PROG
 __proginstall: .USE
 	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${STRIPFLAG} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
+		${STRIPFLAG} ${.ALLSRC} ${.TARGET}
 
 .if ${MKUPDATE} == "no"
 ${DESTDIR}${BINDIR}/${PROGNAME}! ${PROG} __proginstall
@@ -274,7 +276,7 @@ __scriptinstall: .USE
 	    -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \
 	    -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \
 	    -m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \
-	    ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
+	    ${.ALLSRC} ${.TARGET}
 
 .for S in ${SCRIPTS:O:u}
 .if ${MKUPDATE} == "no"