 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.60 2009/03/15 07:48:36 lukem Exp $
+#	$NetBSD: Makefile,v 1.61 2011/04/24 21:42:06 elric Exp $
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
 .include <bsd.own.mk>
 PROG=	ftpd
 SRCS=	cmds.c conf.c ftpd.c ftpcmd.y logutmp.c logwtmp.c popen.c
 CPPFLAGS+=-I${.CURDIR} -DSUPPORT_UTMP -DSUPPORT_UTMPX -DLOGIN_CAP
 DPADD+=	${LIBCRYPT} ${LIBUTIL}
 LDADD+=	-lcrypt -lutil
 MAN=	ftpd.conf.5 ftpusers.5 ftpd.8
 MLINKS=	ftpusers.5 ftpchroot.5
 .if defined(NO_INTERNAL_LS)
 @@ -33,23 +33,22 @@ CPPFLAGS+=-DSKEY
 DPADD+= ${LIBSKEY}
 LDADD+= -lskey
 .endif
 .endif	# USE_PAM == no
 ftpd.o ftpcmd.o: version.h
 #.if (${USE_KERBEROS} != "no")
+#
 #.PATH:	${NETBSDSRCDIR}/usr.bin/login
+#
 #SRCS+=	k5login.c
 #CPPFLAGS+=-DKERBEROS5
 #CPPFLAGS+=-DKERBEROS5 -I${DESTDIR}/usr/include/krb5
 #DPADD+=	${LIBKRB5} ${LIBASN1}
 #LDADD+= -lkrb5 -lasn1
+#
 #DPADD+=	${LIBCRYPTO} ${{LIBCRYPT} ${LIBROKEN} ${LIBCOM_ERR}
 #LDADD+=	-lcrypto -lcrypt -lroken -lcom_err
+#
 #.endif
 .include <bsd.prog.mk>

 @@ -1,37 +1,36 @@
-#	$NetBSD: Makefile,v 1.47 2011/04/15 18:05:45 elric Exp $
+#	$NetBSD: Makefile,v 1.48 2011/04/24 21:42:06 elric Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 12/15/93
 WARNS?=	2		# XXX: const issues in sys_term.c
 .include <bsd.own.mk>
 MAN=	telnetd.8
 PROG=	telnetd
 CPPFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DDIAGNOSTICS
 CPPFLAGS+=-DOLD_ENVIRON -DENV_HACK -DSECURELOGIN -DSUPPORT_UTMP -DSUPPORT_UTMPX
 SRCS=	authenc.c global.c slc.c state.c sys_term.c telnetd.c \
 	termstat.c utility.c
 DPADD=	${LIBTELNETDIR}/libtelnet.a ${LIBTERMINFO} ${LIBUTIL}
 LDADD+=	${LIBTELNETDIR}/libtelnet.a -lterminfo -lutil
 CPPFLAGS+=-I${NETBSDSRCDIR}/lib
 CPPFLAGS+=-I${.CURDIR}
 LIBTELNETDIR!=	cd ${.CURDIR}/../../lib/libtelnet; ${PRINTOBJDIR}
 .if (${USE_KERBEROS} != "no")
 CPPFLAGS+=-I${DESTDIR}/usr/include/krb5
 CPPFLAGS+=-DKRB5 -DAUTHENTICATION -DENCRYPTION
 LDADD+= -lkrb5 -lasn1 -lcrypto -lcrypt
 DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
 .if (${USE_PAM} != "no")
 LDADD+= -lpam ${PAM_STATIC_LDADD}
 DPADD+=	${LIBPAM} ${PAM_STATIC_DPADD}
 .endif
 LDADD+=	 -ldes -lcom_err -lroken
 DPADD+=	${LIBDES} ${LIBCOM_ERR} ${LIBROKEN}
 .endif

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.41 2007/05/28 12:06:29 tls Exp $
+#	$NetBSD: Makefile,v 1.42 2011/04/24 21:42:06 elric Exp $
 #	from: @(#)Makefile    8.3 (Berkeley) 4/2/94
 .include <bsd.own.mk>
 USE_FORT?= yes	# setuid
 PROG=	passwd
 SRCS=	local_passwd.c passwd.c
 MAN=	passwd.1
 CPPFLAGS+=-I${.CURDIR} -DLOGIN_CAP
 .if (${USE_YP} != "no")
 SRCS+=	yp_passwd.c
 @@ -16,27 +16,27 @@ CPPFLAGS+=-DYP
 DPADD+=	${LIBRPCSVC}
 LDADD+=	-lrpcsvc
 LINKS+=	${BINDIR}/passwd ${BINDIR}/yppasswd
 MAN+=	yppasswd.1
 .endif
 DPADD+= ${LIBCRYPT} ${LIBUTIL}
 LDADD+= -lcrypt -lutil
 BINOWN=	root
 BINMODE=4555
 .if (${USE_KERBEROS} != "no")
