git: f5ab36c2e174 - stable/13 - pkgbase: Create a FreeBSD-kerberos package
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 05 Jan 2022 17:24:15 UTC
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=f5ab36c2e17451921a4b22352fe06574f3eb4e5a
commit f5ab36c2e17451921a4b22352fe06574f3eb4e5a
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-09-02 04:09:15 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2022-01-05 17:23:50 +0000
pkgbase: Create a FreeBSD-kerberos package
This allows users to install or not kerberos related utilities
and libs.
Differential Revision: https://reviews.freebsd.org/D31801
(cherry picked from commit a30235a4c360c06bb57be1f10ae6866a71fb5622)
---
kerberos5/lib/libasn1/Makefile | 2 ++
kerberos5/lib/libgssapi_krb5/Makefile | 2 ++
kerberos5/lib/libgssapi_ntlm/Makefile | 2 ++
kerberos5/lib/libgssapi_spnego/Makefile | 2 ++
kerberos5/lib/libhdb/Makefile | 2 ++
kerberos5/lib/libheimbase/Makefile | 2 ++
kerberos5/lib/libheimipcc/Makefile | 2 ++
kerberos5/lib/libheimipcs/Makefile | 2 ++
kerberos5/lib/libheimntlm/Makefile | 2 ++
kerberos5/lib/libhx509/Makefile | 2 ++
kerberos5/lib/libkadm5clnt/Makefile | 2 ++
kerberos5/lib/libkadm5srv/Makefile | 2 ++
kerberos5/lib/libkafs5/Makefile | 2 ++
kerberos5/lib/libkdc/Makefile | 2 ++
kerberos5/lib/libkrb5/Makefile | 2 ++
kerberos5/lib/libroken/Makefile | 2 ++
kerberos5/lib/libsl/Makefile | 2 ++
kerberos5/lib/libvers/Makefile | 2 ++
kerberos5/lib/libwind/Makefile | 2 ++
kerberos5/libexec/digest-service/Makefile | 2 ++
kerberos5/libexec/hprop/Makefile | 2 ++
kerberos5/libexec/hpropd/Makefile | 2 ++
kerberos5/libexec/ipropd-master/Makefile | 2 ++
kerberos5/libexec/ipropd-slave/Makefile | 2 ++
kerberos5/libexec/kadmind/Makefile | 2 ++
kerberos5/libexec/kcm/Makefile | 2 ++
kerberos5/libexec/kdc/Makefile | 2 ++
kerberos5/libexec/kdigest/Makefile | 2 ++
kerberos5/libexec/kfd/Makefile | 2 ++
kerberos5/libexec/kimpersonate/Makefile | 2 ++
kerberos5/libexec/kpasswdd/Makefile | 2 ++
kerberos5/tools/asn1_compile/Makefile | 2 ++
kerberos5/tools/make-roken/Makefile | 2 ++
kerberos5/tools/slc/Makefile | 2 ++
kerberos5/usr.bin/hxtool/Makefile | 2 ++
kerberos5/usr.bin/kadmin/Makefile | 2 ++
kerberos5/usr.bin/kcc/Makefile | 2 ++
kerberos5/usr.bin/kdestroy/Makefile | 2 ++
kerberos5/usr.bin/kf/Makefile | 2 ++
kerberos5/usr.bin/kgetcred/Makefile | 2 ++
kerberos5/usr.bin/kinit/Makefile | 2 ++
kerberos5/usr.bin/kpasswd/Makefile | 2 ++
kerberos5/usr.bin/krb5-config/Makefile | 2 ++
kerberos5/usr.bin/ksu/Makefile | 2 ++
kerberos5/usr.bin/string2key/Makefile | 2 ++
kerberos5/usr.bin/verify_krb5_conf/Makefile | 2 ++
kerberos5/usr.sbin/iprop-log/Makefile | 2 ++
kerberos5/usr.sbin/kstash/Makefile | 2 ++
kerberos5/usr.sbin/ktutil/Makefile | 2 ++
lib/libcom_err/Makefile | 2 ++
lib/libpam/modules/pam_krb5/Makefile | 2 ++
lib/libpam/modules/pam_ksu/Makefile | 2 ++
libexec/rc/rc.d/Makefile | 7 ++++++-
release/packages/Makefile.package | 2 ++
usr.bin/compile_et/Makefile | 2 ++
usr.sbin/gssd/Makefile | 2 ++
56 files changed, 116 insertions(+), 1 deletion(-)
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index f75445e47f63..1772965239e8 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= asn1
LDFLAGS= -Wl,--no-undefined
INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h
diff --git a/kerberos5/lib/libgssapi_krb5/Makefile b/kerberos5/lib/libgssapi_krb5/Makefile
index 9ba59dcb48c5..fe64b99d57f0 100644
--- a/kerberos5/lib/libgssapi_krb5/Makefile
+++ b/kerberos5/lib/libgssapi_krb5/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= gssapi_krb5
LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
LIBADD= gssapi krb5 crypto roken asn1 com_err
diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile b/kerberos5/lib/libgssapi_ntlm/Makefile
index b5edb08a8d47..224404600205 100644
--- a/kerberos5/lib/libgssapi_ntlm/Makefile
+++ b/kerberos5/lib/libgssapi_ntlm/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= gssapi_ntlm
LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
LIBADD= crypto gssapi krb5 heimntlm roken
diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile
index 1ccf1377e8bc..bfd235b27981 100644
--- a/kerberos5/lib/libgssapi_spnego/Makefile
+++ b/kerberos5/lib/libgssapi_spnego/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= gssapi_spnego
LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
LIBADD= gssapi heimbase asn1 roken
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index fda622d6945a..647ee1513148 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= hdb
LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS}
VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map
diff --git a/kerberos5/lib/libheimbase/Makefile b/kerberos5/lib/libheimbase/Makefile
index b6bf526b3522..d98d6ebbb4f4 100644
--- a/kerberos5/lib/libheimbase/Makefile
+++ b/kerberos5/lib/libheimbase/Makefile
@@ -1,5 +1,7 @@
#$FreeBSD$
+PACKAGE= kerberos
+
LIB= heimbase
LDFLAGS= -Wl,--no-undefined
LIBADD= pthread
diff --git a/kerberos5/lib/libheimipcc/Makefile b/kerberos5/lib/libheimipcc/Makefile
index 9ec712572371..d102058720e7 100644
--- a/kerberos5/lib/libheimipcc/Makefile
+++ b/kerberos5/lib/libheimipcc/Makefile
@@ -1,5 +1,7 @@
#$FreeBSD$
+PACKAGE= kerberos
+
LIB= heimipcc
PRIVATELIB=
LIBADD= heimbase roken pthread
diff --git a/kerberos5/lib/libheimipcs/Makefile b/kerberos5/lib/libheimipcs/Makefile
index b1201f65a842..308b5ecd6840 100644
--- a/kerberos5/lib/libheimipcs/Makefile
+++ b/kerberos5/lib/libheimipcs/Makefile
@@ -1,5 +1,7 @@
#$FreeBSD$
+PACKAGE= kerberos
+
LIB= heimipcs
PRIVATELIB=
LIBADD= heimbase roken pthread
diff --git a/kerberos5/lib/libheimntlm/Makefile b/kerberos5/lib/libheimntlm/Makefile
index 148aa8df1f70..a422ef641a49 100644
--- a/kerberos5/lib/libheimntlm/Makefile
+++ b/kerberos5/lib/libheimntlm/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= heimntlm
LDFLAGS= -Wl,--no-undefined
LIBADD= crypto com_err krb5 roken
diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile
index 1696ffb73cb8..175dc63a0bb7 100644
--- a/kerberos5/lib/libhx509/Makefile
+++ b/kerberos5/lib/libhx509/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= hx509
LDFLAGS= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map
diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile
index fecdf915070e..e336f85fc302 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile
+++ b/kerberos5/lib/libkadm5clnt/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= kadm5clnt
LDFLAGS= -Wl,--no-undefined
LIBADD= com_err krb5 roken
diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile
index 733242ce99af..fac25253d26e 100644
--- a/kerberos5/lib/libkadm5srv/Makefile
+++ b/kerberos5/lib/libkadm5srv/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= kadm5srv
LDFLAGS= -Wl,--no-undefined
LIBADD= com_err hdb krb5 roken
diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile
index 24400b8b2edc..67ad3920bbd9 100644
--- a/kerberos5/lib/libkafs5/Makefile
+++ b/kerberos5/lib/libkafs5/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= kafs5
LDFLAGS= -Wl,--no-undefined
LIBADD= asn1 krb5 roken
diff --git a/kerberos5/lib/libkdc/Makefile b/kerberos5/lib/libkdc/Makefile
index 24267a8dd419..423a8919bc28 100644
--- a/kerberos5/lib/libkdc/Makefile
+++ b/kerberos5/lib/libkdc/Makefile
@@ -1,5 +1,7 @@
#$FreeBSD$
+PACKAGE= kerberos
+
LIB= kdc
LDFLAGS= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/kdc/version-script.map
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index 75e065a2192e..2aaa0da9fe1e 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= krb5
LDFLAGS= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index 95505d2a1ff9..bea5694ce348 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= roken
LIBADD= crypt
VERSION_MAP= ${KRB5DIR}/lib/roken/version-script.map
diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile
index 71a38a5729d1..766d5931d8d8 100644
--- a/kerberos5/lib/libsl/Makefile
+++ b/kerberos5/lib/libsl/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= sl
INTERNALLIB=
SRCS= sl.c
diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile
index cef5a88a7461..a4f46d62f043 100644
--- a/kerberos5/lib/libvers/Makefile
+++ b/kerberos5/lib/libvers/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= vers
INTERNALLIB=
SRCS= print_version.c roken.h
diff --git a/kerberos5/lib/libwind/Makefile b/kerberos5/lib/libwind/Makefile
index 0e4fa4303b98..ef1ca66696c9 100644
--- a/kerberos5/lib/libwind/Makefile
+++ b/kerberos5/lib/libwind/Makefile
@@ -1,5 +1,7 @@
#$FreeBSD$
+PACKAGE= kerberos
+
LIB= wind
LDFLAGS= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map
diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile
index 7b888f5481cd..caeb6427af45 100644
--- a/kerberos5/libexec/digest-service/Makefile
+++ b/kerberos5/libexec/digest-service/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= digest-service
MAN=
CFLAGS+= -I${KRB5DIR}/kdc \
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index 1c5d4b20e1bf..0a8c46e15a44 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= hprop
MAN= hprop.8
SRCS= hprop.c mit_dump.c
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index 56a598f08312..005125ec1544 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= hpropd
MAN= hpropd.8
CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index 9f0bddbae4fd..3f3097ce062b 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= ipropd-master
MAN= iprop.8
SRCS= ipropd_common.c ipropd_master.c kadm5_err.h
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index cae84aa5ffb5..f9287251fda6 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= ipropd-slave
MAN=
SRCS= ipropd_common.c ipropd_slave.c kadm5_err.h
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index b2f3f71cc1e8..ac92fc3ba292 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kadmind
MAN= kadmind.8
SRCS= rpc.c \
diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile
index 35165ef9e424..c061e94de6ee 100644
--- a/kerberos5/libexec/kcm/Makefile
+++ b/kerberos5/libexec/kcm/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kcm
MAN= kcm.8
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index 338a508de20b..66063a5d669f 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kdc
MAN= kdc.8
diff --git a/kerberos5/libexec/kdigest/Makefile b/kerberos5/libexec/kdigest/Makefile
index 5f3fb2450646..5ce04da70b6d 100644
--- a/kerberos5/libexec/kdigest/Makefile
+++ b/kerberos5/libexec/kdigest/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kdigest
MAN= kdigest.8
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
diff --git a/kerberos5/libexec/kfd/Makefile b/kerberos5/libexec/kfd/Makefile
index 82df3adbb6da..8561a770a42c 100644
--- a/kerberos5/libexec/kfd/Makefile
+++ b/kerberos5/libexec/kfd/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kfd
MAN= kfd.8
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
diff --git a/kerberos5/libexec/kimpersonate/Makefile b/kerberos5/libexec/kimpersonate/Makefile
index 3c94db6857d0..8bada272688f 100644
--- a/kerberos5/libexec/kimpersonate/Makefile
+++ b/kerberos5/libexec/kimpersonate/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kimpersonate
MAN= kimpersonate.8
CFLAGS+= -I${KRB5DIR}/lib/hx509 \
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index ec36c24fc034..867c9f19961d 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kpasswdd
MAN= kpasswdd.8
CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/libhdb ${LDAPCFLAGS}
diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile
index 5e9cbfa5ea45..ac54c9dfa134 100644
--- a/kerberos5/tools/asn1_compile/Makefile
+++ b/kerberos5/tools/asn1_compile/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= asn1_compile
MAN=
LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a
diff --git a/kerberos5/tools/make-roken/Makefile b/kerberos5/tools/make-roken/Makefile
index fb7487016c65..6bb9b889b517 100644
--- a/kerberos5/tools/make-roken/Makefile
+++ b/kerberos5/tools/make-roken/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= make-roken
MAN=
diff --git a/kerberos5/tools/slc/Makefile b/kerberos5/tools/slc/Makefile
index df64d829d080..7b34a442019d 100644
--- a/kerberos5/tools/slc/Makefile
+++ b/kerberos5/tools/slc/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= slc
LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a
LIBADD= vers
diff --git a/kerberos5/usr.bin/hxtool/Makefile b/kerberos5/usr.bin/hxtool/Makefile
index 7cec9ee729b1..cbae762b3091 100644
--- a/kerberos5/usr.bin/hxtool/Makefile
+++ b/kerberos5/usr.bin/hxtool/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= hxtool
MAN=
CFLAGS+= -I${KRB5DIR}/lib/hx509 \
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 729b9f7f418e..b735637e1201 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kadmin
MAN= kadmin.8
diff --git a/kerberos5/usr.bin/kcc/Makefile b/kerberos5/usr.bin/kcc/Makefile
index 7c4b7ab3962a..c0dafd57af9d 100644
--- a/kerberos5/usr.bin/kcc/Makefile
+++ b/kerberos5/usr.bin/kcc/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kcc
MAN= klist.1 kswitch.1
LINKS= ${BINDIR}/kcc ${BINDIR}/klist \
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index 23e90237c658..c192d33a3634 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kdestroy
CFLAGS+=-I${KRB5DIR}/lib/roken
LIBADD= kafs5 krb5 roken vers
diff --git a/kerberos5/usr.bin/kf/Makefile b/kerberos5/usr.bin/kf/Makefile
index 44d91830baaf..65618e1f59dc 100644
--- a/kerberos5/usr.bin/kf/Makefile
+++ b/kerberos5/usr.bin/kf/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kf
MAN= kf.1
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
diff --git a/kerberos5/usr.bin/kgetcred/Makefile b/kerberos5/usr.bin/kgetcred/Makefile
index 1451154f9cf8..9e4ae650a8a5 100644
--- a/kerberos5/usr.bin/kgetcred/Makefile
+++ b/kerberos5/usr.bin/kgetcred/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kgetcred
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index 7622b8da956e..12db5bfde044 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kinit
CFLAGS+=-I${KRB5DIR}/lib/roken
LIBADD= kafs5 krb5 heimntlm roken crypto vers
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
index 05e07dddc03d..2f1102315ab7 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kpasswd
CFLAGS+=-I${KRB5DIR}/lib/roken
LIBADD= hdb krb5 roken vers crypto
diff --git a/kerberos5/usr.bin/krb5-config/Makefile b/kerberos5/usr.bin/krb5-config/Makefile
index 5224f7c54503..38a47811c6a8 100644
--- a/kerberos5/usr.bin/krb5-config/Makefile
+++ b/kerberos5/usr.bin/krb5-config/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
SCRIPTS=krb5-config
MAN= krb5-config.1
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
index ebd39c677b54..a286f658e4dd 100644
--- a/kerberos5/usr.bin/ksu/Makefile
+++ b/kerberos5/usr.bin/ksu/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= ksu
.if defined(ENABLE_SUID_K5SU)
BINMODE=4555
diff --git a/kerberos5/usr.bin/string2key/Makefile b/kerberos5/usr.bin/string2key/Makefile
index 129d12cbcf0d..bf343ceaddaa 100644
--- a/kerberos5/usr.bin/string2key/Makefile
+++ b/kerberos5/usr.bin/string2key/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= string2key
MAN= string2key.8
CFLAGS+= -I${KRB5DIR}/kdc \
diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile
index 372870c1ecc9..c56112a028aa 100644
--- a/kerberos5/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= verify_krb5_conf
MAN= verify_krb5_conf.8
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
diff --git a/kerberos5/usr.sbin/iprop-log/Makefile b/kerberos5/usr.sbin/iprop-log/Makefile
index 1f71f9b2a400..736b702f7629 100644
--- a/kerberos5/usr.sbin/iprop-log/Makefile
+++ b/kerberos5/usr.sbin/iprop-log/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= iprop-log
MAN= iprop-log.8
SRCS= iprop-log.c iprop-commands.c iprop-commands.h kadm5_err.h
diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile
index 1eec313766d3..cd7318f01462 100644
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= kstash
MAN= kstash.8
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile
index c79d09e6d94d..4adbbcef15ab 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
PROG= ktutil
MAN= ktutil.8
diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile
index 89fed48e1dd1..4bb69614453e 100644
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= com_err
SRCS= com_err.c error.c
INCS= ${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h
diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile
index 97fd49092298..a11cad75ebce 100644
--- a/lib/libpam/modules/pam_krb5/Makefile
+++ b/lib/libpam/modules/pam_krb5/Makefile
@@ -24,6 +24,8 @@
#
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= pam_krb5
SRCS= pam_krb5.c
MAN= pam_krb5.8
diff --git a/lib/libpam/modules/pam_ksu/Makefile b/lib/libpam/modules/pam_ksu/Makefile
index 26f3f850daaa..b16e923bde89 100644
--- a/lib/libpam/modules/pam_ksu/Makefile
+++ b/lib/libpam/modules/pam_ksu/Makefile
@@ -24,6 +24,8 @@
#
# $FreeBSD$
+PACKAGE= kerberos
+
LIB= pam_ksu
SRCS= pam_ksu.c
MAN= pam_ksu.8
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index 9825edc5f78e..f95ef1ec58b6 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -36,7 +36,6 @@ CONFS= DAEMON \
geli2 \
gptboot \
growfs \
- gssd \
hostid \
hostid_save \
hostname \
@@ -193,6 +192,12 @@ CONFS+= ccd
CONFS+= ftpd
.endif
+.if ${MK_GSSAPI} != "no"
+CONFGROUPS+= gssd
+GSSD= gssd
+GSSDPACKAGE= kerberos
+.endif
+
.if ${MK_HAST} != "no"
CONFGROUPS+= HAST
HAST= hastd
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 70f91bf676c3..8e46304e1225 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -61,6 +61,8 @@ jail-lib32_DESCR= 32-bit Libraries
jail-lib32-debug_DESCR=32-bit Debugging Symbols
jail-lib32-development_DESCR=32-bit Development Files
jail-lib32-profile_DESCR=32-bit Profiling Libraries
+kerberos_COMMENT= Kerberos Utilities
+kerberos_DESC= Kerberos Utilities
kernel_COMMENT= FreeBSD Kernel
kernel_DESC= FreeBSD Kernel
manuals_COMMENT= Manual Pages
diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile
index aeccbf3fd55f..a7a7130e9228 100644
--- a/usr.bin/compile_et/Makefile
+++ b/usr.bin/compile_et/Makefile
@@ -2,6 +2,8 @@
.PATH: ${SRCTOP}/contrib/com_err
+PACKAGE= kerberos
+
PROG= compile_et
SRCS= compile_et.c parse.y lex.l
LIBADD= roken vers
diff --git a/usr.sbin/gssd/Makefile b/usr.sbin/gssd/Makefile
index e40017016f18..d22a01597ced 100644
--- a/usr.sbin/gssd/Makefile
+++ b/usr.sbin/gssd/Makefile
@@ -2,6 +2,8 @@
.include <src.opts.mk>
+PACKAGE= kerberos
+
PROG= gssd
MAN= gssd.8
SRCS= gssd.c gssd.h gssd_svc.c gssd_xdr.c gssd_prot.c