6 files changed, 17 insertions, 48 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index d1ec0b74eac5..da5d9ca334e0 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		heimdal
-PORTVERSION=		0.3c
-PORTREVISION=		2
+PORTVERSION=		0.3d
 CATEGORIES=		security ipv6
 MASTER_SITES=		ftp://ftp.pdc.kth.se/pub/heimdal/src/ \
 			ftp://ftp.replay.com/pub/replay/crypto/APPS/kerberos/heimdal/ \
@@ -23,7 +22,8 @@ LIB_DEPENDS=		ldap.2:${PORTSDIR}/net/openldap2
 RESTRICTED=		"Crypto; export-controlled"
 
 MAN1=			ftp.1 kdestroy.1 kf.1 kgetcred.1 kinit.1 klist.1 kpasswd.1 \
-			telnet.1 kx.1 rxtelnet.1 rxterm.1 tenletxr.1 pfrom.1
+			telnet.1 kx.1 rxtelnet.1 rxterm.1 tenletxr.1 pfrom.1 \
+			otp.1 otpprint.1 xnlock.1 krb5-config.1
 MAN3=			editline.3 krb5_425_conv_principal.3 kafs.3 \
 			krb5_appdefault.3 krb5_build_principal.3 krb5_config.3 \
 			krb5_free_principal.3 krb5_openlog.3 krb5_parse_name.3 \
@@ -32,7 +32,7 @@ MAN5=			ftpusers.5 krb5.conf.5
 MAN8=			ftpd.8 hprop.8 hpropd.8 kadmind.8 kdc.8 kfd.8 kpasswdd.8 \
 			kstash.8 \
 			ktutil.8 push.8 telnetd.8 kxd.8 verify_krb5_conf.8 \
-			string2key.8
+			string2key.8 kerberos.8 kadmin.8
 
 # must use supplied ltconfig et. al. for now
 #USE_LIBTOOL=		yes
@@ -54,9 +54,6 @@ USE_XLIB=		yes
 .endif
 
 .if defined(USE_XLIB)
