Attachment #197116 for bug #222745

Lines 63-68 OLD_FILES+=usr/share/man/man2/numa_getaffinity.2.gz Link Here

(-)b/ObsoleteFiles.inc (+195 lines)
63	OLD_FILES+=usr/share/man/man2/numa_setaffinity.2.gz	63	OLD_FILES+=usr/share/man/man2/numa_setaffinity.2.gz
64	OLD_FILES+=usr/share/man/man1/numactl.1.gz	64	OLD_FILES+=usr/share/man/man1/numactl.1.gz
65	OLD_FILES+=usr/bin/numactl	65	OLD_FILES+=usr/bin/numactl
		66	# 20180708: libcom_err is private
		67	OLD_FILES+=usr/include/com_err.h
		68	OLD_LIBS+=usr/lib/libcom_err.a
		69	OLD_LIBS+=usr/lib/libcom_err.so
		70	OLD_LIBS+=usr/lib/libcom_err.so.5
		71	OLD_LIBS+=usr/lib/libcom_err_p.a
		72	OLD_LIBS+=/usr/lib32/libcom_err.a
		73	OLD_LIBS+=/usr/lib32/libcom_err.so
		74	OLD_LIBS+=/usr/lib32/libcom_err.so.5
66	# 20180630: new clang import which bumps version from 6.0.0 to 6.0.1.	75	# 20180630: new clang import which bumps version from 6.0.0 to 6.0.1.
67	OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/allocator_interface.h	76	OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/allocator_interface.h
68	OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/asan_interface.h	77	OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/asan_interface.h
Lines 199-204 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_ Link Here
199	OLD_DIRS+=usr/lib/clang/6.0.0/lib/freebsd	208	OLD_DIRS+=usr/lib/clang/6.0.0/lib/freebsd
200	OLD_DIRS+=usr/lib/clang/6.0.0/lib	209	OLD_DIRS+=usr/lib/clang/6.0.0/lib
201	OLD_DIRS+=usr/lib/clang/6.0.0	210	OLD_DIRS+=usr/lib/clang/6.0.0
		211	# 20180625: krb5 private lib32
		212	OLD_LIBS+=usr/lib32/libgssapi.a
		213	OLD_LIBS+=usr/lib32/libgssapi.so
		214	OLD_LIBS+=usr/lib32/libgssapi.so.10
		215	OLD_LIBS+=usr/lib32/libasn1.a
		216	OLD_LIBS+=usr/lib32/libasn1.so
		217	OLD_LIBS+=usr/lib32/libasn1.so.11
		218	OLD_LIBS+=usr/lib32/libasn1_p.a
		219	OLD_LIBS+=usr/lib32/libgssapi_krb5.a
		220	OLD_LIBS+=usr/lib32/libgssapi_krb5.so
		221	OLD_LIBS+=usr/lib32/libgssapi_krb5.so.10
		222	OLD_LIBS+=usr/lib32/libgssapi_krb5_p.a
		223	OLD_LIBS+=usr/lib32/libgssapi_ntlm.a
		224	OLD_LIBS+=usr/lib32/libgssapi_ntlm.so
		225	OLD_LIBS+=usr/lib32/libgssapi_ntlm.so.10
		226	OLD_LIBS+=usr/lib32/libgssapi_ntlm_p.a
		227	OLD_LIBS+=usr/lib32/libgssapi_spnego.a
		228	OLD_LIBS+=usr/lib32/libgssapi_spnego.so
		229	OLD_LIBS+=usr/lib32/libgssapi_spnego.so.10
		230	OLD_LIBS+=usr/lib32/libgssapi_spnego_p.a
		231	OLD_LIBS+=usr/lib32/libhdb.a
		232	OLD_LIBS+=usr/lib32/libhdb.so
		233	OLD_LIBS+=usr/lib32/libhdb.so.11
		234	OLD_LIBS+=usr/lib32/libhdb_p.a
		235	OLD_LIBS+=usr/lib32/libheimbase.a
		236	OLD_LIBS+=usr/lib32/libheimbase.so
		237	OLD_LIBS+=usr/lib32/libheimbase.so.11
		238	OLD_LIBS+=usr/lib32/libheimbase_p.a
		239	OLD_LIBS+=usr/lib32/libheimntlm.a
		240	OLD_LIBS+=usr/lib32/libheimntlm.so
		241	OLD_LIBS+=usr/lib32/libheimntlm.so.11
		242	OLD_LIBS+=usr/lib32/libheimntlm_p.a
		243	OLD_LIBS+=usr/lib32/libhx509.a
		244	OLD_LIBS+=usr/lib32/libhx509.so
		245	OLD_LIBS+=usr/lib32/libhx509.so.11
		246	OLD_LIBS+=usr/lib32/libhx509_p.a
		247	OLD_LIBS+=usr/lib32/libkadm5clnt.a
		248	OLD_LIBS+=usr/lib32/libkadm5clnt.so
		249	OLD_LIBS+=usr/lib32/libkadm5clnt.so.11
		250	OLD_LIBS+=usr/lib32/libkadm5clnt_p.a
		251	OLD_LIBS+=usr/lib32/libkadm5srv.a
		252	OLD_LIBS+=usr/lib32/libkadm5srv.so
		253	OLD_LIBS+=usr/lib32/libkadm5srv.so.11
		254	OLD_LIBS+=usr/lib32/libkadm5srv_p.a
		255	OLD_LIBS+=usr/lib32/libkafs5.a
		256	OLD_LIBS+=usr/lib32/libkafs5.so
		257	OLD_LIBS+=usr/lib32/libkafs5.so.11
		258	OLD_LIBS+=usr/lib32/libkafs5_p.a
		259	OLD_LIBS+=usr/lib32/libkdc.a
		260	OLD_LIBS+=usr/lib32/libkdc.so
		261	OLD_LIBS+=usr/lib32/libkdc.so.11
		262	OLD_LIBS+=usr/lib32/libkdc_p.a
		263	OLD_LIBS+=usr/lib32/libkrb5.a
		264	OLD_LIBS+=usr/lib32/libkrb5.so
		265	OLD_LIBS+=usr/lib32/libkrb5.so.11
		266	OLD_LIBS+=usr/lib32/libkrb5_p.a
		267	OLD_LIBS+=usr/lib32/libroken.a
		268	OLD_LIBS+=usr/lib32/libroken.so
		269	OLD_LIBS+=usr/lib32/libroken.so.11
		270	OLD_LIBS+=usr/lib32/libroken_p.a
		271	OLD_LIBS+=usr/lib32/libwind.a
		272	OLD_LIBS+=usr/lib32/libwind.so
		273	OLD_LIBS+=usr/lib32/libwind.so.11
		274	OLD_LIBS+=usr/lib32/libwind_p.a
202	# 20180615: asf(8) removed	275	# 20180615: asf(8) removed
203	OLD_FILES+=usr/sbin/asf	276	OLD_FILES+=usr/sbin/asf
204	OLD_FILES+=usr/share/man/man8/asf.8.gz	277	OLD_FILES+=usr/share/man/man8/asf.8.gz
Lines 218-223 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/grep.cat Link Here
218	OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/grep.cat	291	OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/grep.cat
219	OLD_FILES+=usr/share/nls/uk_UA.UTF-8/grep.cat	292	OLD_FILES+=usr/share/nls/uk_UA.UTF-8/grep.cat
220	OLD_FILES+=usr/share/nls/ja_JP.UTF-8/grep.cat	293	OLD_FILES+=usr/share/nls/ja_JP.UTF-8/grep.cat
		294	# 20180603: No need for krb5-config, it confuses ports.
		295	OLD_FILES+=usr/bin/krb5-config
221	# 20180517: retire vxge	296	# 20180517: retire vxge
222	OLD_FILES+=usr/share/man/man4/if_vxge.4.gz	297	OLD_FILES+=usr/share/man/man4/if_vxge.4.gz
223	OLD_FILES+=usr/share/man/man4/vxge.4.gz	298	OLD_FILES+=usr/share/man/man4/vxge.4.gz
Lines 246-251 OLD_FILES+=usr/sbin/lmcconfig Link Here
246	OLD_FILES+=usr/share/man/man4/lmc.4.gz	321	OLD_FILES+=usr/share/man/man4/lmc.4.gz
247	OLD_FILES+=usr/share/man/man4/if_lmc.4.gz	322	OLD_FILES+=usr/share/man/man4/if_lmc.4.gz
248	OLD_FILES+=usr/share/man/man8/lmcconfig.8.gz	323	OLD_FILES+=usr/share/man/man8/lmcconfig.8.gz
		324	# 20180430: libgssapi should also be private
		325	OLD_LIBS+=usr/lib/libgssapi.a
		326	OLD_LIBS+=usr/lib/libgssapi.so
		327	OLD_LIBS+=usr/lib/libgssapi.so.10
249	# 20180417: remove fuswintr and suswintr	328	# 20180417: remove fuswintr and suswintr
250	OLD_FILES+=usr/share/man/man9/fuswintr.9.gz	329	OLD_FILES+=usr/share/man/man9/fuswintr.9.gz
251	OLD_FILES+=usr/share/man/man9/suswintr.9.gz	330	OLD_FILES+=usr/share/man/man9/suswintr.9.gz
Lines 786-791 OLD_DIRS+=usr/share/openssl/man/cat1 Link Here
786	OLD_DIRS+=usr/share/openssl/man/cat3	865	OLD_DIRS+=usr/share/openssl/man/cat3
787	OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat1	866	OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat1
788	OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat3	867	OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat3
		868	# 20170831: hemdal becomes private
		869	OLD_FILES+=usr/include/asn1-common.h
		870	OLD_FILES+=usr/include/asn1_err.h
		871	OLD_FILES+=usr/include/base64.h
		872	OLD_FILES+=usr/include/cms_asn1.h
		873	OLD_FILES+=usr/include/crmf_asn1.h
		874	OLD_FILES+=usr/include/der-private.h
		875	OLD_FILES+=usr/include/der-protos.h
		876	OLD_FILES+=usr/include/der.h
		877	OLD_FILES+=usr/include/digest_asn1.h
		878	OLD_FILES+=usr/include/getarg.h
		879	OLD_FILES+=usr/include/hdb-protos.h
		880	OLD_FILES+=usr/include/hdb.h
		881	OLD_FILES+=usr/include/hdb_asn1.h
		882	OLD_FILES+=usr/include/hdb_err.h
		883	OLD_FILES+=usr/include/heim_asn1.h
		884	OLD_FILES+=usr/include/heim_err.h
		885	OLD_FILES+=usr/include/heim_threads.h
		886	OLD_FILES+=usr/include/heimbase.h
		887	OLD_FILES+=usr/include/heimntlm-protos.h
		888	OLD_FILES+=usr/include/heimntlm.h
		889	OLD_FILES+=usr/include/hex.h
		890	OLD_FILES+=usr/include/hx509-private.h
		891	OLD_FILES+=usr/include/hx509-protos.h
		892	OLD_FILES+=usr/include/hx509.h
		893	OLD_FILES+=usr/include/hx509_err.h
		894	OLD_FILES+=usr/include/k524_err.h
		895	OLD_FILES+=usr/include/kafs.h
		896	OLD_FILES+=usr/include/kdc-protos.h
		897	OLD_FILES+=usr/include/kdc.h
		898	OLD_FILES+=usr/include/krb5-private.h
		899	OLD_FILES+=usr/include/krb5-protos.h
		900	OLD_FILES+=usr/include/krb5-types.h
		901	OLD_FILES+=usr/include/krb5.h
		902	OLD_FILES+=usr/include/krb5_asn1.h
		903	OLD_FILES+=usr/include/krb5_ccapi.h
		904	OLD_FILES+=usr/include/krb5_err.h
		905	OLD_FILES+=usr/include/kx509_asn1.h
		906	OLD_FILES+=usr/include/ntlm_err.h
		907	OLD_FILES+=usr/include/ocsp_asn1.h
		908	OLD_FILES+=usr/include/parse_bytes.h
		909	OLD_FILES+=usr/include/parse_time.h
		910	OLD_FILES+=usr/include/parse_units.h
		911	OLD_FILES+=usr/include/pkcs10_asn1.h
		912	OLD_FILES+=usr/include/pkcs12_asn1.h
		913	OLD_FILES+=usr/include/pkcs8_asn1.h
		914	OLD_FILES+=usr/include/pkcs9_asn1.h
		915	OLD_FILES+=usr/include/pkinit_asn1.h
		916	OLD_FILES+=usr/include/resolve.h
		917	OLD_FILES+=usr/include/rfc2459_asn1.h
		918	OLD_FILES+=usr/include/roken-common.h
		919	OLD_FILES+=usr/include/roken.h
		920	OLD_FILES+=usr/include/rtbl.h
		921	OLD_FILES+=usr/include/wind.h
		922	OLD_FILES+=usr/include/wind_err.h
		923	OLD_FILES+=usr/include/xdbm.h
		924	OLD_LIBS+=usr/lib/libasn1.a
		925	OLD_LIBS+=usr/lib/libasn1.so
		926	OLD_LIBS+=usr/lib/libasn1.so.11
		927	OLD_LIBS+=usr/lib/libasn1_p.a
		928	OLD_LIBS+=usr/lib/libgssapi_krb5.a
		929	OLD_LIBS+=usr/lib/libgssapi_krb5.so
		930	OLD_LIBS+=usr/lib/libgssapi_krb5.so.10
		931	OLD_LIBS+=usr/lib/libgssapi_krb5_p.a
