Date: Tue, 8 Jul 2014 11:52:24 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361223 - in head/mail/couriergraph: . files Message-ID: <201407081152.s68BqOg2024142@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Jul 8 11:52:24 2014 New Revision: 361223 URL: http://svnweb.freebsd.org/changeset/ports/361223 QAT: https://qat.redports.org/buildarchive/r361223/ Log: - Stagify; cleanup installation routine; fix whitespace - Add missing USE_PERL5 (run) - Explain the need for non-obvious move (post-extract) - Point MASTER_SITES and WWW line to a working website Modified: head/mail/couriergraph/Makefile head/mail/couriergraph/distinfo head/mail/couriergraph/files/couriergraph.in head/mail/couriergraph/files/pkg-message.in head/mail/couriergraph/pkg-descr Modified: head/mail/couriergraph/Makefile ============================================================================== --- head/mail/couriergraph/Makefile Tue Jul 8 11:47:14 2014 (r361222) +++ head/mail/couriergraph/Makefile Tue Jul 8 11:52:24 2014 (r361223) @@ -1,60 +1,60 @@ -# Created by: Xavier Beaudouin (kiwi@oav.net) +# Created by: Xavier Beaudouin <kiwi@oav.net> # $FreeBSD$ PORTNAME= couriergraph PORTVERSION= 20060202 PORTREVISION= 3 CATEGORIES= mail -MASTER_SITES= ftp://ftp.oav.net/couriergraph/ -DIST_SUBDIR= ${PORTNAME} +MASTER_SITES= http://www.arschkrebs.de/postfix/${PORTNAME}/ +DISTNAME= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= RRDtool frontend for Courier statistics -RUN_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool \ +RUN_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool \ p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail -NO_BUILD= yes USES= perl5 +USE_PERL5= run +USE_RC_SUBR= ${PORTNAME} +NO_BUILD= yes +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DATADIR?= /var/db/couriergraph COURIERGRAPH_USER?= ${WWWOWN} COURIERGRAPH_GROUP?= ${WWWGRP} -USE_RC_SUBR= ${PORTNAME} -SUB_LIST+= COURIERGRAPH_USER=${COURIERGRAPH_USER} COURIERGRAPH_GROUP=${COURIERGRAPH_GROUP} - +SUB_LIST= COURIERGRAPH_USER=${COURIERGRAPH_USER} \ + COURIERGRAPH_GROUP=${COURIERGRAPH_GROUP} STARTUP_FILE= ${PREFIX}/etc/rc.d/couriergraph.sh SUB_FILES= pkg-message -NO_STAGE= yes pre-everything:: @${ECHO_MSG} - @${ECHO_MSG} "You may set following options:" + @${ECHO_MSG} "You may set the following options:" @${ECHO_MSG} - @${ECHO_MSG} "DATADIR=/var/db/couriergraph Where do you put RRD databases?" - @${ECHO_MSG} "COURIERGRAPH_USER=www User to run couriergraph (Default: ${WWWOWN})" - @${ECHO_MSG} "COURIERGRAPH_GROUP=www Group to run couriergraph (Default: ${WWWGRP})" + @${ECHO_MSG} "DATADIR=/var/db/couriergraph Where do you put RRD databases?" + @${ECHO_MSG} "COURIERGRAPH_USER=www User to run couriergraph (default: ${WWWOWN})" + @${ECHO_MSG} "COURIERGRAPH_GROUP=www Group to run couriergraph (default: ${WWWGRP})" @${ECHO_MSG} +# To avoid conflict between default WRKSRC and RC_SUBR file being the same post-extract: @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} post-patch: - @${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/couriergraph.cgi - @${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/couriergraph.pl + @${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," \ + ${WRKSRC}/couriergraph.cgi ${WRKSRC}/couriergraph.pl do-install: - ${MKDIR} ${PREFIX}/www/cgi-bin - ${MKDIR} ${DATADIR} - @${CHOWN} -R ${COURIERGRAPH_USER}:${COURIERGRAPH_GROUP} ${DATADIR} - @${INSTALL_SCRIPT} ${WRKSRC}/couriergraph.pl ${PREFIX}/sbin - @${INSTALL_SCRIPT} ${WRKSRC}/couriergraph.cgi ${PREFIX}/www/cgi-bin - -post-install: - @${ECHO} - @${CAT} ${PKGMESSAGE} - @${ECHO} + @${MKDIR} ${STAGEDIR}${PREFIX}/www/cgi-bin + @${MKDIR} ${STAGEDIR}${DATADIR} + @${CHOWN} -R ${COURIERGRAPH_USER}:${COURIERGRAPH_GROUP} \ + ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/couriergraph.pl \ + ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/couriergraph.cgi \ + ${STAGEDIR}${PREFIX}/www/cgi-bin .include <bsd.port.mk> Modified: head/mail/couriergraph/distinfo ============================================================================== --- head/mail/couriergraph/distinfo Tue Jul 8 11:47:14 2014 (r361222) +++ head/mail/couriergraph/distinfo Tue Jul 8 11:52:24 2014 (r361223) @@ -1,2 +1,2 @@ -SHA256 (couriergraph/couriergraph-20060202.tar.gz) = 3159948a122d808e90567a12ad7db4031b5e47e9ec6c7e90f6fc3283eb0cdc7f -SIZE (couriergraph/couriergraph-20060202.tar.gz) = 7559 +SHA256 (couriergraph.tar.gz) = 3159948a122d808e90567a12ad7db4031b5e47e9ec6c7e90f6fc3283eb0cdc7f +SIZE (couriergraph.tar.gz) = 7559 Modified: head/mail/couriergraph/files/couriergraph.in ============================================================================== --- head/mail/couriergraph/files/couriergraph.in Tue Jul 8 11:47:14 2014 (r361222) +++ head/mail/couriergraph/files/couriergraph.in Tue Jul 8 11:52:24 2014 (r361223) @@ -23,7 +23,7 @@ stop_postcmd=stop_postcmd stop_postcmd() { - rm -f $pidfile + rm -f $pidfile } couriergraph_enable=${couriergraph_enable:-"NO"} Modified: head/mail/couriergraph/files/pkg-message.in ============================================================================== --- head/mail/couriergraph/files/pkg-message.in Tue Jul 8 11:47:14 2014 (r361222) +++ head/mail/couriergraph/files/pkg-message.in Tue Jul 8 11:52:24 2014 (r361223) @@ -1,8 +1,7 @@ Make sure this script should be invoked with privilege to read /var/log/maillog. - *** WARNING *** -The rrd database has been moved to %%DATADIR%%. +The RRD database has been moved to %%DATADIR%%. If you have previous ones, please move them to %%DATADIR%%. Modified: head/mail/couriergraph/pkg-descr ============================================================================== --- head/mail/couriergraph/pkg-descr Tue Jul 8 11:47:14 2014 (r361222) +++ head/mail/couriergraph/pkg-descr Tue Jul 8 11:52:24 2014 (r361223) @@ -2,4 +2,4 @@ Couriergraph is a very simple mail stati that produces daily, weekly, monthly and yearly graphs of Courier's POP3, IMAP, POP3s and IMAPs logins. -WWW: http://www.stahl.bau.tu-bs.de/~hildeb/postfix/couriergraph/ +WWW: http://www.arschkrebs.de/postfix/couriergraph/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407081152.s68BqOg2024142>