diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 6c8aee89e871..0508e9d72a0b 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,59 +1,59 @@
 # New ports collection makefile for:	mailagent
 # Date created:			23 Sep 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=		mailagent
 PORTVERSION=		3.0.73
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/RAM
 
 MAINTAINER=	max@FreeBSD.org
 
 USE_PERL5=	yes
 NO_PACKAGE=	"Correct FQDN needs to be hardcoded"
 IS_INTERACTIVE=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-dres \
-			-Dperlpath='${PERL5}' \
+			-Dperlpath='${PERL}' \
+			-Dccflags='${CFLAGS}' \
+			-Dd_flockonly='define' \
 			-Dutmp='/var/run/utmp' \
-			-Dprefix='${PREFIX}' -Dmansrc='${PREFIX}/man/man1' \
-			-Dnotifypatches='false'
+			-Dprefix='${PREFIX}' -Dmansrc='${PREFIX}/man/man1'
 MAKE_ENV=	PATH=`dirname ${PERL5}`:${PATH}
 INSTALL_TARGET=	install install.man
 
 # Note that mailhelp.1 is intentionally left uncompressed as it is referred
 # from several other man pages with .so macro.
 MAN1=			edusers.1 mailagent.1 maildist.1  \
 			maillist.1 mailpatch.1 package.1
 
 pre-extract:
 	@if [ `${SH} -c umask` != 0022 ]; then \
 	  ${ECHO} "Please set umask to 022 before running make,"; \
 	  ${ECHO} "or mailagent will not build successfully."; \
 	  ${FALSE}; fi
 	@if [ `id -u` = 0 ]; then \
 	  ${ECHO} "Do not build mailagent as root or it won't pass the sanity tests."; \
 	  ${FALSE}; fi
 
 post-patch:
 	@(cd ${WRKSRC}; \
 	  ${PERL} -pi.bak \
 	    -e 's|exec perl -S|exec ${PERL} -S|' \
 	    agent/edusers.SH agent/magent.sh agent/maildist.SH \
 	    agent/mailhelp.SH agent/maillist.SH agent/mailpatch.SH \
 	    agent/package.SH agent/test/TEST agent/test/atail \
 	    bin/perload misc/getcost/getcost misc/mime/unmime \
 	    misc/news/newsgate)
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/examples/mailagent
 	@${MKDIR} ${PREFIX}/share/examples/mailagent/misc
 	${CP} -pR ${WRKSRC}/misc/* ${PREFIX}/share/examples/mailagent/misc
 	@${LN} -fs ${PREFIX}/lib/mailagent/examples ${PREFIX}/share/examples/mailagent/agent
 
 .include <bsd.port.mk>