-CPPFLAGS+= -DKERBEROS5 -I${DESTDIR}/usr/include/krb5
+CPPFLAGS+= -DKERBEROS5
 SRCS+=	krb5_passwd.c
 DPADD+=	${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPT}
 LDADD+=	-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lcrypt
 LINKS+=	${BINDIR}/passwd ${BINDIR}/kpasswd
 MAN+=	kpasswd.1
 .endif
 .if (${USE_PAM} != "no")
 CPPFLAGS+=-DUSE_PAM
 SRCS+= pam_passwd.c
 LDADD+=-lpam ${PAM_STATIC_LDADD}
 DPADD+=${LIBPAM} ${PAM_STATIC_DPADD}

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.49 2008/04/06 09:54:37 lukem Exp $
+#	$NetBSD: Makefile,v 1.50 2011/04/24 21:42:06 elric Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 7/19/93
 .include <bsd.own.mk>
 USE_FORT?= yes	# setuid
 PROG=	su
 BINOWN=	root
 BINMODE=4555
 .PATH.c: ${.CURDIR}/../newgrp
 CPPFLAGS+=-I${.CURDIR}/../newgrp
 CPPFLAGS+=-DLOGIN_CAP
 CPPFLAGS+=-DALLOW_GROUP_CHANGE
 @@ -35,27 +35,27 @@ LDADD+=	-lcrypt -lutil
 #CPPFLAGS+=-DSU_GROUP=\"sugroup\"
 # Uncomment the following line to make su
 # treat group wheel (SUGROUP) and/or ROOTAUTH as an indirect
 # list of groups.
 #CPPFLAGS+=-DSU_INDIRECT_GROUP
 .if (${USE_KERBEROS} != "no")
 .ifdef AFS
 DPADD+= ${LIBKAFS}
 LDADD+= -lkafs
 .endif
-CPPFLAGS+=-DKERBEROS5 -I${DESTDIR}/usr/include/krb5
+CPPFLAGS+=-DKERBEROS5
 DPADD+=	${LIBKRB5} ${LIBASN1}
 LDADD+= -lkrb5 -lasn1
 DPADD+=	${LIBCRYPTO} ${LIBROKEN} ${LIBCOM_ERR}
 LDADD+=	-lcrypto -lroken -lcom_err
 .endif
 .if (${USE_SKEY} != "no")
 CPPFLAGS+=-DSKEY
 DPADD+= ${LIBSKEY}
 LDADD+= -lskey
 .endif

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.44 2010/02/03 15:34:46 roy Exp $
+#	$NetBSD: Makefile,v 1.45 2011/04/24 21:42:06 elric Exp $
+#
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 # 3. All advertising materials mentioning features or use of this software
 @@ -53,27 +53,26 @@ SRCS=	authenc.c commands.c main.c networ
 CPPFLAGS+=-I${NETBSDSRCDIR}/lib
 CPPFLAGS+=-DIPSEC
 LDADD+=	-lipsec
 DPADD+=	${LIBIPSEC}
 .if (${USE_INET6} != "no")
 CPPFLAGS+=-DINET6
 .endif
 LIBTELNETDIR!=	cd ${.CURDIR}/../../lib/libtelnet; ${PRINTOBJDIR}
 .if (${USE_KERBEROS} != "no")
 CPPFLAGS+=-I${DESTDIR}/usr/include/krb5
 CPPFLAGS+=-DKRB5 -DFORWARD -DAUTHENTICATION -DENCRYPTION
 LDADD+= -lkrb5 -lasn1 -lcrypto -lcrypt
 DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
 .if (${USE_PAM} != "no")
 LDADD+= -lpam ${PAM_STATIC_LDADD}
 DPADD+=	${LIBPAM} ${PAM_STATIC_DPADD}
 .endif
 LDADD+= -ldes -lcom_err -lroken
 DPADD+=	${LIBDES} ${LIBCOM_ERR} ${LIBROKEN}
 .endif