2 files changed, 12 insertions, 16 deletions

diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index 2a5a06ad99e4..017571450c23 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -14,7 +14,7 @@ COMMENT=		Authentication system developed at MIT, successor to Kerberos IV
 
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4 \
 			krb5-config:${PORTSDIR}/security/krb5
-LIB_DEPENDS=		krb5support.0:${PORTSDIR}/security/krb5
+LIB_DEPENDS=		libkrb5support.so:${PORTSDIR}/security/krb5
 RUN_DEPENDS=		kinit:${PORTSDIR}/security/krb5
 
 CONFLICTS=		krb4-[0-9]* krb5-1.[0-7].* heimdal-[0-9]* srp-[0-9]*
@@ -39,7 +39,6 @@ KRB5_RENAME_RLOGIN_DESC=	Rename rlogin to krlogin
 KRB5_RENAME_RSH_DESC=		Rename rsh to krsh
 KRB5_RENAME_RCP_DESC=		Rename rcp to krcp
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MKRB5_DOC}
@@ -50,17 +49,13 @@ INFO=			krb5-admin krb5-install krb5-user
 
 .if defined(KRB5_HOME)
 PREFIX=			${KRB5_HOME}
+BROKEN=			LIB_DEPENDS when using KRB5_HOME is broken
 .endif
 
 CFLAGS+=		-I${PREFIX}/include
 LDFLAGS+=		-L${PREFIX}/lib
 
-MAN1=			rsh.1 rcp.1 rlogin.1 ftp.1 telnet.1
-MAN8=			kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8
-
 .if ${PORT_OPTIONS:MKRB5_RENAME_FTP}
-MAN1:=			${MAN1:C/ftp/kftp/}
-MAN8:=			${MAN8:C/ftp/kftp/}
 PROGRAM_TRANSFORM_NAME+=	s/^ftp/kftp/;
 PLIST_SUB+=		FTP_PROG="kftp"
 .else
@@ -68,8 +63,6 @@ PLIST_SUB+=		FTP_PROG="ftp"
 .endif
 
 .if ${PORT_OPTIONS:MKRB5_RENAME_TELNET}
-MAN1:=			${MAN1:C/telnet/ktelnet/}
-MAN8:=			${MAN8:C/telnet/ktelnet/}
 PROGRAM_TRANSFORM_NAME+=	s/^telnet/ktelnet/;
 PLIST_SUB+=		TELNET_PROG="ktelnet"
 .else
@@ -77,23 +70,18 @@ PLIST_SUB+=		TELNET_PROG="telnet"
 .endif
 
 .if ${PORT_OPTIONS:MKRB5_RENAME_RLOGIN}
-MAN1:=			${MAN1:C/rlogin/krlogin/}
-PROGRAM_TRANSFORM_NAME+=	s/^rlogin/krlogin/;
 PLIST_SUB+=		RLOGIN_PROG="krlogin"
 .else
 PLIST_SUB+=		RLOGIN_PROG="rlogin"
 .endif
 
 .if ${PORT_OPTIONS:MKRB5_RENAME_RSH}
-MAN1:=			${MAN1:C/rsh/krsh/}
-PROGRAM_TRANSFORM_NAME+=	s/^rsh/krsh/;
 PLIST_SUB+=		RSH_PROG="krsh"
 .else
 PLIST_SUB+=		RSH_PROG="rsh"
 .endif
 
 .if ${PORT_OPTIONS:MKRB5_RENAME_RCP}
-MAN1:=			${MAN1:C/rcp/krcp/}
 PROGRAM_TRANSFORM_NAME+=	s/^rcp/krcp/;
 PLIST_SUB+=		RCP_PROG="krcp"
 .else
@@ -125,8 +113,6 @@ post-extract:
 .endif
 
 post-install:
-	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${PREFIX}/share/doc/krb5/README.FreeBSD
-	@${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${ECHO} "------------------------------------------------------"
 	@${ECHO} "This port of MIT Kerberos 5 includes remote login     "
 	@${ECHO} "daemons (telnetd and klogind).  These daemons default "
diff --git a/security/krb5-appl/pkg-plist b/security/krb5-appl/pkg-plist
index 00ae2b3a2f07..00b827c04578 100644
--- a/security/krb5-appl/pkg-plist
+++ b/security/krb5-appl/pkg-plist
@@ -3,6 +3,16 @@ bin/%%RCP_PROG%%
 bin/%%RLOGIN_PROG%%
 bin/%%RSH_PROG%%
 bin/%%TELNET_PROG%%
+man/man1/%%RSH_PROG%%.1.gz
+man/man1/%%RCP_PROG%%.1.gz
+man/man1/%%RLOGIN_PROG%%.1.gz
+man/man1/%%FTP_PROG%%.1.gz
+man/man1/%%TELNET_PROG%%.1.gz
+man/man8/kshd.8.gz
+man/man8/klogind.8.gz
+man/man8/login.krb5.8.gz
+man/man8/%%FTP_PROG%%d.8.gz
+man/man8/%%TELNET_PROG%%d.8.gz
 sbin/%%FTP_PROG%%d
 sbin/klogind
 sbin/kshd