Date: Sun, 15 May 2011 03:44:22 GMT From: Ryan Steinmetz <rpsfa@rit.edu> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/157051: [maintainer-update] net-mgmt/pmacct Message-ID: <201105150344.p4F3iMLT092393@red.freebsd.org> Resent-Message-ID: <201105150350.p4F3o3I0078839@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157051 >Category: ports >Synopsis: [maintainer-update] net-mgmt/pmacct >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: Sun May 15 03:50:02 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Ryan Steinmetz >Release: 8.2-RELEASE >Organization: Rochester Institute of Technology >Environment: >Description: -Include SQL files/instructions in port install -Add rc script -Fix incorrect use of CONFIGURE_ENV in Makefile -Add second mirror to MASTER_SITES >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN /usr/ports/net-mgmt/pmacct/Makefile pmacct/Makefile --- /usr/ports/net-mgmt/pmacct/Makefile 2011-01-09 22:01:04.000000000 -0500 +++ pmacct/Makefile 2011-05-14 23:33:23.000000000 -0400 @@ -7,15 +7,19 @@ PORTNAME= pmacct DISTVERSION= 0.12.5 +PORTREVISION= 1 CATEGORIES= net-mgmt -MASTER_SITES= http://www.pmacct.net/ +MASTER_SITES= http://www.pmacct.net/ \ + http://people.rit.edu/rpsfa/ MAINTAINER= rpsfa@rit.edu COMMENT= Accounting and aggregation tool for IPv4 and IPv6 traffic +USE_RC_SUBR= pmacctd.sh +SUB_FILES= pkg-message GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= "-I${LOCALBASE}/include" +LDFLAGS= "-L${LOCALBASE}/lib" OPTIONS= MYSQL "Enable MySQL support." Off \ PGSQL "Enable PostgreSQL support." Off \ @@ -93,5 +97,8 @@ ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif + @${MKDIR} ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/sql/* ${DATADIR} + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff -urN /usr/ports/net-mgmt/pmacct/files/pkg-message.in pmacct/files/pkg-message.in --- /usr/ports/net-mgmt/pmacct/files/pkg-message.in 1969-12-31 19:00:00.000000000 -0500 +++ pmacct/files/pkg-message.in 2011-05-14 23:33:00.000000000 -0400 @@ -0,0 +1,17 @@ +========================================================================= +Please note that this port requires configuration before it will function + +Add these to /etc/rc.conf: +pmacctd_enable="YES" +pmacctd_flags="-DF %%PREFIX%%/etc/pmacctd.conf -i <interface>" + +Configuration examples are located in %%EXAMPLESDIR%%. You must copy +one of these to %%PREFIX%%/etc/pmacctd.conf and make any required edits +for your environment. + +Database-related files/information can be found in %%DATADIR%%. + +Additional documentation is available at: +WWW: http://wiki.pmacct.net/ +========================================================================= + diff -urN /usr/ports/net-mgmt/pmacct/files/pmacctd.sh.in pmacct/files/pmacctd.sh.in --- /usr/ports/net-mgmt/pmacct/files/pmacctd.sh.in 1969-12-31 19:00:00.000000000 -0500 +++ pmacct/files/pmacctd.sh.in 2011-05-14 10:47:32.000000000 -0400 @@ -0,0 +1,36 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: pmacctd +# REQUIRE: NETWORKING +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable pmacctd: +# +# pmacctd_enable="YES" +# +# You can define flags for pmacctd running. See pmacctd(8) for details. +# +# Example: +# pmacctd_flags="-Df ${PREFIX}/etc/pmacctd.conf -i em0" +# +# Default flags: -Df ${PREFIX}/etc/pmacctd.conf +# + +. /etc/rc.subr + +name=pmacctd +rcvar=`set_rcvar` + +command=%%PREFIX%%/$name + +# set defaults + +pmacctd_enable=${pmacctd_enable:-"NO"} +pmacctd_flags=${pmacctd_flags:-"-Df %%PREFIX%%/etc/pmacctd.conf"} + +load_rc_config $name +run_rc_command "$1" diff -urN /usr/ports/net-mgmt/pmacct/pkg-plist pmacct/pkg-plist --- /usr/ports/net-mgmt/pmacct/pkg-plist 2011-01-09 22:01:04.000000000 -0500 +++ pmacct/pkg-plist 2011-05-14 10:39:52.000000000 -0400 @@ -5,6 +5,45 @@ sbin/pmacctd sbin/sfacctd sbin/uacctd +%%DATADIR%%/README.64bit +%%DATADIR%%/README.IPv6 +%%DATADIR%%/README.agent_id2 +%%DATADIR%%/README.cos +%%DATADIR%%/README.iface +%%DATADIR%%/README.is_symmetric +%%DATADIR%%/README.mask +%%DATADIR%%/README.mysql +%%DATADIR%%/README.pgsql +%%DATADIR%%/README.sqlite3 +%%DATADIR%%/pmacct-create-db.pgsql +%%DATADIR%%/pmacct-create-db_bgp_v1.mysql +%%DATADIR%%/pmacct-create-db_v1.mysql +%%DATADIR%%/pmacct-create-db_v2.mysql +%%DATADIR%%/pmacct-create-db_v3.mysql +%%DATADIR%%/pmacct-create-db_v4.mysql +%%DATADIR%%/pmacct-create-db_v5.mysql +%%DATADIR%%/pmacct-create-db_v6.mysql +%%DATADIR%%/pmacct-create-db_v7.mysql +%%DATADIR%%/pmacct-create-db_v8.mysql +%%DATADIR%%/pmacct-create-table_bgp_v1.pgsql +%%DATADIR%%/pmacct-create-table_bgp_v1.sqlite3 +%%DATADIR%%/pmacct-create-table_v1.pgsql +%%DATADIR%%/pmacct-create-table_v1.sqlite3 +%%DATADIR%%/pmacct-create-table_v2.pgsql +%%DATADIR%%/pmacct-create-table_v2.sqlite3 +%%DATADIR%%/pmacct-create-table_v3.pgsql +%%DATADIR%%/pmacct-create-table_v3.sqlite3 +%%DATADIR%%/pmacct-create-table_v4.pgsql +%%DATADIR%%/pmacct-create-table_v4.sqlite3 +%%DATADIR%%/pmacct-create-table_v5.pgsql +%%DATADIR%%/pmacct-create-table_v5.sqlite3 +%%DATADIR%%/pmacct-create-table_v6.pgsql +%%DATADIR%%/pmacct-create-table_v6.sqlite3 +%%DATADIR%%/pmacct-create-table_v7.pgsql +%%DATADIR%%/pmacct-create-table_v7.sqlite3 +%%DATADIR%%/pmacct-create-table_v8.sqlite3 +%%DATADIR%%/pmacct-grant-db.mysql +@dirrmtry %%DATADIR%% %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/EXAMPLES %%PORTDOCS%%%%DOCSDIR%%/FAQS >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105150344.p4F3iMLT092393>