Attachment #186891 for bug #222745




    ..
    include
        private
            asn1
            ..
            bsdstat
            ..
            event
            ..
            hdb
            ..
            heimbase
            ..
            heimntlm
            ..
            hx509
            ..
            kafs5
            ..
            kdc
            ..
            krb5
            ..
            roken
            ..
            sqlite3
            ..
            ucl
            ..
            wind
            ..
            zstd
            ..
        ..

Lines 1-6 Link Here

(-)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 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.
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${KRB5DIR}/base -I.

.include <bsd.lib.mk>


Lines 1-6 Link Here

(-)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 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

(-)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 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

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

Lines 1-6 Link Here

(-)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 Link Here

(-)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 Link Here

(-)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

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

GEN_OCSP= \
	asn1_OCSPBasicOCSPResponse.x \

Lines 1-6 Link Here

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

Lines 1-6 Link Here

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

Lines 1-6 Link Here

(-)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 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${KRB5DIR}/base

.include <bsd.lib.mk>


Lines 1-6 Link Here

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

Lines 1-6 Link Here

(-)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

(-)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

(-)kerberos5/lib/libwind/Makefile (-1 / +2 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 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 -I.
31		32
32	.include <bsd.lib.mk>	33	.include <bsd.lib.mk>
33		34





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
LIBADD=	hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm
LDFLAGS=${LDAPLDFLAGS}


Lines 8-15 Link Here

(-)kerberos5/libexec/hprop/Makefile (+10 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
13	LIBADD= hdb krb5 roken vers	23	LIBADD= hdb krb5 roken vers
14	DPADD= ${LDAPDPADD}	24	DPADD= ${LDAPDPADD}
15	LDADD= ${LDAPLDADD}	25	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 \
	${LDAPCFLAGS}
LIBADD=	hdb krb5 roken vers
DPADD=	${LDAPDPADD}
LDADD=	${LDAPLDADD}

Lines 4-10 Link Here

(-)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 Link Here

(-)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 \
	${LDAPCFLAGS}
LIBADD=	kadm5srv gssapi hdb krb5 roken vers
DPADD=	${LDAPDPADD}

Lines 18-24 Link Here

(-)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 \
	${LDAPCFLAGS}
LIBADD=	kdc hdb krb5 roken crypt vers
LDFLAGS=${LDAPLDFLAGS}


Lines 4-10 Link Here

(-)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

(-)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 Link Here

(-)kerberos5/libexec/kimpersonate/Makefile (-1 / +7 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.
9	LIBADD= krb5 roken asn1 vers	15	LIBADD= krb5 roken asn1 vers
10		16
11	.include <bsd.prog.mk>	17	.include <bsd.prog.mk>

Lines 2-8 Link Here

(-)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

(-)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

(-)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 5-10 Link Here

(-)kerberos5/usr.bin/hxtool/Makefile (+3 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${.OBJDIR:H:H}/lib/libhx509 \
		9	-I${.OBJDIR:H:H}/lib/libasn1 \
		10	-I${.OBJDIR:H:H}/lib/libroken \
8	-I${KRB5DIR}/lib/sl -I.	11	-I${KRB5DIR}/lib/sl -I.
9	LIBADD= hx509 roken asn1 crypto sl vers edit	12	LIBADD= hx509 roken asn1 crypto sl vers edit
10	SRCS= hxtool.c hxtool-commands.c hxtool-commands.h	13	SRCS= hxtool.c hxtool-commands.c hxtool-commands.h




	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. \
	${LDAPCFLAGS}
LIBADD=	kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit
DPADD=	${LDAPDPADD}
LDADD=	${LDAPLDADD}

Lines 7-13 Link Here

(-)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

(-)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

(-)kerberos5/usr.bin/kf/Makefile (-1 / +5 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
7	LIBADD= krb5 roken vers	11	LIBADD= krb5 roken vers
8		12
9	.include <bsd.prog.mk>	13	.include <bsd.prog.mk>

Lines 2-8 Link Here

(-)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

(-)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

(-)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 Link Here

(-)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
LIBADD=	krb5 roken crypto vers

.include <bsd.prog.mk>

Lines 2-8 Link Here

(-)kerberos5/usr.bin/verify_krb5_conf/Makefile (-1 / +9 lines)
2		2
3	PROG= verify_krb5_conf	3	PROG= verify_krb5_conf
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	-I${KRB5DIR}/base \
		7	-I${KRB5DIR}/lib/wind \
		8	-I${KRB5DIR}/lib/hx509 \
		9	-I${.OBJDIR:H:H}/lib/libkrb5 \
		10	-I${.OBJDIR:H:H}/lib/libroken \
		11	-I${.OBJDIR:H:H}/lib/libwind \
		12	-I${.OBJDIR:H:H}/lib/libasn1 \
		13	-I${.OBJDIR:H:H}/lib/libhx509
6	LIBADD= krb5 roken vers	14	LIBADD= krb5 roken vers
7		15
8	.include <bsd.prog.mk>	16	.include <bsd.prog.mk>

Lines 7-12 Link Here

(-)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 \
	${LDAPCFLAGS}
LIBADD=	hdb krb5 crypto vers
DPADD=	${LDAPDPADD}
LDADD=	${LDAPLDADD}

Lines 16-22 Link Here

(-)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 6-12 Link Here

(-)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 34-37 Link Here

(-)lib/libpam/modules/pam_krb5/Makefile (+11 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
37	.include <bsd.lib.mk>	48	.include <bsd.lib.mk>

Lines 30-33 Link Here

(-)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

(-)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 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 24-30 Link Here

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

Lines 48-54 Link Here

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

Lines 13-30 Link Here

(-)share/mk/src.libnames.mk (-13 / +17 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 \
19	devdctl \	20	devdctl \
20	event \	21	event \
		22	gssapi_krb5 \
		23	gssapi_ntlm \
		24	gssapi_spnego \
		25	hdb \
		26	heimbase \
21	heimipcc \	27	heimipcc \
22	heimipcs \	28	heimipcs \
		29	heimntlm \
		30	hx509 \
		31	kadm5clnt \
		32	kadm5srv \
		33	kafs5 \
		34	kdc \
		35	krb5 \
23	ldns \	36	ldns \
		37	roken \
24	sqlite3 \	38	sqlite3 \
25	ssh \	39	ssh \
26	ucl \	40	ucl \
27	unbound \	41	unbound \
		42	wind \
28	zstd	43	zstd
29		44
30	_INTERNALLIBS= \	45	_INTERNALLIBS= \
Lines 57-63 Link Here
57	80211 \	72	80211 \
58	alias \	73	alias \
59	archive \	74	archive \
60	asn1 \
61	auditd \	75	auditd \
62	avl \	76	avl \
63	begemot \	77	begemot \
Lines 102-122 Link Here
102	gnuregex \	116	gnuregex \
103	gpio \	117	gpio \
104	gssapi \	118	gssapi \
105	gssapi_krb5 \
106	hdb \
107	heimbase \
108	heimntlm \
109	heimsqlite \	119	heimsqlite \
110	hx509 \
111	ifconfig \	120	ifconfig \
112	ipsec \	121	ipsec \
113	jail \	122	jail \
114	kadm5clnt \
115	kadm5srv \
116	kafs5 \
117	kdc \
118	kiconv \	123	kiconv \
119	krb5 \
120	kvm \	124	kvm \
121	l \	125	l \
122	lzma \	126	lzma \
Lines 146-152 Link Here
146	pthread \	150	pthread \
147	radius \	151	radius \
148	readline \	152	readline \
149	roken \
150	rpcsec_gss \	153	rpcsec_gss \
151	rpcsvc \	154	rpcsvc \
152	rt \	155	rt \
Lines 172-178 Link Here
172	util \	175	util \
173	uutil \	176	uutil \
174	vmmapi \	177	vmmapi \
175	wind \
176	wrap \	178	wrap \
177	xo \	179	xo \
178	y \	180	y \
Lines 304-309 Link Here
304	_DP_kafs5= asn1 krb5 roken	306	_DP_kafs5= asn1 krb5 roken
305	_DP_krb5+= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc	307	_DP_krb5+= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc
306	_DP_gssapi_krb5+= gssapi krb5 crypto roken asn1 com_err	308	_DP_gssapi_krb5+= gssapi krb5 crypto roken asn1 com_err
		309	_DP_gssapi_ntlm+= crypto gssapi krb5 heimntlm roken
		310	_DP_gssapi_spnego+= gssapi heimbase asn1 roken
307	_DP_lzma= pthread	311	_DP_lzma= pthread
308	_DP_ucl= m	312	_DP_ucl= m
309	_DP_vmmapi= util	313	_DP_vmmapi= util

Lines 5-11 Link Here

(-)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 Link Here

(-)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




#   xargs -n1 | sort | uniq -d;
# done

# 20170831: hemdal becomes private
OLD_FILES+=usr/include/asn1-common.h
OLD_FILES+=usr/include/asn1_err.h
OLD_FILES+=usr/include/base64.h
OLD_FILES+=usr/include/cms_asn1.h
OLD_FILES+=usr/include/crmf_asn1.h
OLD_FILES+=usr/include/der-private.h
OLD_FILES+=usr/include/der-protos.h
OLD_FILES+=usr/include/der.h
OLD_FILES+=usr/include/digest_asn1.h
OLD_FILES+=usr/include/getarg.h
OLD_FILES+=usr/include/hdb-protos.h
OLD_FILES+=usr/include/hdb.h
OLD_FILES+=usr/include/hdb_asn1.h
OLD_FILES+=usr/include/hdb_err.h
OLD_FILES+=usr/include/heim_asn1.h
OLD_FILES+=usr/include/heim_err.h
OLD_FILES+=usr/include/heim_threads.h
OLD_FILES+=usr/include/heimbase.h
OLD_FILES+=usr/include/heimntlm-protos.h
OLD_FILES+=usr/include/heimntlm.h
OLD_FILES+=usr/include/hex.h
OLD_FILES+=usr/include/hx509-private.h
OLD_FILES+=usr/include/hx509-protos.h
OLD_FILES+=usr/include/hx509.h
OLD_FILES+=usr/include/hx509_err.h
OLD_FILES+=usr/include/k524_err.h
OLD_FILES+=usr/include/kafs.h
OLD_FILES+=usr/include/kdc-protos.h
OLD_FILES+=usr/include/kdc.h
OLD_FILES+=usr/include/krb5-private.h
OLD_FILES+=usr/include/krb5-protos.h
OLD_FILES+=usr/include/krb5-types.h
OLD_FILES+=usr/include/krb5.h
OLD_FILES+=usr/include/krb5_asn1.h
OLD_FILES+=usr/include/krb5_ccapi.h
OLD_FILES+=usr/include/krb5_err.h
OLD_FILES+=usr/include/kx509_asn1.h
OLD_FILES+=usr/include/ntlm_err.h
OLD_FILES+=usr/include/ocsp_asn1.h
OLD_FILES+=usr/include/parse_bytes.h
OLD_FILES+=usr/include/parse_time.h
OLD_FILES+=usr/include/parse_units.h
OLD_FILES+=usr/include/pkcs10_asn1.h
OLD_FILES+=usr/include/pkcs12_asn1.h
OLD_FILES+=usr/include/pkcs8_asn1.h
OLD_FILES+=usr/include/pkcs9_asn1.h
OLD_FILES+=usr/include/pkinit_asn1.h
OLD_FILES+=usr/include/resolve.h
OLD_FILES+=usr/include/rfc2459_asn1.h
OLD_FILES+=usr/include/roken-common.h
OLD_FILES+=usr/include/roken.h
OLD_FILES+=usr/include/rtbl.h
OLD_FILES+=usr/include/wind.h
OLD_FILES+=usr/include/wind_err.h
OLD_FILES+=usr/include/xdbm.h
OLD_LIBS+=usr/lib/libasn1.a
OLD_LIBS+=usr/lib/libasn1.so
OLD_LIBS+=usr/lib/libasn1.so.11
OLD_LIBS+=usr/lib/libasn1_p.a
OLD_LIBS+=usr/lib/libgssapi_krb5.a
OLD_LIBS+=usr/lib/libgssapi_krb5.so
OLD_LIBS+=usr/lib/libgssapi_krb5.so.10
OLD_LIBS+=usr/lib/libgssapi_krb5_p.a
OLD_LIBS+=usr/lib/libgssapi_ntlm.a
OLD_LIBS+=usr/lib/libgssapi_ntlm.so
OLD_LIBS+=usr/lib/libgssapi_ntlm.so.10
OLD_LIBS+=usr/lib/libgssapi_ntlm_p.a
OLD_LIBS+=usr/lib/libgssapi_spnego.a
OLD_LIBS+=usr/lib/libgssapi_spnego.so
OLD_LIBS+=usr/lib/libgssapi_spnego.so.10
OLD_LIBS+=usr/lib/libgssapi_spnego_p.a
OLD_LIBS+=usr/lib/libhdb.a
OLD_LIBS+=usr/lib/libhdb.so
OLD_LIBS+=usr/lib/libhdb.so.11
OLD_LIBS+=usr/lib/libhdb_p.a
OLD_LIBS+=usr/lib/libheimbase.a
OLD_LIBS+=usr/lib/libheimbase.so
OLD_LIBS+=usr/lib/libheimbase.so.11
OLD_LIBS+=usr/lib/libheimbase_p.a
OLD_LIBS+=usr/lib/libheimntlm.a
OLD_LIBS+=usr/lib/libheimntlm.so
OLD_LIBS+=usr/lib/libheimntlm.so.11
OLD_LIBS+=usr/lib/libheimntlm_p.a
OLD_LIBS+=usr/lib/libhx509.a
OLD_LIBS+=usr/lib/libhx509.so
OLD_LIBS+=usr/lib/libhx509.so.11
OLD_LIBS+=usr/lib/libhx509_p.a
OLD_LIBS+=usr/lib/libkadm5clnt.a
OLD_LIBS+=usr/lib/libkadm5clnt.so
OLD_LIBS+=usr/lib/libkadm5clnt.so.11
OLD_LIBS+=usr/lib/libkadm5clnt_p.a
OLD_LIBS+=usr/lib/libkadm5srv.a
OLD_LIBS+=usr/lib/libkadm5srv.so
OLD_LIBS+=usr/lib/libkadm5srv.so.11
OLD_LIBS+=usr/lib/libkadm5srv_p.a
OLD_LIBS+=usr/lib/libkafs5.a
OLD_LIBS+=usr/lib/libkafs5.so
OLD_LIBS+=usr/lib/libkafs5.so.11
OLD_LIBS+=usr/lib/libkafs5_p.a
OLD_LIBS+=usr/lib/libkdc.a
OLD_LIBS+=usr/lib/libkdc.so
OLD_LIBS+=usr/lib/libkdc.so.11
OLD_LIBS+=usr/lib/libkdc_p.a
OLD_LIBS+=usr/lib/libkrb5.a
OLD_LIBS+=usr/lib/libkrb5.so
OLD_LIBS+=usr/lib/libkrb5.so.11
OLD_LIBS+=usr/lib/libkrb5_p.a
OLD_LIBS+=usr/lib/libroken.a
OLD_LIBS+=usr/lib/libroken.so
OLD_LIBS+=usr/lib/libroken.so.11
OLD_LIBS+=usr/lib/libroken_p.a
OLD_LIBS+=usr/lib/libwind.a
OLD_LIBS+=usr/lib/libwind.so
OLD_LIBS+=usr/lib/libwind.so.11
OLD_LIBS+=usr/lib/libwind_p.a

# 20170802: ksyms(4) ioctl interface was removed
OLD_FILES+=usr/include/sys/ksyms.h


Return to bug 222745

Lines 9-22 Link Here

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

Lines 1-6 Link Here

(-)kerberos5/lib/libgssapi_krb5/Makefile (-1 / +10 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 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${KRB5DIR}/base -I.
82		91
83	.include <bsd.lib.mk>	92	.include <bsd.lib.mk>
84		93

Lines 1-6 Link Here

(-)kerberos5/lib/libhx509/Makefile (-3 / +4 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 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 -I.
215		216
216	GEN_OCSP= \	217	GEN_OCSP= \
217	asn1_OCSPBasicOCSPResponse.x \	218	asn1_OCSPBasicOCSPResponse.x \

Lines 1-6 Link Here

(-)kerberos5/lib/libkdc/Makefile (-4 / +10 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 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${KRB5DIR}/base
32		38
33	.include <bsd.lib.mk>	39	.include <bsd.lib.mk>
34		40

Lines 2-13 Link Here

(-)kerberos5/libexec/digest-service/Makefile (-2 / +13 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
11	LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm	22	LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm
12	LDFLAGS=${LDAPLDFLAGS}	23	LDFLAGS=${LDAPLDFLAGS}
13		24

Lines 3-9 Link Here

(-)kerberos5/libexec/hpropd/Makefile (-1 / +14 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	${LDAPCFLAGS}
7	LIBADD= hdb krb5 roken vers	20	LIBADD= hdb krb5 roken vers
8	DPADD= ${LDAPDPADD}	21	DPADD= ${LDAPDPADD}
9	LDADD= ${LDAPLDADD}	22	LDADD= ${LDAPLDADD}

Lines 8-13 Link Here

(-)kerberos5/libexec/kadmind/Makefile (+10 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 \
11	${LDAPCFLAGS}	21	${LDAPCFLAGS}
12	LIBADD= kadm5srv gssapi hdb krb5 roken vers	22	LIBADD= kadm5srv gssapi hdb krb5 roken vers
13	DPADD= ${LDAPDPADD}	23	DPADD= ${LDAPDPADD}

Lines 9-15 Link Here

(-)kerberos5/libexec/kdc/Makefile (-1 / +14 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	${LDAPCFLAGS}
13	LIBADD= kdc hdb krb5 roken crypt vers	26	LIBADD= kdc hdb krb5 roken crypt vers
14	LDFLAGS=${LDAPLDFLAGS}	27	LDFLAGS=${LDAPLDFLAGS}
15		28

Lines 25-31 Link Here

(-)kerberos5/usr.bin/kadmin/Makefile (-1 / +13 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. \
		40	${LDAPCFLAGS}
29	LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit	41	LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit
30	DPADD= ${LDAPDPADD}	42	DPADD= ${LDAPDPADD}
31	LDADD= ${LDAPLDADD}	43	LDADD= ${LDAPLDADD}

Lines 6-12 Link Here

(-)kerberos5/usr.bin/string2key/Makefile (-1 / +12 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
10	LIBADD= krb5 roken crypto vers	21	LIBADD= krb5 roken crypto vers
11		22
12	.include <bsd.prog.mk>	23	.include <bsd.prog.mk>

Lines 3-9 Link Here

(-)kerberos5/usr.sbin/kstash/Makefile (-1 / +14 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	${LDAPCFLAGS}
7	LIBADD= hdb krb5 crypto vers	20	LIBADD= hdb krb5 crypto vers
8	DPADD= ${LDAPDPADD}	21	DPADD= ${LDAPDPADD}
9	LDADD= ${LDAPLDADD}	22	LDADD= ${LDAPLDADD}

Lines 38-43 Link Here

(-)ObsoleteFiles.inc (+117 lines)
38	# xargs -n1 \| sort \| uniq -d;	38	# xargs -n1 \| sort \| uniq -d;
39	# done	39	# done
40		40
		41	# 20170831: hemdal becomes private
		42	OLD_FILES+=usr/include/asn1-common.h
		43	OLD_FILES+=usr/include/asn1_err.h
		44	OLD_FILES+=usr/include/base64.h
		45	OLD_FILES+=usr/include/cms_asn1.h
		46	OLD_FILES+=usr/include/crmf_asn1.h
		47	OLD_FILES+=usr/include/der-private.h
		48	OLD_FILES+=usr/include/der-protos.h
		49	OLD_FILES+=usr/include/der.h
		50	OLD_FILES+=usr/include/digest_asn1.h
		51	OLD_FILES+=usr/include/getarg.h
		52	OLD_FILES+=usr/include/hdb-protos.h
		53	OLD_FILES+=usr/include/hdb.h
		54	OLD_FILES+=usr/include/hdb_asn1.h
		55	OLD_FILES+=usr/include/hdb_err.h
		56	OLD_FILES+=usr/include/heim_asn1.h
		57	OLD_FILES+=usr/include/heim_err.h
		58	OLD_FILES+=usr/include/heim_threads.h
		59	OLD_FILES+=usr/include/heimbase.h
		60	OLD_FILES+=usr/include/heimntlm-protos.h
		61	OLD_FILES+=usr/include/heimntlm.h
		62	OLD_FILES+=usr/include/hex.h
		63	OLD_FILES+=usr/include/hx509-private.h
		64	OLD_FILES+=usr/include/hx509-protos.h
		65	OLD_FILES+=usr/include/hx509.h
		66	OLD_FILES+=usr/include/hx509_err.h
		67	OLD_FILES+=usr/include/k524_err.h
		68	OLD_FILES+=usr/include/kafs.h
		69	OLD_FILES+=usr/include/kdc-protos.h
		70	OLD_FILES+=usr/include/kdc.h
		71	OLD_FILES+=usr/include/krb5-private.h
		72	OLD_FILES+=usr/include/krb5-protos.h
		73	OLD_FILES+=usr/include/krb5-types.h
		74	OLD_FILES+=usr/include/krb5.h
		75	OLD_FILES+=usr/include/krb5_asn1.h
		76	OLD_FILES+=usr/include/krb5_ccapi.h
		77	OLD_FILES+=usr/include/krb5_err.h
		78	OLD_FILES+=usr/include/kx509_asn1.h
		79	OLD_FILES+=usr/include/ntlm_err.h
		80	OLD_FILES+=usr/include/ocsp_asn1.h
		81	OLD_FILES+=usr/include/parse_bytes.h
		82	OLD_FILES+=usr/include/parse_time.h
		83	OLD_FILES+=usr/include/parse_units.h
		84	OLD_FILES+=usr/include/pkcs10_asn1.h
		85	OLD_FILES+=usr/include/pkcs12_asn1.h
		86	OLD_FILES+=usr/include/pkcs8_asn1.h
		87	OLD_FILES+=usr/include/pkcs9_asn1.h
		88	OLD_FILES+=usr/include/pkinit_asn1.h
		89	OLD_FILES+=usr/include/resolve.h
		90	OLD_FILES+=usr/include/rfc2459_asn1.h
		91	OLD_FILES+=usr/include/roken-common.h
		92	OLD_FILES+=usr/include/roken.h
		93	OLD_FILES+=usr/include/rtbl.h
		94	OLD_FILES+=usr/include/wind.h
		95	OLD_FILES+=usr/include/wind_err.h
		96	OLD_FILES+=usr/include/xdbm.h
		97	OLD_LIBS+=usr/lib/libasn1.a
		98	OLD_LIBS+=usr/lib/libasn1.so
		99	OLD_LIBS+=usr/lib/libasn1.so.11
		100	OLD_LIBS+=usr/lib/libasn1_p.a
		101	OLD_LIBS+=usr/lib/libgssapi_krb5.a
		102	OLD_LIBS+=usr/lib/libgssapi_krb5.so
		103	OLD_LIBS+=usr/lib/libgssapi_krb5.so.10
		104	OLD_LIBS+=usr/lib/libgssapi_krb5_p.a
105	OLD_LIBS+=usr/lib/libgssapi_ntlm.a
106	OLD_LIBS+=usr/lib/libgssapi_ntlm.so
107	OLD_LIBS+=usr/lib/libgssapi_ntlm.so.10
108	OLD_LIBS+=usr/lib/libgssapi_ntlm_p.a
109	OLD_LIBS+=usr/lib/libgssapi_spnego.a
110	OLD_LIBS+=usr/lib/libgssapi_spnego.so
111	OLD_LIBS+=usr/lib/libgssapi_spnego.so.10
112	OLD_LIBS+=usr/lib/libgssapi_spnego_p.a
113	OLD_LIBS+=usr/lib/libhdb.a
114	OLD_LIBS+=usr/lib/libhdb.so
115	OLD_LIBS+=usr/lib/libhdb.so.11
116	OLD_LIBS+=usr/lib/libhdb_p.a
117	OLD_LIBS+=usr/lib/libheimbase.a
118	OLD_LIBS+=usr/lib/libheimbase.so
119	OLD_LIBS+=usr/lib/libheimbase.so.11
120	OLD_LIBS+=usr/lib/libheimbase_p.a
121	OLD_LIBS+=usr/lib/libheimntlm.a
122	OLD_LIBS+=usr/lib/libheimntlm.so
123	OLD_LIBS+=usr/lib/libheimntlm.so.11
124	OLD_LIBS+=usr/lib/libheimntlm_p.a
125	OLD_LIBS+=usr/lib/libhx509.a
126	OLD_LIBS+=usr/lib/libhx509.so
127	OLD_LIBS+=usr/lib/libhx509.so.11
128	OLD_LIBS+=usr/lib/libhx509_p.a
129	OLD_LIBS+=usr/lib/libkadm5clnt.a
130	OLD_LIBS+=usr/lib/libkadm5clnt.so
131	OLD_LIBS+=usr/lib/libkadm5clnt.so.11
132	OLD_LIBS+=usr/lib/libkadm5clnt_p.a
133	OLD_LIBS+=usr/lib/libkadm5srv.a
134	OLD_LIBS+=usr/lib/libkadm5srv.so
135	OLD_LIBS+=usr/lib/libkadm5srv.so.11
136	OLD_LIBS+=usr/lib/libkadm5srv_p.a
137	OLD_LIBS+=usr/lib/libkafs5.a
138	OLD_LIBS+=usr/lib/libkafs5.so
139	OLD_LIBS+=usr/lib/libkafs5.so.11
140	OLD_LIBS+=usr/lib/libkafs5_p.a
141	OLD_LIBS+=usr/lib/libkdc.a
142	OLD_LIBS+=usr/lib/libkdc.so
143	OLD_LIBS+=usr/lib/libkdc.so.11
144	OLD_LIBS+=usr/lib/libkdc_p.a
145	OLD_LIBS+=usr/lib/libkrb5.a
146	OLD_LIBS+=usr/lib/libkrb5.so
147	OLD_LIBS+=usr/lib/libkrb5.so.11
148	OLD_LIBS+=usr/lib/libkrb5_p.a
149	OLD_LIBS+=usr/lib/libroken.a
150	OLD_LIBS+=usr/lib/libroken.so
151	OLD_LIBS+=usr/lib/libroken.so.11
152	OLD_LIBS+=usr/lib/libroken_p.a
153	OLD_LIBS+=usr/lib/libwind.a
154	OLD_LIBS+=usr/lib/libwind.so
155	OLD_LIBS+=usr/lib/libwind.so.11
156	OLD_LIBS+=usr/lib/libwind_p.a
157
41	# 20170802: ksyms(4) ioctl interface was removed	158	# 20170802: ksyms(4) ioctl interface was removed
42	OLD_FILES+=usr/include/sys/ksyms.h	159	OLD_FILES+=usr/include/sys/ksyms.h
43		160