From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 12 23:10:28 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A61416A4CE for ; Wed, 12 May 2004 23:10:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96D0243D67 for ; Wed, 12 May 2004 23:10:26 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i4D6AOKu054135 for ; Wed, 12 May 2004 23:10:24 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i4D6AOph054134; Wed, 12 May 2004 23:10:24 -0700 (PDT) (envelope-from gnats) Resent-Date: Wed, 12 May 2004 23:10:24 -0700 (PDT) Resent-Message-Id: <200405130610.i4D6AOph054134@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rong-En Fan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 333CA16A4CE for ; Wed, 12 May 2004 23:08:52 -0700 (PDT) Received: from muse.csie.ntu.edu.tw (muse.csie.ntu.edu.tw [140.112.28.158]) by mx1.FreeBSD.org (Postfix) with ESMTP id 784C943D1D for ; Wed, 12 May 2004 23:08:51 -0700 (PDT) (envelope-from rafan@muse.csie.ntu.edu.tw) Received: by muse.csie.ntu.edu.tw (Postfix, from userid 1001) id AFC695252D; Thu, 13 May 2004 14:08:50 +0800 (CST) Message-Id: <20040513060850.AFC695252D@muse.csie.ntu.edu.tw> Date: Thu, 13 May 2004 14:08:50 +0800 (CST) From: Rong-En Fan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Jun Kuriyama Subject: ports/66596: Update Port: mail/mailgrapy by maintainer X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Rong-En Fan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 May 2004 06:10:28 -0000 >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: