From wxs@atarininja.org  Tue Jul 10 17:56:22 2007
Return-Path: <wxs@atarininja.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 71D2C16A469
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 10 Jul 2007 17:56:22 +0000 (UTC)
	(envelope-from wxs@atarininja.org)
Received: from syn.atarininja.org (syn.csh.rit.edu [129.21.60.158])
	by mx1.freebsd.org (Postfix) with ESMTP id 5069F13C468
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 10 Jul 2007 17:56:22 +0000 (UTC)
	(envelope-from wxs@atarininja.org)
Received: by syn.atarininja.org (Postfix, from userid 1001)
	id 466845C5B; Tue, 10 Jul 2007 14:03:04 -0400 (EDT)
Message-Id: <20070710180304.466845C5B@syn.atarininja.org>
Date: Tue, 10 Jul 2007 14:03:04 -0400 (EDT)
From: Wesley Shields <wxs@atarininja.org>
Reply-To: Wesley Shields <wxs@atarininja.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: onatan@gmail.com
Subject: [PATCH]: Fix py-libdnet on -CURRENT
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         114475
>Category:       ports
>Synopsis:       [PATCH]: Fix py-libdnet on -CURRENT
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 10 18:00:12 GMT 2007
>Closed-Date:    Tue Jul 10 21:19:42 GMT 2007
>Last-Modified:  Tue Jul 10 21:20:03 GMT 2007
>Originator:     Wesley Shields
>Release:        FreeBSD 6.2-RELEASE-p5 amd64
>Organization:
>Environment:
System: FreeBSD syn.csh.rit.edu 6.2-RELEASE-p5 FreeBSD 6.2-RELEASE-p5 #7: Thu May 24 09:18:59 EDT 2007 root@syn.csh.rit.edu:/usr/obj/usr/src/sys/SMP amd64

>Description:
py-libdnet fails to build with the new gcc in -CURRENT.  The attached
patch applies to net/libdnet and fixes the build of the python module.
The patch is taken from gentoo and tested in my tinderbox.  I've CC'ed
the maintainer on this.

I bumped PORTREVISION also, but  I'm not entirely sure it's needed.

>How-To-Repeat:
N/A

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/libdnet/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile	12 Mar 2007 17:51:53 -0000	1.27
+++ Makefile	10 Jul 2007 16:48:06 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdnet
 PORTVERSION=	1.11
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
Index: files/patch-python__dnet.c
===================================================================
RCS file: files/patch-python__dnet.c
diff -N files/patch-python__dnet.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-python__dnet.c	10 Jul 2007 16:48:06 -0000
@@ -0,0 +1,20 @@
+--- ./python/dnet.c.orig	Tue Jul 10 12:35:10 2007
++++ ./python/dnet.c	Tue Jul 10 12:35:59 2007
+@@ -2726,7 +2726,7 @@
+   PyObject *__pyx_3 = 0;
+   unsigned short __pyx_4;
+   Py_INCREF(__pyx_v_self);
+-  ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next));
++  __pyx_v_next = Py_None; Py_INCREF(((PyObject*)__pyx_v_next));
+ 
+   /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":634 */
+   __pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max);
+@@ -2738,7 +2738,7 @@
+     Py_DECREF(__pyx_2); __pyx_2 = 0;
+     if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}
+     Py_DECREF(((PyObject *)__pyx_v_next));
+-    ((PyObject *)__pyx_v_next) = __pyx_3;
++    __pyx_v_next = __pyx_3;
+     __pyx_3 = 0;
+ 
+     /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":636 */
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Tue Jul 10 21:14:05 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/114475: commit references a PR
Date: Tue, 10 Jul 2007 21:19:32 +0000 (UTC)

 pav         2007-07-10 21:19:27 UTC
 
   FreeBSD ports repository
 
   Added files:
     net/libdnet/files    patch-python__dnet.c 
   Log:
   - Fix build of net/py-libdnet slave with GCC 4.2
   
   PR:             ports/114475
   Submitted by:   Wesley Shields <wxs@atarininja.org>
   
   Revision  Changes    Path
   1.1       +20 -0     ports/net/libdnet/files/patch-python__dnet.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:
