Date: Tue, 8 Jul 2014 14:14:22 +0000 From: Steve Wills <swills@freebsd.org> To: Alexey Dokuchaev <danfe@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r361223 - in head/mail/couriergraph: . files Message-ID: <20140708141419.GA17378@mouf.net> In-Reply-To: <201407081152.s68BqOg2024142@svn.freebsd.org> References: <201407081152.s68BqOg2024142@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--gKMricLos+KVdGMg Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, Slight issue here: https://jenkins.freebsd.org/pci/head-amd64/poudriere/data/headamd64-default= /580/logs/errors/couriergraph-20060202_3.log https://jenkins.freebsd.org/pci/head-i386/poudriere/data/headi386-default/5= 80/logs/errors/couriergraph-20060202_3.log =3D=3D=3D=3D> Running Q/A tests (stage-qa) Error: '/usr/bin/perl' is an invalid shebang you need USES=3Dshebangfix for= 'sbin/couriergraph.pl' Should be an easy fix. Thanks! Steve On Tue, Jul 08, 2014 at 11:52:24AM +0000, Alexey Dokuchaev wrote: > 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/ >=20 > 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 >=20 > 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 >=20 > Modified: head/mail/couriergraph/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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$ > =20 > PORTNAME=3D couriergraph > PORTVERSION=3D 20060202 > PORTREVISION=3D 3 > CATEGORIES=3D mail > -MASTER_SITES=3D ftp://ftp.oav.net/couriergraph/ > -DIST_SUBDIR=3D ${PORTNAME} > +MASTER_SITES=3D http://www.arschkrebs.de/postfix/${PORTNAME}/ > +DISTNAME=3D ${PORTNAME} > =20 > -MAINTAINER=3D ports@FreeBSD.org > +MAINTAINER=3D ports@FreeBSD.org > COMMENT=3D RRDtool frontend for Courier statistics > =20 > -RUN_DEPENDS=3D rrdtool>=3D0:${PORTSDIR}/databases/rrdtool \ > +RUN_DEPENDS=3D rrdtool>=3D0:${PORTSDIR}/databases/rrdtool \ > p5-File-Tail>=3D0:${PORTSDIR}/devel/p5-File-Tail > =20 > -NO_BUILD=3D yes > USES=3D perl5 > +USE_PERL5=3D run > +USE_RC_SUBR=3D ${PORTNAME} > +NO_BUILD=3D yes > +WRKSRC=3D ${WRKDIR}/${PORTNAME}-${PORTVERSION} > =20 > DATADIR?=3D /var/db/couriergraph > COURIERGRAPH_USER?=3D ${WWWOWN} > COURIERGRAPH_GROUP?=3D ${WWWGRP} > =20 > -USE_RC_SUBR=3D ${PORTNAME} > -SUB_LIST+=3D COURIERGRAPH_USER=3D${COURIERGRAPH_USER} COURIERGRAPH_GROUP= =3D${COURIERGRAPH_GROUP} > - > +SUB_LIST=3D COURIERGRAPH_USER=3D${COURIERGRAPH_USER} \ > + COURIERGRAPH_GROUP=3D${COURIERGRAPH_GROUP} > STARTUP_FILE=3D ${PREFIX}/etc/rc.d/couriergraph.sh > =20 > SUB_FILES=3D pkg-message > =20 > -NO_STAGE=3D 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=3D/var/db/couriergraph Where do you put RRD data= bases?" > - @${ECHO_MSG} "COURIERGRAPH_USER=3Dwww User to run couriergraph (Defau= lt: ${WWWOWN})" > - @${ECHO_MSG} "COURIERGRAPH_GROUP=3Dwww Group to run couriergraph (Def= ault: ${WWWGRP})" > + @${ECHO_MSG} "DATADIR=3D/var/db/couriergraph Where do you put RRD datab= ases?" > + @${ECHO_MSG} "COURIERGRAPH_USER=3Dwww User to run couriergraph (defaul= t: ${WWWOWN})" > + @${ECHO_MSG} "COURIERGRAPH_GROUP=3Dwww Group to run couriergraph (defa= ult: ${WWWGRP})" > @${ECHO_MSG} > =20 > +# To avoid conflict between default WRKSRC and RC_SUBR file being the sa= me > post-extract: > @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} > =20 > post-patch: > - @${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/couriergraph= =2Ecgi > - @${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/couriergraph= =2Epl > + @${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," \ > + ${WRKSRC}/couriergraph.cgi ${WRKSRC}/couriergraph.pl > =20 > 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 > =20 > .include <bsd.port.mk> >=20 > Modified: head/mail/couriergraph/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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) =3D 3159948a122d808e9= 0567a12ad7db4031b5e47e9ec6c7e90f6fc3283eb0cdc7f > -SIZE (couriergraph/couriergraph-20060202.tar.gz) =3D 7559 > +SHA256 (couriergraph.tar.gz) =3D 3159948a122d808e90567a12ad7db4031b5e47e= 9ec6c7e90f6fc3283eb0cdc7f > +SIZE (couriergraph.tar.gz) =3D 7559 >=20 > Modified: head/mail/couriergraph/files/couriergraph.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3Dstop_postcmd > =20 > stop_postcmd() > { > - rm -f $pidfile > + rm -f $pidfile > } > =20 > couriergraph_enable=3D${couriergraph_enable:-"NO"} >=20 > Modified: head/mail/couriergraph/files/pkg-message.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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. > =20 > - > *** WARNING *** > =20 > -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%%. >=20 > Modified: head/mail/couriergraph/pkg-descr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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. > =20 > -WWW: http://www.stahl.bau.tu-bs.de/~hildeb/postfix/couriergraph/ > +WWW: http://www.arschkrebs.de/postfix/couriergraph/ --gKMricLos+KVdGMg Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJTu/y6AAoJEPXPYrMgexuh1lAH/iVH5tCbSHQ5XNUVsn1YhBPw p0i+ayxJjy1MKIl01sW5EfkNZHsQQYalIUlrbwd4wX7Vh0nGF7Rffby7+N/I4ztn ep8U8mpA7WFn9wkJhs8PZXJpnKLZbbxzgACHqjYctcmtgNHLi6JhX41uWH8CqVC5 YetjRoUmzMgZxBgujgO13A39FYjWe1Qf++996u5nXfqH6H+yZuXB9gL8grdSk4Uz MTyPVnNj1/WrW6nOLLYZWBnlvAltYXJTSyWBxa+qu6jSTUxHrLJ3Ea8Ku92nQ6JJ CyOGdMm/tifWmPcvN++crAD6pXDor6YzJ2OggU2+d/tVVl+ZjsGkCtNIhusNSZ8= =YPbf -----END PGP SIGNATURE----- --gKMricLos+KVdGMg--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140708141419.GA17378>