diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile index 36a1f3bd38ed..8b2d282962e6 100644 --- a/mail/mailgraph/Makefile +++ b/mail/mailgraph/Makefile @@ -1,58 +1,58 @@ PORTNAME= mailgraph PORTVERSION= 1.14 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= mail MASTER_SITES= http://mailgraph.schweikert.ch/pub/ \ http://mailgraph.schweikert.ch/pub/old/ MAINTAINER= dgeo@centrale-med.fr COMMENT= RRDtool frontend for Postfix statistics WWW= https://mailgraph.schweikert.ch/ RUN_DEPENDS= rrdtool>=0:databases/rrdtool \ p5-File-Tail>=0:devel/p5-File-Tail NO_BUILD= yes USES= perl5 shebangfix SHEBANG_FILES= mailgraph.pl mailgraph.cgi CGIDIR?= ${PREFIX}/www/cgi-bin DATADIR?= /var/db/mailgraph WWWROOT?= ${PREFIX}/www/data MAILGRAPH_USER?= ${WWWOWN} MAILGRAPH_GROUP?= ${WWWGRP} USE_RC_SUBR= ${PORTNAME} SUB_LIST+= MAILGRAPH_USER=${MAILGRAPH_USER} MAILGRAPH_GROUP=${MAILGRAPH_GROUP} PERL=${PERL} PLIST_SUB= CGIDIR=${CGIDIR:S,${PREFIX}/,,} WWWROOT=${WWWROOT:S,${PREFIX}/,,} OPTIONS_DEFINE= DOCS DOCS= README CHANGES PORTDOCS= ${DOCS} pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "You may set following options:" @${ECHO_MSG} "" @${ECHO_MSG} "DATADIR=/var/db/mailgraph Where do you put RRD databases?" @${ECHO_MSG} "CGIDIR=${PREFIX}/www/cgi-bin Where do you put cgi?" @${ECHO_MSG} "WWWROOT=${PREFIX}/www/data Where do you put httpd's document root?" @${ECHO_MSG} "MAILGRAPH_USER=www User to run mailgraph (Default: ${WWWOWN})" @${ECHO_MSG} "" post-patch: @${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/mailgraph.cgi do-install: ${MKDIR} ${STAGEDIR}${CGIDIR} ${MKDIR} ${STAGEDIR}${WWWROOT}/mailgraph @${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.pl ${STAGEDIR}${PREFIX}/sbin @${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.cgi ${STAGEDIR}${CGIDIR} @${INSTALL_DATA} ${WRKSRC}/mailgraph.css ${STAGEDIR}${WWWROOT}/mailgraph ${MKDIR} ${STAGEDIR}${DOCSDIR} for f in ${DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$$f ${STAGEDIR}${DOCSDIR}; \ done .include diff --git a/mail/mailgraph/files/patch-mailgraph.cgi b/mail/mailgraph/files/patch-mailgraph.cgi index dd55a0b4694c..d97068626d08 100644 --- a/mail/mailgraph/files/patch-mailgraph.cgi +++ b/mail/mailgraph/files/patch-mailgraph.cgi @@ -1,22 +1,64 @@ +Add fix from https://github.com/schweikert/mailgraph/pull/23: ("removed version checks to tackle rrdtool pr #1331 - #23") + --- mailgraph.cgi.orig Wed Aug 29 17:06:01 2007 +++ mailgraph.cgi Thu Sep 6 22:46:09 2007 @@ -16,8 +16,8 @@ my $points_per_sample = 3; my $ypoints = 160; my $ypoints_err = 96; -my $rrd = 'mailgraph.rrd'; # path to where the RRD database is -my $rrd_virus = 'mailgraph_virus.rrd'; # path to where the Virus RRD database is +my $rrd = '%%DATADIR%%/mailgraph.rrd'; # path to where the RRD database is +my $rrd_virus = '%%DATADIR%%/mailgraph_virus.rrd'; # path to where the Virus RRD database is my $tmp_dir = '/tmp/mailgraph'; # temporary directory where to store the images my @graphs = ( +@@ -43,7 +43,7 @@ + # choose carefully the end otherwise rrd will maybe pick the wrong RRA: + my $end = time; $end -= $end % $step; + my $date = localtime(time); +- $date =~ s|:|\\:|g unless $RRDs::VERSION < 1.199908; ++ $date =~ s|:|\\:|g; + + my ($graphret,$xs,$ys) = RRDs::graph($file, + '--imgformat', 'PNG', +@@ -59,14 +59,14 @@ + '--color', 'SHADEB#ffffff', + '--color', 'BACK#ffffff', + +- $RRDs::VERSION < 1.2002 ? () : ( '--slope-mode'), ++ '--slope-mode', + + @rrdargs, + + 'COMMENT:['.$date.']\r', + ); + +- my $ERR=RRDs::error; ++ my $ERR = RRDs::error; + die "ERROR: $ERR\n" if $ERR; + } + @@ -163,7 +163,7 @@ Mail statistics for $host - + HEADER +@@ -185,10 +185,10 @@ + print < + ++Mailgraph $VERSION ++by David Schweikert +
+-Mailgraph $VERSION +-by David Schweikert +- ++ +
+ + FOOTER