932	OLD_LIBS+=usr/lib/libgssapi_ntlm.a
933	OLD_LIBS+=usr/lib/libgssapi_ntlm.so
934	OLD_LIBS+=usr/lib/libgssapi_ntlm.so.10
935	OLD_LIBS+=usr/lib/libgssapi_ntlm_p.a
936	OLD_LIBS+=usr/lib/libgssapi_spnego.a
937	OLD_LIBS+=usr/lib/libgssapi_spnego.so
938	OLD_LIBS+=usr/lib/libgssapi_spnego.so.10
939	OLD_LIBS+=usr/lib/libgssapi_spnego_p.a
940	OLD_LIBS+=usr/lib/libhdb.a
941	OLD_LIBS+=usr/lib/libhdb.so
942	OLD_LIBS+=usr/lib/libhdb.so.11
943	OLD_LIBS+=usr/lib/libhdb_p.a
944	OLD_LIBS+=usr/lib/libheimbase.a
945	OLD_LIBS+=usr/lib/libheimbase.so
946	OLD_LIBS+=usr/lib/libheimbase.so.11
947	OLD_LIBS+=usr/lib/libheimbase_p.a
948	OLD_LIBS+=usr/lib/libheimntlm.a
949	OLD_LIBS+=usr/lib/libheimntlm.so
950	OLD_LIBS+=usr/lib/libheimntlm.so.11
951	OLD_LIBS+=usr/lib/libheimntlm_p.a
952	OLD_LIBS+=usr/lib/libhx509.a
953	OLD_LIBS+=usr/lib/libhx509.so
954	OLD_LIBS+=usr/lib/libhx509.so.11
955	OLD_LIBS+=usr/lib/libhx509_p.a
956	OLD_LIBS+=usr/lib/libkadm5clnt.a
957	OLD_LIBS+=usr/lib/libkadm5clnt.so
958	OLD_LIBS+=usr/lib/libkadm5clnt.so.11
959	OLD_LIBS+=usr/lib/libkadm5clnt_p.a
960	OLD_LIBS+=usr/lib/libkadm5srv.a
961	OLD_LIBS+=usr/lib/libkadm5srv.so
962	OLD_LIBS+=usr/lib/libkadm5srv.so.11
963	OLD_LIBS+=usr/lib/libkadm5srv_p.a
964	OLD_LIBS+=usr/lib/libkafs5.a
965	OLD_LIBS+=usr/lib/libkafs5.so
966	OLD_LIBS+=usr/lib/libkafs5.so.11
967	OLD_LIBS+=usr/lib/libkafs5_p.a
968	OLD_LIBS+=usr/lib/libkdc.a
969	OLD_LIBS+=usr/lib/libkdc.so
970	OLD_LIBS+=usr/lib/libkdc.so.11
971	OLD_LIBS+=usr/lib/libkdc_p.a
972	OLD_LIBS+=usr/lib/libkrb5.a
973	OLD_LIBS+=usr/lib/libkrb5.so
974	OLD_LIBS+=usr/lib/libkrb5.so.11
975	OLD_LIBS+=usr/lib/libkrb5_p.a
976	OLD_LIBS+=usr/lib/libroken.a
977	OLD_LIBS+=usr/lib/libroken.so
978	OLD_LIBS+=usr/lib/libroken.so.11
979	OLD_LIBS+=usr/lib/libroken_p.a
980	OLD_LIBS+=usr/lib/libwind.a
981	OLD_LIBS+=usr/lib/libwind.so
982	OLD_LIBS+=usr/lib/libwind.so.11
983	OLD_LIBS+=usr/lib/libwind_p.a
789	# 20170802: ksyms(4) ioctl interface was removed	984	# 20170802: ksyms(4) ioctl interface was removed
790	OLD_FILES+=usr/include/sys/ksyms.h	985	OLD_FILES+=usr/include/sys/ksyms.h
791	# 20170722: new clang import which bumps version from 4.0.0 to 5.0.0.	986	# 20170722: new clang import which bumps version from 4.0.0 to 5.0.0.

Lines 9-22 Link Here

(-)b/etc/mtree/BSD.usr.dist (+22 lines)
9	..	9	..
10	include	10	include
11	private	11	private
		12	asn1
		13	..
12	bsdstat	14	bsdstat
13	..	15	..
		16	com_err
		17	..
14	event	18	event
15	..	19	..
		20	hdb
		21	..
		22	heimbase
		23	..
		24	heimntlm
		25	..
		26	hx509
		27	..
		28	kafs5
		29	..
		30	kdc
		31	..
		32	krb5
		33	..
		34	roken
		35	..
16	sqlite3	36	sqlite3
17	..	37	..
18	ucl	38	ucl
19	..	39	..
		40	wind
		41	..
20	zstd	42	zstd
21	..	43	..
22	..	44	..

Lines 6-12 NO_LINT= Link Here

(-)b/kerberos5/Makefile.inc (-1 / +1 lines)
6		6
7	KRB5DIR= ${SRCTOP}/crypto/heimdal	7	KRB5DIR= ${SRCTOP}/crypto/heimdal
8		8
9	CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include	9	CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include -I${KRB5DIR}/include
10		10
11	.if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT)	11	.if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT)
12	OPENLDAPBASE?= /usr/local	12	OPENLDAPBASE?= /usr/local

Lines 1-6 Link Here

