- Update to version 0.6.0

* Add PostgreSQL support

4 files changed, 28 insertions, 11 deletions

diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile
index 378912cc403c..bb17cbbd293c 100644
--- a/net-mgmt/pmacct/Makefile
+++ b/net-mgmt/pmacct/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pmacct
-PORTVERSION=	0.5.4
+PORTVERSION=	0.6.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.ba.cnr.it/~paolo/pmacct/
 
@@ -18,8 +18,20 @@ USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \
 		--with-mysql-includes=${LOCALBASE}/include/mysql \
 		--enable-mysql
+CFLAGS+=	"-I${LOCALBASE}/include"
+PLIST_SUB+=	WITH_MYSQL=""
 .else
 CONFIGURE_ARGS+=	--disable-mysql
+PLIST_SUB+=	WITH_MYSQL="@comment "
+.endif
+
+.if defined(WITH_PGSQL)
+LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
+CONFIGURE_ARGS+=--enable-pgsql
+PLIST_SUB+=	WITH_PGSQL=""
+.else
+CONFIGURE_ARGS+=	--disable-pgsql
+PLIST_SUB+=	WITH_PGSQL="@comment "
 .endif
 
 GNU_CONFIGURE=	yes
@@ -33,7 +45,7 @@ pre-patch:
 	's,<mysql/mysql.h>,<mysql.h>,' \
 		${WRKSRC}/mysql_plugin.h
 	@${REINPLACE_CMD} -e \
-	's|-O2|${CFLAGS}|g' ${WRKSRC}/configure
+	's|-O2||g' ${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/net-mgmt/pmacct/distinfo b/net-mgmt/pmacct/distinfo
index c945fd887296..2bc754d5bd60 100644
--- a/net-mgmt/pmacct/distinfo
+++ b/net-mgmt/pmacct/distinfo
@@ -1 +1 @@
-MD5 (pmacct-0.5.4.tar.gz) = 9a5177a6c78beefdb8ee27e099a8c67c
+MD5 (pmacct-0.6.0.tar.gz) = 8baefb60a5b6947669c6b43e5aa74357
diff --git a/net-mgmt/pmacct/pkg-descr b/net-mgmt/pmacct/pkg-descr
index 38ca49b26874..1079eeb0532d 100644
--- a/net-mgmt/pmacct/pkg-descr
+++ b/net-mgmt/pmacct/pkg-descr
@@ -1,10 +1,13 @@
-pmacct is a network tool to gather IP traffic information (bytes counter and
-number of packets). Aggregation of statistics is done either by looking at
-destination, source, both source and destination, or unidirectional IP flows.
-Data is stored in an in-memory table or using an SQL database (currently only
-MySQL). The content of these tables can be later retrieved by a client program
-via a local stream-oriented connection (for simple output or export to MRTG) or
-via an SQL client. Gathering packets off the wire is done with the pcap library
-and promiscuous mode of one or more network interfaces.
+pmacct is a network tool to gather ip traffic informations
+(bytes counter and number of packets); aggregation of
+statistics is done using simple primitives (MAC addresses,
+source host, destination host, ports and ip protocols) that can
+be used alone or combined together to form complex aggregation
+methods; counters are either global or historical (aggregated
+and separated at fixed timeslots). Data is stored in a
+in-memory table or using a SQL database (MySQL or PostgreSQL).
+Gathering packets off the wire is done using pcap library and
+promiscuous mode of network interfaces when specifically
+required.
 
 WWW: http://www.ba.cnr.it/~paolo/pmacct/ 
diff --git a/net-mgmt/pmacct/pkg-plist b/net-mgmt/pmacct/pkg-plist
index 2fec93f20a52..950038f8a81d 100644
--- a/net-mgmt/pmacct/pkg-plist
+++ b/net-mgmt/pmacct/pkg-plist
@@ -1,4 +1,6 @@
 bin/pmacct
+%%WITH_MYSQL%%bin/pmmyplay
+%%WITH_PGSQL%%bin/pmpgplay
 sbin/pmacctd
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLES