Index: head/mail/masqmail/Makefile
===================================================================
--- head/mail/masqmail/Makefile	(revision 378690)
+++ head/mail/masqmail/Makefile	(revision 378691)
@@ -1,45 +1,44 @@
 # Created by: Andrey Slusar <anray@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	masqmail
-PORTVERSION=	0.3.4
-PORTREVISION=	1
+PORTVERSION=	0.3.5
 CATEGORIES=	mail
 MASTER_SITES=	http://marmaro.de/prog/masqmail/files/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Mail server for hosts, not permanently connected to the internet
 
 LICENSE=	GPLv2
 
 USE_GNOME=	glib20
 USES=		pkgconfig
 USE_RC_SUBR=	masqmail
 GNU_CONFIGURE=	yes
 CFLAGS+=	-Wno-trigraphs
 CONFIGURE_ARGS=	--with-user=mailnull --with-group=mail \
 		--with-confdir=${ETCDIR} --with-logdir=/var/log/masqmail
 
 OPTIONS_DEFINE=	RESOLVER AUTH DEBUG DOCS
 OPTIONS_DEFAULT=	RESOLVER AUTH
 RESOLVER_DESC=	Resolver
 AUTH_DESC=	SMTP AUTH (RFC2554) support
 
 AUTH_CONFIGURE_ENABLE=	auth
 DEBUG_CONFIGURE_ENABLE=	debug
 RESOLVER_CONFIGURE_ENABLE=	resolver
 
 post-patch:
 	@${REINPLACE_CMD} -e '/sed.*SENDMAIL/ s|$$(DESTDIR)||' ${WRKSRC}/Makefile.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/masqmail.conf ${STAGEDIR}${ETCDIR}/masqmail.conf-dist
-	${INSTALL_DATA} ${WRKSRC}/examples/example.route ${STAGEDIR}${ETCDIR}/masqmail.route-dist
-	${INSTALL_DATA} ${WRKSRC}/examples/localnet.route ${STAGEDIR}${ETCDIR}/localnet.route-dist
-	${INSTALL_DATA} ${WRKSRC}/examples/openssl.route ${STAGEDIR}${ETCDIR}/openssl.route-dist
+	${INSTALL_DATA} ${WRKSRC}/examples/masqmail.conf ${STAGEDIR}${ETCDIR}/masqmail.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/examples/example.route ${STAGEDIR}${ETCDIR}/masqmail.route.sample
+	${INSTALL_DATA} ${WRKSRC}/examples/localnet.route ${STAGEDIR}${ETCDIR}/localnet.route.sample
+	${INSTALL_DATA} ${WRKSRC}/examples/openssl.route ${STAGEDIR}${ETCDIR}/openssl.route.sample
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/docs
 	cd ${WRKSRC} && ${CP} ChangeLog NEWS AUTHORS COPYING README TODO INSTALL THANKS ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/docs/
 
 .include <bsd.port.mk>
Index: head/mail/masqmail/distinfo
===================================================================
--- head/mail/masqmail/distinfo	(revision 378690)
+++ head/mail/masqmail/distinfo	(revision 378691)
@@ -1,2 +1,2 @@
-SHA256 (masqmail-0.3.4.tar.gz) = 1f0db635febc4fa8336a0645f444faf26c9db346d5056f9367206265c83cc06c
-SIZE (masqmail-0.3.4.tar.gz) = 255824
+SHA256 (masqmail-0.3.5.tar.gz) = 030699bdce256f6446239e793e301331e94c4a0124808ce0f7a926ed99b34039
+SIZE (masqmail-0.3.5.tar.gz) = 258302
Index: head/mail/masqmail/files/patch-Makefile.in
===================================================================
--- head/mail/masqmail/files/patch-Makefile.in	(revision 378690)
+++ head/mail/masqmail/files/patch-Makefile.in	(revision 378691)
@@ -1,24 +1,24 @@
---- Makefile.in.orig	2012-04-04 02:18:39.238237978 +0600
-+++ Makefile.in	2012-04-04 02:19:13.710250762 +0600
-@@ -689,7 +689,7 @@
+--- Makefile.in.orig	2015-02-08 16:43:54.226325979 +0600
++++ Makefile.in	2015-02-08 16:45:17.150325866 +0600
+@@ -691,7 +691,7 @@
  	uninstall uninstall-am uninstall-local
  
  
