3 files changed, 27 insertions, 18 deletions

diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index 9e2855ef5821..99e0971dae71 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.3.1
+PORTREVISION=		1
 CATEGORIES=		security
 # USE_MIT_TARBALL tells the port that the user has fetched the source
 # directly from MIT rather than the default crypto-publish.org.
@@ -23,11 +24,10 @@ EXTRACT_SUFX=		.tar.gz
 MAINTAINER=		cy@FreeBSD.org
 COMMENT=		An authentication system developed at MIT, successor to Kerberos IV
 
-BROKEN=			"Does not build on 4.x, broken pkg-plist on 5.x; will be removed after Feb 2"
-
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
 KERBEROSV_URL=		http://web.mit.edu/network/kerberos-form.html
+USE_REINPLACE=		yes
 USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
 INSTALLS_SHLIB=		yes
@@ -57,14 +57,15 @@ INFO_FILES=		krb425.info krb5-admin.info krb5-admin.info-1 \
 
 MAN1=			krb5-send-pr.1 kpasswd.1 v5passwd.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
+			ftp.1 telnet.1 kerberos.1 kvno.1 compile_et.1
 .if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
 MAN1+=			v4rcp.1
 .endif
 MAN5=			kdc.conf.5 krb5.conf.5 .k5login.5
 MAN8=			krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \
 			ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \
-			kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8
+			kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8 \
+			k5srvutil.8
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 
@@ -73,6 +74,8 @@ HTML_DOC_DIR=		${WRKDIR}/${DISTNAME}/doc
 HTML_DOCS=		admin.html user-guide.html install.html
 HTML_OUTDIRS=		krb5-admin krb5-install
 
+.include <bsd.port.pre.mk>
+
 .if defined(USE_MIT_TARBALL) && ${USE_MIT_TARBALL} == "YES"
 do-fetch:
 	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then        \
@@ -102,6 +105,15 @@ post-extract:
 .endif
 .endif
 
+post-patch:
+.if ${OSVERSION} >= 500000
+	@${REINPLACE_CMD} -e '1s,^#!\/usr\/athena,#!${LOCALBASE},' \
+		${WRKSRC}/../doc/man2html
+.else
+	@${REINPLACE_CMD} -e '1s,^#!\/usr\/athena,#!\/usr,' \
+		${WRKSRC}/../doc/man2html
+.endif
+
 pre-build:
 .if !defined(KRB5_KRB4_COMPAT)
 	@${ECHO} "------------------------------------------------------"
@@ -118,8 +130,6 @@ post-build:
 	${MAKE} ${HTML_DOCS})
 .endif
 
-.include <bsd.port.pre.mk>
-
 post-install:
 # html documentation
 .if defined(WANT_HTML) && ${WANT_HTML} == "YES"
diff --git a/security/krb5-17/files/patch-doc::man2html b/security/krb5-17/files/patch-doc::man2html
deleted file mode 100644
index 88f00d594e54..000000000000
--- a/security/krb5-17/files/patch-doc::man2html
+++ /dev/null
@@ -1,7 +0,0 @@
---- ../doc/man2html.orig	Wed Jun 26 14:15:11 2002
-+++ ../doc/man2html	Wed Jul 30 19:05:54 2003
-@@ -1,4 +1,3 @@
--#!/usr/athena/bin/perl
- #!/usr/local/bin/perl
- ##---------------------------------------------------------------------------##
- ##  File:
diff --git a/security/krb5-17/pkg-plist b/security/krb5-17/pkg-plist
index ffc5cf6892a3..55f03d68c13b 100644
--- a/security/krb5-17/pkg-plist
+++ b/security/krb5-17/pkg-plist
@@ -2,6 +2,7 @@
 @unexec install-info --delete %D/info/krb5-admin.info %D/info/dir
 @unexec install-info --delete %D/info/krb5-install.info %D/info/dir
 @unexec install-info --delete %D/info/krb5-user.info %D/info/dir
+bin/compile_et
 bin/ftp
 bin/gss-client
 bin/kdestroy
@@ -25,11 +26,11 @@ include/com_err.h
 include/gssapi/gssapi.h
 include/gssapi/gssapi_generic.h
 include/gssapi/gssapi_krb5.h
-include/kerberosIV/des.h
-include/kerberosIV/kadm_err.h
-include/kerberosIV/krb.h
-include/kerberosIV/krb_err.h
-include/kerberosIV/mit-copyright.h
+%%KRB4%%include/kerberosIV/des.h
+%%KRB4%%include/kerberosIV/kadm_err.h
+%%KRB4%%include/kerberosIV/krb.h
+%%KRB4%%include/kerberosIV/krb_err.h
+%%KRB4%%include/kerberosIV/mit-copyright.h
 include/krb5.h
 include/profile.h
 info/krb425.info
@@ -73,6 +74,7 @@ lib/libkrb5.so
 lib/libkrb5.so.3
 sbin/ftpd
 sbin/gss-server
+sbin/k5srvutil
 sbin/kadmin
 sbin/kadmin.local
 sbin/kadmind
@@ -93,9 +95,13 @@ sbin/telnetd
 sbin/uuserver
 sbin/v5passwdd
 share/doc/krb5/README.FreeBSD
+share/et/et_c.awk
+share/et/et_h.awk
 share/gnats/mit
 @dirrm include/gssapi
 @dirrm include/kerberosIV
+@dirrm share/et
+@dirrm share/gnats
 @exec install-info %D/info/krb425.info %D/info/dir
 @exec install-info %D/info/krb5-admin.info %D/info/dir
 @exec install-info %D/info/krb5-install.info %D/info/dir