[Midnightbsd-cvs] src [7148] trunk/kerberos5: cleanup botched merge
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jul 25 15:24:41 EDT 2015
Revision: 7148
http://svnweb.midnightbsd.org/src/?rev=7148
Author: laffer1
Date: 2015-07-25 15:24:41 -0400 (Sat, 25 Jul 2015)
Log Message:
-----------
cleanup botched merge
Modified Paths:
--------------
trunk/kerberos5/libexec/Makefile
trunk/kerberos5/libexec/hprop/Makefile
trunk/kerberos5/libexec/hpropd/Makefile
trunk/kerberos5/libexec/ipropd-master/Makefile
trunk/kerberos5/libexec/ipropd-slave/Makefile
trunk/kerberos5/libexec/kadmind/Makefile
trunk/kerberos5/libexec/kcm/Makefile
trunk/kerberos5/libexec/kdc/Makefile
trunk/kerberos5/libexec/kpasswdd/Makefile
trunk/kerberos5/tools/Makefile
trunk/kerberos5/tools/Makefile.inc
trunk/kerberos5/tools/asn1_compile/Makefile
trunk/kerberos5/tools/make-roken/Makefile
trunk/kerberos5/tools/slc/Makefile
trunk/kerberos5/usr.bin/Makefile
trunk/kerberos5/usr.bin/Makefile.inc
trunk/kerberos5/usr.bin/kadmin/Makefile
trunk/kerberos5/usr.bin/kdestroy/Makefile
trunk/kerberos5/usr.bin/kinit/Makefile
trunk/kerberos5/usr.bin/kpasswd/Makefile
trunk/kerberos5/usr.bin/krb5-config/Makefile
trunk/kerberos5/usr.bin/ksu/Makefile
trunk/kerberos5/usr.bin/verify_krb5_conf/Makefile
trunk/kerberos5/usr.sbin/Makefile
trunk/kerberos5/usr.sbin/Makefile.inc
trunk/kerberos5/usr.sbin/kstash/Makefile
trunk/kerberos5/usr.sbin/ktutil/Makefile
Added Paths:
-----------
trunk/kerberos5/libexec/digest-service/
trunk/kerberos5/libexec/digest-service/Makefile
trunk/kerberos5/libexec/kdigest/
trunk/kerberos5/libexec/kdigest/Makefile
trunk/kerberos5/libexec/kfd/
trunk/kerberos5/libexec/kfd/Makefile
trunk/kerberos5/libexec/kimpersonate/
trunk/kerberos5/libexec/kimpersonate/Makefile
trunk/kerberos5/usr.bin/hxtool/
trunk/kerberos5/usr.bin/hxtool/Makefile
trunk/kerberos5/usr.bin/kcc/
trunk/kerberos5/usr.bin/kcc/Makefile
trunk/kerberos5/usr.bin/kf/
trunk/kerberos5/usr.bin/kf/Makefile
trunk/kerberos5/usr.bin/kgetcred/
trunk/kerberos5/usr.bin/kgetcred/Makefile
trunk/kerberos5/usr.bin/string2key/
trunk/kerberos5/usr.bin/string2key/Makefile
trunk/kerberos5/usr.sbin/iprop-log/
trunk/kerberos5/usr.sbin/iprop-log/Makefile
Removed Paths:
-------------
trunk/kerberos5/tools/NTMakefile
trunk/kerberos5/tools/krb5-config.cat1
trunk/kerberos5/tools/make-print-version/
trunk/kerberos5/usr.bin/klist/
Modified: trunk/kerberos5/libexec/Makefile
===================================================================
--- trunk/kerberos5/libexec/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/libexec/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,5 +1,6 @@
# $MidnightBSD$
-SUBDIR= ipropd-master ipropd-slave hprop hpropd kadmind kdc kpasswdd kcm
+SUBDIR= digest-service ipropd-master ipropd-slave hprop hpropd kadmind kdc \
+ kdigest kfd kimpersonate kpasswdd kcm
.include <bsd.subdir.mk>
Added: trunk/kerberos5/libexec/digest-service/Makefile
===================================================================
--- trunk/kerberos5/libexec/digest-service/Makefile (rev 0)
+++ trunk/kerberos5/libexec/digest-service/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -0,0 +1,19 @@
+# $FreeBSD: stable/10/kerberos5/libexec/digest-service/Makefile 276486 2014-12-31 23:25:37Z ngie $
+
+PROG= digest-service
+MAN=
+CFLAGS+= -I${KRB5DIR}/kdc \
+ -I${KRB5DIR}/lib/asn1 \
+ -I${KRB5DIR}/lib/krb5 \
+ -I${KRB5DIR}/lib/ipc \
+ -I${KRB5DIR}/lib/wind \
+ -I${KRB5DIR}/lib/roken
+DPADD= ${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
+ ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
+LDADD= -lhdb -lkdc -lheimipcs -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
+ ${LIBVERS} -lheimntlm
+USEPRIVATELIB= heimipcs
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kdc
Property changes on: trunk/kerberos5/libexec/digest-service/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/kerberos5/libexec/hprop/Makefile
===================================================================
--- trunk/kerberos5/libexec/hprop/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/libexec/hprop/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,8 +1,8 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/libexec/hprop/Makefile 236337 2012-05-30 22:21:25Z obrien $
PROG= hprop
MAN= hprop.8
-SRCS= hprop.c mit_dump.c v4_dump.c
+SRCS= hprop.c mit_dump.c
CFLAGS+=-I${KRB5DIR}/lib/roken
CFLAGS+=-I${KRB5DIR}/lib/krb5
CFLAGS+=-I${KRB5DIR}/lib/asn1
Modified: trunk/kerberos5/libexec/hpropd/Makefile
===================================================================
--- trunk/kerberos5/libexec/hpropd/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/libexec/hpropd/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/libexec/hpropd/Makefile 178828 2008-05-07 13:53:12Z dfr $
PROG= hpropd
MAN= hpropd.8
Modified: trunk/kerberos5/libexec/ipropd-master/Makefile
===================================================================
--- trunk/kerberos5/libexec/ipropd-master/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/libexec/ipropd-master/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,7 +1,7 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/libexec/ipropd-master/Makefile 233294 2012-03-22 08:48:42Z stas $
PROG= ipropd-master
-NO_MAN=
+MAN= iprop.8
SRCS= ipropd_common.c ipropd_master.c kadm5_err.h
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-I. ${LDAPCFLAGS}
Modified: trunk/kerberos5/libexec/ipropd-slave/Makefile
===================================================================
--- trunk/kerberos5/libexec/ipropd-slave/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/libexec/ipropd-slave/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,7 +1,7 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/libexec/ipropd-slave/Makefile 276486 2014-12-31 23:25:37Z ngie $
PROG= ipropd-slave
-NO_MAN=
+MAN=
SRCS= ipropd_common.c ipropd_slave.c kadm5_err.h
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-I. ${LDAPCFLAGS}
Modified: trunk/kerberos5/libexec/kadmind/Makefile
===================================================================
--- trunk/kerberos5/libexec/kadmind/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/libexec/kadmind/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,14 +1,18 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/libexec/kadmind/Makefile 236337 2012-05-30 22:21:25Z obrien $
PROG= kadmind
MAN= kadmind.8
-SRCS= kadm_conn.c kadmind.c server.c
+SRCS= rpc.c \
+ server.c \
+ kadmind.c \
+ kadm_conn.c
+
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
${LDAPCFLAGS}
-DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD= -lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
- -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+DPADD= ${LIBKADM5SRV} ${LIBGSSAPI} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} \
+ ${LIBASN1} ${LIBVERS} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD}
+LDADD= -lkadm5srv -lgssapi -lhdb -lkrb5 -lroken \
+ -lasn1 ${LIBVERS} -lcrypto -lcrypt ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
Modified: trunk/kerberos5/libexec/kcm/Makefile
===================================================================
--- trunk/kerberos5/libexec/kcm/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/libexec/kcm/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/libexec/kcm/Makefile 255455 2013-09-10 18:40:43Z des $
PROG= kcm
MAN= kcm.8
@@ -9,23 +9,21 @@
client.c \
config.c \
connect.c \
- cursor.c \
events.c \
glue.c \
- headers.h \
- kcm_locl.h \
- kcm_protos.h \
log.c \
main.c \
protocol.c \
+ sessions.c \
renew.c
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/kcm ${LDAPCFLAGS}
-DPADD= ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD= -lkrb5 -lhx509 -lroken ${LIBVERS} \
- -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+ -I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS}
+DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBHEIMNTLM} \
+ ${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} ${LDAPDPADD}
+LDADD= -lhdb -lkrb5 -lroken -lasn1 -lheimntlm -lheimipcs \
+ -lcrypto -lcrypt ${LIBVERS} ${LDAPLDADD}
+USEPRIVATELIB= heimipcs
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
Modified: trunk/kerberos5/libexec/kdc/Makefile
===================================================================
--- trunk/kerberos5/libexec/kdc/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/libexec/kdc/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,33 +1,18 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/libexec/kdc/Makefile 233294 2012-03-22 08:48:42Z stas $
PROG= kdc
MAN= kdc.8
-SRCS= 524.c \
- config.c \
+SRCS= config.c \
connect.c \
- default_config.c \
- digest.c \
- kaserver.c \
- kerberos4.c \
- kerberos5.c \
- krb5tgs.c \
- kx509.c \
- log.c \
- main.c \
- misc.c \
- pkinit.c \
- process.c \
- set_dbinfo.c \
- windc.c
+ announce.c \
+ main.c
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/kdc ${LDAPCFLAGS}
-DPADD= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD= -lhdb -lkrb5 -lhx509 -lheimntlm -lroken ${LIBVERS} \
- -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-LDFLAGS=${LDAPLDFLAGS}
+DPADD= ${LIBKDC} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
+ ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
+LDADD= -lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
.include <bsd.prog.mk>
Added: trunk/kerberos5/libexec/kdigest/Makefile
===================================================================
--- trunk/kerberos5/libexec/kdigest/Makefile (rev 0)
+++ trunk/kerberos5/libexec/kdigest/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -0,0 +1,25 @@
+# $FreeBSD: stable/10/kerberos5/libexec/kdigest/Makefile 236422 2012-06-01 21:26:28Z obrien $
+
+PROG= kdigest
+MAN= kdigest.8
+CFLAGS+= -I${KRB5DIR}/lib/asn1 \
+ -I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/lib/sl -I.
+DPADD= ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+ ${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT}
+LDADD= -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} \
+ ${LIBVERS} -ledit
+SRCS= kdigest.c \
+ kdigest-commands.c \
+ kdigest-commands.h
+
+kdigest-commands.h: kdigest-commands.in
+ ${SLC} ${.ALLSRC:M*.in}
+
+.for ext in c o
+kdigest-commands.${ext}: kdigest-commands.h
+.endfor
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kuser
Property changes on: trunk/kerberos5/libexec/kdigest/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/kerberos5/libexec/kfd/Makefile
===================================================================
--- trunk/kerberos5/libexec/kfd/Makefile (rev 0)
+++ trunk/kerberos5/libexec/kfd/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -0,0 +1,14 @@
+# $FreeBSD: stable/10/kerberos5/libexec/kfd/Makefile 236337 2012-05-30 22:21:25Z obrien $
+
+PROG= kfd
+MAN= kfd.8
+CFLAGS+= -I${KRB5DIR}/lib/asn1 \
+ -I${KRB5DIR}/lib/roken
+DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+ ${LIBCRYPT} ${LIBVERS}
+LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
+ ${LIBVERS}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/appl/kf
Property changes on: trunk/kerberos5/libexec/kfd/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/kerberos5/libexec/kimpersonate/Makefile
===================================================================
--- trunk/kerberos5/libexec/kimpersonate/Makefile (rev 0)
+++ trunk/kerberos5/libexec/kimpersonate/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -0,0 +1,16 @@
+# $FreeBSD: stable/10/kerberos5/libexec/kimpersonate/Makefile 233294 2012-03-22 08:48:42Z stas $
+
+PROG= kimpersonate
+MAN= kimpersonate.8
+CFLAGS+= -I${KRB5DIR}/lib/hx509 \
+ -I${KRB5DIR}/lib/asn1 \
+ -I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/lib/sl -I.
+DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+ ${LIBCRYPT} ${LIBVERS}
+LDADD= -lkafs5 -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt \
+ ${LIBVERS}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kuser
Property changes on: trunk/kerberos5/libexec/kimpersonate/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/kerberos5/libexec/kpasswdd/Makefile
===================================================================
--- trunk/kerberos5/libexec/kpasswdd/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/libexec/kpasswdd/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/libexec/kpasswdd/Makefile 178828 2008-05-07 13:53:12Z dfr $
PROG= kpasswdd
MAN= kpasswdd.8
Modified: trunk/kerberos5/tools/Makefile
===================================================================
--- trunk/kerberos5/tools/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/tools/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,5 +1,5 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/tools/Makefile 233294 2012-03-22 08:48:42Z stas $
-SUBDIR= make-print-version make-roken asn1_compile slc
+SUBDIR= make-roken asn1_compile slc
.include <bsd.subdir.mk>
Modified: trunk/kerberos5/tools/Makefile.inc
===================================================================
--- trunk/kerberos5/tools/Makefile.inc 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/tools/Makefile.inc 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,5 +1,5 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/tools/Makefile.inc 233294 2012-03-22 08:48:42Z stas $
-realinstall:
+BINDIR?= /usr/bin
.include "../Makefile.inc"
Deleted: trunk/kerberos5/tools/NTMakefile
===================================================================
--- trunk/kerberos5/tools/NTMakefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/tools/NTMakefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,35 +0,0 @@
-########################################################################
-#
-# Copyright (c) 2009, Secure Endpoints Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# - Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# - Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-RELDIR=tools
-
-!include ../windows/NTMakefile.w32
-
Modified: trunk/kerberos5/tools/asn1_compile/Makefile
===================================================================
--- trunk/kerberos5/tools/asn1_compile/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/tools/asn1_compile/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,55 +1,35 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/tools/asn1_compile/Makefile 276486 2014-12-31 23:25:37Z ngie $
PROG= asn1_compile
-NO_MAN=
+MAN=
+LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a
+LDADD= ${LIBROKEN_A} ${LIBVERS}
+DPADD= ${LIBROKEN_A} ${LIBVERS}
-SRCS= gen.c \
+SRCS= \
+ asn1parse.y \
+ gen.c \
gen_copy.c \
gen_decode.c \
gen_encode.c \
gen_free.c \
- gen_glue-fixed.c \
+ gen_glue.c \
gen_length.c \
gen_seq.c \
+ gen_template.c \
hash.c \
- ecalloc.c \
- emalloc.c \
- estrdup.c \
+ lex.l \
main.c \
- symbol.c \
- getarg.c \
- warnerr.c \
- lex.l \
- parse.y \
- print_version.c \
- print_version.h \
roken.h \
- get_window_size.c \
- strupr.c
+ symbol.c
CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/asn1 -I.
-CLEANFILES= print_version.h roken.h
+CLEANFILES= roken.h lex.c parse.c
-print_version.h: ../make-print-version/make-print-version
- ../make-print-version/make-print-version ${.TARGET}
+roken.h:
+ make-roken > ${.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}
-
-gen_glue-fixed.c: gen_glue.c
- sed -e '96s/"/"#ifdef __PARSE_UNITS_H__\\n/;'\
- -e '96s/",/\\n#endif\\n",/' ${.ALLSRC} > ${.TARGET}
-CLEANFILES+= gen_glue-fixed.c
-
.include <bsd.prog.mk>
-# There are two print_version.c's, the one we need is in ${KRB5DIR}/lib/vers,
-# so the order of paths is important here.
-.PATH: ${KRB5DIR}/lib/vers ${KRB5DIR}/lib/roken ${KRB5DIR}/lib/asn1
+.PATH: ${KRB5DIR}/lib/asn1
Deleted: trunk/kerberos5/tools/krb5-config.cat1
===================================================================
--- trunk/kerberos5/tools/krb5-config.cat1 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/tools/krb5-config.cat1 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,52 +0,0 @@
-
-KRB5-CONFIG(1) BSD General Commands Manual KRB5-CONFIG(1)
-
-NNAAMMEE
- kkrrbb55--ccoonnffiigg -- give information on how to link code against Heimdal
- libraries
-
-SSYYNNOOPPSSIISS
- kkrrbb55--ccoonnffiigg [----pprreeffiixx[=_d_i_r]] [----eexxeecc--pprreeffiixx[=_d_i_r]] [----lliibbss] [----ccffllaaggss]
- [_l_i_b_r_a_r_i_e_s]
-
-DDEESSCCRRIIPPTTIIOONN
- kkrrbb55--ccoonnffiigg tells the application programmer what special flags to use to
- compile and link programs against the libraries installed by Heimdal.
-
- Options supported:
-
- ----pprreeffiixx[=_d_i_r]
- Print the prefix if no _d_i_r is specified, otherwise set prefix to
- _d_i_r.
-
- ----eexxeecc--pprreeffiixx[=_d_i_r]
- Print the exec-prefix if no _d_i_r is specified, otherwise set exec-
- prefix to _d_i_r.
-
- ----lliibbss Output the set of libraries that should be linked against.
-
- ----ccffllaaggss
- Output the set of flags to give to the C compiler when using the
- Heimdal libraries.
-
- By default kkrrbb55--ccoonnffiigg will output the set of flags and libraries to be
- used by a normal program using the krb5 API. The user can also supply a
- library to be used, the supported ones are:
-
- krb5 (the default)
-
- gssapi use the krb5 gssapi mechanism
-
- kadm-client
- use the client-side kadmin libraries
-
- kadm-server
- use the server-side kadmin libraries
-
-SSEEEE AALLSSOO
- cc(1)
-
-HHIISSTTOORRYY
- kkrrbb55--ccoonnffiigg appeared in Heimdal 0.3d.
-
-HEIMDAL November 30, 2000 HEIMDAL
Modified: trunk/kerberos5/tools/make-roken/Makefile
===================================================================
--- trunk/kerberos5/tools/make-roken/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/tools/make-roken/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,11 +1,13 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/tools/make-roken/Makefile 276486 2014-12-31 23:25:37Z ngie $
PROG= make-roken
-NO_MAN=
+MAN=
CLEANFILES= make-roken.c
-.include <bsd.prog.mk>
+.include "../Makefile.inc"
make-roken.c: ${KRB5DIR}/lib/roken/roken.awk ${KRB5DIR}/lib/roken/roken.h.in
awk -f ${.ALLSRC} > ${.TARGET}
+
+.include <bsd.prog.mk>
Modified: trunk/kerberos5/tools/slc/Makefile
===================================================================
--- trunk/kerberos5/tools/slc/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/tools/slc/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,35 +1,24 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/tools/slc/Makefile 276486 2014-12-31 23:25:37Z ngie $
PROG= slc
-NO_MAN=
+LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a
+LDADD= ${LIBROKEN_A} ${LIBVERS}
+DPADD= ${LIBROKEN_A} ${LIBVERS}
+MAN=
-SRCS= get_window_size.c \
- getarg.c \
- roken.h \
+SRCS= roken.h \
slc-gram.y \
- slc-lex.l \
- slc.h \
- strupr.c
+ slc-lex.l
-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
+CLEANFILES= roken.h slc-gram.c slc-lex.c
-print_version.h: ../make-print-version/make-print-version
- ../make-print-version/make-print-version ${.TARGET}
+roken.h:
+ ${MAKE_ROKEN} > ${.TARGET}
-../make-print-version/make-print-version: .PHONY
- cd ${.CURDIR}/../make-print-version && ${MAKE}
+# ${.OBJDIR}/../make-roken/make-roken > ${.TARGET}
-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
+.PATH: ${KRB5DIR}/lib/roken ${KRB5DIR}/lib/sl
Modified: trunk/kerberos5/usr.bin/Makefile
===================================================================
--- trunk/kerberos5/usr.bin/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/usr.bin/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,6 +1,6 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/usr.bin/Makefile 233294 2012-03-22 08:48:42Z stas $
-SUBDIR= kadmin kdestroy kinit klist kpasswd krb5-config ksu \
- verify_krb5_conf
+SUBDIR= hxtool kadmin kcc kdestroy kgetcred kf kinit kpasswd krb5-config ksu \
+ string2key verify_krb5_conf
.include <bsd.subdir.mk>
Modified: trunk/kerberos5/usr.bin/Makefile.inc
===================================================================
--- trunk/kerberos5/usr.bin/Makefile.inc 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/usr.bin/Makefile.inc 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/usr.bin/Makefile.inc 56068 2000-01-15 21:38:08Z markm $
BINDIR= /usr/bin
Added: trunk/kerberos5/usr.bin/hxtool/Makefile
===================================================================
--- trunk/kerberos5/usr.bin/hxtool/Makefile (rev 0)
+++ trunk/kerberos5/usr.bin/hxtool/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -0,0 +1,22 @@
+# $FreeBSD: stable/10/kerberos5/usr.bin/hxtool/Makefile 276486 2014-12-31 23:25:37Z ngie $
+
+PROG= hxtool
+MAN=
+CFLAGS+= -I${KRB5DIR}/lib/hx509 \
+ -I${KRB5DIR}/lib/asn1 \
+ -I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/lib/sl -I.
+DPADD= ${LIBHX509} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT}
+LDADD= -lhx509 -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} ${LIBVERS} -ledit
+SRCS= hxtool.c hxtool-commands.c hxtool-commands.h
+
+hxtool-commands.h: hxtool-commands.in
+ ${SLC} ${.ALLSRC:M*.in}
+
+.for ext in c o
+hxtool-commands.${ext}: hxtool-commands.h
+.endfor
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/lib/hx509
Property changes on: trunk/kerberos5/usr.bin/hxtool/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/kerberos5/usr.bin/kadmin/Makefile
===================================================================
--- trunk/kerberos5/usr.bin/kadmin/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/usr.bin/kadmin/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/usr.bin/kadmin/Makefile 236422 2012-06-01 21:26:28Z obrien $
PROG= kadmin
MAN= kadmin.8
@@ -29,24 +29,21 @@
DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \
${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \
${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
- ${LIBREADLINE} ${LIBNCURSES} ${LDAPDPADD}
+ ${LIBEDIT} ${LIBNCURSES} ${LDAPDPADD}
LDADD= -lkadm5clnt -lkadm5srv -lhdb -lkrb5 -lhx509 \
${LIBSL} -lroken ${LIBVERS} -lasn1 \
-lcrypto -lcrypt -lcom_err \
- -lreadline -lncurses ${LDAPLDADD}
+ -ledit -lncurses ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
-kadmin-commands.h: ${KRB5DIR}/kadmin/kadmin-commands.in ../../tools/slc/slc
- ../../tools/slc/slc ${.ALLSRC:M*.in}
+kadmin-commands.h: ${KRB5DIR}/kadmin/kadmin-commands.in
+ ${SLC} ${.ALLSRC:M*.in}
-.for ext in c o
+.for ext in o c
kadmin-commands.${ext}: kadmin-commands.h
.endfor
-../../tools/slc/slc:
- cd ${.CURDIR}/../../tools/slc && ${MAKE}
-
.PATH: ${KRB5DIR}/kadmin
Added: trunk/kerberos5/usr.bin/kcc/Makefile
===================================================================
--- trunk/kerberos5/usr.bin/kcc/Makefile (rev 0)
+++ trunk/kerberos5/usr.bin/kcc/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -0,0 +1,31 @@
+# $FreeBSD: stable/10/kerberos5/usr.bin/kcc/Makefile 236422 2012-06-01 21:26:28Z obrien $
+
+PROG= kcc
+MAN= klist.1 kswitch.1
+LINKS= ${BINDIR}/kcc ${BINDIR}/klist \
+ ${BINDIR}/kcc ${BINDIR}/kswitch
+CFLAGS+= -I${KRB5DIR}/lib/hx509 \
+ -I${KRB5DIR}/lib/asn1 \
+ -I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/lib/sl -I.
+DPADD= ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+ ${LIBCRYPT} ${LIBKAFS5} ${LIBSL} ${LIBVERS} ${LIBEDIT}
+LDADD= -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt -lkafs5 ${LIBSL} \
+ ${LIBVERS} -ledit
+SRCS= kcc.c \
+ kcc-commands.c \
+ kcc-commands.h \
+ klist.c \
+ kswitch.c \
+ copy_cred_cache.c
+
+kcc-commands.h: kcc-commands.in
+ ${SLC} ${.ALLSRC:M*.in}
+
+.for ext in c o
+kcc-commands.${ext}: kcc-commands.h
+.endfor
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kuser
Property changes on: trunk/kerberos5/usr.bin/kcc/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/kerberos5/usr.bin/kdestroy/Makefile
===================================================================
--- trunk/kerberos5/usr.bin/kdestroy/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/usr.bin/kdestroy/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,11 +1,12 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/usr.bin/kdestroy/Makefile 233294 2012-03-22 08:48:42Z stas $
PROG= kdestroy
CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD= -lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \
- -lasn1 -lcrypto -lcrypt -lcom_err
+DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
+LDADD= -lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \
+ -lasn1 -lcrypto -lcrypt
+MAN= kdestroy.1
.include <bsd.prog.mk>
Added: trunk/kerberos5/usr.bin/kf/Makefile
===================================================================
--- trunk/kerberos5/usr.bin/kf/Makefile (rev 0)
+++ trunk/kerberos5/usr.bin/kf/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -0,0 +1,14 @@
+# $FreeBSD: stable/10/kerberos5/usr.bin/kf/Makefile 236337 2012-05-30 22:21:25Z obrien $
+
+PROG= kf
+MAN= kf.1
+CFLAGS+= -I${KRB5DIR}/lib/asn1 \
+ -I${KRB5DIR}/lib/roken
+DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+ ${LIBCRYPT} ${LIBVERS}
+LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
+ ${LIBVERS}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/appl/kf
Property changes on: trunk/kerberos5/usr.bin/kf/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/kerberos5/usr.bin/kgetcred/Makefile
===================================================================
--- trunk/kerberos5/usr.bin/kgetcred/Makefile (rev 0)
+++ trunk/kerberos5/usr.bin/kgetcred/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -0,0 +1,11 @@
+# $FreeBSD: stable/10/kerberos5/usr.bin/kgetcred/Makefile 233294 2012-03-22 08:48:42Z stas $
+
+PROG= kgetcred
+CFLAGS+= -I${KRB5DIR}/lib/asn1 \
+ -I${KRB5DIR}/lib/roken
+DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
+LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kuser
Property changes on: trunk/kerberos5/usr.bin/kgetcred/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/kerberos5/usr.bin/kinit/Makefile
===================================================================
--- trunk/kerberos5/usr.bin/kinit/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/usr.bin/kinit/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,10 +1,10 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/usr.bin/kinit/Makefile 233294 2012-03-22 08:48:42Z stas $
PROG= kinit
CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD= -lkafs5 -lkrb5 -lhx509 -lheimntlm -lroken ${LIBVERS} \
+DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
+LDADD= -lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err
.include <bsd.prog.mk>
Modified: trunk/kerberos5/usr.bin/kpasswd/Makefile
===================================================================
--- trunk/kerberos5/usr.bin/kpasswd/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/usr.bin/kpasswd/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/usr.bin/kpasswd/Makefile 201919 2010-01-09 18:53:03Z antoine $
PROG= kpasswd
CFLAGS+=-I${KRB5DIR}/lib/roken
Modified: trunk/kerberos5/usr.bin/krb5-config/Makefile
===================================================================
--- trunk/kerberos5/usr.bin/krb5-config/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/usr.bin/krb5-config/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/usr.bin/krb5-config/Makefile 233294 2012-03-22 08:48:42Z stas $
SCRIPTS=krb5-config
MAN= krb5-config.1
@@ -18,6 +18,7 @@
-e "s, at LIB_pkinit\@,-lhx509,g" \
-e "s, at LIB_dlopen\@,,g" \
-e "s, at LIB_door_create\@,,g" \
+ -e "s, at PTHREAD_LIBADD\@,-pthread,g" \
-e "s, at LIBS\@,,g" \
-e "s, at INCLUDE_hcrypto@,,g" \
${.ALLSRC} > ${.TARGET}
Modified: trunk/kerberos5/usr.bin/ksu/Makefile
===================================================================
--- trunk/kerberos5/usr.bin/ksu/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/usr.bin/ksu/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/usr.bin/ksu/Makefile 276486 2014-12-31 23:25:37Z ngie $
PROG= ksu
.if defined(ENABLE_SUID_K5SU)
@@ -5,7 +5,7 @@
BINMODE=4555
PRECIOUSPROG=
.endif
-NO_MAN=
+MAN=
SRCS= su.c
CFLAGS+=-I${KRB5DIR}/lib/roken
DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
Added: trunk/kerberos5/usr.bin/string2key/Makefile
===================================================================
--- trunk/kerberos5/usr.bin/string2key/Makefile (rev 0)
+++ trunk/kerberos5/usr.bin/string2key/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -0,0 +1,16 @@
+# $FreeBSD: stable/10/kerberos5/usr.bin/string2key/Makefile 236337 2012-05-30 22:21:25Z obrien $
+
+PROG= string2key
+MAN= string2key.8
+CFLAGS+= -I${KRB5DIR}/kdc \
+ -I${KRB5DIR}/lib/asn1 \
+ -I${KRB5DIR}/lib/krb5 \
+ -I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/lib/windc
+DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+ ${LIBCRYPT} ${LIBVERS}
+LDADD= -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/kdc
Property changes on: trunk/kerberos5/usr.bin/string2key/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/kerberos5/usr.bin/verify_krb5_conf/Makefile
===================================================================
--- trunk/kerberos5/usr.bin/verify_krb5_conf/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/usr.bin/verify_krb5_conf/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/usr.bin/verify_krb5_conf/Makefile 178828 2008-05-07 13:53:12Z dfr $
PROG= verify_krb5_conf
MAN= verify_krb5_conf.8
Modified: trunk/kerberos5/usr.sbin/Makefile
===================================================================
--- trunk/kerberos5/usr.sbin/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/usr.sbin/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,5 +1,5 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/usr.sbin/Makefile 233294 2012-03-22 08:48:42Z stas $
-SUBDIR= kstash ktutil
+SUBDIR= iprop-log kstash ktutil
.include <bsd.subdir.mk>
Modified: trunk/kerberos5/usr.sbin/Makefile.inc
===================================================================
--- trunk/kerberos5/usr.sbin/Makefile.inc 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/usr.sbin/Makefile.inc 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/usr.sbin/Makefile.inc 56546 2000-01-24 19:56:26Z markm $
BINDIR= /usr/sbin
Added: trunk/kerberos5/usr.sbin/iprop-log/Makefile
===================================================================
--- trunk/kerberos5/usr.sbin/iprop-log/Makefile (rev 0)
+++ trunk/kerberos5/usr.sbin/iprop-log/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -0,0 +1,25 @@
+# $FreeBSD: stable/10/kerberos5/usr.sbin/iprop-log/Makefile 236422 2012-06-01 21:26:28Z obrien $
+
+PROG= iprop-log
+MAN= iprop-log.8
+SRCS= iprop-log.c iprop-commands.c iprop-commands.h kadm5_err.h
+CFLAGS+= -I${KRB5DIR}/lib/kadm5 \
+ -I${KRB5DIR}/lib/krb5 \
+ -I${KRB5DIR}/lib/roken \
+ -I${KRB5DIR}/lib/sl \
+ -I.
+DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} \
+ ${LIBCRYPT} ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBEDIT}
+LDADD= -lkadm5srv -lhdb -lkrb5 -lasn1 -lcrypto -lcrypt ${LIBSL} -lroken \
+ ${LIBVERS} -ledit
+
+iprop-commands.h: iprop-commands.in
+ ${SLC} ${.ALLSRC:M*.in}
+
+.for ext in c o
+iprop-commands.${ext}: iprop-commands.h
+.endfor
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/lib/kadm5
Property changes on: trunk/kerberos5/usr.sbin/iprop-log/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/kerberos5/usr.sbin/kstash/Makefile
===================================================================
--- trunk/kerberos5/usr.sbin/kstash/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/usr.sbin/kstash/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,13 +1,13 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/usr.sbin/kstash/Makefile 233294 2012-03-22 08:48:42Z stas $
PROG= kstash
MAN= kstash.8
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/kdc ${LDAPCFLAGS}
-DPADD= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD= -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
- -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD}
+LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \
+ -lasn1 -lcrypto -lcrypt ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
Modified: trunk/kerberos5/usr.sbin/ktutil/Makefile
===================================================================
--- trunk/kerberos5/usr.sbin/ktutil/Makefile 2015-07-25 19:24:30 UTC (rev 7147)
+++ trunk/kerberos5/usr.sbin/ktutil/Makefile 2015-07-25 19:24:41 UTC (rev 7148)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/kerberos5/usr.sbin/ktutil/Makefile 236422 2012-06-01 21:26:28Z obrien $
PROG= ktutil
MAN= ktutil.8
@@ -6,6 +6,7 @@
SRCS= add.c \
change.c \
copy.c \
+ destroy.c \
get.c \
ktutil.c \
ktutil-commands.c \
@@ -16,23 +17,18 @@
rename.c
CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I.
-DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBHX509} ${LIBSL} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
- ${LIBREADLINE} ${LIBNCURSES}
-LDADD= -lkadm5clnt -lkrb5 -lhx509 ${LIBSL} -lroken ${LIBVERS} \
- -lasn1 -lcrypto -lcrypt -lcom_err \
- -lreadline -lncurses
+DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBSL} ${LIBROKEN} ${LIBVERS} \
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBEDIT}
+LDADD= -lkadm5clnt -lkrb5 ${LIBSL} -lroken ${LIBVERS} \
+ -lasn1 -lcrypto -lcrypt -ledit
.include <bsd.prog.mk>
-ktutil-commands.h: ${KRB5DIR}/admin/ktutil-commands.in ../../tools/slc/slc
- ../../tools/slc/slc ${.ALLSRC:M*.in}
+ktutil-commands.h: ${KRB5DIR}/admin/ktutil-commands.in
+ ${SLC} ${.ALLSRC:M*.in}
.for ext in c o
ktutil-commands.${ext}: ktutil-commands.h
.endfor
-../../tools/slc/slc:
- cd ${.CURDIR}/../../tools/slc && ${MAKE}
-
.PATH: ${KRB5DIR}/admin
More information about the Midnightbsd-cvs
mailing list