summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kerberosV/Makefile.inc19
-rw-r--r--kerberosV/lib/libgssapi/Makefile7
-rw-r--r--kerberosV/lib/libhdb/Makefile5
-rw-r--r--kerberosV/lib/libheimntlm/Makefile5
-rw-r--r--kerberosV/lib/libhx509/Makefile5
-rw-r--r--kerberosV/lib/libkadm5srv/Makefile5
-rw-r--r--kerberosV/lib/libkafs5/Makefile35
-rw-r--r--kerberosV/lib/libkrb5/Makefile11
-rw-r--r--kerberosV/libexec/hprop/Makefile5
-rw-r--r--kerberosV/libexec/hpropd/Makefile5
-rw-r--r--kerberosV/libexec/ipropd-master/Makefile5
-rw-r--r--kerberosV/libexec/kadmind/Makefile5
-rw-r--r--kerberosV/libexec/kcm/Makefile5
-rw-r--r--kerberosV/libexec/kdc/Makefile5
-rw-r--r--kerberosV/libexec/kfd/Makefile6
-rw-r--r--kerberosV/libexec/kpasswdd/Makefile6
-rw-r--r--kerberosV/usr.bin/kcc/Makefile5
-rw-r--r--kerberosV/usr.bin/kdestroy/Makefile5
-rw-r--r--kerberosV/usr.bin/kf/Makefile5
-rw-r--r--kerberosV/usr.bin/krb5-config/Makefile5
-rw-r--r--kerberosV/usr.bin/string2key/Makefile5
-rw-r--r--kerberosV/usr.bin/verify_krb5_conf/Makefile5
-rw-r--r--kerberosV/usr.sbin/iprop-log/Makefile5
-rw-r--r--kerberosV/usr.sbin/kadmin/Makefile5
-rw-r--r--kerberosV/usr.sbin/kdigest/Makefile6
-rw-r--r--kerberosV/usr.sbin/kimpersonate/Makefile6
-rw-r--r--kerberosV/usr.sbin/kstash/Makefile6
-rw-r--r--kerberosV/usr.sbin/ktutil/Makefile5
-rw-r--r--kerberosV/varsub2
29 files changed, 127 insertions, 72 deletions
diff --git a/kerberosV/Makefile.inc b/kerberosV/Makefile.inc
index fdf8c083a22..4f3c6c4db0f 100644
--- a/kerberosV/Makefile.inc
+++ b/kerberosV/Makefile.inc
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.17 2013/06/21 17:02:20 robert Exp $
+# $OpenBSD: Makefile.inc,v 1.18 2013/07/01 05:15:23 ajacoutot Exp $
KRB5DIR= ${.CURDIR}/../../../kerberosV/src
+KRB5SUBST= ${KRB5DIR}/../varsub
CFLAGS+= -DHAVE_CONFIG_H -DNO_NTLM -I${.CURDIR}/../../include -I/usr/include/kerberosV
@@ -36,6 +37,22 @@ CLEANFILES+= ${_ET}.h ${_ET}.c
.endif # defined(SRCS)
+.if defined(MPAGES)
+
+MAN += ${MPAGES:S@^@${.OBJDIR}/@}
+CLEANFILES += ${MAN}
+
+. for PAGE in ${MPAGES}
+. for dir in ${MSRC}
+. if exists(${dir}/${PAGE:T})
+${PAGE}: ${dir}/${PAGE:T}
+ sed -f ${KRB5SUBST} ${dir}/${PAGE:T} >$@.tmp && mv $@.tmp $@
+. endif
+. endfor
+. endfor
+
+.endif # defined(MPAGES)
+
ASN1_COMPILE= asn1_compile
SLC= slc
COMPILE_ET= compile_et
diff --git a/kerberosV/lib/libgssapi/Makefile b/kerberosV/lib/libgssapi/Makefile
index 29d9635b330..7c01f1a4ef4 100644
--- a/kerberosV/lib/libgssapi/Makefile
+++ b/kerberosV/lib/libgssapi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2013/06/21 09:39:50 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2013/07/01 05:15:23 ajacoutot Exp $
LIB= gssapi
@@ -183,10 +183,13 @@ INCSGROUPS= INCS OIDINCS KRB5INCS #SPNEGOINCS
GEN+= gssapi_asn1.hx \
gssapi_asn1-priv.hx
-MAN= gssapi.3 \
+MPAGES= gssapi.3 \
gss_acquire_cred.3 \
mech.5
+MSRC= ${KRB5DIR}/lib/gssapi \
+ ${KRB5DIR}/lib/gssapi/mech
+
MLINKS= \
gss_acquire_cred.3 gss_accept_sec_context.3 \
gss_acquire_cred.3 gss_add_cred.3 \
diff --git a/kerberosV/lib/libhdb/Makefile b/kerberosV/lib/libhdb/Makefile
index 99d73c7ff17..160cf776b50 100644
--- a/kerberosV/lib/libhdb/Makefile
+++ b/kerberosV/lib/libhdb/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2013/06/21 11:01:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2013/07/01 05:15:23 ajacoutot Exp $
LIB= hdb
-MAN= HDB.3 hdb_entry_ex.3
+MPAGES= HDB.3 hdb_entry_ex.3
+MSRC= ${KRB5DIR}/doc/doxyout/hdb/man/man3
MLINKS= HDB.3 hdb__del.3 \
HDB.3 hdb__get.3 \
diff --git a/kerberosV/lib/libheimntlm/Makefile b/kerberosV/lib/libheimntlm/Makefile
index 74bc31ac369..16cd272e1f7 100644
--- a/kerberosV/lib/libheimntlm/Makefile
+++ b/kerberosV/lib/libheimntlm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2013/06/21 10:59:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2013/07/01 05:15:23 ajacoutot Exp $
LIB= heimntlm
DPADD= ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN}
@@ -6,11 +6,12 @@ SRCS= ntlm.c ntlm_err.c
INCS= heimntlm.h heimntlm-protos.h ntlm_err.h
CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken
-MAN= ntlm_buf.3 \
+MPAGES= ntlm_buf.3 \
ntlm_core.3 \
ntlm_type1.3 \
ntlm_type2.3 \
ntlm_type3.3
+MSRC= ${KRB5DIR}/doc/doxyout/ntlm/man/man3
MLINKS= ntlm_core.3 heim_ntlm_build_ntlm1_master.3 \
ntlm_core.3 heim_ntlm_build_ntlm2_master.3 \
diff --git a/kerberosV/lib/libhx509/Makefile b/kerberosV/lib/libhx509/Makefile
index 3a7acbbf707..0dd5c7ce049 100644
--- a/kerberosV/lib/libhx509/Makefile
+++ b/kerberosV/lib/libhx509/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 2013/06/17 19:11:35 robert Exp $
+# $OpenBSD: Makefile,v 1.2 2013/07/01 05:15:23 ajacoutot Exp $
LIB= hx509
DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPTO} ${LIBROKEN} ${LIBWIND}
-MAN= hx509.3 \
+MPAGES= hx509.3 \
hx509_ca.3 \
hx509_cert.3 \
hx509_cms.3 \
@@ -19,6 +19,7 @@ MAN= hx509.3 \
hx509_query.3 \
hx509_revoke.3 \
hx509_verify.3
+MSRC= ${KRB5DIR}/doc/doxyout/hx509/man/man3
MLINKS= hx509.3 hx509_context_free.3 \
hx509.3 hx509_context_init.3 \
diff --git a/kerberosV/lib/libkadm5srv/Makefile b/kerberosV/lib/libkadm5srv/Makefile
index 612ed37a959..60abcb0280e 100644
--- a/kerberosV/lib/libkadm5srv/Makefile
+++ b/kerberosV/lib/libkadm5srv/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2013/06/21 10:59:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2013/07/01 05:15:24 ajacoutot Exp $
LIB= kadm5srv
-MAN= kadm5_pwcheck.3
+MPAGES= kadm5_pwcheck.3
+MSRC= ${KRB5DIR}/lib/kadm5
SRCS= acl.c \
bump_pw_expire.c \
diff --git a/kerberosV/lib/libkafs5/Makefile b/kerberosV/lib/libkafs5/Makefile
index d245d17176e..92a7cc6e478 100644
--- a/kerberosV/lib/libkafs5/Makefile
+++ b/kerberosV/lib/libkafs5/Makefile
@@ -1,23 +1,24 @@
-# $OpenBSD: Makefile,v 1.2 2013/06/21 10:59:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2013/07/01 05:15:24 ajacoutot Exp $
LIB= kafs5
INCS= kafs.h
-MAN= kafs5.3
-
-MLINKS= kafs5.3 k_afs_cell_of_file.3 \
- kafs5.3 k_hasafs.3 \
- kafs5.3 k_pioctl.3 \
- kafs5.3 k_setpag.3 \
- kafs5.3 k_unlog.3 \
- kafs5.3 kafs.3 \
- kafs5.3 kafs_set_verbose.3 \
- kafs5.3 kafs_settoken.3 \
- kafs5.3 kafs_settoken5.3 \
- kafs5.3 kafs_settoken_rxkad.3 \
- kafs5.3 krb5_afslog.3 \
- kafs5.3 krb5_afslog_uid.3 \
- kafs5.3 krb_afslog.3 \
- kafs5.3 krb_afslog_uid.3
+MPAGES= kafs.3
+MSRC= ${KRB5DIR}/lib/kafs
+
+MLINKS= kafs.3 k_afs_cell_of_file.3 \
+ kafs.3 k_hasafs.3 \
+ kafs.3 k_pioctl.3 \
+ kafs.3 k_setpag.3 \
+ kafs.3 k_unlog.3 \
+ kafs.3 kafs5.3 \
+ kafs.3 kafs_set_verbose.3 \
+ kafs.3 kafs_settoken.3 \
+ kafs.3 kafs_settoken5.3 \
+ kafs.3 kafs_settoken_rxkad.3 \
+ kafs.3 krb5_afslog.3 \
+ kafs.3 krb5_afslog_uid.3 \
+ kafs.3 krb_afslog.3 \
+ kafs.3 krb_afslog_uid.3
SRCS= afssys.c afskrb5.c common.c krb5_err.h
SRCS= afssys.c \
diff --git a/kerberosV/lib/libkrb5/Makefile b/kerberosV/lib/libkrb5/Makefile
index 28d67a72bac..e449060b5ef 100644
--- a/kerberosV/lib/libkrb5/Makefile
+++ b/kerberosV/lib/libkrb5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2013/06/21 12:26:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2013/07/01 05:15:24 ajacoutot Exp $
LIB= krb5
@@ -20,7 +20,7 @@ KRB5INCS= locate_plugin.h \
KRB5INCSDIR= ${INCSDIR}/krb5
INCSGROUPS= INCS KRB5INCS
-MAN= krb5.3 \
+MPAGES= krb5.3 \
krb524_convert_creds_kdc.3 \
krb5_425_conv_principal.3 \
krb5_acl_match_file.3 \
@@ -82,8 +82,11 @@ MAN= krb5.3 \
krb5_verify_init_creds.3 \
krb5_verify_user.3
-MAN+= krb5.conf.5
-MAN+= kerberos.8
+MPAGES+= krb5.conf.5
+MPAGES+= kerberos.8
+
+MSRC= ${KRB5DIR}/lib/krb5 \
+ ${KRB5DIR}/doc/doxyout/krb5/man/man3
MLINKS= krb5.3 krb5_add_et_list.3 \
krb5.3 krb5_add_extra_addresses.3 \
diff --git a/kerberosV/libexec/hprop/Makefile b/kerberosV/libexec/hprop/Makefile
index f59461225e0..a1c902dd31b 100644
--- a/kerberosV/libexec/hprop/Makefile
+++ b/kerberosV/libexec/hprop/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2013/06/19 19:36:46 robert Exp $
+# $OpenBSD: Makefile,v 1.11 2013/07/01 05:15:24 ajacoutot Exp $
PROG= hprop
-MAN= hprop.8
+MPAGES= hprop.8
+MSRC= ${KRB5DIR}/kdc
SRCS= hprop.c mit_dump.c
CFLAGS+=-I${KRB5DIR}/lib/roken
CFLAGS+=-I${KRB5DIR}/lib/krb5
diff --git a/kerberosV/libexec/hpropd/Makefile b/kerberosV/libexec/hpropd/Makefile
index 6f0b024434c..d7581214c33 100644
--- a/kerberosV/libexec/hpropd/Makefile
+++ b/kerberosV/libexec/hpropd/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2013/06/19 19:36:46 robert Exp $
+# $OpenBSD: Makefile,v 1.11 2013/07/01 05:15:24 ajacoutot Exp $
PROG= hpropd
-MAN= hpropd.8
+MPAGES= hpropd.8
+MSRC= ${KRB5DIR}/kdc
CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kdc ${LDAPCFLAGS}
DPADD= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
diff --git a/kerberosV/libexec/ipropd-master/Makefile b/kerberosV/libexec/ipropd-master/Makefile
index c0d4e9cea3d..a2749403180 100644
--- a/kerberosV/libexec/ipropd-master/Makefile
+++ b/kerberosV/libexec/ipropd-master/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2013/06/19 19:36:47 robert Exp $
+# $OpenBSD: Makefile,v 1.12 2013/07/01 05:15:24 ajacoutot Exp $
PROG= ipropd-master
-MAN= iprop.8
+MPAGES= iprop.8
+MSRC= ${KRB5DIR}/lib/kadm5
SRCS= ipropd_common.c ipropd_master.c kadm5_err.h
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-I. ${LDAPCFLAGS}
diff --git a/kerberosV/libexec/kadmind/Makefile b/kerberosV/libexec/kadmind/Makefile
index 02bf02ad3b8..07233b29903 100644
--- a/kerberosV/libexec/kadmind/Makefile
+++ b/kerberosV/libexec/kadmind/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.16 2013/06/21 20:34:23 miod Exp $
+# $OpenBSD: Makefile,v 1.17 2013/07/01 05:15:24 ajacoutot Exp $
PROG= kadmind
-MAN= kadmind.8
+MPAGES= kadmind.8
+MSRC= ${KRB5DIR}/kadmin
SRCS= rpc.c \
server.c \
kadmind.c \
diff --git a/kerberosV/libexec/kcm/Makefile b/kerberosV/libexec/kcm/Makefile
index 92868b07af2..c854ce07bec 100644
--- a/kerberosV/libexec/kcm/Makefile
+++ b/kerberosV/libexec/kcm/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2013/06/20 07:16:22 robert Exp $
+# $OpenBSD: Makefile,v 1.4 2013/07/01 05:15:24 ajacoutot Exp $
PROG= kcm
-MAN= kcm.8
+MPAGES= kcm.8
+MSRC= ${KRB5DIR}/kcm
SRCS= acl.c \
acquire.c \
diff --git a/kerberosV/libexec/kdc/Makefile b/kerberosV/libexec/kdc/Makefile
index c67fb843c13..29be9710e0a 100644
--- a/kerberosV/libexec/kdc/Makefile
+++ b/kerberosV/libexec/kdc/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2013/06/19 19:36:48 robert Exp $
+# $OpenBSD: Makefile,v 1.16 2013/07/01 05:15:24 ajacoutot Exp $
PROG= kdc
-MAN= kdc.8
+MPAGES= kdc.8
+MSRC= ${KRB5DIR}/kdc
SRCS= config.c \
connect.c \
diff --git a/kerberosV/libexec/kfd/Makefile b/kerberosV/libexec/kfd/Makefile
index 605770955d0..a2e89369d28 100644
--- a/kerberosV/libexec/kfd/Makefile
+++ b/kerberosV/libexec/kfd/Makefile
@@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2013/06/19 19:36:49 robert Exp $
+# $OpenBSD: Makefile,v 1.9 2013/07/01 05:15:24 ajacoutot Exp $
PROG= kfd
-MAN= kfd.8
+MPAGES= kfd.8
+MSRC= ${KRB5DIR}/appl/kf
+
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
diff --git a/kerberosV/libexec/kpasswdd/Makefile b/kerberosV/libexec/kpasswdd/Makefile
index c0b074eb1bb..40adce2914f 100644
--- a/kerberosV/libexec/kpasswdd/Makefile
+++ b/kerberosV/libexec/kpasswdd/Makefile
@@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2013/06/19 19:36:49 robert Exp $
+# $OpenBSD: Makefile,v 1.14 2013/07/01 05:15:24 ajacoutot Exp $
PROG= kpasswdd
-MAN= kpasswdd.8
+MPAGES= kpasswdd.8
+MSRC= ${KRB5DIR}/kpasswd
+
CFLAGS+=-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS}
DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
diff --git a/kerberosV/usr.bin/kcc/Makefile b/kerberosV/usr.bin/kcc/Makefile
index 7181a0939aa..46247ba9317 100644
--- a/kerberosV/usr.bin/kcc/Makefile
+++ b/kerberosV/usr.bin/kcc/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2013/06/21 17:02:20 robert Exp $
+# $OpenBSD: Makefile,v 1.5 2013/07/01 05:15:24 ajacoutot Exp $
PROG= kcc
-MAN= klist.1
+MPAGES= klist.1
+MSRC= ${KRB5DIR}/kuser
LINKS= ${BINDIR}/kcc ${BINDIR}/klist
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken \
diff --git a/kerberosV/usr.bin/kdestroy/Makefile b/kerberosV/usr.bin/kdestroy/Makefile
index 303bf485c62..970f30323cd 100644
--- a/kerberosV/usr.bin/kdestroy/Makefile
+++ b/kerberosV/usr.bin/kdestroy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2013/06/19 19:36:54 robert Exp $
+# $OpenBSD: Makefile,v 1.10 2013/07/01 05:15:24 ajacoutot Exp $
PROG= kdestroy
CFLAGS+=-I${KRB5DIR}/lib/roken
@@ -7,7 +7,8 @@ DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lwind -lcom_err \
-lheimbase
-MAN= kdestroy.1
+MPAGES= kdestroy.1
+MSRC= ${KRB5DIR}/kuser
.include <bsd.prog.mk>
diff --git a/kerberosV/usr.bin/kf/Makefile b/kerberosV/usr.bin/kf/Makefile
index 5ca92ba9c5a..79e6ae0afd0 100644
--- a/kerberosV/usr.bin/kf/Makefile
+++ b/kerberosV/usr.bin/kf/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2013/06/19 19:36:55 robert Exp $
+# $OpenBSD: Makefile,v 1.7 2013/07/01 05:15:24 ajacoutot Exp $
PROG= kf
-MAN= kf.1
+MPAGES= kf.1
+MSRC= ${KRB5DIR}/appl/kf
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken
DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
diff --git a/kerberosV/usr.bin/krb5-config/Makefile b/kerberosV/usr.bin/krb5-config/Makefile
index 6b3844937cd..9a91257278e 100644
--- a/kerberosV/usr.bin/krb5-config/Makefile
+++ b/kerberosV/usr.bin/krb5-config/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2013/06/20 08:41:22 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2013/07/01 05:15:24 ajacoutot Exp $
SCRIPTS=krb5-config
-MAN= krb5-config.1
+MPAGES= krb5-config.1
+MSRC= ${KRB5DIR}/tools
CLEANFILES= krb5-config
diff --git a/kerberosV/usr.bin/string2key/Makefile b/kerberosV/usr.bin/string2key/Makefile
index a35e63f2f41..d9cefdc1f4f 100644
--- a/kerberosV/usr.bin/string2key/Makefile
+++ b/kerberosV/usr.bin/string2key/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2013/06/19 19:36:56 robert Exp $
+# $OpenBSD: Makefile,v 1.8 2013/07/01 05:15:24 ajacoutot Exp $
PROG= string2key
-MAN= string2key.8
+MPAGES= string2key.8
+MSRC= ${KRB5DIR}/kdc
CFLAGS+= -I${KRB5DIR}/kdc \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/krb5 \
diff --git a/kerberosV/usr.bin/verify_krb5_conf/Makefile b/kerberosV/usr.bin/verify_krb5_conf/Makefile
index 96be18b61a4..f535c12c157 100644
--- a/kerberosV/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberosV/usr.bin/verify_krb5_conf/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2013/06/19 19:36:57 robert Exp $
+# $OpenBSD: Makefile,v 1.8 2013/07/01 05:15:24 ajacoutot Exp $
PROG= verify_krb5_conf
-MAN= verify_krb5_conf.8
+MPAGES= verify_krb5_conf.8
+MSRC= ${KRB5DIR}/lib/krb5
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
diff --git a/kerberosV/usr.sbin/iprop-log/Makefile b/kerberosV/usr.sbin/iprop-log/Makefile
index 122672de186..6dd603b908c 100644
--- a/kerberosV/usr.sbin/iprop-log/Makefile
+++ b/kerberosV/usr.sbin/iprop-log/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2013/06/21 17:02:20 robert Exp $
+# $OpenBSD: Makefile,v 1.4 2013/07/01 05:15:24 ajacoutot Exp $
PROG= iprop-log
-MAN= iprop-log.8
+MPAGES= iprop-log.8
+MSRC= ${KRB5DIR}/lib/kadm5
SRCS= iprop-log.c \
kadm5_err.h \
diff --git a/kerberosV/usr.sbin/kadmin/Makefile b/kerberosV/usr.sbin/kadmin/Makefile
index f6b6be4205c..3552b7ea46b 100644
--- a/kerberosV/usr.sbin/kadmin/Makefile
+++ b/kerberosV/usr.sbin/kadmin/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.24 2013/06/21 17:02:20 robert Exp $
+# $OpenBSD: Makefile,v 1.25 2013/07/01 05:15:24 ajacoutot Exp $
PROG= kadmin
-MAN= kadmin.8
+MPAGES= kadmin.8
+MSRC= ${KRB5DIR}/kadmin
SRCS= add_enctype.c \
ank.c \
diff --git a/kerberosV/usr.sbin/kdigest/Makefile b/kerberosV/usr.sbin/kdigest/Makefile
index e531a20719c..14617521355 100644
--- a/kerberosV/usr.sbin/kdigest/Makefile
+++ b/kerberosV/usr.sbin/kdigest/Makefile
@@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2013/06/19 19:36:58 robert Exp $
+# $OpenBSD: Makefile,v 1.3 2013/07/01 05:15:24 ajacoutot Exp $
PROG= kdigest
-MAN= kdigest.8
+MPAGES= kdigest.8
+MSRC= ${KRB5DIR}/kuser
+
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/sl -I.
diff --git a/kerberosV/usr.sbin/kimpersonate/Makefile b/kerberosV/usr.sbin/kimpersonate/Makefile
index 6c352116a9b..214f4484cef 100644
--- a/kerberosV/usr.sbin/kimpersonate/Makefile
+++ b/kerberosV/usr.sbin/kimpersonate/Makefile
@@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2013/06/19 19:36:59 robert Exp $
+# $OpenBSD: Makefile,v 1.3 2013/07/01 05:15:24 ajacoutot Exp $
PROG= kimpersonate
-MAN= kimpersonate.8
+MPAGES= kimpersonate.8
+MSRC= ${KRB5DIR}/kuser
+
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/sl -I.
diff --git a/kerberosV/usr.sbin/kstash/Makefile b/kerberosV/usr.sbin/kstash/Makefile
index 4c1891a1a90..0334486ded8 100644
--- a/kerberosV/usr.sbin/kstash/Makefile
+++ b/kerberosV/usr.sbin/kstash/Makefile
@@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2013/06/19 19:36:59 robert Exp $
+# $OpenBSD: Makefile,v 1.12 2013/07/01 05:15:24 ajacoutot Exp $
PROG= kstash
-MAN= kstash.8
+MPAGES= kstash.8
+MSRC= ${KRB5DIR}/kdc
+
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/kdc ${LDAPCFLAGS}
DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
diff --git a/kerberosV/usr.sbin/ktutil/Makefile b/kerberosV/usr.sbin/ktutil/Makefile
index c1463981f27..849f8be7117 100644
--- a/kerberosV/usr.sbin/ktutil/Makefile
+++ b/kerberosV/usr.sbin/ktutil/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.20 2013/06/21 17:02:20 robert Exp $
+# $OpenBSD: Makefile,v 1.21 2013/07/01 05:15:24 ajacoutot Exp $
PROG= ktutil
-MAN= ktutil.8
+MPAGES= ktutil.8
+MSRC= ${KRB5DIR}/admin
SRCS= add.c \
change.c \
diff --git a/kerberosV/varsub b/kerberosV/varsub
new file mode 100644
index 00000000000..98f0ad63e78
--- /dev/null
+++ b/kerberosV/varsub
@@ -0,0 +1,2 @@
+s:/etc/krb5:/etc/kerberosV/krb5:g
+s:/usr/heimdal:/usr:g