(-)b/kerberos5/lib/libasn1/Makefile (-1 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	LIB= asn1	3	LIB= asn1
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,--no-undefined	5	LDFLAGS= -Wl,--no-undefined
5	INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h	6	INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h
6	LIBADD= com_err roken	7	LIBADD= com_err roken
Lines 21-27 SRCS= asn1_err.c \ Link Here
21	timegm.c \	22	timegm.c \
22	${GEN:S/.x$/.c/:S/.hx$/.h/}	23	${GEN:S/.x$/.c/:S/.hx$/.h/}
23		24
24	CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.	25	CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
		26	-I${.OBJDIR:H}/libroken -I${SRCTOP}/contrib/com_err -I.
25		27
26	GEN_RFC2459= asn1_rfc2459_asn1.x rfc2459_asn1.hx rfc2459_asn1-priv.hx	28	GEN_RFC2459= asn1_rfc2459_asn1.x rfc2459_asn1.hx rfc2459_asn1-priv.hx
27	GEN_CMS= asn1_cms_asn1.x cms_asn1.hx cms_asn1-priv.hx	29	GEN_CMS= asn1_cms_asn1.x cms_asn1.hx cms_asn1-priv.hx




# $FreeBSD$

LIB=	gssapi_krb5
PRIVATELIB=	true
LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
LIBADD=	gssapi krb5 crypto roken asn1 com_err
SHLIB_MAJOR=	10

CFLAGS+=-I${KRB5DIR}/lib/gssapi/krb5
CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi
CFLAGS+=-I${KRB5DIR}/lib/krb5
CFLAGS+=-I${.OBJDIR:H}/libkrb5
CFLAGS+=-I${KRB5DIR}/lib/asn1
CFLAGS+=-I${.OBJDIR:H}/libasn1
CFLAGS+=-I${KRB5DIR}/lib/roken
CFLAGS+=-I${.OBJDIR:H}/libroken
CFLAGS+=-I${KRB5DIR}/lib/wind
CFLAGS+=-I${.OBJDIR:H}/libwind
CFLAGS+=-I${KRB5DIR}/lib/hx509
CFLAGS+=-I${.OBJDIR:H}/libhx509
CFLAGS+=-I${SRCTOP}/contrib/com_err 
CFLAGS+=-I${KRB5DIR}/base -I.

.include <bsd.lib.mk>


Lines 1-6 Link Here

(-)b/kerberos5/lib/libgssapi_ntlm/Makefile (+8 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	LIB= gssapi_ntlm	3	LIB= gssapi_ntlm
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined	5	LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
5	LIBADD= crypto gssapi krb5 heimntlm roken	6	LIBADD= crypto gssapi krb5 heimntlm roken
6	SHLIB_MAJOR= 10	7	SHLIB_MAJOR= 10
Lines 41-47 CFLAGS+=-I${KRB5DIR}/lib/gssapi Link Here
41	CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi	42	CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi
42	CFLAGS+=-I${KRB5DIR}/lib/gssapi/ntlm	43	CFLAGS+=-I${KRB5DIR}/lib/gssapi/ntlm
43	CFLAGS+=-I${KRB5DIR}/lib/krb5	44	CFLAGS+=-I${KRB5DIR}/lib/krb5
		45	CFLAGS+=-I${.OBJDIR:H}/libkrb5
44	CFLAGS+=-I${KRB5DIR}/lib/ntlm	46	CFLAGS+=-I${KRB5DIR}/lib/ntlm
		47	CFLAGS+=-I${KRB5DIR}/lib/roken
		48	CFLAGS+=-I${.OBJDIR:H}/libroken
		49	CFLAGS+=-I${KRB5DIR}/lib/asn1
		50	CFLAGS+=-I${.OBJDIR:H}/libasn1
		51	CFLAGS+=-I${KRB5DIR}/lib/ntlm
		52	CFLAGS+=-I${.OBJDIR:H}/libheimntlm
45		53
46	.include <bsd.lib.mk>	54	.include <bsd.lib.mk>
47		55

Lines 1-6 Link Here

(-)b/kerberos5/lib/libgssapi_spnego/Makefile (-1 / +5 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	LIB= gssapi_spnego	3	LIB= gssapi_spnego
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined	5	LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
5	LIBADD= gssapi heimbase asn1 roken	6	LIBADD= gssapi heimbase asn1 roken
6	SHLIB_MAJOR= 10	7	SHLIB_MAJOR= 10
Lines 31-38 CFLAGS+=-I${KRB5DIR}/lib/gssapi Link Here
31	CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi	32	CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi
32	CFLAGS+=-I${KRB5DIR}/lib/gssapi/spnego	33	CFLAGS+=-I${KRB5DIR}/lib/gssapi/spnego
33	CFLAGS+=-I${KRB5DIR}/lib/asn1	34	CFLAGS+=-I${KRB5DIR}/lib/asn1
		35	CFLAGS+=-I${.OBJDIR:H}/libasn1
34	CFLAGS+=-I${SRCTOP}/lib/libgssapi	36	CFLAGS+=-I${SRCTOP}/lib/libgssapi
35	CFLAGS+=-I${KRB5DIR}/lib/roken -I.	37	CFLAGS+=-I${KRB5DIR}/lib/roken
		38	CFLAGS+=-I${.OBJDIR:H}/libroken
		39	CFLAGS+=-I${KRB5DIR}/base -I.
36		40
37	CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \	41	CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \
38	spnego_asn1_files spnego_asn1-template.c	42	spnego_asn1_files spnego_asn1-template.c

Lines 1-6 Link Here

(-)b/kerberos5/lib/libhdb/Makefile (-3 / +9 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	LIB= hdb	3	LIB= hdb
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS}	5	LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS}
5	VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map	6	VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map
6	LIBADD= asn1 com_err krb5 roken sqlite3	7	LIBADD= asn1 com_err krb5 roken sqlite3
Lines 56-64 SRCS= common.c \ Link Here
56	print.c \	57	print.c \
57	${GEN:S/.x$/.c/:S/.hx$/.h/}	58	${GEN:S/.x$/.c/:S/.hx$/.h/}
58		59
59	CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \	60	CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \
60	-I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \	61	-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \
61	-I${KRB5DIR}/lib/krb5 \	62	-I${SRCTOP}/contrib/sqlite3/ \
		63	-I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \
		64	-I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind \
		65	-I${KRB5DIR}/lib/hx509 -I${.OBJDIR:H}/libhx509 \
		66	-I${KRB5DIR}/base \
		67	-I${SRCTOP}/contrib/com_err \
62	-I. ${LDAPCFLAGS}	68	-I. ${LDAPCFLAGS}
63	CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""	69	CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""
64		70

Lines 1-6 Link Here

(-)b/kerberos5/lib/libheimbase/Makefile (+1 lines)
1	#$FreeBSD$	1	#$FreeBSD$
2		2
3	LIB= heimbase	3	LIB= heimbase
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,--no-undefined	5	LDFLAGS= -Wl,--no-undefined
5	LIBADD= pthread	6	LIBADD= pthread
6	VERSION_MAP= ${KRB5DIR}/base/version-script.map	7	VERSION_MAP= ${KRB5DIR}/base/version-script.map

Lines 9-14 SRCS= \ Link Here

(-)b/kerberos5/lib/libheimipcc/Makefile (+2 lines)
9	common.c	9	common.c
10		10
11	CFLAGS+= -I${KRB5DIR}/lib/roken \	11	CFLAGS+= -I${KRB5DIR}/lib/roken \
		12	-I${.OBJDIR:H}/libroken \
		13	-I${KRB5DIR}/lib/asn1 \
12	-I${KRB5DIR}/base \	14	-I${KRB5DIR}/base \
13	-I${KRB5DIR}/lib/ipc \	15	-I${KRB5DIR}/lib/ipc \
14	-I${KRB5DIR}/include	16	-I${KRB5DIR}/include

Lines 8-14 SRCS= \ Link Here

(-)b/kerberos5/lib/libheimipcs/Makefile (-1 / +2 lines)
8	server.c \	8	server.c \
9	common.c	9	common.c
10		10
11	CFLAGS+= -I${KRB5DIR}/lib/roken \	11	CFLAGS+= -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \
		12	-I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \
12	-I${KRB5DIR}/base \	13	-I${KRB5DIR}/base \
13	-I${KRB5DIR}/lib/ipc -I.	14	-I${KRB5DIR}/lib/ipc -I.
14		15

Lines 1-11 Link Here

(-)b/kerberos5/lib/libheimntlm/Makefile (-1 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	LIB= heimntlm	3	LIB= heimntlm
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,--no-undefined	5	LDFLAGS= -Wl,--no-undefined
5	LIBADD= crypto com_err krb5 roken	6	LIBADD= crypto com_err krb5 roken
6	SRCS= ntlm.c ntlm_err.c ntlm_err.h	7	SRCS= ntlm.c ntlm_err.c ntlm_err.h
7	INCS= heimntlm.h heimntlm-protos.h ntlm_err.h	8	INCS= heimntlm.h heimntlm-protos.h ntlm_err.h
8	CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken	9	CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${.OBJDIR:H}/libheimntlm \
		10	-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \
		11	-I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \
		12	-I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \
		13	-I${SRCTOP}/contrib/com_err
9	VERSION_MAP= ${KRB5DIR}/lib/ntlm/version-script.map	14	VERSION_MAP= ${KRB5DIR}/lib/ntlm/version-script.map
10		15
11	MAN= ntlm_buf.3 \	16	MAN= ntlm_buf.3 \




# $FreeBSD$

LIB=	hx509
PRIVATELIB=	true
LDFLAGS=	-Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map
LIBADD=	asn1 com_err crypto roken wind


CFLAGS+=-I${KRB5DIR}/lib/hx509
CFLAGS+=-I${KRB5DIR}/lib/hx509/ref
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1
CFLAGS+=-I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind
CFLAGS+=-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken 
CFLAGS+=-I${SRCTOP}/contrib/com_err -I.

GEN_OCSP= \
	asn1_OCSPBasicOCSPResponse.x \

Lines 1-6 Link Here

(-)b/kerberos5/lib/libkadm5clnt/Makefile (-1 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	LIB= kadm5clnt	3	LIB= kadm5clnt
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,--no-undefined	5	LDFLAGS= -Wl,--no-undefined
5	LIBADD= com_err krb5 roken	6	LIBADD= com_err krb5 roken
6		7
Lines 34-40 SRCS= ad.c \ Link Here
34	rename_c.c \	35	rename_c.c \
35	send_recv.c	36	send_recv.c
36		37
37	CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.	38	CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \
		39	-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \
		40	-I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \
		41	-I${KRB5DIR}/lib/hdb -I${.OBJDIR:H}/libhdb \
		42	-I${SRCTOP}/contrib/com_err -I.
38		43
39	.include <bsd.lib.mk>	44	.include <bsd.lib.mk>
40		45

Lines 1-6 Link Here

(-)b/kerberos5/lib/libkadm5srv/Makefile (-1 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	LIB= kadm5srv	3	LIB= kadm5srv
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,--no-undefined	5	LDFLAGS= -Wl,--no-undefined
5	LIBADD= com_err hdb krb5 roken	6	LIBADD= com_err hdb krb5 roken
6	VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map	7	VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map
Lines 35-41 SRCS= acl.c \ Link Here
35	set_keys.c \	36	set_keys.c \
36	set_modifier.c	37	set_modifier.c
37		38
38	CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.	39	CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \
		40	-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \
		41	-I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \
		42	-I${KRB5DIR}/lib/hdb -I${.OBJDIR:H}/libhdb \
		43	-I${SRCTOP}/contrib/com_err -I.
39		44
40	.include <bsd.lib.mk>	45	.include <bsd.lib.mk>
41		46

Lines 1-6 Link Here

(-)b/kerberos5/lib/libkafs5/Makefile (-1 / +5 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	LIB= kafs5	3	LIB= kafs5
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,--no-undefined	5	LDFLAGS= -Wl,--no-undefined
5	LIBADD= asn1 krb5 roken	6	LIBADD= asn1 krb5 roken
6	INCS= kafs.h	7	INCS= kafs.h
Lines 27-33 SRCS= afssys.c afskrb5.c common.c Link Here
27	CFLAGS+= -I${KRB5DIR}/lib/kafs \	28	CFLAGS+= -I${KRB5DIR}/lib/kafs \
28	-I${KRB5DIR}/lib/krb5 \	29	-I${KRB5DIR}/lib/krb5 \
29	-I${.OBJDIR:H}/libkrb5 \	30	-I${.OBJDIR:H}/libkrb5 \
30	-I${KRB5DIR}/lib/roken	31	-I${KRB5DIR}/lib/roken \
		32	-I${.OBJDIR:H}/libroken \
		33	-I${KRB5DIR}/lib/asn1 \
		34	-I${.OBJDIR:H}/libasn1
31		35
32	CLEANFILES= kafs5.3	36	CLEANFILES= kafs5.3
33		37




#$FreeBSD$

LIB=	kdc
PRIVATELIB=	true
LDFLAGS=	-Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/kdc/version-script.map
LIBADD=	roken hdb hx509 krb5 heimntlm asn1 crypto

	process.c \
	windc.c

CFLAGS+=	-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \
		-I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \
		-I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \
		-I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind \
		-I${KRB5DIR}/lib/hx509 -I${.OBJDIR:H}/libhx509 \
		-I${KRB5DIR}/lib/hdb -I${.OBJDIR:H}/libhdb \
		-I${KRB5DIR}/lib/ntlm -I${.OBJDIR:H}/libheimntlm \
		-I${KRB5DIR}/kdc \
		-I${SRCTOP}/contrib/com_err \
		-I${KRB5DIR}/base

.include <bsd.lib.mk>


Lines 1-6 Link Here

(-)b/kerberos5/lib/libkrb5/Makefile (-2 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	LIB= krb5	3	LIB= krb5
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,--no-undefined	5	LDFLAGS= -Wl,--no-undefined
5	VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map	6	VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map
6	LIBADD= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc	7	LIBADD= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc
Lines 618-626 SRCS+= heim_err.c \ Link Here
618	krb_err.h	619	krb_err.h
619		620
620	CFLAGS+= -I${KRB5DIR}/lib/krb5 \	621	CFLAGS+= -I${KRB5DIR}/lib/krb5 \
621	-I${KRB5DIR}/lib/asn1 \	622	-I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \
622	-I${KRB5DIR}/lib/roken \	623	-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \
		624	-I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind \
		625	-I${KRB5DIR}/lib/hx509 -I${.OBJDIR:H}/libhx509 \
623	-I${KRB5DIR}/lib/ipc \	626	-I${KRB5DIR}/lib/ipc \
		627	-I${SRCTOP}/contrib/com_err \
624	-I${KRB5DIR}/base -I.	628	-I${KRB5DIR}/base -I.
625		629
626	.include <bsd.lib.mk>	630	.include <bsd.lib.mk>

Lines 1-6 Link Here

(-)b/kerberos5/lib/libroken/Makefile (+1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	LIB= roken	3	LIB= roken
		4	PRIVATELIB= true
4	LIBADD= crypt	5	LIBADD= crypt
5	VERSION_MAP= ${KRB5DIR}/lib/roken/version-script.map	6	VERSION_MAP= ${KRB5DIR}/lib/roken/version-script.map
6	INCS= roken.h \	7	INCS= roken.h \

Lines 3-9 Link Here

(-)b/kerberos5/lib/libsl/Makefile (-1 / +1 lines)
3	LIB= sl	3	LIB= sl
4	INTERNALLIB=	4	INTERNALLIB=
5	SRCS= sl.c	5	SRCS= sl.c
6	CFLAGS+=-I${KRB5DIR}/lib/sl	6	CFLAGS+=-I${KRB5DIR}/lib/sl -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken
7		7
8	.include <bsd.lib.mk>	8	.include <bsd.lib.mk>
9		9

Lines 1-6 Link Here

(-)b/kerberos5/lib/libwind/Makefile (-1 / +3 lines)
1	#$FreeBSD$	1	#$FreeBSD$
2		2
3	LIB= wind	3	LIB= wind
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,--no-undefined	5	LDFLAGS= -Wl,--no-undefined
5	VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map	6	VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map
6	LIBADD= com_err roken	7	LIBADD= com_err roken
Lines 27-33 SRCS= bidi.c \ Link Here
27	SRCS+= wind_err.c \	28	SRCS+= wind_err.c \
28	wind_err.h	29	wind_err.h
29		30
30	CFLAGS+=-I${KRB5DIR}/lib/roken -I.	31	CFLAGS+=-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \
		32	-I${SRCTOP}/contrib/com_err -I.
31		33
32	.include <bsd.lib.mk>	34	.include <bsd.lib.mk>
33		35





PROG=	digest-service
MAN=
CFLAGS+=	-I${KRB5DIR}/base \
		-I${KRB5DIR}/kdc \
		-I${KRB5DIR}/lib/asn1 \
		-I${.OBJDIR:H:H}/lib/libasn1 \
		-I${KRB5DIR}/lib/krb5 \
		-I${.OBJDIR:H:H}/lib/libkrb5 \
		-I${KRB5DIR}/lib/ipc \
		-I${KRB5DIR}/lib/wind \
		-I${.OBJDIR:H:H}/lib/libwind \
		-I${KRB5DIR}/lib/roken \
		-I${.OBJDIR:H:H}/lib/libroken \
		-I${KRB5DIR}/lib/hx509 \
		-I${.OBJDIR:H:H}/lib/libhx509 \
		-I${KRB5DIR}/lib/hdb \
		-I${.OBJDIR:H:H}/lib/libhdb \
		-I${KRB5DIR}/lib/ntlm \
		-I${.OBJDIR:H:H}/lib/libheimntlm \
		-I${SRCTOP}/contrib/com_err
LIBADD=	hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm
LDFLAGS=${LDAPLDFLAGS}


Lines 8-15 CFLAGS+=-I${KRB5DIR}/lib/krb5 Link Here

(-)b/kerberos5/libexec/hprop/Makefile (+11 lines)
8	CFLAGS+=-I${KRB5DIR}/lib/asn1	8	CFLAGS+=-I${KRB5DIR}/lib/asn1
9	CFLAGS+=-I${KRB5DIR}/lib/hx509	9	CFLAGS+=-I${KRB5DIR}/lib/hx509
10	CFLAGS+=-I${KRB5DIR}/lib/ntlm	10	CFLAGS+=-I${KRB5DIR}/lib/ntlm
		11	CFLAGS+=-I${KRB5DIR}/lib/wind
		12	CFLAGS+=-I${KRB5DIR}/lib/hdb
		13	CFLAGS+=-I${KRB5DIR}/base
11	CFLAGS+=-I${KRB5DIR}/kdc	14	CFLAGS+=-I${KRB5DIR}/kdc
12	CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5	15	CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5
		16	CFLAGS+=-I${.OBJDIR:H:H}/lib/libroken
		17	CFLAGS+=-I${.OBJDIR:H:H}/lib/libasn1
		18	CFLAGS+=-I${.OBJDIR:H:H}/lib/libhx509
		19	CFLAGS+=-I${.OBJDIR:H:H}/lib/libheimntlm
		20	CFLAGS+=-I${.OBJDIR:H:H}/lib/libwind
		21	CFLAGS+=-I${.OBJDIR:H:H}/lib/libhdb
		22	CFLAGS+=-I${.OBJDIR:H:H}/lib/libheimbase
		23	CFLAGS+=-I${SRCTOP}/contrib/com_err
13	LIBADD= hdb krb5 roken vers	24	LIBADD= hdb krb5 roken vers
14	DPADD= ${LDAPDPADD}	25	DPADD= ${LDAPDPADD}
15	LDADD= ${LDAPLDADD}	26	LDADD= ${LDAPLDADD}




PROG=	hpropd
MAN=	hpropd.8
CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
	-I${KRB5DIR}/lib/wind \
	-I${KRB5DIR}/lib/hx509 \
	-I${KRB5DIR}/lib/hdb \
	-I${KRB5DIR}/lib/ntlm \
	-I${KRB5DIR}/kdc \
	-I${KRB5DIR}/base \
	-I${.OBJDIR:H:H}/lib/libkrb5 \
	-I${.OBJDIR:H:H}/lib/libroken \
	-I${.OBJDIR:H:H}/lib/libasn1 \
	-I${.OBJDIR:H:H}/lib/libwind \
	-I${.OBJDIR:H:H}/lib/libhx509 \
	-I${.OBJDIR:H:H}/lib/libhdb \
	-I${.OBJDIR:H:H}/lib/libheimntlm \
	-I${SRCTOP}/contrib/com_err \
	${LDAPCFLAGS}
LIBADD=	hdb krb5 roken vers
DPADD=	${LDAPDPADD}
LDADD=	${LDAPLDADD}

Lines 4-10 PROG= ipropd-master Link Here

(-)b/kerberos5/libexec/ipropd-master/Makefile (+6 lines)
4	MAN= iprop.8	4	MAN= iprop.8
5	SRCS= ipropd_common.c ipropd_master.c kadm5_err.h	5	SRCS= ipropd_common.c ipropd_master.c kadm5_err.h
6	CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \	6	CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
		7	-I${KRB5DIR}/lib/hdb \
		8	-I${.OBJDIR:H:H}/lib/libkrb5 \
		9	-I${.OBJDIR:H:H}/lib/libroken \
		10	-I${.OBJDIR:H:H}/lib/libasn1 \
		11	-I${.OBJDIR:H:H}/lib/libhdb \
7	-I. ${LDAPCFLAGS}	12	-I. ${LDAPCFLAGS}
		13
8	LIBADD= kadm5srv hdb krb5 roken vers	14	LIBADD= kadm5srv hdb krb5 roken vers
9	DPADD= ${LDAPDPADD}	15	DPADD= ${LDAPDPADD}
10	LDADD= ${LDAPLDADD}	16	LDADD= ${LDAPLDADD}

Lines 4-9 PROG= ipropd-slave Link Here

(-)b/kerberos5/libexec/ipropd-slave/Makefile (+5 lines)
4	MAN=	4	MAN=
5	SRCS= ipropd_common.c ipropd_slave.c kadm5_err.h	5	SRCS= ipropd_common.c ipropd_slave.c kadm5_err.h
6	CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \	6	CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
		7	-I${KRB5DIR}/lib/hdb \
		8	-I${.OBJDIR:H:H}/lib/libkrb5 \
		9	-I${.OBJDIR:H:H}/lib/libasn1 \
		10	-I${.OBJDIR:H:H}/lib/libhdb \
		11	-I${.OBJDIR:H:H}/lib/libroken \
7	-I. ${LDAPCFLAGS}	12	-I. ${LDAPCFLAGS}
8	LIBADD= kadm5srv hdb krb5 roken vers	13	LIBADD= kadm5srv hdb krb5 roken vers
9	DPADD= ${LDAPDPADD}	14	DPADD= ${LDAPDPADD}




	kadm_conn.c

CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
	-I${KRB5DIR}/base \
	-I${KRB5DIR}/lib/wind \
	-I${KRB5DIR}/lib/hx509 \
	-I${KRB5DIR}/lib/hdb \
	-I${.OBJDIR:H:H}/lib/libkrb5 \
	-I${.OBJDIR:H:H}/lib/libroken \
	-I${.OBJDIR:H:H}/lib/libasn1 \
	-I${.OBJDIR:H:H}/lib/libwind \
	-I${.OBJDIR:H:H}/lib/libhx509 \
	-I${.OBJDIR:H:H}/lib/libhdb \
	-I${SRCTOP}/contrib/com_err \
	${LDAPCFLAGS}
LIBADD=	kadm5srv gssapi hdb krb5 roken vers
DPADD=	${LDAPDPADD}

Lines 18-24 SRCS= acl.c \ Link Here

(-)b/kerberos5/libexec/kcm/Makefile (-1 / +7 lines)
18	renew.c	18	renew.c
19		19
20	CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \	20	CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
21	-I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS}	21	-I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc \
		22	-I${KRB5DIR}/lib/ntlm \
		23	-I${.OBJDIR:H:H}/lib/libkrb5 \
		24	-I${.OBJDIR:H:H}/lib/libroken \
		25	-I${.OBJDIR:H:H}/lib/libasn1 \
		26	-I${.OBJDIR:H:H}/lib/libheimntlm \
		27	${LDAPCFLAGS}
22	LIBADD= krb5 roken heimntlm heimipcs crypto	28	LIBADD= krb5 roken heimntlm heimipcs crypto
23	DPADD= ${LDAPDPADD}	29	DPADD= ${LDAPDPADD}
24	LDADD= ${LIBVERS} ${LDAPLDADD}	30	LDADD= ${LIBVERS} ${LDAPLDADD}




	main.c

CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
	-I${KRB5DIR}/lib/wind \
	-I${KRB5DIR}/lib/hx509 \
	-I${KRB5DIR}/lib/hdb \
	-I${KRB5DIR}/lib/ntlm \
	-I${KRB5DIR}/kdc \
	-I${KRB5DIR}/base \
	-I${.OBJDIR:H:H}/lib/libkrb5 \
	-I${.OBJDIR:H:H}/lib/libroken \
	-I${.OBJDIR:H:H}/lib/libasn1 \
	-I${.OBJDIR:H:H}/lib/libwind \
	-I${.OBJDIR:H:H}/lib/libhx509 \
	-I${.OBJDIR:H:H}/lib/libhdb \
	-I${.OBJDIR:H:H}/lib/libheimntlm \
	-I${SRCTOP}/contrib/com_err \
	${LDAPCFLAGS}
LIBADD=	kdc hdb krb5 roken crypt vers
LDFLAGS=${LDAPLDFLAGS}


Lines 4-10 PROG= kdigest Link Here

(-)b/kerberos5/libexec/kdigest/Makefile (-1 / +9 lines)
4	MAN= kdigest.8	4	MAN= kdigest.8
5	CFLAGS+= -I${KRB5DIR}/lib/asn1 \	5	CFLAGS+= -I${KRB5DIR}/lib/asn1 \
6	-I${KRB5DIR}/lib/roken \	6	-I${KRB5DIR}/lib/roken \
7	-I${KRB5DIR}/lib/sl -I.	7	-I${KRB5DIR}/lib/sl \
		8	-I${KRB5DIR}/lib/krb5 \
		9	-I${KRB5DIR}/lib/kafs \
		10	-I${KRB5DIR}/lib/ntlm \
		11	-I${.OBJDIR:H:H}/lib/libroken \
		12	-I${.OBJDIR:H:H}/lib/libkrb5 \
		13	-I${.OBJDIR:H:H}/lib/libasn1 \
		14	-I${.OBJDIR:H:H}/lib/libheimntlm \
		15	-I.
8	LIBADD= krb5 heimntlm roken crypto edit sl vers	16	LIBADD= krb5 heimntlm roken crypto edit sl vers
9	SRCS= kdigest.c \	17	SRCS= kdigest.c \
10	kdigest-commands.c \	18	kdigest-commands.c \

Lines 3-9 Link Here

(-)b/kerberos5/libexec/kfd/Makefile (-1 / +5 lines)
3	PROG= kfd	3	PROG= kfd
4	MAN= kfd.8	4	MAN= kfd.8
5	CFLAGS+= -I${KRB5DIR}/lib/asn1 \	5	CFLAGS+= -I${KRB5DIR}/lib/asn1 \
6	-I${KRB5DIR}/lib/roken	6	-I${KRB5DIR}/lib/roken \
		7	-I${KRB5DIR}/lib/krb5 \
		8	-I${.OBJDIR:H:H}/lib/libroken \
		9	-I${.OBJDIR:H:H}/lib/libasn1 \
		10	-I${.OBJDIR:H:H}/lib/libkrb5
7	LIBADD= krb5 roken vers	11	LIBADD= krb5 roken vers
8		12
9	.include <bsd.prog.mk>	13	.include <bsd.prog.mk>

Lines 5-11 MAN= kimpersonate.8 Link Here

(-)b/kerberos5/libexec/kimpersonate/Makefile (-1 / +8 lines)
5	CFLAGS+= -I${KRB5DIR}/lib/hx509 \	5	CFLAGS+= -I${KRB5DIR}/lib/hx509 \
6	-I${KRB5DIR}/lib/asn1 \	6	-I${KRB5DIR}/lib/asn1 \
7	-I${KRB5DIR}/lib/roken \	7	-I${KRB5DIR}/lib/roken \
8	-I${KRB5DIR}/lib/sl -I.	8	-I${KRB5DIR}/lib/sl \
		9	-I${KRB5DIR}/lib/krb5 \
		10	-I${KRB5DIR}/lib/kafs \
		11	-I${.OBJDIR:H:H}/lib/libroken \
		12	-I${.OBJDIR:H:H}/lib/libasn1 \
		13	-I${.OBJDIR:H:H}/lib/libkrb5 \
		14	-I${SRCTOP}/contrib/com_err \
		15	-I.
9	LIBADD= krb5 roken asn1 vers	16	LIBADD= krb5 roken asn1 vers
10		17
11	.include <bsd.prog.mk>	18	.include <bsd.prog.mk>

Lines 2-8 Link Here

(-)b/kerberos5/libexec/kpasswdd/Makefile (-1 / +9 lines)
2		2
3	PROG= kpasswdd	3	PROG= kpasswdd
4	MAN= kpasswdd.8	4	MAN= kpasswdd.8
5	CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/libhdb ${LDAPCFLAGS}	5	CFLAGS+=-I${KRB5DIR}/lib/roken \
		6	-I${KRB5DIR}/lib/krb5 \
		7	-I${KRB5DIR}/lib/asn1 \
		8	-I${KRB5DIR}/lib/hdb \
		9	-I${.OBJDIR:H:H}/lib/libroken \
		10	-I${.OBJDIR:H:H}/lib/libkrb5 \
		11	-I${.OBJDIR:H:H}/lib/libasn1 \
		12	-I${.OBJDIR:H:H}/lib/libhdb \
		13	${LDAPCFLAGS}
6	LIBADD= kadm5srv hdb krb5 roken vers asn1	14	LIBADD= kadm5srv hdb krb5 roken vers asn1
7	DPADD= ${LDAPDPADD}	15	DPADD= ${LDAPDPADD}
8	LDADD= ${LDAPLDADD}	16	LDADD= ${LDAPLDADD}

Lines 2-8 Link Here

(-)b/kerberos5/tools/asn1_compile/Makefile (-1 / +1 lines)
2		2
3	PROG= asn1_compile	3	PROG= asn1_compile
4	MAN=	4	MAN=
5	LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a	5	LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libprivateroken.a
6	LIBADD= vers	6	LIBADD= vers
7	LDADD= ${LIBROKEN_A}	7	LDADD= ${LIBROKEN_A}
8	DPADD= ${LIBROKEN_A}	8	DPADD= ${LIBROKEN_A}

Lines 1-7 Link Here

(-)b/kerberos5/tools/slc/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PROG= slc	3	PROG= slc
4	LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a	4	LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libprivateroken.a
5	LIBADD= vers	5	LIBADD= vers
6	LDADD= ${LIBROKEN_A}	6	LDADD= ${LIBROKEN_A}
7	DPADD= ${LIBROKEN_A}	7	DPADD= ${LIBROKEN_A}

Lines 1-6 Link Here

(-)b/kerberos5/usr.bin/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	SUBDIR= hxtool kadmin kcc kdestroy kgetcred kf kinit kpasswd krb5-config ksu \	3	SUBDIR= hxtool kadmin kcc kdestroy kgetcred kf kinit kpasswd ksu \
4	string2key verify_krb5_conf	4	string2key verify_krb5_conf
5	SUBDIR_PARALLEL=	5	SUBDIR_PARALLEL=
6		6

Lines 5-11 MAN= Link Here

(-)b/kerberos5/usr.bin/hxtool/Makefile (-1 / +5 lines)
5	CFLAGS+= -I${KRB5DIR}/lib/hx509 \	5	CFLAGS+= -I${KRB5DIR}/lib/hx509 \
6	-I${KRB5DIR}/lib/asn1 \	6	-I${KRB5DIR}/lib/asn1 \
7	-I${KRB5DIR}/lib/roken \	7	-I${KRB5DIR}/lib/roken \
8	-I${KRB5DIR}/lib/sl -I.	8	-I${.OBJDIR:H:H}/lib/libhx509 \
		9	-I${.OBJDIR:H:H}/lib/libasn1 \
		10	-I${.OBJDIR:H:H}/lib/libroken \
		11	-I${KRB5DIR}/lib/sl \
		12	-I${SRCTOP}/contrib/com_err -I.
9	LIBADD= hx509 roken asn1 crypto sl vers edit	13	LIBADD= hx509 roken asn1 crypto sl vers edit
10	SRCS= hxtool.c hxtool-commands.c hxtool-commands.h	14	SRCS= hxtool.c hxtool-commands.c hxtool-commands.h
11		15




	util.c

CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
	-I${KRB5DIR}/lib/sl \
	-I${KRB5DIR}/base \
	-I${KRB5DIR}/lib/wind \
	-I${KRB5DIR}/lib/hx509 \
	-I${KRB5DIR}/lib/hdb \
	-I${.OBJDIR:H:H}/lib/libkrb5 \
	-I${.OBJDIR:H:H}/lib/libroken \
	-I${.OBJDIR:H:H}/lib/libasn1 \
	-I${.OBJDIR:H:H}/lib/libwind \
	-I${.OBJDIR:H:H}/lib/libhx509 \
	-I${.OBJDIR:H:H}/lib/libhdb \
	-I${SRCTOP}/contrib/com_err \
	-I. \
	${LDAPCFLAGS}
LIBADD=	kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit
DPADD=	${LDAPDPADD}
LDADD=	${LDAPLDADD}

Lines 7-13 LINKS= ${BINDIR}/kcc ${BINDIR}/klist \ Link Here

(-)b/kerberos5/usr.bin/kcc/Makefile (-1 / +7 lines)
7	CFLAGS+= -I${KRB5DIR}/lib/hx509 \	7	CFLAGS+= -I${KRB5DIR}/lib/hx509 \
8	-I${KRB5DIR}/lib/asn1 \	8	-I${KRB5DIR}/lib/asn1 \
9	-I${KRB5DIR}/lib/roken \	9	-I${KRB5DIR}/lib/roken \
10	-I${KRB5DIR}/lib/sl -I.	10	-I${KRB5DIR}/lib/sl \
		11	-I${KRB5DIR}/lib/krb5 \
		12	-I${KRB5DIR}/lib/kafs \
		13	-I${.OBJDIR:H:H}/lib/libroken \
		14	-I${.OBJDIR:H:H}/lib/libasn1 \
		15	-I${.OBJDIR:H:H}/lib/libkrb5 \
		16	-I.
11	LIBADD= krb5 roken asn1 kafs5 edit sl vers	17	LIBADD= krb5 roken asn1 kafs5 edit sl vers
12	SRCS= kcc.c \	18	SRCS= kcc.c \
13	kcc-commands.c \	19	kcc-commands.c \

Lines 1-7 Link Here

(-)b/kerberos5/usr.bin/kdestroy/Makefile (-1 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PROG= kdestroy	3	PROG= kdestroy
4	CFLAGS+=-I${KRB5DIR}/lib/roken	4	CFLAGS+=-I${KRB5DIR}/lib/roken \
		5	-I${KRB5DIR}/lib/krb5 \
		6	-I${KRB5DIR}/lib/kafs \
		7	-I${.OBJDIR:H:H}/lib/libroken \
		8	-I${.OBJDIR:H:H}/lib/libkrb5 \
		9	-I${.OBJDIR:H:H}/lib/libasn1
5	LIBADD= kafs5 krb5 roken vers	10	LIBADD= kafs5 krb5 roken vers
6	MAN= kdestroy.1	11	MAN= kdestroy.1
7		12

Lines 3-9 Link Here

(-)b/kerberos5/usr.bin/kf/Makefile (-1 / +6 lines)
3	PROG= kf	3	PROG= kf
4	MAN= kf.1	4	MAN= kf.1
5	CFLAGS+= -I${KRB5DIR}/lib/asn1 \	5	CFLAGS+= -I${KRB5DIR}/lib/asn1 \
6	-I${KRB5DIR}/lib/roken	6	-I${KRB5DIR}/lib/roken \
		7	-I${KRB5DIR}/lib/krb5 \
		8	-I${.OBJDIR:H:H}/lib/libasn1 \
		9	-I${.OBJDIR:H:H}/lib/libroken \
		10	-I${.OBJDIR:H:H}/lib/libkrb5 \
		11	-I${SRCTOP}/contrib/com_err
7	LIBADD= krb5 roken vers	12	LIBADD= krb5 roken vers
8		13
9	.include <bsd.prog.mk>	14	.include <bsd.prog.mk>

Lines 2-8 Link Here

(-)b/kerberos5/usr.bin/kgetcred/Makefile (-1 / +6 lines)
2		2
3	PROG= kgetcred	3	PROG= kgetcred
4	CFLAGS+= -I${KRB5DIR}/lib/asn1 \	4	CFLAGS+= -I${KRB5DIR}/lib/asn1 \
5	-I${KRB5DIR}/lib/roken	5	-I${KRB5DIR}/lib/roken \
		6	-I${KRB5DIR}/lib/krb5 \
		7	-I${KRB5DIR}/lib/kafs \
		8	-I${.OBJDIR:H:H}/lib/libasn1 \
		9	-I${.OBJDIR:H:H}/lib/libroken \
		10	-I${.OBJDIR:H:H}/lib/libkrb5
6	LIBADD= krb5 roken asn1 vers	11	LIBADD= krb5 roken asn1 vers
7		12
8	.include <bsd.prog.mk>	13	.include <bsd.prog.mk>

Lines 1-7 Link Here

(-)b/kerberos5/usr.bin/kinit/Makefile (-1 / +8 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PROG= kinit	3	PROG= kinit
4	CFLAGS+=-I${KRB5DIR}/lib/roken	4	CFLAGS+=-I${KRB5DIR}/lib/roken \
		5	-I${KRB5DIR}/lib/krb5 \
		6	-I${KRB5DIR}/lib/kafs \
		7	-I${KRB5DIR}/lib/ntlm \
		8	-I${.OBJDIR:H:H}/lib/libroken \
		9	-I${.OBJDIR:H:H}/lib/libkrb5 \
		10	-I${.OBJDIR:H:H}/lib/libheimntlm \
		11	-I${.OBJDIR:H:H}/lib/libasn1
5	LIBADD= kafs5 krb5 heimntlm roken crypto vers	12	LIBADD= kafs5 krb5 heimntlm roken crypto vers
6		13
7	.include <bsd.prog.mk>	14	.include <bsd.prog.mk>

Lines 1-7 Link Here

(-)b/kerberos5/usr.bin/kpasswd/Makefile (-1 / +5 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PROG= kpasswd	3	PROG= kpasswd
4	CFLAGS+=-I${KRB5DIR}/lib/roken	4	CFLAGS+=-I${KRB5DIR}/lib/roken \
		5	-I${KRB5DIR}/lib/krb5 \
		6	-I${.OBJDIR:H:H}/lib/libroken \
		7	-I${.OBJDIR:H:H}/lib/libkrb5 \
		8	-I${.OBJDIR:H:H}/lib/libasn1
5	LIBADD= hdb krb5 roken vers crypto	9	LIBADD= hdb krb5 roken vers crypto
6	LDFLAGS=${LDAPLDFLAGS}	10	LDFLAGS=${LDAPLDFLAGS}
7		11

Lines 7-13 PRECIOUSPROG= Link Here

(-)b/kerberos5/usr.bin/ksu/Makefile (-1 / +6 lines)
7	.endif	7	.endif
8	MAN=	8	MAN=
9	SRCS= su.c	9	SRCS= su.c
10	CFLAGS+=-I${KRB5DIR}/lib/roken	10	CFLAGS+=-I${KRB5DIR}/lib/roken \
		11	-I${KRB5DIR}/lib/krb5 \
		12	-I${KRB5DIR}/lib/kafs \
		13	-I${.OBJDIR:H:H}/lib/libroken \
		14	-I${.OBJDIR:H:H}/lib/libkrb5 \
		15	-I${.OBJDIR:H:H}/lib/libasn1
11	LIBADD= kafs5 krb5 roken vers crypto crypt	16	LIBADD= kafs5 krb5 roken vers crypto crypt
12		17
13	.include <bsd.prog.mk>	18	.include <bsd.prog.mk>




		-I${KRB5DIR}/lib/asn1 \
		-I${KRB5DIR}/lib/krb5 \
		-I${KRB5DIR}/lib/roken \
		-I${KRB5DIR}/lib/wind \
		-I${KRB5DIR}/lib/hx509 \
		-I${KRB5DIR}/lib/hdb \
		-I${KRB5DIR}/lib/ntlm \
		-I${KRB5DIR}/base \
		-I${.OBJDIR:H:H}/lib/libkrb5 \
		-I${.OBJDIR:H:H}/lib/libroken \
		-I${.OBJDIR:H:H}/lib/libasn1 \
		-I${.OBJDIR:H:H}/lib/libwind \
		-I${.OBJDIR:H:H}/lib/libhx509 \
		-I${.OBJDIR:H:H}/lib/libhdb \
		-I${.OBJDIR:H:H}/lib/libheimntlm \
		-I${SRCTOP}/contrib/com_err
LIBADD=	krb5 roken crypto vers

.include <bsd.prog.mk>




MAN=	verify_krb5_conf.8
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
LIBADD=	krb5 roken vers
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
	-I${KRB5DIR}/base \
	-I${KRB5DIR}/lib/wind \
	-I${KRB5DIR}/lib/hx509 \
	-I${.OBJDIR:H:H}/lib/libkrb5 \
	-I${.OBJDIR:H:H}/lib/libroken \
	-I${.OBJDIR:H:H}/lib/libwind \
	-I${.OBJDIR:H:H}/lib/libasn1 \
	-I${.OBJDIR:H:H}/lib/libhx509 \
	-I${SRCTOP}/contrib/com_err
LIBADD=	krb5 roken  vers

.include <bsd.prog.mk>


Lines 7-12 CFLAGS+= -I${KRB5DIR}/lib/kadm5 \ Link Here

(-)b/kerberos5/usr.sbin/iprop-log/Makefile (+6 lines)
7	-I${KRB5DIR}/lib/krb5 \	7	-I${KRB5DIR}/lib/krb5 \
8	-I${KRB5DIR}/lib/roken \	8	-I${KRB5DIR}/lib/roken \
9	-I${KRB5DIR}/lib/sl \	9	-I${KRB5DIR}/lib/sl \
		10	-I${KRB5DIR}/lib/hdb \
		11	-I${KRB5DIR}/lib/asn1 \
		12	-I${.OBJDIR:H:H}/lib/libkrb5 \
		13	-I${.OBJDIR:H:H}/lib/libroken \
		14	-I${.OBJDIR:H:H}/lib/libhdb \
		15	-I${.OBJDIR:H:H}/lib/libasn1 \
10	-I.	16	-I.
11	LIBADD= kadm5srv hdb krb5 roken edit sl vers	17	LIBADD= kadm5srv hdb krb5 roken edit sl vers
12	LDFLAGS=${LDAPLDFLAGS}	18	LDFLAGS=${LDAPLDFLAGS}




PROG=	kstash
MAN=	kstash.8
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
	-I${KRB5DIR}/kdc \
	-I${KRB5DIR}/base \
	-I${KRB5DIR}/lib/wind \
	-I${KRB5DIR}/lib/hx509 \
	-I${KRB5DIR}/lib/hdb \
	-I${KRB5DIR}/lib/ntlm \
	-I${.OBJDIR:H:H}/lib/libasn1 \
	-I${.OBJDIR:H:H}/lib/libkrb5 \
	-I${.OBJDIR:H:H}/lib/libroken \
	-I${.OBJDIR:H:H}/lib/libwind \
	-I${.OBJDIR:H:H}/lib/libhx509 \
	-I${.OBJDIR:H:H}/lib/libhdb \
	-I${.OBJDIR:H:H}/lib/libheimntlm \
	-I${SRCTOP}/contrib/com_err \
	${LDAPCFLAGS}
LIBADD=	hdb krb5 crypto vers
DPADD=	${LDAPDPADD}
LDADD=	${LDAPLDADD}

Lines 16-22 SRCS= add.c \ Link Here

(-)b/kerberos5/usr.sbin/ktutil/Makefile (-1 / +6 lines)
16	remove.c \	16	remove.c \
17	rename.c	17	rename.c
18		18
19	CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I.	19	CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl \
		20	-I${KRB5DIR}/lib/krb5 \
		21	-I${.OBJDIR:H:H}/lib/libroken \
		22	-I${.OBJDIR:H:H}/lib/libkrb5 \
		23	-I${.OBJDIR:H:H}/lib/libasn1 \
		24	-I.
20	LIBADD= kadm5clnt krb5 roken crypto edit sl vers	25	LIBADD= kadm5clnt krb5 roken crypto edit sl vers
21		26
22	CLEANFILES= ktutil-commands.h ktutil-commands.c	27	CLEANFILES= ktutil-commands.h ktutil-commands.c

Lines 2-9 Link Here

(-)b/lib/libcom_err/Makefile (-1 / +2 lines)
2		2
3	PACKAGE=lib${LIB}	3	PACKAGE=lib${LIB}
4	LIB= com_err	4	LIB= com_err
		5	PRIVATELIB= true
5	SRCS= com_err.c error.c	6	SRCS= com_err.c error.c
6	INCS= ${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h	7	INCS= com_err.h com_right.h
7	MAN= com_err.3	8	MAN= com_err.3
8	COM_ERRDIR= ${SRCTOP}/contrib/com_err	9	COM_ERRDIR= ${SRCTOP}/contrib/com_err
9	CFLAGS+= -I${COM_ERRDIR}	10	CFLAGS+= -I${COM_ERRDIR}

Lines 2-7 Link Here

(-)b/lib/libgssapi/Makefile (+1 lines)
2		2
3	PACKAGE=lib${LIB}	3	PACKAGE=lib${LIB}
4	LIB= gssapi	4	LIB= gssapi
		5	PRIVATELIB= true
5	SHLIB_MAJOR= 10	6	SHLIB_MAJOR= 10
6	VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def	7	VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
7	SYMBOL_MAPS= ${.CURDIR}/Symbol.map	8	SYMBOL_MAPS= ${.CURDIR}/Symbol.map





LIBADD+=	krb5

# XXX Must be the same as in kerberos5/Makefile.inc
# XXX There will be a better way to reduce duplication but
# XXX for now this will do.
KRB5DIR=	${SRCTOP}/crypto/heimdal

CFLAGS+=	-I${SRCTOP}/kerberos5/include \
		-I${KRB5DIR}/lib/krb5 \
		-I${.OBJDIR:H:H:H:H}/kerberos5/lib/libkrb5 \
 		-I${KRB5DIR}/lib/asn1 \
		-I${.OBJDIR:H:H:H:H}/kerberos5/lib/libasn1 \
		-I${SRCTOP}/contrib/com_err

.include <bsd.lib.mk>

Lines 30-33 MAN= pam_ksu.8 Link Here

(-)b/lib/libpam/modules/pam_ksu/Makefile (+11 lines)
30		30
31	LIBADD+= krb5	31	LIBADD+= krb5
32		32
		33	# XXX Must be the same as in kerberos5/Makefile.inc
		34	# XXX There will be a better way to reduce duplication but
		35	# XXX for now this will do.
		36	KRB5DIR= ${SRCTOP}/crypto/heimdal
		37
		38	CFLAGS+= -I${SRCTOP}/kerberos5/include \
		39	-I${KRB5DIR}/lib/krb5 \
		40	-I${.OBJDIR:H:H:H:H}/kerberos5/lib/libkrb5 \
		41	-I${KRB5DIR}/lib/asn1 \
		42	-I${.OBJDIR:H:H:H:H}/kerberos5/lib/libasn1
		43
33	.include <bsd.lib.mk>	44	.include <bsd.lib.mk>

Lines 3-8 Link Here

(-)b/lib/libtelnet/Makefile (+8 lines)
3		3
4	.include <src.opts.mk>	4	.include <src.opts.mk>
5		5
		6	# XXX Must be the same as in kerberos5/Makefile.inc
		7	# XXX There will be a better way to reduce duplication but
		8	# XXX for now this will do.
		9	KRB5DIR= ${SRCTOP}/crypto/heimdal
		10
6	PACKAGE=lib${LIB}	11	PACKAGE=lib${LIB}
7	TELNETDIR= ${SRCTOP}/contrib/telnet	12	TELNETDIR= ${SRCTOP}/contrib/telnet
8	.PATH: ${TELNETDIR}/libtelnet	13	.PATH: ${TELNETDIR}/libtelnet
Lines 24-29 CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA Link Here
24	.if ${MK_KERBEROS_SUPPORT} != "no"	29	.if ${MK_KERBEROS_SUPPORT} != "no"
25	SRCS+= kerberos5.c	30	SRCS+= kerberos5.c
26	CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write	31	CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write
		32	CFLAGS+= -I${SRCTOP}/kerberos5/include \
		33	-I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H:H}/kerberos5/lib/libkrb5 \
		34	-I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H:H}/kerberos5/lib/libasn1
27	.endif	35	.endif
28		36
29	.include <bsd.lib.mk>	37	.include <bsd.lib.mk>

Lines 26-32 CFLAGS+= -DHAVE_LDNS=1 Link Here

(-)b/secure/usr.bin/ssh/Makefile (-1 / +5 lines)
26	.endif	26	.endif
27		27
28	.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"	28	.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
29	CFLAGS+= -include krb5_config.h	29	KRB5DIR= ${SRCTOP}/crypto/heimdal
		30	KERBEROS5_DIR= ${SRCTOP}/kerberos5
		31	CFLAGS+= -include krb5_config.h \
		32	-I${KERBEROS5_DIR}/include \
		33	-I${KRB5DIR}/lib/krb5
30	SRCS+= krb5_config.h	34	SRCS+= krb5_config.h
31	LIBADD+= gssapi	35	LIBADD+= gssapi
32	.endif	36	.endif

Lines 53-59 LDFLAGS+=-L${LIBBLACKLISTDIR} Link Here

(-)b/secure/usr.sbin/sshd/Makefile (-1 / +7 lines)
53	.endif	53	.endif
54		54
55	.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"	55	.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
56	CFLAGS+= -include krb5_config.h	56	KRB5DIR= ${SRCTOP}/crypto/heimdal
		57	CFLAGS+= -include krb5_config.h \
		58	-I${KRB5DIR}/lib/krb5 \
		59	-I${SRCTOP}/kerberos5/include \
		60	-I${.OBJDIR:H:H:H}/kerberos5/lib/libkrb5 \
		61	-I${.OBJDIR:H:H:H}/kerberos5/lib/libroken \
		62	-I${.OBJDIR:H:H:H}/kerberos5/lib/libasn1
57	SRCS+= krb5_config.h	63	SRCS+= krb5_config.h
58	LIBADD+= gssapi_krb5 gssapi krb5	64	LIBADD+= gssapi_krb5 gssapi krb5
59	.endif	65	.endif

Lines 13-31 __<src.libnames.mk>__: Link Here

(-)b/share/mk/src.libnames.mk (-15 / +19 lines)
13	.include <src.opts.mk>	13	.include <src.opts.mk>
14		14
15	_PRIVATELIBS= \	15	_PRIVATELIBS= \
		16	asn1 \
16	atf_c \	17	atf_c \
17	atf_cxx \	18	atf_cxx \
18	bsdstat \	19	bsdstat \
		20	com_err \
19	devdctl \	21	devdctl \
20	event \	22	event \
		23	gssapi \
		24	gssapi_krb5 \
		25	gssapi_ntlm \
		26	gssapi_spnego \
		27	hdb \
		28	heimbase \
21	heimipcc \	29	heimipcc \
22	heimipcs \	30	heimipcs \
		31	heimntlm \
23	ifconfig \	32	ifconfig \
		33	hx509 \
		34	kadm5clnt \
		35	kadm5srv \
		36	kafs5 \
		37	kdc \
		38	krb5 \
24	ldns \	39	ldns \
		40	roken \
25	sqlite3 \	41	sqlite3 \
26	ssh \	42	ssh \
27	ucl \	43	ucl \
28	unbound \	44	unbound \
		45	wind \
29	zstd	46	zstd
30		47
31	_INTERNALLIBS= \	48	_INTERNALLIBS= \
Lines 59-65 _LIBRARIES= \ Link Here
59	80211 \	76	80211 \
60	alias \	77	alias \
61	archive \	78	archive \
62	asn1 \
63	auditd \	79	auditd \
64	avl \	80	avl \
65	be \	81	be \
Lines 80-86 _LIBRARIES= \ Link Here
80	cap_random \	96	cap_random \
81	cap_sysctl \	97	cap_sysctl \
82	cap_syslog \	98	cap_syslog \
83	com_err \
84	compiler_rt \	99	compiler_rt \
85	crypt \	100	crypt \
86	crypto \	101	crypto \
Lines 105-126 _LIBRARIES= \ Link Here
105	geom \	120	geom \
106	gnuregex \	121	gnuregex \
107	gpio \	122	gpio \
108	gssapi \
109	gssapi_krb5 \
110	hdb \
111	heimbase \
112	heimntlm \
113	heimsqlite \	123	heimsqlite \
114	hx509 \
115	ipsec \	124	ipsec \
116	ipt \	125	ipt \
117	jail \	126	jail \
118	kadm5clnt \
119	kadm5srv \
120	kafs5 \
121	kdc \
122	kiconv \	127	kiconv \
123	krb5 \
124	kvm \	128	kvm \
125	l \	129	l \
126	lzma \	130	lzma \
Lines 151-157 _LIBRARIES= \ Link Here
151	pthread \	155	pthread \
152	radius \	156	radius \
153	regex \	157	regex \
154	roken \
155	rpcsec_gss \	158	rpcsec_gss \
156	rpcsvc \	159	rpcsvc \
157	rt \	160	rt \
Lines 177-183 _LIBRARIES= \ Link Here
177	util \	180	util \
178	uutil \	181	uutil \
179	vmmapi \	182	vmmapi \
180	wind \
181	wrap \	183	wrap \
182	xo \	184	xo \
183	y \	185	y \
Lines 310-315 _DP_heimipcs= heimbase roken pthread Link Here
310	_DP_kafs5= asn1 krb5 roken	312	_DP_kafs5= asn1 krb5 roken
311	_DP_krb5+= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc	313	_DP_krb5+= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc
312	_DP_gssapi_krb5+= gssapi krb5 crypto roken asn1 com_err	314	_DP_gssapi_krb5+= gssapi krb5 crypto roken asn1 com_err
		315	_DP_gssapi_ntlm+= crypto gssapi krb5 heimntlm roken
		316	_DP_gssapi_spnego+= gssapi heimbase asn1 roken
313	_DP_lzma= pthread	317	_DP_lzma= pthread
314	_DP_ucl= m	318	_DP_ucl= m
315	_DP_vmmapi= util	319	_DP_vmmapi= util

Lines 68-73 installdirs: Link Here

(-)b/tools/build/Makefile (+7 lines)
68	mkdir -p "${DESTDIR}/${_dir}"	68	mkdir -p "${DESTDIR}/${_dir}"
69	.endfor	69	.endfor
70		70
		71	# For private kerberos
		72	# XXX There really needs to be a better way than this, such as building
		73	# XXX mtree and installing it in legacy early.
		74	.for _dir in asn1 bsdstat com_err event hdb heimbase heimntlm hx509 kafs5 kdc krb5 roken sqlite3 ucl wind zstd
		75	mkdir -p "${DESTDIR}/usr/include/private/${_dir}"
		76	.endfor
		77
71	.for _group in ${INCSGROUPS:NINCS}	78	.for _group in ${INCSGROUPS:NINCS}
72	mkdir -p "${DESTDIR}/${${_group}DIR}"	79	mkdir -p "${DESTDIR}/${${_group}DIR}"
73	.endfor	80	.endfor

Lines 5-11 Link Here

(-)b/usr.bin/compile_et/Makefile (-1 / +5 lines)
5	PROG= compile_et	5	PROG= compile_et
6	SRCS= compile_et.c parse.y lex.l	6	SRCS= compile_et.c parse.y lex.l
7	LIBADD= roken vers	7	LIBADD= roken vers
8	CFLAGS+=-I. -I${SRCTOP}/contrib/com_err	8	KRB5DIR= ${SRCTOP}/crypto/heimdal
		9	CFLAGS+=-I. -I${SRCTOP}/contrib/com_err \
		10	-I${KRB5DIR}/lib/roken \
		11	-I${.OBJDIR:H:H}/kerberos5/lib/libroken \
		12	-I${.OBJDIR:H:H}/kerberos5/lib/libasn1
9		13
10	WARNS?= 0	14	WARNS?= 0
11		15

Lines 11-16 WARNS?= 1 Link Here

(-)b/usr.sbin/gssd/Makefile (+5 lines)
11		11
12	LIBADD= gssapi	12	LIBADD= gssapi
13	.if ${MK_KERBEROS_SUPPORT} != "no"	13	.if ${MK_KERBEROS_SUPPORT} != "no"
		14	KRB5DIR= ${SRCTOP}/crypto/heimdal
		15	CFLAGS+= -I${KRB5DIR}/lib/krb5 \
		16	-I${SRCTOP}/kerberos5/include \
		17	-I${.OBJDIR:H:H}/kerberos5/lib/libkrb5 \
		18	-I${.OBJDIR:H:H}/kerberos5/lib/libasn1
14	LIBADD+= krb5 roken	19	LIBADD+= krb5 roken
15	.else	20	.else
16	CFLAGS+= -DWITHOUT_KERBEROS	21	CFLAGS+= -DWITHOUT_KERBEROS

Return to bug 222745

Lines 1-6 Link Here

(-)b/kerberos5/lib/libgssapi_krb5/Makefile (-1 / +11 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	LIB= gssapi_krb5	3	LIB= gssapi_krb5
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined	5	LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
5	LIBADD= gssapi krb5 crypto roken asn1 com_err	6	LIBADD= gssapi krb5 crypto roken asn1 com_err
6	SHLIB_MAJOR= 10	7	SHLIB_MAJOR= 10
Lines 77-84 CFLAGS+=-I${KRB5DIR}/lib/gssapi Link Here
77	CFLAGS+=-I${KRB5DIR}/lib/gssapi/krb5	78	CFLAGS+=-I${KRB5DIR}/lib/gssapi/krb5
78	CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi	79	CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi
79	CFLAGS+=-I${KRB5DIR}/lib/krb5	80	CFLAGS+=-I${KRB5DIR}/lib/krb5
		81	CFLAGS+=-I${.OBJDIR:H}/libkrb5
80	CFLAGS+=-I${KRB5DIR}/lib/asn1	82	CFLAGS+=-I${KRB5DIR}/lib/asn1
81	CFLAGS+=-I${KRB5DIR}/lib/roken -I.	83	CFLAGS+=-I${.OBJDIR:H}/libasn1
		84	CFLAGS+=-I${KRB5DIR}/lib/roken
		85	CFLAGS+=-I${.OBJDIR:H}/libroken
		86	CFLAGS+=-I${KRB5DIR}/lib/wind
		87	CFLAGS+=-I${.OBJDIR:H}/libwind
		88	CFLAGS+=-I${KRB5DIR}/lib/hx509
		89	CFLAGS+=-I${.OBJDIR:H}/libhx509
		90	CFLAGS+=-I${SRCTOP}/contrib/com_err
		91	CFLAGS+=-I${KRB5DIR}/base -I.
82		92
83	.include <bsd.lib.mk>	93	.include <bsd.lib.mk>
84		94

Lines 1-6 Link Here

(-)b/kerberos5/lib/libhx509/Makefile (-3 / +5 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	LIB= hx509	3	LIB= hx509
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,--no-undefined	5	LDFLAGS= -Wl,--no-undefined
5	VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map	6	VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map
6	LIBADD= asn1 com_err crypto roken wind	7	LIBADD= asn1 com_err crypto roken wind
Lines 209-217 SRCS+= ${GEN_OCSP:S/.x$/.c/:S/.hx$/.h/} \ Link Here
209		210
210	CFLAGS+=-I${KRB5DIR}/lib/hx509	211	CFLAGS+=-I${KRB5DIR}/lib/hx509
211	CFLAGS+=-I${KRB5DIR}/lib/hx509/ref	212	CFLAGS+=-I${KRB5DIR}/lib/hx509/ref
212	CFLAGS+=-I${KRB5DIR}/lib/asn1	213	CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1
213	CFLAGS+=-I${KRB5DIR}/lib/wind	214	CFLAGS+=-I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind
214	CFLAGS+=-I${KRB5DIR}/lib/roken -I.	215	CFLAGS+=-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken
		216	CFLAGS+=-I${SRCTOP}/contrib/com_err -I.
215		217
216	GEN_OCSP= \	218	GEN_OCSP= \
217	asn1_OCSPBasicOCSPResponse.x \	219	asn1_OCSPBasicOCSPResponse.x \

Lines 1-6 Link Here

(-)b/kerberos5/lib/libkdc/Makefile (-4 / +11 lines)
1	#$FreeBSD$	1	#$FreeBSD$
2		2
3	LIB= kdc	3	LIB= kdc
		4	PRIVATELIB= true
4	LDFLAGS= -Wl,--no-undefined	5	LDFLAGS= -Wl,--no-undefined
5	VERSION_MAP= ${KRB5DIR}/kdc/version-script.map	6	VERSION_MAP= ${KRB5DIR}/kdc/version-script.map
6	LIBADD= roken hdb hx509 krb5 heimntlm asn1 crypto	7	LIBADD= roken hdb hx509 krb5 heimntlm asn1 crypto
Lines 25-34 SRCS= \ Link Here
25	process.c \	26	process.c \
26	windc.c	27	windc.c
27		28
28	CFLAGS+= -I${KRB5DIR}/lib/roken \	29	CFLAGS+= -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \
29	-I${KRB5DIR}/lib/krb5 \	30	-I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \
30	-I${KRB5DIR}/lib/hdb \	31	-I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \
31	-I${KRB5DIR}/kdc	32	-I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind \
		33	-I${KRB5DIR}/lib/hx509 -I${.OBJDIR:H}/libhx509 \
		34	-I${KRB5DIR}/lib/hdb -I${.OBJDIR:H}/libhdb \
		35	-I${KRB5DIR}/lib/ntlm -I${.OBJDIR:H}/libheimntlm \
		36	-I${KRB5DIR}/kdc \
		37	-I${SRCTOP}/contrib/com_err \
		38	-I${KRB5DIR}/base
32		39
33	.include <bsd.lib.mk>	40	.include <bsd.lib.mk>
34		41

Lines 2-13 Link Here

(-)b/kerberos5/libexec/digest-service/Makefile (-2 / +14 lines)
2		2
3	PROG= digest-service	3	PROG= digest-service
4	MAN=	4	MAN=
5	CFLAGS+= -I${KRB5DIR}/kdc \	5	CFLAGS+= -I${KRB5DIR}/base \
		6	-I${KRB5DIR}/kdc \
6	-I${KRB5DIR}/lib/asn1 \	7	-I${KRB5DIR}/lib/asn1 \
		8	-I${.OBJDIR:H:H}/lib/libasn1 \
7	-I${KRB5DIR}/lib/krb5 \	9	-I${KRB5DIR}/lib/krb5 \
		10	-I${.OBJDIR:H:H}/lib/libkrb5 \
8	-I${KRB5DIR}/lib/ipc \	11	-I${KRB5DIR}/lib/ipc \
9	-I${KRB5DIR}/lib/wind \	12	-I${KRB5DIR}/lib/wind \
10	-I${KRB5DIR}/lib/roken	13	-I${.OBJDIR:H:H}/lib/libwind \
		14	-I${KRB5DIR}/lib/roken \
		15	-I${.OBJDIR:H:H}/lib/libroken \
		16	-I${KRB5DIR}/lib/hx509 \
		17	-I${.OBJDIR:H:H}/lib/libhx509 \
		18	-I${KRB5DIR}/lib/hdb \
		19	-I${.OBJDIR:H:H}/lib/libhdb \
		20	-I${KRB5DIR}/lib/ntlm \
		21	-I${.OBJDIR:H:H}/lib/libheimntlm \
		22	-I${SRCTOP}/contrib/com_err
11	LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm	23	LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm
12	LDFLAGS=${LDAPLDFLAGS}	24	LDFLAGS=${LDAPLDFLAGS}
13		25

Lines 3-9 Link Here

(-)b/kerberos5/libexec/hpropd/Makefile (-1 / +15 lines)
3	PROG= hpropd	3	PROG= hpropd
4	MAN= hpropd.8	4	MAN= hpropd.8
5	CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \	5	CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
6	-I${KRB5DIR}/kdc ${LDAPCFLAGS}	6	-I${KRB5DIR}/lib/wind \
		7	-I${KRB5DIR}/lib/hx509 \
		8	-I${KRB5DIR}/lib/hdb \
		9	-I${KRB5DIR}/lib/ntlm \
		10	-I${KRB5DIR}/kdc \
		11	-I${KRB5DIR}/base \
		12	-I${.OBJDIR:H:H}/lib/libkrb5 \
		13	-I${.OBJDIR:H:H}/lib/libroken \
		14	-I${.OBJDIR:H:H}/lib/libasn1 \
		15	-I${.OBJDIR:H:H}/lib/libwind \
		16	-I${.OBJDIR:H:H}/lib/libhx509 \
		17	-I${.OBJDIR:H:H}/lib/libhdb \
		18	-I${.OBJDIR:H:H}/lib/libheimntlm \
		19	-I${SRCTOP}/contrib/com_err \
		20	${LDAPCFLAGS}
7	LIBADD= hdb krb5 roken vers	21	LIBADD= hdb krb5 roken vers
8	DPADD= ${LDAPDPADD}	22	DPADD= ${LDAPDPADD}
9	LDADD= ${LDAPLDADD}	23	LDADD= ${LDAPLDADD}

Lines 8-13 SRCS= rpc.c \ Link Here

(-)b/kerberos5/libexec/kadmind/Makefile (+11 lines)
8	kadm_conn.c	8	kadm_conn.c
9		9
10	CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \	10	CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
		11	-I${KRB5DIR}/base \
		12	-I${KRB5DIR}/lib/wind \
		13	-I${KRB5DIR}/lib/hx509 \
		14	-I${KRB5DIR}/lib/hdb \
		15	-I${.OBJDIR:H:H}/lib/libkrb5 \
		16	-I${.OBJDIR:H:H}/lib/libroken \
		17	-I${.OBJDIR:H:H}/lib/libasn1 \
		18	-I${.OBJDIR:H:H}/lib/libwind \
		19	-I${.OBJDIR:H:H}/lib/libhx509 \
		20	-I${.OBJDIR:H:H}/lib/libhdb \
		21	-I${SRCTOP}/contrib/com_err \
11	${LDAPCFLAGS}	22	${LDAPCFLAGS}
12	LIBADD= kadm5srv gssapi hdb krb5 roken vers	23	LIBADD= kadm5srv gssapi hdb krb5 roken vers
13	DPADD= ${LDAPDPADD}	24	DPADD= ${LDAPDPADD}

Lines 9-15 SRCS= config.c \ Link Here

(-)b/kerberos5/libexec/kdc/Makefile (-1 / +15 lines)
9	main.c	9	main.c
10		10
11	CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \	11	CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
12	-I${KRB5DIR}/kdc ${LDAPCFLAGS}	12	-I${KRB5DIR}/lib/wind \
		13	-I${KRB5DIR}/lib/hx509 \
		14	-I${KRB5DIR}/lib/hdb \
		15	-I${KRB5DIR}/lib/ntlm \
		16	-I${KRB5DIR}/kdc \
		17	-I${KRB5DIR}/base \
		18	-I${.OBJDIR:H:H}/lib/libkrb5 \
		19	-I${.OBJDIR:H:H}/lib/libroken \
		20	-I${.OBJDIR:H:H}/lib/libasn1 \
		21	-I${.OBJDIR:H:H}/lib/libwind \
		22	-I${.OBJDIR:H:H}/lib/libhx509 \
		23	-I${.OBJDIR:H:H}/lib/libhdb \
		24	-I${.OBJDIR:H:H}/lib/libheimntlm \
		25	-I${SRCTOP}/contrib/com_err \
		26	${LDAPCFLAGS}
13	LIBADD= kdc hdb krb5 roken crypt vers	27	LIBADD= kdc hdb krb5 roken crypt vers
14	LDFLAGS=${LDAPLDFLAGS}	28	LDFLAGS=${LDAPLDFLAGS}
15		29

Lines 25-31 SRCS= add_enctype.c \ Link Here

(-)b/kerberos5/usr.bin/kadmin/Makefile (-1 / +14 lines)
25	util.c	25	util.c
26		26
27	CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \	27	CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
28	-I${KRB5DIR}/lib/sl -I. ${LDAPCFLAGS}	28	-I${KRB5DIR}/lib/sl \
		29	-I${KRB5DIR}/base \
		30	-I${KRB5DIR}/lib/wind \
		31	-I${KRB5DIR}/lib/hx509 \
		32	-I${KRB5DIR}/lib/hdb \
		33	-I${.OBJDIR:H:H}/lib/libkrb5 \
		34	-I${.OBJDIR:H:H}/lib/libroken \
		35	-I${.OBJDIR:H:H}/lib/libasn1 \
		36	-I${.OBJDIR:H:H}/lib/libwind \
		37	-I${.OBJDIR:H:H}/lib/libhx509 \
		38	-I${.OBJDIR:H:H}/lib/libhdb \
		39	-I${SRCTOP}/contrib/com_err \
		40	-I. \
		41	${LDAPCFLAGS}
29	LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit	42	LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit
30	DPADD= ${LDAPDPADD}	43	DPADD= ${LDAPDPADD}
31	LDADD= ${LDAPLDADD}	44	LDADD= ${LDAPLDADD}

Lines 6-12 CFLAGS+= -I${KRB5DIR}/kdc \ Link Here

(-)b/kerberos5/usr.bin/string2key/Makefile (-1 / +13 lines)
6	-I${KRB5DIR}/lib/asn1 \	6	-I${KRB5DIR}/lib/asn1 \
7	-I${KRB5DIR}/lib/krb5 \	7	-I${KRB5DIR}/lib/krb5 \
8	-I${KRB5DIR}/lib/roken \	8	-I${KRB5DIR}/lib/roken \
9	-I${KRB5DIR}/lib/windc	9	-I${KRB5DIR}/lib/wind \
		10	-I${KRB5DIR}/lib/hx509 \
		11	-I${KRB5DIR}/lib/hdb \
		12	-I${KRB5DIR}/lib/ntlm \
		13	-I${KRB5DIR}/base \
		14	-I${.OBJDIR:H:H}/lib/libkrb5 \
		15	-I${.OBJDIR:H:H}/lib/libroken \
		16	-I${.OBJDIR:H:H}/lib/libasn1 \
		17	-I${.OBJDIR:H:H}/lib/libwind \
		18	-I${.OBJDIR:H:H}/lib/libhx509 \
		19	-I${.OBJDIR:H:H}/lib/libhdb \
		20	-I${.OBJDIR:H:H}/lib/libheimntlm \
		21	-I${SRCTOP}/contrib/com_err
10	LIBADD= krb5 roken crypto vers	22	LIBADD= krb5 roken crypto vers
11		23
12	.include <bsd.prog.mk>	24	.include <bsd.prog.mk>

Lines 4-9 PROG= verify_krb5_conf Link Here

(-)b/kerberos5/usr.bin/verify_krb5_conf/Makefile (+11 lines)
4	MAN= verify_krb5_conf.8	4	MAN= verify_krb5_conf.8
5	CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken	5	CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
6	LIBADD= krb5 roken vers	6	LIBADD= krb5 roken vers
		7	CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
		8	-I${KRB5DIR}/base \
		9	-I${KRB5DIR}/lib/wind \
		10	-I${KRB5DIR}/lib/hx509 \
		11	-I${.OBJDIR:H:H}/lib/libkrb5 \
		12	-I${.OBJDIR:H:H}/lib/libroken \
		13	-I${.OBJDIR:H:H}/lib/libwind \
		14	-I${.OBJDIR:H:H}/lib/libasn1 \
		15	-I${.OBJDIR:H:H}/lib/libhx509 \
		16	-I${SRCTOP}/contrib/com_err
		17	LIBADD= krb5 roken vers
7		18
8	.include <bsd.prog.mk>	19	.include <bsd.prog.mk>
9		20

Lines 3-9 Link Here

(-)b/kerberos5/usr.sbin/kstash/Makefile (-1 / +15 lines)
3	PROG= kstash	3	PROG= kstash
4	MAN= kstash.8	4	MAN= kstash.8
5	CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \	5	CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
6	-I${KRB5DIR}/kdc ${LDAPCFLAGS}	6	-I${KRB5DIR}/kdc \
		7	-I${KRB5DIR}/base \
		8	-I${KRB5DIR}/lib/wind \
		9	-I${KRB5DIR}/lib/hx509 \
		10	-I${KRB5DIR}/lib/hdb \
		11	-I${KRB5DIR}/lib/ntlm \
		12	-I${.OBJDIR:H:H}/lib/libasn1 \
		13	-I${.OBJDIR:H:H}/lib/libkrb5 \
		14	-I${.OBJDIR:H:H}/lib/libroken \
		15	-I${.OBJDIR:H:H}/lib/libwind \
		16	-I${.OBJDIR:H:H}/lib/libhx509 \
		17	-I${.OBJDIR:H:H}/lib/libhdb \
		18	-I${.OBJDIR:H:H}/lib/libheimntlm \
		19	-I${SRCTOP}/contrib/com_err \
		20	${LDAPCFLAGS}
7	LIBADD= hdb krb5 crypto vers	21	LIBADD= hdb krb5 crypto vers
8	DPADD= ${LDAPDPADD}	22	DPADD= ${LDAPDPADD}
9	LDADD= ${LDAPLDADD}	23	LDADD= ${LDAPLDADD}

Lines 34-37 WARNS?= 3 Link Here

(-)b/lib/libpam/modules/pam_krb5/Makefile (+12 lines)
34		34
35	LIBADD+= krb5	35	LIBADD+= krb5
36		36
		37	# XXX Must be the same as in kerberos5/Makefile.inc
		38	# XXX There will be a better way to reduce duplication but
		39	# XXX for now this will do.
		40	KRB5DIR= ${SRCTOP}/crypto/heimdal
		41
		42	CFLAGS+= -I${SRCTOP}/kerberos5/include \
		43	-I${KRB5DIR}/lib/krb5 \
		44	-I${.OBJDIR:H:H:H:H}/kerberos5/lib/libkrb5 \
		45	-I${KRB5DIR}/lib/asn1 \
		46	-I${.OBJDIR:H:H:H:H}/kerberos5/lib/libasn1 \
		47	-I${SRCTOP}/contrib/com_err
		48
37	.include <bsd.lib.mk>	49	.include <bsd.lib.mk>