--install-data-local: log_dir spool_dir uid_bit conf_dir tpl_dir run_dir doc_dir rmail
-+install-data-local: uid_bit conf_dir tpl_dir rmail
+-install-data-local: uid_bit tpl_dir doc_dir rmail conf_dir
++install-data-local: tpl_dir rmail conf_dir
  
- uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir rm-conf_dir rm-run_dir rm-spool_dir rm-log_dir
+ uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir rm-dirs
  
-@@ -707,12 +707,6 @@
+@@ -706,12 +706,6 @@
  rm-tpl_dir:
  	rm -rf $(DESTDIR)@datadir@/masqmail/
  
 -doc_dir:
 -	install -d $(DESTDIR)@docdir@
 -	cp -r docs $(DESTDIR)@docdir@
 -	cp -r examples $(DESTDIR)@docdir@
 -	cp ChangeLog NEWS AUTHORS COPYING README TODO INSTALL THANKS $(DESTDIR)@docdir@
 -
  rm-doc_dir:
  	cd $(DESTDIR)@docdir@ && ( \
  	    rm -rf docs examples ; \
Index: head/mail/masqmail/pkg-plist
===================================================================
--- head/mail/masqmail/pkg-plist	(revision 378690)
+++ head/mail/masqmail/pkg-plist	(revision 378691)
@@ -1,52 +1,43 @@
 bin/mservdetect
-@owner mailnull
-@group mail
-%%ETCDIR%%/localnet.route-dist
-%%ETCDIR%%/masqmail.conf-dist
-%%ETCDIR%%/masqmail.route-dist
-%%ETCDIR%%/openssl.route-dist
-@owner
-@group
+@sample(mailnull,mail,) %%ETCDIR%%/localnet.route.sample
+@sample(mailnull,mail,) %%ETCDIR%%/masqmail.conf.sample
+@sample(mailnull,mail,) %%ETCDIR%%/masqmail.route.sample
+@sample(mailnull,mail,) %%ETCDIR%%/openssl.route.sample
 man/man1/mservdetect.1.gz
 man/man5/masqmail.aliases.5.gz
 man/man5/masqmail.conf.5.gz
 man/man5/masqmail.route.5.gz
 man/man8/masqmail.8.gz
 man/man8/rmail.8.gz
 sbin/masqmail
 sbin/rmail
 %%DATADIR%%/tpl/failmsg.tpl
 %%DATADIR%%/tpl/failmsg.tpl.de
 %%DATADIR%%/tpl/failmsg.tpl.fr
 %%DATADIR%%/tpl/failmsg.tpl.it
 %%DATADIR%%/tpl/warnmsg.tpl
 %%DATADIR%%/tpl/warnmsg.tpl.de
 %%DATADIR%%/tpl/warnmsg.tpl.fr
 %%DATADIR%%/tpl/warnmsg.tpl.it
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/docs/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.agenda
 %%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.ipaq
 %%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.linux
 %%PORTDOCS%%%%DOCSDIR%%/docs/README
 %%PORTDOCS%%%%DOCSDIR%%/docs/agenda-config.site
 %%PORTDOCS%%%%DOCSDIR%%/docs/howto-release
 %%PORTDOCS%%%%DOCSDIR%%/docs/howto-report-bugs
 %%PORTDOCS%%%%DOCSDIR%%/docs/howto-static-linking
 %%PORTDOCS%%%%DOCSDIR%%/docs/oem-option
 %%PORTDOCS%%%%DOCSDIR%%/docs/ppp-setup
 %%PORTDOCS%%%%DOCSDIR%%/docs/simple-local-setup
 %%PORTDOCS%%%%DOCSDIR%%/docs/simple-relay-setup
 %%PORTDOCS%%%%DOCSDIR%%/docs/uucp-setup
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/tpl
-@dirrm %%DATADIR%%
-@dirrm %%ETCDIR%%