2 files changed, 50 insertions, 49 deletions

diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 325d636a635f..03af3a37e071 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -7,15 +7,16 @@
 
 PORTNAME=		mailagent
 PORTVERSION=		3.0.73
+PORTREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/RAM
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	max@FreeBSD.org
 COMMENT=	A sophisticated automatic mail-processing tool
 
 USE_PERL5=	yes
-NO_PACKAGE=	"Correct FQDN needs to be hardcoded"
+NO_PACKAGE=	Correct FQDN needs to be hardcoded
 IS_INTERACTIVE=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
@@ -52,8 +53,8 @@ post-patch:
 	    misc/news/newsgate)
 
 post-install:
-	@${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
+	@${MKDIR} ${EXAMPLESDIR}/misc
+	${CP} -pR ${WRKSRC}/misc/* ${EXAMPLESDIR}/misc
+	@${LN} -fs ${PREFIX}/lib/mailagent/examples ${EXAMPLESDIR}/agent
 
 .include <bsd.port.mk>
diff --git a/mail/mailagent/pkg-plist b/mail/mailagent/pkg-plist
index a6ff4db49935..e30162e7ecc4 100644
--- a/mail/mailagent/pkg-plist
+++ b/mail/mailagent/pkg-plist
@@ -39,50 +39,50 @@ lib/mailagent/examples/nocmds
 lib/mailagent/examples/profile
 lib/mailagent/examples/rules
 lib/mailagent/examples/vacation
-share/examples/mailagent/misc/README
-share/examples/mailagent/misc/fakesend/README
-share/examples/mailagent/misc/fakesend/fakesend.pl
-share/examples/mailagent/misc/fakesend/freplcomps
-share/examples/mailagent/misc/fakesend/mh_profile
-share/examples/mailagent/misc/getcost/README
-share/examples/mailagent/misc/getcost/getcost
-share/examples/mailagent/misc/getcost/getcost.bak
-share/examples/mailagent/misc/getcost/rules
-share/examples/mailagent/misc/getcost/spamconfig
-share/examples/mailagent/misc/mime/README
-share/examples/mailagent/misc/mime/rules
-share/examples/mailagent/misc/mime/unmime
-share/examples/mailagent/misc/mime/unmime.bak
-share/examples/mailagent/misc/news/README
-share/examples/mailagent/misc/news/ml.map
-share/examples/mailagent/misc/news/newsgate
-share/examples/mailagent/misc/news/newsgate.bak
-share/examples/mailagent/misc/news/rules
-share/examples/mailagent/misc/pbounce/README
-share/examples/mailagent/misc/pbounce/mailagent.cf
-share/examples/mailagent/misc/pbounce/newcmd.cf
-share/examples/mailagent/misc/pbounce/patbounce.pl
-share/examples/mailagent/misc/pbounce/rules
-share/examples/mailagent/misc/shell/README
-share/examples/mailagent/misc/shell/server.cf
-share/examples/mailagent/misc/shell/shell
-share/examples/mailagent/misc/unkit/README
-share/examples/mailagent/misc/unkit/kitok.msg
-share/examples/mailagent/misc/unkit/mailagent.cf
-share/examples/mailagent/misc/unkit/newcmd.cf
-share/examples/mailagent/misc/unkit/rules
-share/examples/mailagent/misc/unkit/unkit.pl
-@exec /bin/ln -sf %D/lib/mailagent/examples %D/share/examples/mailagent/agent
-@unexec /bin/rm -f %D/share/examples/mailagent/agent
-@dirrm share/examples/mailagent/misc/unkit
-@dirrm share/examples/mailagent/misc/shell
-@dirrm share/examples/mailagent/misc/pbounce
-@dirrm share/examples/mailagent/misc/news
-@dirrm share/examples/mailagent/misc/mime
-@dirrm share/examples/mailagent/misc/getcost
-@dirrm share/examples/mailagent/misc/fakesend
-@dirrm share/examples/mailagent/misc
-@dirrm share/examples/mailagent
+%%EXAMPLESDIR%%/misc/README
+%%EXAMPLESDIR%%/misc/fakesend/README
+%%EXAMPLESDIR%%/misc/fakesend/fakesend.pl
+%%EXAMPLESDIR%%/misc/fakesend/freplcomps
+%%EXAMPLESDIR%%/misc/fakesend/mh_profile
+%%EXAMPLESDIR%%/misc/getcost/README
+%%EXAMPLESDIR%%/misc/getcost/getcost
+%%EXAMPLESDIR%%/misc/getcost/getcost.bak
+%%EXAMPLESDIR%%/misc/getcost/rules
+%%EXAMPLESDIR%%/misc/getcost/spamconfig
+%%EXAMPLESDIR%%/misc/mime/README
+%%EXAMPLESDIR%%/misc/mime/rules
+%%EXAMPLESDIR%%/misc/mime/unmime
+%%EXAMPLESDIR%%/misc/mime/unmime.bak
+%%EXAMPLESDIR%%/misc/news/README
+%%EXAMPLESDIR%%/misc/news/ml.map
+%%EXAMPLESDIR%%/misc/news/newsgate
+%%EXAMPLESDIR%%/misc/news/newsgate.bak
+%%EXAMPLESDIR%%/misc/news/rules
+%%EXAMPLESDIR%%/misc/pbounce/README
+%%EXAMPLESDIR%%/misc/pbounce/mailagent.cf
+%%EXAMPLESDIR%%/misc/pbounce/newcmd.cf
+%%EXAMPLESDIR%%/misc/pbounce/patbounce.pl
+%%EXAMPLESDIR%%/misc/pbounce/rules
+%%EXAMPLESDIR%%/misc/shell/README
+%%EXAMPLESDIR%%/misc/shell/server.cf
+%%EXAMPLESDIR%%/misc/shell/shell
+%%EXAMPLESDIR%%/misc/unkit/README
+%%EXAMPLESDIR%%/misc/unkit/kitok.msg
+%%EXAMPLESDIR%%/misc/unkit/mailagent.cf
+%%EXAMPLESDIR%%/misc/unkit/newcmd.cf
+%%EXAMPLESDIR%%/misc/unkit/rules
+%%EXAMPLESDIR%%/misc/unkit/unkit.pl
+@exec /bin/ln -sf %D/lib/mailagent/examples %D/%%EXAMPLESDIR%%/agent
+@unexec /bin/rm -f %D/%%EXAMPLESDIR%%/agent
+@dirrm %%EXAMPLESDIR%%/misc/unkit
+@dirrm %%EXAMPLESDIR%%/misc/shell
+@dirrm %%EXAMPLESDIR%%/misc/pbounce
+@dirrm %%EXAMPLESDIR%%/misc/news
+@dirrm %%EXAMPLESDIR%%/misc/mime
+@dirrm %%EXAMPLESDIR%%/misc/getcost
+@dirrm %%EXAMPLESDIR%%/misc/fakesend
+@dirrm %%EXAMPLESDIR%%/misc
+@dirrm %%EXAMPLESDIR%%
 @dirrm lib/mailagent/examples
 @dirrm lib/mailagent/help
 @dirrm lib/mailagent