-# These man pages are always installed, so I moved them up
-#MAN1+=			kx.1 rxtelnet.1 rxterm.1 tenletxr.1
-#MAN8+=			kxd.8
 CONFIGURE_ARGS+=	--with-x
 .else
 CONFIGURE_ARGS+=	--without-x
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index f3fec042ca60..e86e1b7e4370 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1 +1 @@
-MD5 (heimdal-0.3c.tar.gz) = 9333ca0af2ce52c89f305eb2cf420864
+MD5 (heimdal-0.3d.tar.gz) = 59bcfcd7cd6ef8786b958f06bf198556
diff --git a/security/heimdal/files/patch-ci b/security/heimdal/files/patch-ci
deleted file mode 100644
index 509395cb2f73..000000000000
--- a/security/heimdal/files/patch-ci
+++ /dev/null
@@ -1,11 +0,0 @@
---- appl/ftp/ftp/security.c.orig	Sun Feb  6 21:11:43 2000
-+++ appl/ftp/ftp/security.c	Fri Nov  3 10:11:47 2000
-@@ -237,7 +237,7 @@
- 	ret = sec_get_data(fd, &in_buffer, data_prot);
- 	if (ret < 0)
- 	    return -1;
--	if(ret == 0 || in_buffer.size == 0) {
-+	if(ret == 0 && in_buffer.size == 0) {
- 	    if(rx)
- 		in_buffer.eof_flag = 1;
- 	    return rx;
diff --git a/security/heimdal/files/patch-cn b/security/heimdal/files/patch-cn
index 7db2073a2bc1..bca48b727ed1 100644
--- a/security/heimdal/files/patch-cn
+++ b/security/heimdal/files/patch-cn
@@ -1,20 +1,20 @@
---- lib/Makefile.in.orig	Wed Nov  8 10:21:25 2000
-+++ lib/Makefile.in	Wed Nov  8 10:21:34 2000
-@@ -194,7 +194,7 @@
+--- lib/Makefile.in.orig	Thu Dec 14 09:25:08 2000
++++ lib/Makefile.in	Thu Dec 14 09:25:18 2000
+@@ -190,7 +190,7 @@
  @OTP_TRUE@dir_otp = @OTP_TRUE@otp
  @DCE_TRUE@dir_dce = @DCE_TRUE@kdfs
  
--SUBDIRS = @DIR_roken@ vers editline com_err sl asn1 des krb5 \
-+SUBDIRS = @DIR_roken@ vers editline sl asn1 des krb5 \
+-SUBDIRS = @DIR_roken@ vers editline com_err sl asn1 @DIR_des@ krb5 \
++SUBDIRS = @DIR_roken@ vers editline sl asn1 @DIR_des@ krb5 \
  	kafs hdb kadm5 gssapi auth $(dir_45) $(dir_otp) $(dir_dce)
  
  subdir = lib
-@@ -214,7 +214,7 @@
+@@ -210,7 +210,7 @@
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  
  GZIP_ENV = --best
--DIST_SUBDIRS =  @DIR_roken@ vers editline com_err sl asn1 des krb5 kafs \
-+DIST_SUBDIRS =  @DIR_roken@ vers editline sl asn1 des krb5 kafs \
- hdb kadm5 gssapi auth 45 otp kdfs
+-DIST_SUBDIRS =  @DIR_roken@ vers editline com_err sl asn1 @DIR_des@ krb5 \
++DIST_SUBDIRS =  @DIR_roken@ vers editline sl asn1 @DIR_des@ krb5 \
+ kafs hdb kadm5 gssapi auth 45 otp kdfs
  all: all-redirect
  .SUFFIXES:
diff --git a/security/heimdal/files/patch-cq b/security/heimdal/files/patch-cq
deleted file mode 100644
index 4c27bdc13cb3..000000000000
--- a/security/heimdal/files/patch-cq
+++ /dev/null
@@ -1,14 +0,0 @@
---- kadmin/get.c.orig	Wed Nov  8 12:28:57 2000
-+++ kadmin/get.c	Wed Nov  8 12:44:44 2000
-@@ -150,7 +150,10 @@
-     printf("%24s: %d\n", "Failed login count", princ->fail_auth_count);
-     time_t2str(princ->mod_date, buf, sizeof(buf), 1);
-     printf("%24s: %s\n", "Last modified", buf);
--    krb5_unparse_name_fixed(context, princ->mod_name, buf, sizeof(buf));
-+    if (princ->mod_name)
-+	    krb5_unparse_name_fixed(context, princ->mod_name, buf, sizeof(buf));
-+    else
-+	    strcpy(buf, "<none>");
-     printf("%24s: %s\n", "Modifier", buf);
-     attributes2str (princ->attributes, buf, sizeof(buf));
-     printf("%24s: %s\n", "Attributes", buf);
diff --git a/security/heimdal/pkg-plist b/security/heimdal/pkg-plist
index 40061ff31877..97e53177f79c 100644
--- a/security/heimdal/pkg-plist
+++ b/security/heimdal/pkg-plist
@@ -1,4 +1,3 @@
-bin/compile_et
 bin/des
 bin/ftp
 bin/kauth
@@ -8,6 +7,7 @@ bin/kgetcred
 bin/kinit
 bin/klist
 bin/kpasswd
+bin/krb5-config
 bin/login
 bin/mk_cmds
 bin/otp
@@ -82,22 +82,19 @@ lib/libkadm5srv.so
 lib/libkadm5srv.so.7
 lib/libkrb5.a
 lib/libkrb5.so
-lib/libkrb5.so.13
+lib/libkrb5.so.14
 lib/libotp.a
 lib/libotp.so
 lib/libotp.so.1
 lib/libroken.a
 lib/libroken.so
-lib/libroken.so.10
+lib/libroken.so.11
 lib/libsl.a
 lib/libsl.so
 lib/libsl.so.1
 lib/libss.a
 lib/libss.so
 lib/libss.so.1
-lib/libvers.a
-lib/libvers.so
-lib/libvers.so.1
 libexec/ftpd
 libexec/hprop
 libexec/hpropd