From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 27 11:00:23 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18AC51065674 for ; Mon, 27 Jun 2011 11:00:23 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D69078FC1C for ; Mon, 27 Jun 2011 11:00:22 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p5RB0MLS062150 for ; Mon, 27 Jun 2011 11:00:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p5RB0MeX062149; Mon, 27 Jun 2011 11:00:22 GMT (envelope-from gnats) Resent-Date: Mon, 27 Jun 2011 11:00:22 GMT Resent-Message-Id: <201106271100.p5RB0MeX062149@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Wen Heping Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B108106564A for ; Mon, 27 Jun 2011 10:59:12 +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 7190A8FC14 for ; Mon, 27 Jun 2011 10:59:12 +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 p5RAxC5C051507 for ; Mon, 27 Jun 2011 10:59:12 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p5RAxC42051506; Mon, 27 Jun 2011 10:59:12 GMT (envelope-from nobody) Message-Id: <201106271059.p5RAxC42051506@red.freebsd.org> Date: Mon, 27 Jun 2011 10:59:12 GMT From: Wen Heping To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/158337: [Patch]math/py-matplotlib: fix build with python-2.7.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jun 2011 11:00:23 -0000 >Number: 158337 >Category: ports >Synopsis: [Patch]math/py-matplotlib: fix build with python-2.7.2 >Confidential: no >Severity: critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jun 27 11:00:22 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Wen Heping >Release: FreeBSD 9.0 >Organization: FreeBSD >Environment: >Description: fix build with python-2.7.2 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN py-matplotlib.orig/Makefile py-matplotlib/Makefile --- py-matplotlib.orig/Makefile 2011-06-27 18:53:44.000000000 +0800 +++ py-matplotlib/Makefile 2011-06-27 18:52:11.000000000 +0800 @@ -8,6 +8,7 @@ PORTNAME= matplotlib PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff -urN py-matplotlib.orig/files/patch-setupext.py py-matplotlib/files/patch-setupext.py --- py-matplotlib.orig/files/patch-setupext.py 2011-06-27 18:53:44.000000000 +0800 +++ py-matplotlib/files/patch-setupext.py 2011-06-27 16:34:18.000000000 +0800 @@ -1,5 +1,5 @@ ---- setupext.py.orig 2010-07-28 11:18:08.000000000 -0400 -+++ setupext.py 2010-07-28 11:21:02.000000000 -0400 +--- setupext.py.orig 2010-07-07 09:41:55.000000000 +0800 ++++ setupext.py 2011-06-27 16:14:58.000000000 +0800 @@ -68,6 +68,9 @@ 'freebsd4' : ['/usr/local', '/usr'], 'freebsd5' : ['/usr/local', '/usr'], @@ -13,22 +13,36 @@ @@ -789,7 +792,7 @@ module.libraries.extend(wxlibs) return - + - get_pkgconfig(module, '', flags='--cppflags --libs', pkg_config_exec='wx-config') + get_pkgconfig(module, '', flags='--cppflags --libs', pkg_config_exec=wxconfig) - + # Make sure you use the Tk version given by Tkinter.TkVersion # or else you'll build for a wrong version of the Tcl -@@ -1092,9 +1095,9 @@ - +@@ -828,8 +831,12 @@ + gotit = False + + if gotit: ++ try: ++ tk_v = Tkinter.__version__.split()[-2] ++ except (AttributeError, IndexError): ++ tk_v = 'version not identified' + print_status("Tkinter", "Tkinter: %s, Tk: %s, Tcl: %s" % +- (Tkinter.__version__.split()[-2], Tkinter.TkVersion, Tkinter.TclVersion)) ++ (tk_v, Tkinter.TkVersion, Tkinter.TclVersion)) + else: + print_status("Tkinter", "no") + if explanation is not None: +@@ -1092,9 +1099,9 @@ + # Add final versions of directories and libraries to module lists tcl_lib, tcl_inc, tk_lib, tk_inc = result - module.include_dirs.extend([tcl_inc, tk_inc]) - module.library_dirs.extend([tcl_lib, tk_lib]) - module.libraries.extend(['tk' + tk_ver, 'tcl' + tk_ver]) -+ module.include_dirs.extend(["%%TCL_INCLUDEDIR%%", "%%TK_INCLUDEDIR%%"]) -+ module.library_dirs.extend(["%%TCL_LIBDIR%%", "%%TK_LIBDIR%%"]) -+ module.libraries.extend(['tk' + "%%TK_VER%%", 'tcl' + "%%TCL_VER%%"]) - ++ module.include_dirs.extend(["/usr/local/include/tcl8.5", "/usr/local/include/tk8.5"]) ++ module.library_dirs.extend(["/usr/local/lib/tcl8.5", "/usr/local/lib/tk8.5"]) ++ module.libraries.extend(['tk' + "85", 'tcl' + "85"]) + return message - + >Release-Note: >Audit-Trail: >Unformatted: