svn commit: r378691 - in head/mail/masqmail: . files

[Muhammad Moinur Rahman]

Author: bofh
Date: Sun Feb  8 21:55:07 2015
New Revision: 378691
URL: https://svnweb.freebsd.org/changeset/ports/378691
QAT: https://qat.redports.org/buildarchive/r378691/

Log:
  mail/masqmail: Update version 0.3.=>0.3.5
  
  - Make use of @sample
  - Make use of @(user,group,mode)
  - Remove depricated @dir* and cleanup pkg-plist
  
  Approved by:	bapt marino (implicit)

Modified:
  head/mail/masqmail/Makefile
  head/mail/masqmail/distinfo
  head/mail/masqmail/files/patch-Makefile.in
  head/mail/masqmail/pkg-plist

Modified: head/mail/masqmail/Makefile
==============================================================================
--- head/mail/masqmail/Makefile	Sun Feb  8 21:44:03 2015	(r378690)
+++ head/mail/masqmail/Makefile	Sun Feb  8 21:55:07 2015	(r378691)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	masqmail
-PORTVERSION=	0.3.4
-PORTREVISION=	1
+PORTVERSION=	0.3.5
 CATEGORIES=	mail
 MASTER_SITES=	http://marmaro.de/prog/masqmail/files/
 
@@ -34,10 +33,10 @@ post-patch:
 
 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/

Modified: head/mail/masqmail/distinfo
==============================================================================
--- head/mail/masqmail/distinfo	Sun Feb  8 21:44:03 2015	(r378690)
+++ head/mail/masqmail/distinfo	Sun Feb  8 21:55:07 2015	(r378691)
@@ -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

Modified: head/mail/masqmail/files/patch-Makefile.in
==============================================================================
--- head/mail/masqmail/files/patch-Makefile.in	Sun Feb  8 21:44:03 2015	(r378690)
+++ head/mail/masqmail/files/patch-Makefile.in	Sun Feb  8 21:55:07 2015	(r378691)
@@ -1,15 +1,15 @@
---- 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/
  

Modified: head/mail/masqmail/pkg-plist
==============================================================================
--- head/mail/masqmail/pkg-plist	Sun Feb  8 21:44:03 2015	(r378690)
+++ head/mail/masqmail/pkg-plist	Sun Feb  8 21:55:07 2015	(r378691)
@@ -1,12 +1,8 @@
 bin/mservdetect
- at owner mailnull
- at group mail
-%%ETCDIR%%/localnet.route-dist
-%%ETCDIR%%/masqmail.conf-dist
-%%ETCDIR%%/masqmail.route-dist
-%%ETCDIR%%/openssl.route-dist
- at owner
- at group
+ at sample(mailnull,mail,) %%ETCDIR%%/localnet.route.sample
+ at sample(mailnull,mail,) %%ETCDIR%%/masqmail.conf.sample
+ at sample(mailnull,mail,) %%ETCDIR%%/masqmail.route.sample
+ at sample(mailnull,mail,) %%ETCDIR%%/openssl.route.sample
 man/man1/mservdetect.1.gz
 man/man5/masqmail.aliases.5.gz
 man/man5/masqmail.conf.5.gz
@@ -45,8 +41,3 @@ sbin/rmail
 %%PORTDOCS%%%%DOCSDIR%%/docs/simple-local-setup
 %%PORTDOCS%%%%DOCSDIR%%/docs/simple-relay-setup
 %%PORTDOCS%%%%DOCSDIR%%/docs/uucp-setup
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm %%DATADIR%%/tpl
- at dirrm %%DATADIR%%
- at dirrm %%ETCDIR%%