From nobody@FreeBSD.org  Fri Jul  1 01:10:10 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9ED521065675
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  1 Jul 2011 01:10:10 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F6F58FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  1 Jul 2011 01:10:10 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p611AAGr094851
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 1 Jul 2011 01:10:10 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p611AAXo094850;
	Fri, 1 Jul 2011 01:10:10 GMT
	(envelope-from nobody)
Message-Id: <201107010110.p611AAXo094850@red.freebsd.org>
Date: Fri, 1 Jul 2011 01:10:10 GMT
From: Ryan Steinmetz <rpsfa@rit.edu>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer-update] net-mgmt/pmacct to build under clang
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         158549
>Category:       ports
>Synopsis:       [maintainer-update] net-mgmt/pmacct to build under clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    zi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 01 01:20:08 UTC 2011
>Closed-Date:    Sun Jul 17 17:13:20 UTC 2011
>Last-Modified:  Sun Jul 17 17:20:10 UTC 2011
>Originator:     Ryan Steinmetz
>Release:        8.2-RELEASE
>Organization:
Rochester Institute of Technology
>Environment:
>Description:
-Add License
-Fix build when using clang
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/pmacct/Makefile,v
retrieving revision 1.76
diff -u -r1.76 Makefile
--- Makefile	15 May 2011 14:08:00 -0000	1.76
+++ Makefile	1 Jul 2011 01:01:40 -0000
@@ -29,6 +29,10 @@
 		LAYER2 "Enable Layer-2 support: MAC Adresses and VLANs" On \
 		IPV6  "Enable IPv6 support." On
 
+.include <bsd.port.options.mk>
+
+LICENSE=	GPLv2
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
Index: files/patch-src__ll.c
===================================================================
RCS file: files/patch-src__ll.c
diff -N files/patch-src__ll.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src__ll.c	1 Jul 2011 01:00:07 -0000
@@ -0,0 +1,11 @@
+--- ./src/ll.c.orig	2011-06-30 20:43:06.000000000 -0400
++++ ./src/ll.c	2011-06-30 20:43:45.000000000 -0400
+@@ -118,7 +118,7 @@
+ 
+   if (*caplen < 4) {
+     pptrs->iph_ptr = NULL;
+-    return;
++    return 0;
+   }
+ 
+   do {


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Fri Jul 1 12:55:46 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158549 

From: Ryan Steinmetz <rpsfa@rit.edu>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/158549: [maintainer-update] net-mgmt/pmacct to build under
 clang
Date: Sun, 3 Jul 2011 10:13:12 -0400

 Upstream has accepted this patch and it has been merged into CVS.  We should see it in the next major release (right now, we're at a RC).
 
 We're also working on eliminating the warnings that clang produces if any of them are of a serious nature.
Responsible-Changed-From-To: miwi->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Jul 12 04:41:30 UTC 2011 
Responsible-Changed-Why:  
Back to pool at assignee request for the moment. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158549 
Responsible-Changed-From-To: freebsd-ports-bugs->zi 
Responsible-Changed-By: zi 
Responsible-Changed-When: Fri Jul 15 21:45:41 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158549 
State-Changed-From-To: open->closed 
State-Changed-By: zi 
State-Changed-When: Sun Jul 17 17:13:19 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158549 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/158549: commit references a PR
Date: Sun, 17 Jul 2011 17:11:10 +0000 (UTC)

 zi          2011-07-17 17:10:56 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/pmacct      Makefile 
   Added files:
     net-mgmt/pmacct/files patch-src__ll.c 
   Log:
   Fix build under clang
   Add LICENSE
   
   PR:             ports/158549
   Submitted by:   rpsfa@rit.edu (me)
   Approved by:    wxs (mentor)
   
   Revision  Changes    Path
   1.78      +2 -0      ports/net-mgmt/pmacct/Makefile
   1.1       +11 -0     ports/net-mgmt/pmacct/files/patch-src__ll.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
