Date: Thu, 13 May 2004 14:08:50 +0800 (CST) From: Rong-En Fan <rafan@infor.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Jun Kuriyama <kuriyama@imgsrc.co.jp> Subject: ports/66596: Update Port: mail/mailgrapy by maintainer Message-ID: <20040513060850.AFC695252D@muse.csie.ntu.edu.tw> Resent-Message-ID: <200405130610.i4D6AOph054134@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 66596 >Category: ports >Synopsis: Update Port: mail/mailgrapy by maintainer >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 12 23:10:24 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Rong-En Fan >Release: FreeBSD 4.9-RELEASE-p4 i386 >Organization: NTU CSIE >Environment: System: FreeBSD muse.csie.ntu.edu.tw 4.9-RELEASE-p4 FreeBSD 4.9-RELEASE-p4 #4: Mon Mar 22 00:36:52 CST 2004 root@muse.csie.ntu.edu.tw:/home/admin/usr/obj/home/admin/usr/src/sys/MUSE i386 >Description: Let user specify rrd database path, user/group to run mailgraph. Thanks Jun Kuriyama for original patch. >How-To-Repeat: >Fix: diff -ruN mailgraph.orig/Makefile mailgraph/Makefile --- mailgraph.orig/Makefile Thu May 13 13:53:35 2004 +++ mailgraph/Makefile Thu May 13 14:01:13 2004 @@ -7,7 +7,7 @@ PORTNAME= mailgraph PORTVERSION= 1.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://people.ee.ethz.ch/~dws/software/mailgraph/pub/ \ http://people.ee.ethz.ch/~dws/software/mailgraph/pub/old/ @@ -20,16 +20,28 @@ NO_BUILD= yes -DATADIR= /var/db/mailgraph +DATADIR?= /var/db/mailgraph +MAILGRAPH_USER?= www +MAILGRAPH_GROUP?= www USE_REINPLACE= yes USE_RC_SUBR= yes -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} DATADIR=${DATADIR} +RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} DATADIR=${DATADIR} \ + MAILGRAPH_USER=${MAILGRAPH_USER} MAILGRAPH_GROUP=${MAILGRAPH_GROUP} STARTUP_FILE= ${PREFIX}/etc/rc.d/mailgraph.sh MSG_FILE= ${PKGDIR}/pkg-message PKGMESSAGE= ${WRKSRC}/pkg-message +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} "MAILGRAPH_USER=www User to run mailgraph" + @${ECHO_MSG} "MAILGRAPH_GROUP=www Group to run mailgraph" + @${ECHO_MSG} + post-patch: @${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/mailgraph.cgi @${SED} 's|%%DATADIR%%|${DATADIR}|g' ${MSG_FILE} > ${PKGMESSAGE} @@ -37,7 +49,7 @@ do-install: ${MKDIR} ${PREFIX}/www/cgi-bin ${MKDIR} ${DATADIR} - @${CHOWN} www:www ${DATADIR} + @${CHOWN} -R ${MAILGRAPH_USER}:${MAILGRAPH_GROUP} ${DATADIR} @${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.pl ${PREFIX}/sbin @${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.cgi ${PREFIX}/www/cgi-bin @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ diff -ruN mailgraph.orig/files/mailgraph.sh.tmpl mailgraph/files/mailgraph.sh.tmpl --- mailgraph.orig/files/mailgraph.sh.tmpl Thu May 13 13:53:35 2004 +++ mailgraph/files/mailgraph.sh.tmpl Thu May 13 13:57:27 2004 @@ -28,7 +28,8 @@ mailgraph_enable=${mailgraph_enable:-"NO"} mailgraph_pidfile=${mailgraph_pidfile:-"%%DATADIR%%/mailgraph.pid"} mailgraph_flags=${mailgraph_flags:-"--logfile /var/log/maillog --daemon-rrd=%%DATADIR%% --ignore-localhost --daemon --daemon-pid=${mailgraph_pidfile}"} -mailgraph_user=${mailgraph_user:-"www"} +mailgraph_user=${mailgraph_user:-"%%MAILGRAPH_USER%%"} +mailgraph_group=${mailgraph_group:-"%%MAILGRAPH_GROUP%%"} mailgraph_chdir=${mailgraph_chdir:-"%%DATADIR%%"} load_rc_config $name >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040513060850.AFC695252D>