kerberos5: Fix the Heimdal pkgbase build

When LIB_PACKAGE was added, MIT Kerberos was updated to use it but
Heimdal was not, so it still used PACKAGE=kerberos-lib.  Since we
deleted kerberos-lib-all.ucl, this caused update-packages to fail
when WITHOUT_MITKRB5 is set.

Change the Heimdal libraries to use LIB_PACKAGE by setting this in
kerberos5/lib/Makefile.inc, and remove PACKAGE=kerberos-lib from the
individual Makefiles for each library.  This means Heimdal gets the
same set of packages as MIT Kerberos, except for kerberos-kdc which
we don't create for Heimdal.

Fixes:	929f5966a9fd ("packages: Improve handling of -lib packages")
Reported by:	jlduran
Reviewed by:	jlduran, cy
Differential Revision:	https://reviews.freebsd.org/D52371

21 files changed, 4 insertions, 39 deletions

diff --git a/kerberos5/lib/Makefile.inc b/kerberos5/lib/Makefile.inc
index 7c74af1e9742..a7d76580f56e 100644
--- a/kerberos5/lib/Makefile.inc
+++ b/kerberos5/lib/Makefile.inc
@@ -1,3 +1,5 @@
+PACKAGE=	kerberos
+LIB_PACKAGE=
 SHLIB_MAJOR?=	11
 
 .include "../Makefile.inc"
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index 0398ed185481..e30aa20b3c21 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 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 6f74f6516c4e..2e7767ec9309 100644
--- a/kerberos5/lib/libgssapi_krb5/Makefile
+++ b/kerberos5/lib/libgssapi_krb5/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 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 51da17339620..e4721d73403b 100644
--- a/kerberos5/lib/libgssapi_ntlm/Makefile
+++ b/kerberos5/lib/libgssapi_ntlm/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 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 2cf73285cd37..371e7a2fc423 100644
--- a/kerberos5/lib/libgssapi_spnego/Makefile
+++ b/kerberos5/lib/libgssapi_spnego/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 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 04e3a4739ef9..bcc3f75206bc 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 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 9870fe1d6204..e5c391e32d24 100644
--- a/kerberos5/lib/libheimbase/Makefile
+++ b/kerberos5/lib/libheimbase/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 LIB=	heimbase
 LDFLAGS+=	-Wl,--no-undefined
 LIBADD=	pthread
diff --git a/kerberos5/lib/libheimipcc/Makefile b/kerberos5/lib/libheimipcc/Makefile
index 8eb2b2b3756a..848518da303d 100644
--- a/kerberos5/lib/libheimipcc/Makefile
+++ b/kerberos5/lib/libheimipcc/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 LIB=	heimipcc
 PRIVATELIB=
 LIBADD=	heimbase roken pthread
diff --git a/kerberos5/lib/libheimipcs/Makefile b/kerberos5/lib/libheimipcs/Makefile
index e689ac06a601..68cdf97c9f60 100644
--- a/kerberos5/lib/libheimipcs/Makefile
+++ b/kerberos5/lib/libheimipcs/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 LIB=	heimipcs
 PRIVATELIB=
 LIBADD=	heimbase roken pthread
diff --git a/kerberos5/lib/libheimntlm/Makefile b/kerberos5/lib/libheimntlm/Makefile
index cc32e4c5e509..1b5002479ffd 100644
--- a/kerberos5/lib/libheimntlm/Makefile
+++ b/kerberos5/lib/libheimntlm/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 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 7713b4897170..eedc8765ec42 100644
--- a/kerberos5/lib/libhx509/Makefile
+++ b/kerberos5/lib/libhx509/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 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 182d60c9843c..b6a5b70171b2 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile
+++ b/kerberos5/lib/libkadm5clnt/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 LIB=	kadm5clnt
 LDFLAGS+=	-Wl,--no-undefined
 LIBADD=	com_err krb5 roken
diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile
index 05006288220c..92734b439f8b 100644
--- a/kerberos5/lib/libkadm5srv/Makefile
+++ b/kerberos5/lib/libkadm5srv/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 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 91e06d5d777a..6f52b8a8ac98 100644
--- a/kerberos5/lib/libkafs5/Makefile
+++ b/kerberos5/lib/libkafs5/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 LIB=	kafs5
 LDFLAGS+=	-Wl,--no-undefined
 LIBADD=	asn1 krb5 roken
diff --git a/kerberos5/lib/libkdc/Makefile b/kerberos5/lib/libkdc/Makefile
index 72bd7d183a29..d6a1e90654ae 100644
--- a/kerberos5/lib/libkdc/Makefile
+++ b/kerberos5/lib/libkdc/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 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 d377446cd437..4ea5bfc2f86f 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 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 2299beed67a1..08733ac80774 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 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 159e16089294..c104bb6d64b6 100644
--- a/kerberos5/lib/libsl/Makefile
+++ b/kerberos5/lib/libsl/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 LIB=	sl
 INTERNALLIB=
 SRCS=	sl.c
diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile
index d7fe0a001659..514b8abe6a32 100644
--- a/kerberos5/lib/libvers/Makefile
+++ b/kerberos5/lib/libvers/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 LIB=	vers
 INTERNALLIB=
 SRCS=	print_version.c roken.h
diff --git a/kerberos5/lib/libwind/Makefile b/kerberos5/lib/libwind/Makefile
index b57d62dc830f..0bf1f7a9613c 100644
--- a/kerberos5/lib/libwind/Makefile
+++ b/kerberos5/lib/libwind/Makefile
@@ -1,5 +1,3 @@
-PACKAGE=	kerberos-lib
-
 LIB=	wind
 LDFLAGS+=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map
diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile
index f070fd534469..dab4794fcded 100644
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@@ -1,4 +1,5 @@
-PACKAGE=	kerberos-lib
+PACKAGE=	kerberos
+LIB_PACKAGE=
 
 LIB=	com_err
 SRCS=	com_err.c error.c