3 files changed, 71 insertions, 7 deletions

diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 79979e8af7d4..715d624367ff 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.12.1
+PORTREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
@@ -40,15 +41,14 @@ LDAP=			Enable LDAP support
 
 .if defined(KRB5_HOME)
 PREFIX=			${KRB5_HOME}
-CFLAGS+=		-rpath=${KRB5_HOME}/lib
-LDFLAGS+=		-rpath=${KRB5_HOME}/lib
+CFLAGS+=		-Wl,-rpath=${KRB5_HOME}/lib
+LDFLAGS+=		-Wl,-rpath=${KRB5_HOME}/lib
 .endif
 LDFLAGS+=		-L${LOCALBASE}/lib
 CFLAGS+=		-I${LOCALBASE}/include
 
 USE_OPENSSL=		yes
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDNS_FOR_REALM}
@@ -96,13 +96,13 @@ post-extract:
 .endif
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/doc/krb5
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5
 # html documentation
 .if ${PORT_OPTIONS:MKRB5_PDF}
 	pdf_files=`${FIND} ${PDF_DOC_DIR} ! -type d`
 	pdf_dirs=`${FIND} ${PDF_DOC_DIR} -type d`
 	for i in $${pdf_dirs}; do \
-		${MKDIR} ${PREFIX}/share/doc/krb5/$${i}; \
+		${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \
 	done; \
 	for i in $${pdf_files}; do \
 		${INSTALL_MAN} $${pdf} ${PREFIX}/share/doc/krb5/$${i}; \
@@ -131,8 +131,8 @@ post-install:
 	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
+	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${STAGEDIR}${PREFIX}/share/doc/krb5/README.FreeBSD
+	@${CHMOD} 444 ${STAGEDIR}${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/files/patch-lib-apputils-net-server.c b/security/krb5/files/patch-lib-apputils-net-server.c
new file mode 100644
index 000000000000..613e7555eca9
--- /dev/null
+++ b/security/krb5/files/patch-lib-apputils-net-server.c
@@ -0,0 +1,34 @@
+diff --git a/security/krb5/files/patch-lib__apputils__net-server.c b/security/krb5/files/patch-lib__apputils__net-server.c
+new file mode 100644
+index 0000000..01d0298
+--- /dev/null
++++ b/security/krb5/files/patch-lib__apputils__net-server.c
+@@ -0,0 +1,28 @@
++--- ./lib/apputils/net-server.c.orig	2014-04-17 08:07:05.144912855 +0000
+++++ ./lib/apputils/net-server.c	2014-04-17 08:07:59.603908167 +0000
++@@ -992,8 +992,12 @@
++     case RTM_NEWADDR: return "RTM_NEWADDR";
++     case RTM_DELADDR: return "RTM_DELADDR";
++     case RTM_IFINFO: return "RTM_IFINFO";
+++#ifdef RTM_OLDADD
++     case RTM_OLDADD: return "RTM_OLDADD";
+++#endif
+++#ifdef RTM_OLDDEL
++     case RTM_OLDDEL: return "RTM_OLDDEL";
+++#endif
++     case RTM_RESOLVE: return "RTM_RESOLVE";
++ #ifdef RTM_NEWMADDR
++     case RTM_NEWMADDR: return "RTM_NEWMADDR";
++@@ -1026,8 +1030,12 @@
++     case RTM_NEWADDR:
++     case RTM_DELADDR:
++     case RTM_IFINFO:
+++#ifdef RTM_OLDADD
++     case RTM_OLDADD:
+++#endif
+++#ifdef RTM_OLDDEL
++     case RTM_OLDDEL:
+++#endif
++         /*
++          * Some flags indicate routing table updates that don't
++          * indicate local address changes.  They may come from
diff --git a/security/krb5/pkg-plist b/security/krb5/pkg-plist
index 8982a1652a3f..0c9b8ab0eb9f 100644
--- a/security/krb5/pkg-plist
+++ b/security/krb5/pkg-plist
@@ -95,6 +95,36 @@ lib/pkgconfig/krb5-gssapi.pc
 lib/pkgconfig/krb5.pc
 lib/pkgconfig/mit-krb5-gssapi.pc
 lib/pkgconfig/mit-krb5.pc
+man/man1/k5srvutil.1.gz
+man/man1/kadmin.1.gz
+man/man1/krb5-config.1.gz
+man/man1/krb5-send-pr.1.gz
+man/man1/kpasswd.1.gz
+man/man1/klist.1.gz
+man/man1/kinit.1.gz
+man/man1/kdestroy.1.gz
+man/man1/kswitch.1.gz
+man/man1/ksu.1.gz
+man/man1/ktutil.1.gz
+man/man1/sclient.1.gz
+man/man1/kvno.1.gz
+man/man1/compile_et.1.gz
+man/man5/kadm5.acl.5.gz
+man/man5/kdc.conf.5.gz
+man/man5/krb5.conf.5.gz
+man/man5/.k5identity.5.gz
+man/man5/.k5login.5.gz
+man/man5/k5identity.5.gz
+man/man5/k5login.5.gz
+man/man8/krb5kdc.8.gz
+man/man8/kadmin.local.8.gz
+man/man8/kdb5_ldap_util.8.gz
+man/man8/kdb5_util.8.gz
+man/man8/kadmind.8.gz
+man/man8/kprop.8.gz
+man/man8/kpropd.8.gz
+man/man8/kproplog.8.gz
+man/man8/sserver.8.gz
 sbin/gss-server
 sbin/kadmin.local
 sbin/kadmind