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.211 diff -u -p -r1.208 -r1.211 --- src/share/mk/bsd.prog.mk 2006/01/20 16:54:11 1.208 +++ src/share/mk/bsd.prog.mk 2006/03/20 21:48:43 1.211 @@ -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.211 2006/03/20 21:48:43 christos Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .ifndef HOSTPROG @@ -63,7 +63,7 @@ LIBCRT0= ${DESTDIR}/usr/lib/crt0.o 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 \ usbhid util wrap y z @@ -80,8 +80,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") @@ -239,7 +239,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 +274,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"