Back out previous and do the same thing more generally for all platforms.

Since the heimdal install process will install additional headers in
${PREFIX}/include/krb5 depending on what the configure process detects,
simply query the source Makefile at install-time for the extra headers
that it will install and dynamically add them to the PLIST.

6 files changed, 26 insertions, 13 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index b2b61b6af19..0ba7288631c 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2006/07/02 13:53:28 markd Exp $
+# $NetBSD: Makefile,v 1.61 2006/07/05 04:39:14 jlam Exp $
 
 DISTNAME=	heimdal-0.7.2
 PKGREVISION=	2
@@ -97,6 +97,14 @@ SPECIAL_PERMS=		${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS}
 RCD_SCRIPTS=		kadmind kcm kdc kpasswdd
 INFO_FILES=		# PLIST
 
+# Dynamically determine the "replacement" headers for things missing
+# in the base system and add them to the PLIST.
+#
+GENERATE_PLIST+=	\
+	( cd ${WRKSRC}/lib/roken && ${MAKE_PROGRAM} print-xheaders |	\
+	  ${XARGS} -n 1 | ${SED} -e "s,^,include/krb5/," );		\
+	${ECHO} "@dirrm include/krb5";
+
 # Fix some places in the Heimdal sources that don't point to the correct
 # Kerberized binaries when exec'ing programs.
 #
diff --git a/security/heimdal/PLIST b/security/heimdal/PLIST
index 09759820152..04f533fdc8a 100644
--- a/security/heimdal/PLIST
+++ b/security/heimdal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/03/30 03:44:43 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/07/05 04:39:14 jlam Exp $
 bin/${KRB5_PREFIX}login
 bin/${KRB5_PREFIX}rcp
 bin/${KRB5_PREFIX}rsh
@@ -28,7 +28,6 @@ include/krb5/com_err.h
 include/krb5/com_right.h
 include/krb5/der.h
 include/krb5/editline.h
-include/krb5/fnmatch.h
 include/krb5/getarg.h
 include/krb5/gssapi.h
 include/krb5/hdb-private.h
@@ -705,4 +704,3 @@ share/examples/rc.d/kpasswdd
 ${LDAP}@dirrm share/examples/heimdal
 @dirrm include/krb5/ss
 @dirrm include/krb5/kadm5
-@dirrm include/krb5
diff --git a/security/heimdal/PLIST.Linux b/security/heimdal/PLIST.Linux
deleted file mode 100644
index 903f3e36bd3..00000000000
--- a/security/heimdal/PLIST.Linux
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2006/05/15 09:17:14 minskim Exp $
-include/krb5/glob.h
-include/krb5/vis.h
diff --git a/security/heimdal/PLIST.SunOS b/security/heimdal/PLIST.SunOS
deleted file mode 100644
index dbcedc6b44f..00000000000
--- a/security/heimdal/PLIST.SunOS
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2006/07/02 13:53:28 markd Exp $
-include/krb5/err.h
-include/krb5/glob.h
-include/krb5/ifaddrs.h
-include/krb5/vis.h
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index 4a86593814c..6a76dc9b8d5 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.19 2006/02/07 12:20:52 lha Exp $
+$NetBSD: distinfo,v 1.20 2006/07/05 04:39:14 jlam Exp $
 
 SHA1 (heimdal-0.7.2.tar.gz) = a902e6ad7c31d940b588dc0235b348936f0d719d
 RMD160 (heimdal-0.7.2.tar.gz) = 0f028a9d5a6a66e8efc0397e4d8c8adc2183b409
 Size (heimdal-0.7.2.tar.gz) = 4525734 bytes
 SHA1 (patch-ac) = 313c0a1f91e4f9546ae906f981adae0d499dd9cf
 SHA1 (patch-ad) = a7cfc038e76f8c3da38f8eb0ee48a7f8c7a9c7df
+SHA1 (patch-al) = 6035ef920b1a005902ae021b307fc4c3efc77449
diff --git a/security/heimdal/patches/patch-al b/security/heimdal/patches/patch-al
new file mode 100644
index 00000000000..4d9892d20b9
--- /dev/null
+++ b/security/heimdal/patches/patch-al
@@ -0,0 +1,14 @@
+$NetBSD: patch-al,v 1.1 2006/07/05 04:39:15 jlam Exp $
+
+--- lib/roken/Makefile.in.orig	2006-02-06 08:32:11.000000000 -0500
++++ lib/roken/Makefile.in
+@@ -1654,6 +1654,9 @@ roken.h: make-roken$(EXEEXT)
+ 
+ make-roken.c: roken.h.in roken.awk
+ 	$(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c
++
++print-xheaders:
++	@echo $(XHEADERS)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: