From krion@voodoo.oberon.net  Tue May 13 01:08:30 2003
Return-Path: <krion@voodoo.oberon.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A380F37B404
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 May 2003 01:08:30 -0700 (PDT)
Received: from office.LF.net (office.LF.net [212.9.190.165])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BA73043F3F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 May 2003 01:08:29 -0700 (PDT)
	(envelope-from krion@voodoo.oberon.net)
Received: from voodoo.oberon.net ([212.118.165.100])
	by office.LF.net with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.10)
	id 19FUpm-0001FN-00
	for FreeBSD-gnats-submit@freebsd.org; Tue, 13 May 2003 10:08:26 +0200
Received: from krion by voodoo.oberon.net with local (Exim 4.10)
	id 19FUqD-000PRJ-00
	for FreeBSD-gnats-submit@freebsd.org; Tue, 13 May 2003 10:08:53 +0200
Message-Id: <E19FUqD-000PRJ-00@voodoo.oberon.net>
Date: Tue, 13 May 2003 10:08:53 +0200
From: Kirill Ponomarew <ponomarew@oberon.net>
Sender: Kirill Ponomarew <krion@voodoo.oberon.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update net/pmacct
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         52152
>Category:       ports
>Synopsis:       Update net/pmacct
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 13 01:10:00 PDT 2003
>Closed-Date:    Sun May 18 21:05:49 CDT 2003
>Last-Modified:  Sun May 18 21:05:49 CDT 2003
>Originator:     Kirill Ponomarew
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
Oberon.net 
>Environment:
 
        
>Description:
Update net/pmacct

Fix building with mysql-client

>How-To-Repeat:
>Fix:
diff -ruN pmacct.orig/Makefile pmacct/Makefile
--- pmacct.orig/Makefile	Mon May 12 18:17:50 2003
+++ pmacct/Makefile	Tue May 13 09:59:03 2003
@@ -13,12 +13,16 @@
 MAINTAINER=	ponomarew@oberon.net
 COMMENT=	Network tool to gather IP traffic information
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 GNU_CONFIGURE=	yes
+USE_GETOPT_LONG=yes
+USE_REINPLACE=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+
+pre-patch:
+		@${REINPLACE_CMD} -e 's,<mysql/mysql.h>,<mysql.h>,' \
+			${WRKSRC}/mysql_plugin.h
 
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff -ruN pmacct.orig/files/patch-pmacct.h pmacct/files/patch-pmacct.h
--- pmacct.orig/files/patch-pmacct.h	Thu Jan  1 01:00:00 1970
+++ pmacct/files/patch-pmacct.h	Tue May 13 10:00:32 2003
@@ -0,0 +1,13 @@
+--- pmacct.h.orig	Thu May  8 11:59:46 2003
++++ pmacct.h	Tue May 13 10:00:09 2003
+@@ -32,10 +32,6 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ 
+-#ifdef HAVE_GETOPT_H
+-#include <getopt.h> 
+-#endif
+-
+ #include <fcntl.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: petef 
State-Changed-When: Sun May 18 21:05:48 CDT 2003 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=52152 
>Unformatted:
