5 files changed, 8 insertions, 33 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index a57793772ac2..fc6001f97072 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		heimdal
-PORTVERSION=	0.3e
-PORTREVISION=	1
+PORTVERSION=	0.3f
 CATEGORIES=		security ipv6
 MASTER_SITES=	ftp://ftp.pdc.kth.se/pub/heimdal/src/ \
 				ftp://ftp.replay.com/pub/replay/crypto/APPS/kerberos/heimdal/ \
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index f0194766729a..e04211e89dc5 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1 +1 @@
-MD5 (heimdal-0.3e.tar.gz) = 139cb6a45f4b68b4d6d80ded078933ae
+MD5 (heimdal-0.3f.tar.gz) = 66f2107a87872a105ccfb9547ae758d9
diff --git a/security/heimdal/files/patch-cb b/security/heimdal/files/patch-cb
index 6b2335177ce8..a6e1baed6fda 100644
--- a/security/heimdal/files/patch-cb
+++ b/security/heimdal/files/patch-cb
@@ -11,15 +11,3 @@
  AC_TEST_PACKAGE_NEW(krb4,[#include <krb.h>],-lkrb,-ldes,/usr/athena, KRB4)
  
  LIB_kdb=
-@@ -566,7 +570,10 @@
- "$ac_cv_func_SHA1_Init" = "yes" -a \
- "$ac_cv_func_RC4" = "yes"; then
-   DIR_des=''
--  LIB_des="-R $krb4_libdir -L$krb4_libdir $ac_cv_funclib_MD4_Init"
-+  LIB_des="$ac_cv_funclib_MD4_Init"
-+  if test "$krb4_libdir"; then
-+    LIB_des="-R $krb4_libdir -L$krb4_libdir $LIB_des"
-+  fi
-   LIB_des_appl="$LIB_des"
- else
-   DIR_des='des'
diff --git a/security/heimdal/files/patch-cc b/security/heimdal/files/patch-cc
index 0ff51ecc1de9..1439fa6d0613 100644
--- a/security/heimdal/files/patch-cc
+++ b/security/heimdal/files/patch-cc
@@ -11,15 +11,3 @@
  # Check whether --with-krb4 or --without-krb4 was given.
  if test "${with_krb4+set}" = set; then
    withval="$with_krb4"
-@@ -21344,7 +21348,10 @@
- "$ac_cv_func_SHA1_Init" = "yes" -a \
- "$ac_cv_func_RC4" = "yes"; then
-   DIR_des=''
--  LIB_des="-R $krb4_libdir -L$krb4_libdir $ac_cv_funclib_MD4_Init"
-+  LIB_des="$ac_cv_funclib_MD4_Init"
-+  if test "$krb4_libdir"; then
-+    LIB_des="-R $krb4_libdir -L$krb4_libdir $LIB_des"
-+  fi
-   LIB_des_appl="$LIB_des"
- else
-   DIR_des='des'
diff --git a/security/heimdal/pkg-plist b/security/heimdal/pkg-plist
index 4fdfd74fad79..6097f880fd3c 100644
--- a/security/heimdal/pkg-plist
+++ b/security/heimdal/pkg-plist
@@ -19,7 +19,6 @@ bin/su
 bin/telnet
 bin/verify_krb5_conf
 etc/rc.d/kdc.sh.sample
-include/asn1.h
 include/asn1_err.h
 include/base64.h
 include/der.h
@@ -33,8 +32,8 @@ include/hdb_asn1.h
 include/hdb_err.h
 include/heim_err.h
 include/kadm5/admin.h
-include/kadm5/kadm5-protos.h
 include/kadm5/kadm5-private.h
+include/kadm5/kadm5-protos.h
 include/kadm5/kadm5_err.h
 include/kadm5/private.h
 include/kafs.h
@@ -42,15 +41,16 @@ include/krb5-private.h
 include/krb5-protos.h
 include/krb5-types.h
 include/krb5.h
+include/krb5_asn1.h
 include/krb5_err.h
 include/otp.h
 include/parse_bytes.h
 include/parse_time.h
 include/parse_units.h
 include/resolve.h
-include/rtbl.h
 include/roken-common.h
 include/roken.h
+include/rtbl.h
 include/sl.h
 include/ss/ss.h
 include/xdbm.h
@@ -59,7 +59,7 @@ info/heimdal.info
 @exec install-info %D/info/heimdal.info %D/info/dir
 lib/libasn1.a
 lib/libasn1.so
-lib/libasn1.so.4
+lib/libasn1.so.5
 lib/libeditline.a
 lib/libgssapi.a
 lib/libgssapi.so
@@ -75,13 +75,13 @@ lib/libkadm5srv.so
 lib/libkadm5srv.so.7
 lib/libkrb5.a
 lib/libkrb5.so
-lib/libkrb5.so.15
+lib/libkrb5.so.16
 lib/libotp.a
 lib/libotp.so
 lib/libotp.so.1
 lib/libroken.a
 lib/libroken.so
-lib/libroken.so.11
+lib/libroken.so.12
 lib/libsl.a
 lib/libsl.so
 lib/libsl.so.1