5 files changed, 25 insertions, 26 deletions

diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 750d67a4bf77..7f5491440310 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=		krb5
-PORTVERSION=		1.4.3
+PORTVERSION=		1.5
 CATEGORIES=		security
-MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/\.[0-9]*$/&/:C/\.[0-9]*$//}/
+MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
 EXTRACT_SUFX=		.tar
 
@@ -25,8 +25,8 @@ USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
 INSTALLS_SHLIB=		yes
 USE_AUTOTOOLS=		libtool:15
-CONFIGURE_ARGS?=	--enable-shared --enable-static
-CONFIGURE_ARGS+=	--disable-thread-support
+CONFIGURE_ARGS?=	--enable-shared
+# CONFIGURE_ARGS+=	--disable-thread-support
 CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
 			CFLAGS="${CFLAGS}"
 MAKE_ARGS=		INSTALL="${INSTALL}"
@@ -49,7 +49,7 @@ MAN1=			krb5-send-pr.1 krb5-config.1 kpasswd.1 klist.1 \
 			kinit.1 kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 \
 			rlogin.1 ftp.1 telnet.1 kerberos.1 kvno.1 compile_et.1
 .if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
-MAN1+=			v4rcp.1
+MAN1+=			krb524init.1 v4rcp.1
 .endif
 MAN5=			kdc.conf.5 krb5.conf.5 .k5login.5
 MAN8=			krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \
diff --git a/security/krb5/distinfo b/security/krb5/distinfo
index bb45a5e8048e..b50af585ebd2 100644
--- a/security/krb5/distinfo
+++ b/security/krb5/distinfo
@@ -1,3 +1,3 @@
-MD5 (krb5-1.4.3-signed.tar) = 6c805139a4108fbb82fa4adba557a448
-SHA256 (krb5-1.4.3-signed.tar) = 86f246877cc912ae6a82b6bb16217e54ec31fe46ae33a39a42b3f062bb5e6cbe
-SIZE (krb5-1.4.3-signed.tar) = 7290880
+MD5 (krb5-1.5-signed.tar) = 5be6ec9d69cc73339e5bfda421eea5bc
+SHA256 (krb5-1.5-signed.tar) = ac8e85284d9997807406938bc9f785c7997fd6eb5e6a2a5807b3d6cba62137b1
+SIZE (krb5-1.5-signed.tar) = 9984000
diff --git a/security/krb5/files/patch-ax b/security/krb5/files/patch-ax
index 0307d8372b35..472c40035307 100644
--- a/security/krb5/files/patch-ax
+++ b/security/krb5/files/patch-ax
@@ -1,12 +1,13 @@
---- ../doc/Makefile.orig	Fri Sep 20 10:35:27 2002
-+++ ../doc/Makefile	Tue Jul 29 18:53:08 2003
-@@ -1,7 +1,7 @@
- SRCDIR=../src
+--- ../doc/Makefile.orig	Thu Apr 21 16:02:59 2005
++++ ../doc/Makefile	Sat Jul  1 06:08:13 2006
+@@ -2,8 +2,8 @@
  DVI=texi2dvi
  DVIPS=dvips -o "$@"
+ PSPDF=ps2pdf
 -INFO=makeinfo
-+INFO=makeinfo --no-validate --no-split
 -HTML=makeinfo --html
++INFO=makeinfo --no-validate --no-split
 +HTML=makeinfo --html --no-split
  RM=rm -f
  TAR=tar -chvf
+ GZIP=gzip -9
diff --git a/security/krb5/files/patch-ay b/security/krb5/files/patch-ay
index 54c041e205f1..a6cb9ebbfd13 100644
--- a/security/krb5/files/patch-ay
+++ b/security/krb5/files/patch-ay
@@ -1,5 +1,5 @@
---- util/pty/getpty.c.orig	Wed Jan  9 14:28:37 2002
-+++ util/pty/getpty.c	Thu Jan 10 21:30:40 2002
+--- appl/libpty/getpty.c.orig	Wed Jan  9 14:28:37 2002
++++ appl/libpty/getpty.c	Thu Jan 10 21:30:40 2002
 @@ -24,13 +24,26 @@
  #include "libpty.h"
  #include "pty-int.h"
diff --git a/security/krb5/pkg-plist b/security/krb5/pkg-plist
index 937c488b75e3..7830a8f9dfcf 100644
--- a/security/krb5/pkg-plist
+++ b/security/krb5/pkg-plist
@@ -21,6 +21,7 @@ include/com_err.h
 include/gssapi/gssapi.h
 include/gssapi/gssapi_generic.h
 include/gssapi/gssapi_krb5.h
+include/gssapi/mechglue.h
 include/gssrpc/auth.h
 include/gssrpc/auth_gss.h
 include/gssrpc/auth_gssapi.h
@@ -43,40 +44,32 @@ include/gssrpc/xdr.h
 %%KRB4%%include/kerberosIV/krb_err.h
 %%KRB4%%include/kerberosIV/mit-copyright.h
 include/krb5.h
+include/krb5/krb5.h
+include/krb5/locate_plugin.h
 include/profile.h
-lib/libcom_err.a
 lib/libcom_err.so
 lib/libcom_err.so.3
-lib/libdes425.a
 lib/libdes425.so
 lib/libdes425.so.3
-lib/libgssapi_krb5.a
 lib/libgssapi_krb5.so
 lib/libgssapi_krb5.so.2
-lib/libgssrpc.a
 lib/libgssrpc.so
 lib/libgssrpc.so.4
-lib/libk5crypto.a
 lib/libk5crypto.so
 lib/libk5crypto.so.3
-lib/libkadm5clnt.a
 lib/libkadm5clnt.so
 lib/libkadm5clnt.so.5
-lib/libkadm5srv.a
 lib/libkadm5srv.so
 lib/libkadm5srv.so.5
-lib/libkdb5.a
 lib/libkdb5.so
 lib/libkdb5.so.4
-%%KRB4%%lib/libkrb4.a
 %%KRB4%%lib/libkrb4.so
 %%KRB4%%lib/libkrb4.so.2
-lib/libkrb5.a
 lib/libkrb5.so
 lib/libkrb5.so.3
-lib/libkrb5support.a
 lib/libkrb5support.so
 lib/libkrb5support.so.0
+lib/krb5/plugins/kdb/db2.so
 sbin/ftpd
 sbin/gss-server
 sbin/k5srvutil
@@ -104,9 +97,14 @@ share/examples/krb5/kdc.conf
 share/examples/krb5/krb5.conf
 share/examples/krb5/services.append
 share/gnats/mit
+@dirrm lib/krb5/plugins/libkrb5
+@dirrm lib/krb5/plugins/kdb
+@dirrm lib/krb5/plugins
+@dirrm lib/krb5
 @dirrm include/gssapi
 @dirrm include/gssrpc
 @dirrm include/kerberosIV
+@dirrm include/krb5
 @dirrm share/et
 @dirrm share/gnats
 @dirrm share/examples/krb5