[src/netbsd-1-5]: src Update from trunk:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/99ab28c9f92d
branches:  netbsd-1-5
changeset: 488919:99ab28c9f92d
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Aug 06 21:17:38 2000 +0000

description:
Update from trunk:
hprop(8) belongs in /usr/sbin, not /usr/libexec.

diffstat:

 libexec/Makefile        |   4 ++--
 libexec/hprop/Makefile  |  40 ----------------------------------------
 usr.sbin/Makefile       |   4 ++--
 usr.sbin/hprop/Makefile |  40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 44 deletions(-)

diffs (124 lines):

diff -r 739775969c6b -r 99ab28c9f92d libexec/Makefile
--- a/libexec/Makefile  Sun Aug 06 21:15:42 2000 +0000
+++ b/libexec/Makefile  Sun Aug 06 21:17:38 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.37.2.3 2000/08/06 21:14:23 thorpej Exp $
+#      $NetBSD: Makefile,v 1.37.2.4 2000/08/06 21:17:38 thorpej Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/4/93
 
 .include <bsd.own.mk>
@@ -10,7 +10,7 @@
 
 .if (${MKCRYPTO} != "no")
 # Heimdal/KTH Kerberos
-SUBDIR+= hprop hpropd kadmind kfd kpasswdd
+SUBDIR+= hpropd kadmind kfd kpasswdd
 .endif
 
 .include <bsd.subdir.mk>
diff -r 739775969c6b -r 99ab28c9f92d libexec/hprop/Makefile
--- a/libexec/hprop/Makefile    Sun Aug 06 21:15:42 2000 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 23:41:40 thorpej Exp $
-DIST=          ${.CURDIR}/../../crypto/dist
-.PATH: ${DIST}/heimdal/kdc
-
-WARNS?=  1
-MKLINT= no
-
-PROG= hprop
-
-SRCS=  hprop.c                                 \
-       hprop-common.c
-
-CPPFLAGS+= -I.                                 \
-       -I${DIST}/heimdal/kdc                   \
-       -I${DIST}/heimdal/lib/hdb               \
-       -I${DIST}/heimdal/lib/krb5              \
-       -I${.CURDIR}/../../include/heimdal      \
-       -I${DIST}/heimdal/lib/asn1              \
-       -I${DESTDIR}/usr/include/kerberosIV     \
-       -I${DESTDIR}/usr/include/krb5           \
-       -I${DIST}/openssl/crypto/md4            \
-       -I${DIST}/openssl/crypto/md5            \
-       -I${DIST}/openssl/crypto/sha            \
-       -I${DIST}/openssl/crypto/rc4            \
-       -I${DIST}/openssl/crypto/des            \
-       -DHAVE_CONFIG_H
-
-LDADD= -lhdb                                   \
-       -lkrb5                                  \
-       -lkdb                                   \
-       -lkrb                                   \
-       -lcrypto                                \
-       -lasn1                                  \
-       -lcom_err                               \
-       -lroken                                 \
-       -lcrypt
-
-MAN=   hprop.8
-
-.include <bsd.prog.mk>
diff -r 739775969c6b -r 99ab28c9f92d usr.sbin/Makefile
--- a/usr.sbin/Makefile Sun Aug 06 21:15:42 2000 +0000
+++ b/usr.sbin/Makefile Sun Aug 06 21:17:38 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.144.2.4 2000/08/06 21:14:24 thorpej Exp $
+#      $NetBSD: Makefile,v 1.144.2.5 2000/08/06 21:17:39 thorpej Exp $
 #      from: @(#)Makefile      5.20 (Berkeley) 6/12/93
 
 .include <bsd.own.mk>
@@ -28,7 +28,7 @@
 SUBDIR+=pvcsif pvctxctl
 
 .if (${MKCRYPTO} != "no")
-SUBDIR+= kadmin kdc kstash ktutil
+SUBDIR+= hprop kadmin kdc kstash ktutil
 .endif
 
 .include <bsd.subdir.mk>
diff -r 739775969c6b -r 99ab28c9f92d usr.sbin/hprop/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.sbin/hprop/Makefile   Sun Aug 06 21:17:38 2000 +0000
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.1.2.2 2000/08/06 21:17:39 thorpej Exp $
+DIST=          ${.CURDIR}/../../crypto/dist
+.PATH: ${DIST}/heimdal/kdc
+
+WARNS?=  1
+MKLINT= no
+
+PROG= hprop
+
+SRCS=  hprop.c                                 \
+       hprop-common.c
+
+CPPFLAGS+= -I.                                 \
+       -I${DIST}/heimdal/kdc                   \
+       -I${DIST}/heimdal/lib/hdb               \
+       -I${DIST}/heimdal/lib/krb5              \
+       -I${.CURDIR}/../../include/heimdal      \
+       -I${DIST}/heimdal/lib/asn1              \
+       -I${DESTDIR}/usr/include/kerberosIV     \
+       -I${DESTDIR}/usr/include/krb5           \
+       -I${DIST}/openssl/crypto/md4            \
+       -I${DIST}/openssl/crypto/md5            \
+       -I${DIST}/openssl/crypto/sha            \
+       -I${DIST}/openssl/crypto/rc4            \
+       -I${DIST}/openssl/crypto/des            \
+       -DHAVE_CONFIG_H
+
+LDADD= -lhdb                                   \
+       -lkrb5                                  \
+       -lkdb                                   \
+       -lkrb                                   \
+       -lcrypto                                \
+       -lasn1                                  \
+       -lcom_err                               \
+       -lroken                                 \
+       -lcrypt
+
+MAN=   hprop.8
+
+.include <bsd.prog.mk>