aboutsummaryrefslogtreecommitdiff
path: root/net-mgmt/pmacct
diff options
context:
space:
mode:
authorRyan Steinmetz <zi@FreeBSD.org>2013-01-15 19:38:19 +0000
committerRyan Steinmetz <zi@FreeBSD.org>2013-01-15 19:38:19 +0000
commit7653e201b70e00592e6c95063a04f4795c910fcb (patch)
tree97f6aad0d9d4d2ec7eedbb45132d5249868788d3 /net-mgmt/pmacct
parent36c535078feeaab08cbb46fad62c76f9608e2801 (diff)
downloadports-7653e201b70e00592e6c95063a04f4795c910fcb.tar.gz
ports-7653e201b70e00592e6c95063a04f4795c910fcb.zip
- Update to 0.14.2
- Convert header to new format - Use PORT_OPTIONS:MDOCS instead of *PORTDOCS - Update rc script such that -D is always specified
Notes
Notes: svn path=/head/; revision=310459
Diffstat (limited to 'net-mgmt/pmacct')
-rw-r--r--net-mgmt/pmacct/Makefile10
-rw-r--r--net-mgmt/pmacct/distinfo4
-rw-r--r--net-mgmt/pmacct/files/pmacctd.in7
-rw-r--r--net-mgmt/pmacct/pkg-plist2
4 files changed, 11 insertions, 12 deletions
diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile
index c0f63fdfdb27..69ba75f02696 100644
--- a/net-mgmt/pmacct/Makefile
+++ b/net-mgmt/pmacct/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: pmacct
-# Date created: Thu May 8 16:03:11 CEST 2003
-# Whom: Kirill Ponomarew <ponomarew@oberon.net>
-#
+# Created by: Kirill Ponomarew <ponomarew@oberon.net>
# $FreeBSD$
-#
PORTNAME= pmacct
-DISTVERSION= 0.14.1
+DISTVERSION= 0.14.2
CATEGORIES= net-mgmt
MASTER_SITES= http://www.pmacct.net/ \
http://mirrors.rit.edu/zi/
@@ -104,7 +100,7 @@ post-install:
@${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
.for i in ChangeLog FAQS README TOOLS CONFIG-KEYS KNOWN-BUGS
diff --git a/net-mgmt/pmacct/distinfo b/net-mgmt/pmacct/distinfo
index cd6a950801a9..7a15fad39519 100644
--- a/net-mgmt/pmacct/distinfo
+++ b/net-mgmt/pmacct/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pmacct-0.14.1.tar.gz) = 048f5747c2caa1085f1cd9442668b9edc98a40688b7696d1ad6f1e16c5a6d206
-SIZE (pmacct-0.14.1.tar.gz) = 704707
+SHA256 (pmacct-0.14.2.tar.gz) = ce6f877c78cbb27aa40e8284d33d962980b40a8c442e58656ffee34ef53d2830
+SIZE (pmacct-0.14.2.tar.gz) = 721749
diff --git a/net-mgmt/pmacct/files/pmacctd.in b/net-mgmt/pmacct/files/pmacctd.in
index 860690cfb6d5..3aea0939e5c7 100644
--- a/net-mgmt/pmacct/files/pmacctd.in
+++ b/net-mgmt/pmacct/files/pmacctd.in
@@ -15,9 +15,9 @@
# You can define flags for pmacctd running. See pmacctd(8) for details.
#
# Example:
-# pmacctd_flags="-Df %%PREFIX%%/etc/pmacctd.conf -i em0"
+# pmacctd_flags="-f %%PREFIX%%/etc/pmacctd.conf -i em0"
#
-# Default flags: -Df %%PREFIX%%/etc/pmacctd.conf
+# Default flags: -f %%PREFIX%%/etc/pmacctd.conf
#
. /etc/rc.subr
@@ -26,11 +26,12 @@ name=pmacctd
rcvar=pmacctd_enable
command=%%PREFIX%%/sbin/$name
+command_args="-D"
# set defaults
pmacctd_enable=${pmacctd_enable:-"NO"}
-pmacctd_flags=${pmacctd_flags:-"-Df %%PREFIX%%/etc/pmacctd.conf"}
+pmacctd_flags=${pmacctd_flags:-"-f %%PREFIX%%/etc/pmacctd.conf"}
load_rc_config $name
run_rc_command "$1"
diff --git a/net-mgmt/pmacct/pkg-plist b/net-mgmt/pmacct/pkg-plist
index 9846f1fd578a..2f36f8f4b47c 100644
--- a/net-mgmt/pmacct/pkg-plist
+++ b/net-mgmt/pmacct/pkg-plist
@@ -8,6 +8,7 @@ sbin/uacctd
%%DATADIR%%/README.64bit
%%DATADIR%%/README.IPv6
%%DATADIR%%/README.agent_id2
+%%DATADIR%%/README.country
%%DATADIR%%/README.cos
%%DATADIR%%/README.etype
%%DATADIR%%/README.iface
@@ -15,6 +16,7 @@ sbin/uacctd
%%DATADIR%%/README.mpls_vpn_rd
%%DATADIR%%/README.mysql
%%DATADIR%%/README.pgsql
+%%DATADIR%%/README.sampling_rate
%%DATADIR%%/README.sqlite3
%%DATADIR%%/pmacct-create-db.pgsql
%%DATADIR%%/pmacct-create-db_bgp_v1.mysql