- Update to 1.13 [1]

- Refine pkg-message [2]

PR:		ports/111707 [1]
Submitted by:	Olli Hauer <ohauer at gmx.de> [1]
Suggested by:	Dan Langille [2]

4 files changed, 28 insertions, 20 deletions

diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index 1510ed2c4128..07312b95bff3 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	mailgraph
-PORTVERSION=	1.12
-PORTREVISION=	1
+PORTVERSION=	1.13
 CATEGORIES=	mail
-MASTER_SITES=	http://people.ee.ethz.ch/~dws/software/mailgraph/pub/ \
-		http://people.ee.ethz.ch/~dws/software/mailgraph/pub/old/
+MASTER_SITES=	http://mailgraph.schweikert.ch/pub/ \
+		http://mailgraph.schweikert.ch/pub/old/
 
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	A RRDtool frontend for Postfix statistics
@@ -30,14 +29,19 @@ SUB_LIST+=	MAILGRAPH_USER=${MAILGRAPH_USER} MAILGRAPH_GROUP=${MAILGRAPH_GROUP}
 MSG_FILE=	${PKGDIR}/pkg-message
 PKGMESSAGE=	${WRKSRC}/pkg-message
 
+DOCS=		README CHANGES
+.if !defined(NOPORTDOCS)
+PORTDOCS=	${DOCS}
+.endif
+
 pre-everything::
-	@${ECHO_MSG}
+	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may set following options:"
-	@${ECHO_MSG}
+	@${ECHO_MSG} ""
 	@${ECHO_MSG} "DATADIR=/var/db/mailgraph		Where do you put RRD databases?"
 	@${ECHO_MSG} "MAILGRAPH_USER=www			User to run mailgraph (Default: ${WWWOWN})"
 	@${ECHO_MSG} "MAILGRAPH_GROUP=www			Group to run mailgraph (Default: ${WWWGRP})"
-	@${ECHO_MSG}
+	@${ECHO_MSG} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/mailgraph.cgi
@@ -49,10 +53,16 @@ do-install:
 	@${CHOWN} -R ${MAILGRAPH_USER}:${MAILGRAPH_GROUP} ${DATADIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.pl ${TARGETDIR}/sbin
 	@${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.cgi ${TARGETDIR}/www/cgi-bin
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	for f in ${DOCS}; do \
+	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
+	done
+.endif
 
 post-install:
-	@${ECHO}
+	@${ECHO_MSG} ""
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO}
+	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/mail/mailgraph/distinfo b/mail/mailgraph/distinfo
index de5d7a39e890..63920ae6d92c 100644
--- a/mail/mailgraph/distinfo
+++ b/mail/mailgraph/distinfo
@@ -1,3 +1,3 @@
-MD5 (mailgraph-1.12.tar.gz) = e3c88ee9ff6e423942ff8ce7038449c4
-SHA256 (mailgraph-1.12.tar.gz) = 7ff3b56654fef85180abcece7d4ae42ac173a0815d728ae1c406c8e48dc56e7c
-SIZE (mailgraph-1.12.tar.gz) = 20053
+MD5 (mailgraph-1.13.tar.gz) = b59cc2375662f6c113c6be2ab5bfa179
+SHA256 (mailgraph-1.13.tar.gz) = f08476371b59b1e2313b388e962e6ff968432d4b66520c11e8b05ff7e968c6c8
+SIZE (mailgraph-1.13.tar.gz) = 21322
diff --git a/mail/mailgraph/pkg-descr b/mail/mailgraph/pkg-descr
index 3f07a1ade80e..1e9dc0ef442e 100644
--- a/mail/mailgraph/pkg-descr
+++ b/mail/mailgraph/pkg-descr
@@ -2,4 +2,4 @@ Mailgraph is a very simple mail statistics RRDtool frontend for Postfix
 that produces daily, weekly, monthly and yearly graphs of received/sent
 and bounced/rejected mail.
 
-WWW: http://people.ee.ethz.ch/~dws/software/mailgraph/
+WWW: http://mailgraph.schweikert.ch/
diff --git a/mail/mailgraph/pkg-message b/mail/mailgraph/pkg-message
index 9a5a40aa6f4b..193590d59ece 100644
--- a/mail/mailgraph/pkg-message
+++ b/mail/mailgraph/pkg-message
@@ -1,13 +1,11 @@
 Edit /etc/rc.conf and set
 
-mailgraph_enable="YES"
+  mailgraph_enable="YES"
 
-to enable mailgraph.
+to enable mailgraph. 
 
 Make sure this script should be invoked with privilege to read
-/var/log/maillog.
+/var/log/maillog. For example, you may change the permission of
+maillog to be 644. Another way is to make maillog owned by
+the mail group, and put mailgraph_user in that group. 
 
-*** WARNING ***
-
-The rrd database has been moved to %%DATADIR%%.
-If you have previous ones, please move them to %%DATADIR%%.