Fix heimdal.

- Resolve conflict with security/openssl regarding manual pages.
- Add a couple of patches from the upstream.
- Remove NO_STAGE and delete obsolete MLINKS while at it.

PR:		177397
Submitted by:	Shane Ambler <FreeBSD@ShaneWare.Biz>
Approved by:	(MAINTAINER timeout)

security/heimdal/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	heimdal
 PORTVERSION=	1.5.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.h5l.org/dist/src/ \
 		http://ftp.pdc.kth.se/pub/heimdal/src/ \
@@ -42,7 +42,6 @@ MAKE_ENV+=	INSTALL_CATPAGES=no
 INFO=		heimdal hx509
 PLIST=		${WRKDIR}/PLIST
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64"
@@ -50,6 +49,7 @@ CFLAGS+=	-fPIC
 .endif
 
 .if ${OSVERSION} >= 700000
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-doc__Makefile.in
 PLIST_SUB+=	HCRYPTO="@comment "
 .else
 PLIST_SUB+=	HCRYPTO=""
@@ -168,14 +168,12 @@ pre-install:
 	@${ECHO_CMD} include/ifaddrs.h >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MCRACKLIB}
-	${INSTALL_PROGRAM} ${WRKSRC}/kpasswdd-cracklib.so ${PREFIX}/lib/
+	${INSTALL_PROGRAM} ${WRKSRC}/kpasswdd-cracklib.so ${STAGEDIR}${PREFIX}/lib/
 	@${ECHO_CMD} lib/kpasswdd-cracklib.so >> ${PLIST}
 .endif
 
-.include "Makefile.man"
-
 post-install:
 	${SED} 's;%%PREFIX%%;${PREFIX};g' ${FILESDIR}/kdc.sh > \
-		${PREFIX}/etc/rc.d/kdc.sh.sample
+		${STAGEDIR}${PREFIX}/etc/rc.d/kdc.sh.sample
 
 .include <bsd.port.mk>

security/heimdal/files/extra-patch-doc__Makefile.in

@@ -0,0 +1,48 @@
+--- doc/Makefile.in.orig	2013-03-26 23:18:01.813922381 +1030
++++ doc/Makefile.in	2013-03-26 23:19:41.535922356 +1030
+@@ -386,7 +380,7 @@
+ texi_subst = sed -e 's,[@]dbdir[@],$(localstatedir),g' \
+ 	-e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g'
+ 
+-PROJECTS = hcrypto hdb hx509 gssapi krb5 ntlm wind 
++PROJECTS = hdb hx509 gssapi krb5 ntlm wind 
+ heimdal_TEXINFOS = \
+ 	ack.texi \
+ 	apps.texi \
+@@ -409,7 +403,6 @@
+ 	footer.html \
+ 	gssapi.din \
+ 	hdb.din \
+-	hcrypto.din \
+ 	header.html \
+ 	heimdal.css \
+ 	hx509.din \
+@@ -423,7 +416,6 @@
+ 	vars.tin
+ 
+ CLEANFILES = \
+-	hcrypto.dxy* \
+ 	hx509.dxy* \
+ 	hdb.dxy* \
+ 	gssapi.dxy* \
+@@ -1040,11 +1032,6 @@
+ 	  fi ; \
+ 	done
+ 
+-hcrypto.dxy: hcrypto.din Makefile
+-	$(dxy_subst) < $(srcdir)/hcrypto.din > hcrypto.dxy.tmp
+-	chmod +x hcrypto.dxy.tmp
+-	mv hcrypto.dxy.tmp hcrypto.dxy
+-
+ hdb.dxy: hdb.din Makefile
+ 	$(dxy_subst) < $(srcdir)/hdb.din > hdb.dxy.tmp
+ 	chmod +x hdb.dxy.tmp
+@@ -1080,7 +1067,7 @@
+ 	chmod +x vars.texi.tmp
+ 	mv vars.texi.tmp vars.texi
+ 
+-doxyout doxygen: hdb.dxy hx509.dxy hcrypto.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy
++doxyout doxygen: hdb.dxy hx509.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy
+ 	@find $(srcdir)/doxyout -type d ! -perm -200 -exec chmod u+w {} ';' ; \
+ 	rm -rf $(srcdir)/doxyout ; \
+ 	mkdir $(srcdir)/doxyout ; \

security/heimdal/files/patch-kcm__cache.c

@@ -0,0 +1,11 @@
+--- kcm/cache.c.orig	2013-03-28 14:22:47.807924196 +1030
++++ kcm/cache.c	2013-03-28 14:23:09.600166386 +1030
+@@ -102,7 +102,7 @@
+     for (p = ccache_head; p != NULL; p = p->next) {
+ 	if ((p->flags & KCM_FLAGS_VALID) == 0)
+ 	    continue;
+-	if (memcmp(p->uuid, uuid, sizeof(uuid)) == 0) {
++	if (memcmp(p->uuid, uuid, sizeof(kcmuuid_t)) == 0) {
+ 	    ret = 0;
+ 	    break;
+ 	}

security/heimdal/files/patch-lib__sl__slc-lex.l

@@ -0,0 +1,11 @@
+--- lib/sl/slc-lex.l.orig	2013-03-28 14:22:37.561924559 +1030
++++ lib/sl/slc-lex.l	2013-03-28 14:23:21.647677881 +1030
+@@ -47,8 +47,6 @@
+ static void handle_comment(void);
+ static char * handle_string(void);
+ 
+-#define YY_NO_UNPUT
+-
+ #undef ECHO
+ 
+ %}