heimdal: fix build on NetBSD, update TODO

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Sat Mar 7 21:37:16 2020 +0100
Changeset:	198b6d9d86091d85643b596e285562c19f5f97cd

Modified Files:
	heimdal/Makefile
	heimdal/PLIST
	heimdal/TODO
	heimdal/options.mk

Log Message:
heimdal: fix build on NetBSD, update TODO

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=198b6d9d86091d85643b596e285562c19f5f97cd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 heimdal/Makefile   |  4 +++-
 heimdal/PLIST      |  3 ++-
 heimdal/TODO       |  3 +--
 heimdal/options.mk | 13 -------------
 4 files changed, 6 insertions(+), 17 deletions(-)

diffs:
diff --git a/heimdal/Makefile b/heimdal/Makefile
index 17d245f600..51b6753962 100644
--- a/heimdal/Makefile
+++ b/heimdal/Makefile
@@ -11,6 +11,8 @@ HOMEPAGE=	https://heimdal.software/
 COMMENT=	Kerberos 5 implementation
 LICENSE=	modified-bsd
 
+BUILD_DEPENDS+=	p5-JSON-[0-9]*:../../converters/p5-JSON
+
 CONFLICTS+=	arla-[0-9]*
 CONFLICTS+=	mit-krb5-[0-9]*
 CONFLICTS+=	openafs-[0-9]*
@@ -110,7 +112,7 @@ pre-build:
 CHECK_BUILTIN.openssl:=	yes
 .include "../../security/openssl/builtin.mk"
 CHECK_BUILTIN.openssl:=no
-.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != "" || \
+.if ${MACHINE_PLATFORM:MNetBSD-*} != "" || \
     (${OPSYS} == "SunOS" && ${USE_BUILTIN.openssl} == yes &&	\
 		!empty(BUILTIN_LIB_FOUND.crypto:M[Nn][Oo]))
 PLIST.hcrypto=		yes
diff --git a/heimdal/PLIST b/heimdal/PLIST
index 4b8ff094b5..0642e37cc2 100644
--- a/heimdal/PLIST
+++ b/heimdal/PLIST
@@ -278,6 +278,7 @@ man/man3/hdb_open.3
 man/man3/hdb_password.3
 man/man3/hdb_remove.3
 man/man3/hdb_rename.3
+man/man3/hdb_set_sync.3
 man/man3/hdb_store.3
 man/man3/hdb_unlock.3
 man/man3/heim_ntlm_build_ntlm1_master.3
@@ -946,6 +947,7 @@ man/man3/krb5_principal_get_num_comp.3
 man/man3/krb5_principal_get_realm.3
 man/man3/krb5_principal_get_type.3
 man/man3/krb5_principal_intro.3
+man/man3/krb5_principal_is_anonymous.3
 man/man3/krb5_principal_is_gss_hostbased_service.3
 man/man3/krb5_principal_is_krbtgt.3
 man/man3/krb5_principal_is_lkdc.3
@@ -1210,4 +1212,3 @@ man/man8/string2key.8
 man/man8/verify_krb5_conf.8
 sbin/iprop-log
 sbin/kstash
-@pkgdir include/krb5/roken
diff --git a/heimdal/TODO b/heimdal/TODO
index a59baada90..945c59695c 100644
--- a/heimdal/TODO
+++ b/heimdal/TODO
@@ -1,5 +1,4 @@
-In NetBSD-HEAD, hcrypto components are installed and the PLIST check fails.
 Are glob, vis and afskauth redundant now?
 Handle su which comes with Heimdal.
 Port remaining patches if applicable.
-Record build-time dependency on ../../converters/p5-JSON -- how?
+Find out details of when hcrypto is included.
diff --git a/heimdal/options.mk b/heimdal/options.mk
index 9002a7efc0..2f1a7303ad 100644
--- a/heimdal/options.mk
+++ b/heimdal/options.mk
@@ -51,16 +51,3 @@ HEIMDAL_TRANSFORM=	s/^ftp/k&/
 
 PLIST_SUBST+=		KRB5_PREFIX=${KRB5_PREFIX:Q}
 CONFIGURE_ARGS+=	--program-transform-name=${HEIMDAL_TRANSFORM:Q}
-#
-# Fix some places in the Heimdal sources that don't point to the correct
-# Kerberized binaries when exec'ing programs.
-#
-SUBST_CLASSES+=		heimdal
-SUBST_STAGE.heimdal=	pre-configure
-SUBST_FILES.heimdal=	appl/rcp/rcp.c appl/rcp/rcp_locl.h
-SUBST_FILES.heimdal+=	appl/rsh/rsh_locl.h
-SUBST_FILES.heimdal+=	appl/telnet/telnetd/telnetd.h
-SUBST_SED.heimdal=	-e "/RSH_PROGRAM/s,rsh,${KRB5_PREFIX}rsh,g"
-SUBST_SED.heimdal+=	-e "/PATH_RSH/s,\"/usr/bin/rsh\",BINDIR \"${KRB5_PREFIX}rsh\",g"
-SUBST_SED.heimdal+=	-e "/PATH_RSH/s,/rsh,/${KRB5_PREFIX}rsh,g"
-SUBST_SED.heimdal+=	-e "/PATH_LOGIN/s,/login,/${KRB5_PREFIX}login,g"