Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 15 Jan 2013 19:38:20 +0000 (UTC)
From:      Ryan Steinmetz <zi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r310459 - in head/net-mgmt/pmacct: . files
Message-ID:  <201301151938.r0FJcKQH042096@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: zi
Date: Tue Jan 15 19:38:19 2013
New Revision: 310459
URL: http://svnweb.freebsd.org/changeset/ports/310459

Log:
  - 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

Modified:
  head/net-mgmt/pmacct/Makefile   (contents, props changed)
  head/net-mgmt/pmacct/distinfo   (contents, props changed)
  head/net-mgmt/pmacct/files/pmacctd.in   (contents, props changed)
  head/net-mgmt/pmacct/pkg-plist   (contents, props changed)

Modified: head/net-mgmt/pmacct/Makefile
==============================================================================
--- head/net-mgmt/pmacct/Makefile	Tue Jan 15 19:35:44 2013	(r310458)
+++ head/net-mgmt/pmacct/Makefile	Tue Jan 15 19:38:19 2013	(r310459)
@@ -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

Modified: head/net-mgmt/pmacct/distinfo
==============================================================================
--- head/net-mgmt/pmacct/distinfo	Tue Jan 15 19:35:44 2013	(r310458)
+++ head/net-mgmt/pmacct/distinfo	Tue Jan 15 19:38:19 2013	(r310459)
@@ -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

Modified: head/net-mgmt/pmacct/files/pmacctd.in
==============================================================================
--- head/net-mgmt/pmacct/files/pmacctd.in	Tue Jan 15 19:35:44 2013	(r310458)
+++ head/net-mgmt/pmacct/files/pmacctd.in	Tue Jan 15 19:38:19 2013	(r310459)
@@ -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"

Modified: head/net-mgmt/pmacct/pkg-plist
==============================================================================
--- head/net-mgmt/pmacct/pkg-plist	Tue Jan 15 19:35:44 2013	(r310458)
+++ head/net-mgmt/pmacct/pkg-plist	Tue Jan 15 19:38:19 2013	(r310459)
@@ -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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301151938.r0FJcKQH042096>