sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- fix build on FreeBSD 10

Browse source 
- strict python versions to 2.6-2.7
  - bump USE_WX to 2.8+ according to matplotlib docs
  - fix pkg-plist after switching this port to wxPython 2.8+
  - bump PORTREVISION

  PR:             ports/161716
  Submitted by:   rm (myself)
  Approved by:    Geoffrey Mainland <mainland@apeiron.net> (maintainer),
                  novel (mentor)
  Feature safe:   yes
This commit is contained in:
Ruslan Makhmatkhanov 2011-11-11 18:16:37 +00:00
parent b0a8e9dbdc
commit 55a433209f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=285590
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
math/py-matplotlib/Makefile
View file

@ -8,7 +8,7 @@
PORTNAME= matplotlib PORTNAME= matplotlib
PORTVERSION= 1.0.1 PORTVERSION= 1.0.1
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= math python CATEGORIES= math python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -25,7 +25,7 @@ RUN_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:${PORTSDIR}/devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:${PORTSDIR}/devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz ${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
USE_PYTHON= 2.4+ USE_PYTHON= 2.6-2.7
USE_PYDISTUTILS=yes USE_PYDISTUTILS=yes
CFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include
@ -85,17 +85,13 @@ PLIST_SUB+= TKAGGBACKEND="@comment "
.endif .endif
.if defined(WITH_WXAGGBACKEND) .if defined(WITH_WXAGGBACKEND)
USE_WX= 2.6 USE_WX= 2.8+
WX_COMPS= python WX_COMPS= python
CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}" CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}"
WXAGG_BACKEND= True WXAGG_BACKEND= True
PLIST_SUB+= WXAGGBACKEND=""
.else .else
WXAGG_BACKEND= False WXAGG_BACKEND= False
PLIST_SUB+= WXAGGBACKEND="@comment "
.endif .endif
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>

13
math/py-matplotlib/files/patch-setupext.py
View file

@ -1,16 +1,17 @@
--- setupext.py.orig 2010-07-07 09:41:55.000000000 +0800 --- setupext.py.orig 2010-07-07 05:41:55.000000000 +0400
+++ setupext.py 2011-06-27 16:14:58.000000000 +0800 +++ setupext.py 2011-10-16 18:49:43.000000000 +0400
@@ -68,6 +68,9 @@ @@ -68,6 +68,10 @@
'freebsd4' : ['/usr/local', '/usr'], 'freebsd4' : ['/usr/local', '/usr'],
'freebsd5' : ['/usr/local', '/usr'], 'freebsd5' : ['/usr/local', '/usr'],
'freebsd6' : ['/usr/local', '/usr'], 'freebsd6' : ['/usr/local', '/usr'],
+ 'freebsd7' : ['/usr/local', '/usr'], + 'freebsd7' : ['/usr/local', '/usr'],
+ 'freebsd8' : ['/usr/local', '/usr'], + 'freebsd8' : ['/usr/local', '/usr'],
+ 'freebsd9' : ['/usr/local', '/usr'], + 'freebsd9' : ['/usr/local', '/usr'],
+ 'freebsd10': ['/usr/local', '/usr'],
'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',], 'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
'gnukfreebsd5' : ['/usr/local', '/usr'], 'gnukfreebsd5' : ['/usr/local', '/usr'],
'gnukfreebsd6' : ['/usr/local', '/usr'], 'gnukfreebsd6' : ['/usr/local', '/usr'],
@@ -789,7 +792,7 @@ @@ -789,7 +793,7 @@
module.libraries.extend(wxlibs) module.libraries.extend(wxlibs)
return return
@ -19,7 +20,7 @@
# Make sure you use the Tk version given by Tkinter.TkVersion # Make sure you use the Tk version given by Tkinter.TkVersion
# or else you'll build for a wrong version of the Tcl # or else you'll build for a wrong version of the Tcl
@@ -828,8 +831,12 @@ @@ -828,8 +832,12 @@
gotit = False gotit = False
if gotit: if gotit:
@ -33,7 +34,7 @@
else: else:
print_status("Tkinter", "no") print_status("Tkinter", "no")
if explanation is not None: if explanation is not None:
@@ -1092,9 +1099,9 @@ @@ -1092,9 +1100,9 @@
# Add final versions of directories and libraries to module lists # Add final versions of directories and libraries to module lists
tcl_lib, tcl_inc, tk_lib, tk_inc = result tcl_lib, tcl_inc, tk_lib, tk_inc = result

1
math/py-matplotlib/pkg-plist
View file

@ -50,7 +50,6 @@
%%GTKBACKEND%%%%PYTHON_SITELIBDIR%%/matplotlib/backends/_backend_gdk.so %%GTKBACKEND%%%%PYTHON_SITELIBDIR%%/matplotlib/backends/_backend_gdk.so
%%GTKAGGBACKEND%%%%PYTHON_SITELIBDIR%%/matplotlib/backends/_gtkagg.so %%GTKAGGBACKEND%%%%PYTHON_SITELIBDIR%%/matplotlib/backends/_gtkagg.so
%%TKAGGBACKEND%%%%PYTHON_SITELIBDIR%%/matplotlib/backends/_tkagg.so %%TKAGGBACKEND%%%%PYTHON_SITELIBDIR%%/matplotlib/backends/_tkagg.so
%%WXAGGBACKEND%%%%PYTHON_SITELIBDIR%%/matplotlib/backends/_wxagg.so
%%PYTHON_SITELIBDIR%%/matplotlib/backends/backend_agg.py %%PYTHON_SITELIBDIR%%/matplotlib/backends/backend_agg.py
%%PYTHON_SITELIBDIR%%/matplotlib/backends/backend_agg.pyc %%PYTHON_SITELIBDIR%%/matplotlib/backends/backend_agg.pyc
%%PYTHON_SITELIBDIR%%/matplotlib/backends/backend_agg.pyo %%PYTHON_SITELIBDIR%%/matplotlib/backends/backend_agg.pyo