. Update 0.2c -> 0.2d

. remove an army of patches that are no longer needed with this version
. enable shared library support
. compress man pages
. add missing newline to COMMENT

4 files changed, 27 insertions, 32 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 5eda53a9f1eb..b5683b49dfcb 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-DISTNAME=		heimdal-0.2c
+DISTNAME=		heimdal-0.2d
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.pdc.kth.se/pub/heimdal/src/ \
 			ftp://ftp.replay.com/pub/replay/crypto/APPS/kerberos/heimdal/ \
@@ -18,17 +18,20 @@ MAINTAINER=		nectar@FreeBSD.ORG
 RESTRICTED=             "Crypto; export-controlled"
 
 USE_LIBTOOL=		YES
-USE_GMAKE=		YES
-CONFIGURE_ARGS=		--enable-shared=YES
-CONFIGURE_ENV=		INSTALL_TMP="cp"
-MAKE_ENV=		INSTALL_TMP="cp"
+CONFIGURE_ARGS=		--enable-shared
 
 .if defined(HEIMDAL_HOME)
 PREFIX=			${HEIMDAL_HOME}
 .endif
 
-# XXX  I patched Makefile*, but I want to avoid rerunning automake
-post-patch:
-	find ${WRKSRC} -name Makefile.in -print | xargs ${TOUCH}
+MAN1=	kdestroy.1 kgetcred.1 kinit.1 klist.1 kpasswd.1
+MAN3=	editline.3 krb5_425_conv_principal.3 krb5_build_principal.3 \
+	krb5_free_principal.3 krb5_openlog.3 krb5_parse_name.3 \
+	krb5_sname_to_principal.3 krb5_unparse_name.3 krb5_warn.3
+MAN5=	krb5.conf.5
+MAN8=	hprop.8 hpropd.8 kdc.8 kpasswdd.8 kstash.8 ktutil.8 push.8
+
+post-install:
+	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index 9914a20c3f95..eeb88074eca2 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1 +1 @@
-MD5 (heimdal-0.2c.tar.gz) = 39ed0ab0404167541bbc7d8f2fe96bcd
+MD5 (heimdal-0.2d.tar.gz) = b444fcee9e64efeb7fb9bb173ec58486
diff --git a/security/heimdal/pkg-comment b/security/heimdal/pkg-comment
index e67f8a4d5002..3138ec58189e 100644
--- a/security/heimdal/pkg-comment
+++ b/security/heimdal/pkg-comment
@@ -1 +1 @@
-Heimdal is a re-implementation of Kerberos V.
\ No newline at end of file
+Heimdal is a re-implementation of Kerberos V.
diff --git a/security/heimdal/pkg-plist b/security/heimdal/pkg-plist
index 1ed5aa452ece..93f30294f667 100644
--- a/security/heimdal/pkg-plist
+++ b/security/heimdal/pkg-plist
@@ -60,18 +60,30 @@ include/ss/ss.h
 info/dir
 info/heimdal.info
 lib/libasn1.a
+lib/libasn1.so.1
 lib/libcom_err.a
+lib/libcom_err.so.1
 lib/libdes.a
+lib/libdes.so.0
 lib/libeditline.a
 lib/libgssapi.a
+lib/libgssapi.so.0
 lib/libhdb.a
+lib/libhdb.so.4
 lib/libkadm5clnt.a
+lib/libkadm5clnt.so.3
 lib/libkadm5srv.a
+lib/libkadm5srv.so.4
 lib/libkrb5.a
+lib/libkrb5.so.5
 lib/libotp.a
+lib/libotp.so.0
 lib/libroken.a
+lib/libroken.so.3
 lib/libsl.a
+lib/libsl.so.0
 lib/libss.a
+lib/libss.so.0
 libexec/ftpd
 libexec/hprop
 libexec/hpropd
@@ -85,28 +97,6 @@ libexec/popper
 libexec/push
 libexec/rshd
 libexec/telnetd
-man/man1/kdestroy.1
-man/man1/kgetcred.1
-man/man1/kinit.1
-man/man1/klist.1
-man/man1/kpasswd.1
-man/man3/editline.3
-man/man3/krb5_425_conv_principal.3
-man/man3/krb5_build_principal.3
-man/man3/krb5_free_principal.3
-man/man3/krb5_openlog.3
-man/man3/krb5_parse_name.3
-man/man3/krb5_sname_to_principal.3
-man/man3/krb5_unparse_name.3
-man/man3/krb5_warn.3
-man/man5/krb5.conf.5
-man/man8/hprop.8
-man/man8/hpropd.8
-man/man8/kdc.8
-man/man8/kpasswdd.8
-man/man8/kstash.8
-man/man8/ktutil.8
-man/man8/push.8
 sbin/dump_log
 sbin/kadmin
 sbin/kstash
@@ -114,3 +104,5 @@ sbin/ktutil
 sbin/replay_log
 @dirrm include/kadm5
 @dirrm include/ss
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R