Version bump thanks to Marcin Mirosław (bug #339229). Change init.d script to allow multiple instances by Marcin Mirosław (bug #306837).

(Portage version: 2.2_rc86/cvs/Linux i686)

6 files changed, 88 insertions, 19 deletions

diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index 307392472078..147bf3c68527 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/pmacct
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.68 2010/09/30 16:31:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.69 2010/09/30 16:43:04 jer Exp $
+
+*pmacct-0.12.3 (30 Sep 2010)
+
+  30 Sep 2010; Jeroen Roovers <jer@gentoo.org> pmacct-0.12.0-r1.ebuild,
+  pmacct-0.12.1.ebuild, pmacct-0.12.2.ebuild, +pmacct-0.12.3.ebuild,
+  files/pmacctd-init.d:
+  Version bump thanks to Marcin Mirosław (bug #339229). Change init.d
+  script to allow multiple instances by Marcin Mirosław (bug #306837).
 
 *pmacct-0.12.2 (21 Jul 2010)
 
diff --git a/net-analyzer/pmacct/files/pmacctd-init.d b/net-analyzer/pmacct/files/pmacctd-init.d
index 987e9c603a2a..1db2f92c05cd 100644
--- a/net-analyzer/pmacct/files/pmacctd-init.d
+++ b/net-analyzer/pmacct/files/pmacctd-init.d
@@ -1,29 +1,37 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v 1.4 2009/06/01 09:48:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v 1.5 2010/09/30 16:43:05 jer Exp $
+
+PMACCTDDIR=${PMACCTDDIR:-/etc/pmacct}
+if [ ${SVCNAME} != "pmacctd" ]; then
+	PMACCTDPID="/var/run/${SVCNAME}.pid"
+else
+	PMACCTDPID="/var/run/pmacctd.pid"
+fi
+PMACCTDCONF="${PMACCTDDIR}/${SVCNAME}.conf"
 
 depend() {
 	need net
 }
 
 checkconfig() {
-	if [ ! -e /etc/pmacctd.conf ] ; then
-		eerror "You need an /etc/pmacctd.conf file to run pmacctd"
+	if [ ! -e ${PMACCTDCONF} ] ; then
+		eerror "You need an ${PMACCTDCONF} file to run pmacctd"
 		return 1
 	fi
 }
 
 start() {
 	checkconfig || return 1
-	ebegin "Starting pmacctd"
-	start-stop-daemon --start --pidfile /var/run/pmacctd.pid --exec /usr/sbin/pmacctd \
-		-- -D -f /etc/pmacctd.conf -F /var/run/pmacctd.pid ${OPTS}
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --pidfile "${PMACCTDPID}" --exec /usr/sbin/pmacctd \
+		-- -D -f "${PMACCTDCONF}" -F "${PMACCTDPID}" ${OPTS}
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping pmacctd"
-	start-stop-daemon --stop --pidfile /var/run/pmacctd.pid --exec /usr/sbin/pmacctd
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile "${PMACCTDPID}" --exec /usr/sbin/pmacctd
 	eend $?
 }
diff --git a/net-analyzer/pmacct/pmacct-0.12.0-r1.ebuild b/net-analyzer/pmacct/pmacct-0.12.0-r1.ebuild
index 8f9742d4ef58..e765ea5473a8 100644
--- a/net-analyzer/pmacct/pmacct-0.12.0-r1.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.12.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.0-r1.ebuild,v 1.2 2010/06/17 20:32:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.0-r1.ebuild,v 1.3 2010/09/30 16:43:04 jer Exp $
 
 EAPI="2"
 
@@ -22,8 +22,6 @@ RDEPEND="net-libs/libpcap
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	cp -av configure{,.org}
-	cp -av configure.in{,.org}
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
diff --git a/net-analyzer/pmacct/pmacct-0.12.1.ebuild b/net-analyzer/pmacct/pmacct-0.12.1.ebuild
index e3dbbdc8fdc9..f3dfcf71ae8b 100644
--- a/net-analyzer/pmacct/pmacct-0.12.1.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.1.ebuild,v 1.2 2010/06/17 20:32:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.1.ebuild,v 1.3 2010/09/30 16:43:04 jer Exp $
 
 EAPI="2"
 
@@ -22,8 +22,6 @@ RDEPEND="net-libs/libpcap
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	cp -av configure{,.org}
-	cp -av configure.in{,.org}
 	epatch "${FILESDIR}"/${PN}-0.12.0-gentoo.patch
 }
 
diff --git a/net-analyzer/pmacct/pmacct-0.12.2.ebuild b/net-analyzer/pmacct/pmacct-0.12.2.ebuild
index e10bc5259d87..724a1cce9672 100644
--- a/net-analyzer/pmacct/pmacct-0.12.2.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.2.ebuild,v 1.1 2010/07/21 16:21:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.2.ebuild,v 1.2 2010/09/30 16:43:04 jer Exp $
 
 EAPI="2"
 
@@ -22,8 +22,6 @@ RDEPEND="net-libs/libpcap
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	cp -av configure{,.org}
-	cp -av configure.in{,.org}
 	epatch "${FILESDIR}"/${PN}-0.12.0-gentoo.patch
 }
 
diff --git a/net-analyzer/pmacct/pmacct-0.12.3.ebuild b/net-analyzer/pmacct/pmacct-0.12.3.ebuild
new file mode 100644
index 000000000000..7a4dcf44d709
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-0.12.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.3.ebuild,v 1.1 2010/09/30 16:43:04 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="64bit debug ipv6 mysql postgres sqlite threads ulog"
+
+RDEPEND="net-libs/libpcap
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( =dev-db/sqlite-3* )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.12.0-gentoo.patch
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		$(use_enable ulog) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog CONFIG-KEYS EXAMPLES FAQS KNOWN-BUGS README UPGRADE \
+		docs/SIGNALS docs/PLUGINS docs/INTERNALS TODO TOOLS \
+		|| die "dodoc failed"
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc ${dirname}/* || die "dodoc ${dirname} failed"
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd || die "newinitd failed"
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd || die "newconfd failed"
+
+	insinto /etc
+	newins "${S}/examples/pmacctd-imt.conf.example" pmacctd.conf || \
+		die "newins failed"
+}