Fix conflicts after heimdal-1.1 import and add build infrastructure. Import

all non-style changes made by heimdal to our own libgssapi.

3 files changed, 40 insertions, 3 deletions

diff --git a/kerberos5/tools/Makefile b/kerberos5/tools/Makefile
index ed8d30a..271f511 100644
--- a/kerberos5/tools/Makefile
+++ b/kerberos5/tools/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	make-print-version make-roken asn1_compile
+SUBDIR=	make-print-version make-roken asn1_compile slc
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile
index a8ffa32..8fc7b01 100644
--- a/kerberos5/tools/asn1_compile/Makefile
+++ b/kerberos5/tools/asn1_compile/Makefile
@@ -10,8 +10,11 @@ SRCS=	gen.c \
 	gen_free.c \
 	gen_glue-fixed.c \
 	gen_length.c \
+	gen_seq.c \
 	hash.c \
+	ecalloc.c \
 	emalloc.c \
+	estrdup.c \
 	main.c \
 	symbol.c \
 	getarg.c \
@@ -41,8 +44,8 @@ roken.h: ../make-roken/make-roken
 	cd ${.CURDIR}/../make-roken && ${MAKE}
 
 gen_glue-fixed.c: gen_glue.c
-	 sed -e '106s/"/"#ifdef __PARSE_UNITS_H__\\n/;'\
-	     -e '106s/",/\\n#endif\\n",/' ${.ALLSRC} > ${.TARGET}
+	 sed -e '96s/"/"#ifdef __PARSE_UNITS_H__\\n/;'\
+	     -e '96s/",/\\n#endif\\n",/' ${.ALLSRC} > ${.TARGET}
 CLEANFILES+= gen_glue-fixed.c
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/tools/slc/Makefile b/kerberos5/tools/slc/Makefile
new file mode 100644
index 0000000..6388628
--- /dev/null
+++ b/kerberos5/tools/slc/Makefile
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+PROG=	slc
+NO_MAN=
+
+SRCS=	get_window_size.c \
+	getarg.c \
+	slc-gram.y \
+	slc-lex.l \
+	slc.h \
+	strupr.c
+
+SRCS+=	print_version.c \
+	print_version.h
+
+CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I${KRB5DIR}/lib/vers -I.
+
+CLEANFILES= print_version.h roken.h
+
+print_version.h: ../make-print-version/make-print-version
+	../make-print-version/make-print-version ${.TARGET}
+
+../make-print-version/make-print-version: .PHONY
+	cd ${.CURDIR}/../make-print-version && ${MAKE}
+
+roken.h: ../make-roken/make-roken
+	../make-roken/make-roken > ${.TARGET}
+
+../make-roken/make-roken: .PHONY
+	cd ${.CURDIR}/../make-roken && ${MAKE}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/lib/vers ${KRB5DIR}/lib/roken ${KRB5DIR}/lib/sl