4 files changed, 19 insertions, 19 deletions

diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 590d8a666453..2c730ab5dc98 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -15,15 +15,14 @@ MAINTAINER=	wes@FreeBSD.org
 COMMENT=	Milter based anti-spam and anti-virus filtering program
 
 BUILD_DEPENDS=	\
-	${PERL_SITELIBDIR}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
+	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
 	p5-MIME-Tools>=5.417:${PORTSDIR}/mail/p5-MIME-Tools \
-	${PERL_SITELIBDIR}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-	${PERL_SITELIBDIR}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
-	${PERL_SITELIBDIR}/Mail/SpamAssassin.pm:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+	${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+	${SITE_PERL}/Mail/SpamAssassin.pm:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PERL5=	yes
-PERL_SITELIBDIR=	${SITE_PERL}
 GNU_CONFIGURE=	yes
 
 MAILUSER?=		mailnull
@@ -38,11 +37,10 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc \
 			--with-quarantinedir=${QUARANTINEDIR} \
 			--prefix=${PREFIX}
 
-
 .if defined (MIMEDEFANG_DISABLE_CLAMAV)
 CONFIGURE_ARGS+=	--disable-antivirus \
 			--disable-clamav \
-			--disable-clamd 
+			--disable-clamd
 .endif
 
 MAN5=	mimedefang-filter.5
@@ -50,13 +48,15 @@ MAN7=	mimedefang-notify.7 mimedefang-protocol.7
 MAN8=	mimedefang.8 mimedefang.pl.8 mimedefang-multiplexor.8 \
 	md-mx-ctrl.8 watch-mimedefang.8 watch-multiple-mimedefangs.8
 
+SUB_FILES=	pkg-message
+
 .include <bsd.port.pre.mk>
 
 .if !exists( /usr/include/libmilter/mfapi.h )
 BUILD_DEPENDS+=	${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail
 .endif
 
-.if exists( /usr/local/include/libmilter/mfapi.h )
+.if exists( ${LOCALBASE}/include/libmilter/mfapi.h )
 CONFIGURE_ARGS+=	--with-milterinc=${LOCALBASE}/include --with-milterlib=${LOCALBASE}/lib
 .endif
 
@@ -70,12 +70,13 @@ post-install:
 	@${REINPLACE_CMD} -e 's,%%CHMOD%%,${CHMOD},g' ${WRKSRC}/examples/init-script
 	@${INSTALL_SCRIPT} ${WRKSRC}/examples/init-script ${PREFIX}/etc/rc.d/mimedefang
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/stream-by-domain-filter ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/suggested-minimum-filter-for-windows-clients ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README* ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README* ${DOCSDIR}/
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	@cd ${WRKSRC}/examples/ && ${INSTALL_DATA} stream-by-domain-filter \
+		suggested-minimum-filter-for-windows-clients README ${EXAMPLESDIR}/
 .endif
 	@[ -d ${SPOOLDIR} ] && ${CHGRP} ${MAILUSER} ${SPOOLDIR}
 	@[ -d ${QUARANTINEDIR} ] && ${CHGRP} ${MAILUSER} ${QUARANTINEDIR}
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
index 57f443ed1a24..5c01c71aedce 100644
--- a/mail/mimedefang/distinfo
+++ b/mail/mimedefang/distinfo
@@ -1,3 +1,2 @@
-MD5 (mimedefang-2.68.tar.gz) = b988d34b7d656fcf007a00c23565ed20
 SHA256 (mimedefang-2.68.tar.gz) = af6d947eef87f00fe513045bf79828808ea42b9cf70eaee033d5e96e73edf61a
 SIZE (mimedefang-2.68.tar.gz) = 342973
diff --git a/mail/mimedefang/pkg-message b/mail/mimedefang/files/pkg-message.in
index 07d8dd1046c3..daa4e3862cc8 100644
--- a/mail/mimedefang/pkg-message
+++ b/mail/mimedefang/files/pkg-message.in
@@ -1,6 +1,6 @@
 To finish installation please follow these steps:
 
-1. Edit /usr/local/etc/mimedefang/mimedefang-filter
+1. Edit %%ETCDIR%%/mimedefang-filter
 
 2. Reconfigure sendmail to use MIMEDefang, for example add this lines to
    your sendmail.mc:
diff --git a/mail/mimedefang/pkg-plist b/mail/mimedefang/pkg-plist
index b3ca808114dc..3e3a829ef001 100644
--- a/mail/mimedefang/pkg-plist
+++ b/mail/mimedefang/pkg-plist
@@ -18,11 +18,11 @@ etc/mimedefang/sa-mimedefang.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/README.TRU64
 %%PORTDOCS%%%%DOCSDIR%%/README.IRIX
 %%PORTDOCS%%%%DOCSDIR%%/README.VEXIRA
-%%PORTDOCS%%%%EXAMPLESDIR%%/suggested-minimum-filter-for-windows-clients
-%%PORTDOCS%%%%EXAMPLESDIR%%/stream-by-domain-filter
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stream-by-domain-filter
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/suggested-minimum-filter-for-windows-clients
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm etc/mimedefang
 @cwd /var/spool
 @dirrm MIMEDefang