Index: head/shells/44bsd-csh/Makefile
===================================================================
--- head/shells/44bsd-csh/Makefile	(revision 545547)
+++ head/shells/44bsd-csh/Makefile	(revision 545548)
@@ -1,40 +1,41 @@
 # Created by: David O'Brien <obrien@NUXI.com>
 # $FreeBSD$
 
 PORTNAME=	44bsd-csh
 PORTVERSION=	20001106
 PORTREVISION=	5
 CATEGORIES=	shells
 MASTER_SITES=	LOCAL/cy
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The traditional 4.4BSD /bin/csh C-shell
 
 EXTRACT_DEPENDS=	rcs:devel/rcs57
 
 BROKEN_aarch64=	Fails to link: missing sbrk
 
 USES=		tar:bzip2
+LDFLAGS=	-Wl,--allow-multiple-definition
 NO_WRKSUBDIR=	yes
 PORTDOCS=	paper.ascii.gz
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	cd ${WRKSRC} ; co RCS/*,v; chmod u+w *
 	cd ${WRKSRC}/USD.doc ; co RCS/*,v
 
 post-build:
 	cd ${WRKSRC}/USD.doc ; ${MAKE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/csh ${STAGEDIR}${PREFIX}/bin/44bsd-csh
 	${INSTALL_MAN} ${WRKSRC}/csh.1 ${STAGEDIR}${PREFIX}/man/man1/44bsd-csh.1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/USD.doc/paper.ascii.gz ${STAGEDIR}${DOCSDIR}
 
 tarup:
 	cd ${WRKSRC} ; rm * USD.doc/*
 	cd ${WRKSRC} ; ${TAR} cvyf /tmp/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 .include <bsd.port.mk>
Index: head/sysutils/heirloom/Makefile
===================================================================
--- head/sysutils/heirloom/Makefile	(revision 545547)
+++ head/sysutils/heirloom/Makefile	(revision 545548)
@@ -1,56 +1,57 @@
 # Created by: Cyrille Lefevre <Cyrille.Lefevre@laposte.net>
 # $FreeBSD$
 
 PORTNAME=	heirloom
 PORTVERSION=	070715
 PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Collection of standard Unix utilities
 
 BUILD_DEPENDS=	ksh:shells/pdksh
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake ncurses tar:bzip2
-MAKE_ARGS=	CC=${CC} CFLAGS="${CFLAGS}" ROOT="${STAGEDIR}" \
-		LCURS="-L${LOCALBASE}/lib -lncurses"
+LDFLAGS+=	-Wl,--allow-multiple-definition
+MAKE_ARGS=	CC=${CC} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		ROOT="${STAGEDIR}" LCURS="-L${LOCALBASE}/lib -lncurses"
 MAKEFILE=	makefile
 ALL_TARGET=	#
 DATADIR=	${PREFIX}/${PORTNAME}
 REINPLACE_SUB=	DATADIR="${DATADIR}"
 
 OPTIONS_DEFINE=	DOCS
 
 SH2FIX=		maninst.sh genintro.sh crossln.sh
 
 DOC_FILES=	CHANGES LICENSE/COPYING LICENSE/LICENSE LICENSE/LUCENT \
 		LICENSE/README LICENSE/COPYING.LGPL README intro.txt
 
 post-patch:
 # FreeBSD does not have neither <malloc.h> nor <alloca.h> system headers
 	@${GREP} -ERl --null 'm?alloca?\.h' ${WRKSRC} | \
 		${XARGS} -0 ${REINPLACE_CMD} -E '/<m?alloca?\.h>/d'
 # Avoid a race (to unbreak parallel builds)
 	@${REINPLACE_CMD} -e 's|htemp2|$$@.temp|g' \
 		${WRKSRC}/spell/Makefile.mk
 
 pre-configure:
 	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/build/mk.config ${WRKSRC}/su/su.dfl.in
 	@${REINPLACE_CMD} -e 's|/sbin/sh| ${SH}|' \
 		${SH2FIX:S|^|${WRKSRC}/build/|}
 
 # XXX: hack to avoid inner race (for -jX builds); should be fixed properly
 # one day (e.g. by factoring out special target in the top makefile)
 pre-build:
 	${MAKE_CMD} -C ${WRKSRC}/libcommon -f Makefile.mk headers
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/LICENSE
 .for f in ${DOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f}
 .endfor
 
 .include <bsd.port.mk>