Index: head/math/py-matplotlib/Makefile =================================================================== --- head/math/py-matplotlib/Makefile (revision 276629) +++ head/math/py-matplotlib/Makefile (revision 276630) @@ -1,128 +1,129 @@ # ex:ts=8 # Ports collection makefile for: py-matplotlib # Date created: Aug 4, 2004 # Whom: ijliao # # $FreeBSD$ # PORTNAME= matplotlib PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= mainland@apeiron.net COMMENT= A plotting library uses a syntax familiar to matlab users BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:${PORTSDIR}/devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png.6:${PORTSDIR}/graphics/png RUN_DEPENDS= ${PYNUMPY} USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes CFLAGS+= -I${LOCALBASE}/include OPTIONS= GTKBACKEND "GTK backend support" ON \ GTKAGGBACKEND "GTKAgg backend support" ON \ TKAGGBACKEND "TKAgg backend support" ON \ WXAGGBACKEND "WXAgg backend support" OFF UNIQUENAME= ${PORTNAME} .include .if defined(PACKAGE_BUILDING) && \ (defined(WITH_GTKBACKEND) || defined(WITH_GTKAGGBACKEND) || \ defined(WITH_TKAGGBACKEND) || defined(WITH_WXAGGBACKEND)) BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} .endif .if defined(WITH_GTKBACKEND) || defined(WITH_GTKAGGBACKEND) USE_GNOME= gtk20 pygtk2 .endif .if defined(WITH_GTKBACKEND) && !defined(WITHOUT_GTKBACKEND) GTK_BACKEND=True PLIST_SUB+= GTKBACKEND="" .else GTK_BACKEND=False PLIST_SUB+= GTKBACKEND="@comment " .endif .if defined(WITH_GTKAGGBACKEND) GTKAGG_BACKEND=True PLIST_SUB+= GTKAGGBACKEND="" .else GTKAGG_BACKEND=False PLIST_SUB+= GTKAGGBACKEND="@comment " .endif .if defined(WITH_TKAGGBACKEND) BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter USE_TCL_RUN= yes USE_TK_RUN= yes TKAGG_BACKEND=True PLIST_SUB+= TKAGGBACKEND="" .else TKAGG_BACKEND=False PLIST_SUB+= TKAGGBACKEND="@comment " .endif .if defined(WITH_WXAGGBACKEND) USE_WX= 2.6 WX_COMPS= python CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}" WXAGG_BACKEND=True PLIST_SUB+= WXAGGBACKEND="" .else WXAGG_BACKEND=False PLIST_SUB+= WXAGGBACKEND="@comment " .endif .include EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} post-extract: ${CHMOD} -R ga+r ${WRKDIR} # bsd.tcl.mk doesn't set TK_VER, so we use TCL_VER instead post-patch: ${REINPLACE_CMD} -e 's|png_infopp_NULL|NULL|' \ ${WRKSRC}/src/_png.cpp ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|%%TCL_INCLUDEDIR%%|${TCL_INCLUDEDIR}|g' \ -e 's|%%TK_INCLUDEDIR%%|${TK_INCLUDEDIR}|g' \ -e 's|%%TCL_LIBDIR%%|${TCL_LIBDIR}|g' \ -e 's|%%TK_LIBDIR%%|${TK_LIBDIR}|g' \ -e 's|%%TCL_VER%%|${TCL_VER:S/.//}|g' \ -e 's|%%TK_VER%%|${TCL_VER:S/.//}|g' \ ${WRKSRC}/setupext.py ${REINPLACE_CMD} -e 's|%%GTK_BACKEND%%|${GTK_BACKEND}|g' \ -e 's|%%GTKAGG_BACKEND%%|${GTKAGG_BACKEND}|g' \ -e 's|%%TKAGG_BACKEND%%|${TKAGG_BACKEND}|g' \ -e 's|%%WXAGG_BACKEND%%|${WXAGG_BACKEND}|g' \ ${WRKSRC}/setup.cfg .if !defined(NOPORTEXAMPLES) post-install: @${MKDIR} ${EXAMPLESDIR} ${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR} .endif .include Property changes on: head/math/py-matplotlib/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.38 \ No newline at end of property +1.39 \ No newline at end of property Index: head/math/py-matplotlib/files/patch-setupext.py =================================================================== --- head/math/py-matplotlib/files/patch-setupext.py (revision 276629) +++ head/math/py-matplotlib/files/patch-setupext.py (revision 276630) @@ -1,34 +1,48 @@ ---- 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'], 'freebsd6' : ['/usr/local', '/usr'], + 'freebsd7' : ['/usr/local', '/usr'], + 'freebsd8' : ['/usr/local', '/usr'], + 'freebsd9' : ['/usr/local', '/usr'], 'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',], 'gnukfreebsd5' : ['/usr/local', '/usr'], 'gnukfreebsd6' : ['/usr/local', '/usr'], @@ -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 - + Property changes on: head/math/py-matplotlib/files/patch-setupext.py ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property