7 files changed, 44 insertions, 108 deletions

diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index ed1e5e0ba385..7c32e9bd46c3 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		krb5
-PORTVERSION=		1.10.3
-PORTREVISION=		1
+PORTVERSION=		1.11
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 PATCH_SITES=		http://web.mit.edu/kerberos/advisories/
@@ -36,8 +35,8 @@ PATCH_DIST_STRIP=	-p2
 
 LICENSE=		MIT
 
-OPTIONS=		KRB5_DOC "Build and install krb5 documentation" on \
-			WANT_HTML "Want HTML documentation too" on \
+OPTIONS=		KRB5_PDF "Install krb5 PDF documentation" on \
+			KRB5_HTML "Install HTML documentation" on \
 			DNS_FOR_REALM "enable DNS lookups of Kerberos realm names" off
 
 .if defined(KRB5_HOME)
@@ -55,32 +54,16 @@ CONFIGURE_ARGS+=	--enable-dns-for-realm
 
 USE_OPENSSL=		yes
 
-.if defined(WITH_KRB5_DOC)
-BUILD_DEPENDS+=		texi2dvi:${PORTSDIR}/print/texinfo \
-			dvips:${PORTSDIR}/print/dvipsk-tetex
-INFO=			krb5-admin krb5-install krb5-user
-
-# pointyhat kludge - tetex drags in port-OpenSSL on 7.X, but only as a build
-# dependency. Yet this triggers autodetection code in bsd.openssl.mk and
-# OpenSSL dependency is registered with the resulting package, creating a
-# discord between INDEX and actual package. Work around by explicitly recording
-# the dependency in a way that INDEX build will see.
-.if ${OSVERSION} < 800000
-WITH_OPENSSL_PORT=	yes
-.endif
-
-.endif
-
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 
-MAN1=			k5srvutil.1 kadmin.1 krb5-send-pr.1 krb5-config.1 \
+MAN1=			k5srvutil.1 kadmin.1 krb5-send-pr.1 \
 			kpasswd.1 klist.1 kinit.1 kdestroy.1 kswitch.1 ksu.1 \
 			ktutil.1 \
-			sclient.1 kerberos.1 kvno.1 compile_et.1
-MAN5=			kdc.conf.5 krb5.conf.5 .k5identity.5 .k5login.5 \
-			k5identity.5 k5login.5
-MAN8=			krb5kdc.8 kadmin.local.8 kdb5_util.8 kadmind.8 \
-			kprop.8 kpropd.8 kproplog.8 sserver.8
+			sclient.1 kvno.1 compile_et.1
+MAN5=			kadm5.acl.5 kdc.conf.5 krb5.conf.5 .k5identity.5 \
+			.k5login.5 k5identity.5 k5login.5
+MAN8=			krb5kdc.8 kadmin.local.8 kdb5_ldap_util.8 kdb5_util.8 \
+			kadmind.8 kprop.8 kpropd.8 kproplog.8 sserver.8
 
 .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != ""
 CONFIGURE_ARGS+=	--program-transform-name="${PROGRAM_TRANSFORM_NAME}"
@@ -88,11 +71,8 @@ CONFIGURE_ARGS+=	--program-transform-name="${PROGRAM_TRANSFORM_NAME}"
 
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
-HTML_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc
-HTML_DOCS=		ftp.html kdestroy.html kinit.html klist.html \
-			kpasswd.html krb5-admin.html \
-			krb5-install.html krb5-user.html ksu.html \
-			rcp.html rlogin.html rsh.html telnet.html
+HTML_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/html
+PDF_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/pdf
 
 CONFIGURE_ARGS+=	CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}"
 
@@ -106,33 +86,42 @@ post-extract:
 	fi
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e '1s,^#!\/usr\/athena/bin/perl,#!${PERL5},' \
-		${WRKSRC}/../doc/man2html
-
-post-build:
-.if defined(WITH_KRB5_DOC)
-	@cd ${WRKSRC}/../doc && \
-	${MAKE} all
-.endif
-
 post-install:
 	@${MKDIR} ${PREFIX}/share/doc/krb5
 # html documentation
-.if defined(WITH_KRB5_DOC) && defined(WITH_WANT_HTML)
-	for html in ${HTML_DOC_DIR}/*.html; do \
-		${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5; \
-		${ECHO_CMD} share/doc/krb5/`${BASENAME} $${html}` >> ${TMPPLIST}; \
+.if defined(WITH_KRB5_PDF)
+	pdf_files=`${FIND} ${PDF_DOC_DIR} ! -type d`
+	pdf_dirs=`${FIND} ${PDF_DOC_DIR} -type d`
+	for i in $${pdf_dirs}; do \
+		${MKDIR} -p ${PREFIX}/share/doc/krb5/$${i}; \
+	done; \
+	for i in $${pdf_files}; do \
+		${INSTALL_MAN} $${pdf} ${PREFIX}/share/doc/krb5/$${i}; \
+		${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \
 	done
 .endif
-	${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}
-# handle info files
-.if defined(WITH_KRB5_DOC)
-.for info in ${INFO}
-	${INSTALL_MAN} ${WRKSRC}/../doc/${info}.info ${PREFIX}/info/${info}.info
-.endfor
+.if defined(WITH_KRB5_HTML)
+	html_files=`${FIND} ${HTML_DOC_DIR} ! -type d | ${GREP} -v /_sources`
+	html_dirs=`${FIND} ${HTML_DOC_DIR} -type d | ${GREP} -v /_sources`
+	for i in $${html_dirs}; do \
+		${MKDIR} -p ${PREFIX}/share/doc/krb5/$${i}; \
+	done; \
+	for i in $${html_files}; do \
+		${INSTALL_MAN} $${i} ${PREFIX}/share/doc/krb5/$${i}; \
+		${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \
+	done
 .endif
-
+.if defined(WITH_KRB5_PDF)
+	for i in $${pdf_dirs}; do \
+		${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \
+	done | ${TAIL} -r >> ${TMPPLIST}
+.endif
+.if defined(WITH_KRB5_HTML)
+	for i in $${html_dirs}; do \
+		${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \
+	done | ${TAIL} -r >> ${TMPPLIST}
+.endif
+	${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}
 	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${ECHO} "------------------------------------------------------"
diff --git a/security/krb5/distinfo b/security/krb5/distinfo
index 4343b1ad17dd..3f77ab943a47 100644
--- a/security/krb5/distinfo
+++ b/security/krb5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (krb5-1.10.3-signed.tar) = fc48f9f985bf04aa91c239dae0daaa0509c85b61b2d172d9d65ab0c52bcea3cf
-SIZE (krb5-1.10.3-signed.tar) = 11530240
+SHA256 (krb5-1.11-signed.tar) = fe37fb93b398db98a1b23f814673ea2ae4b90138f85e1a4027ef639456a78651
+SIZE (krb5-1.11-signed.tar) = 11653120
diff --git a/security/krb5/files/patch-ac b/security/krb5/files/patch-ac
deleted file mode 100644
index 8bca5437d964..000000000000
--- a/security/krb5/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/admin.texinfo	Fri Feb  6 21:40:56 1998
-+++ admin.texinfo	Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-admin.info
- @settitle Kerberos V5 System Administrator's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Admin Guide: (krb5-admin).            Kerberos V5 System Admin's Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5/files/patch-ad b/security/krb5/files/patch-ad
deleted file mode 100644
index c8b6d3e99e91..000000000000
--- a/security/krb5/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/user-guide.texinfo	Fri Feb  6 21:40:58 1998
-+++ user-guide.texinfo	Fri Jun 19 15:13:45 1998
-@@ -3,6 +3,10 @@
- @c guide
- @setfilename krb5-user.info
- @settitle Kerberos V5 UNIX User's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* User's Guide: (krb5-user).             Kerberos V5 UNIX User's Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5/files/patch-ae b/security/krb5/files/patch-ae
deleted file mode 100644
index f5643b5aa04f..000000000000
--- a/security/krb5/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/install.texinfo	Fri Feb  6 21:40:56 1998
-+++ install.texinfo	Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-install.info
- @settitle Kerberos V5 Installation Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Installation Guide: (krb5-install).    Kerberos V5 Installation Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5/files/patch-ax b/security/krb5/files/patch-ax
deleted file mode 100644
index 8396b35c215b..000000000000
--- a/security/krb5/files/patch-ax
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../doc/Makefile.orig	2007-09-17 20:36:09.000000000 -0700
-+++ ../doc/Makefile	2007-10-25 14:04:48.000000000 -0700
-@@ -1,8 +1,8 @@
- SRCDIR=../src
- DVI=texi2dvi
- DVIPS=dvips -o "$@"
- PSPDF=ps2pdf
--INFO=makeinfo
-+INFO=makeinfo --no-validate --no-split
- HTML=makeinfo --html --no-split
- RM=rm -f
- TAR=tar -chvf
diff --git a/security/krb5/pkg-plist b/security/krb5/pkg-plist
index 0f708df1c870..12c5a345012d 100644
--- a/security/krb5/pkg-plist
+++ b/security/krb5/pkg-plist
@@ -66,15 +66,13 @@ lib/libkadm5srv.so
 lib/libkadm5srv_mit.so
 lib/libkadm5srv_mit.so.8
 lib/libkdb5.so
-lib/libkdb5.so.6
+lib/libkdb5.so.7
 lib/libkrb5.so
 lib/libkrb5.so.3
 lib/libkrb5support.so
 lib/libkrb5support.so.0
 lib/krb5/plugins/kdb/db2.so
 lib/krb5/plugins/preauth/pkinit.so
-lib/libverto-k5ev.so.0
-lib/libverto-k5ev.so
 lib/libverto.so.0
 lib/libverto.so
 sbin/gss-server