Index: head/math/py-matplotlib/Makefile
===================================================================
--- head/math/py-matplotlib/Makefile	(revision 148110)
+++ head/math/py-matplotlib/Makefile	(revision 148111)
@@ -1,71 +1,67 @@
 # ex:ts=8
 # Ports collection makefile for:	py-matplotlib
 # Date created:			Aug 4, 2004
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	matplotlib
 PORTVERSION=	0.80
 PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A plotting library uses a syntax familiar to matlab users
 
 BUILD_DEPENDS=	${PYNUMERIC} \
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${LOCALBASE}/lib/libagg.a:${PORTSDIR}/graphics/agg
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	${PYNUMERIC} \
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 .if defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT}
 .endif
 
 USE_REINPLACE=	yes
 USE_PYTHON=	2.2+
 USE_PYDISTUTILS=	yes
 USE_GNOME=	gtk20 pygtk2
 CFLAGS+=	-I${X11BASE}/include
 
 DATADIR=	${PREFIX}/share/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
 PLISTDIR=	${PYTHON_SITELIBDIR}/${PORTNAME} ${PYTHON_SITELIBDIR}/dateutil ${PYTHON_SITELIBDIR}/pytz \
 		${PYTHON_SITELIBDIR}/pylab* ${DATADIR}
 .if !defined(NOPORTDOCS)
 PLISTDIR+=	${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ( ${OSVERSION} < 500000)
 USE_GCC=	3.4
 .endif
 
-.if ${OSVERSION} >= 700000
-BROKEN=		"Does not build on FreeBSD >= 7.0"
-.endif
-
 post-patch:
 	@${GREP} -lR "share/matplotlib" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
 		-e "s,share/matplotlib,share/py-matplotlib,g"
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
 .endif
 .for dir in ${PLISTDIR}
 	@${FIND} ${dir} ! -type d | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${dir} -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 .endfor
 
 .include <bsd.port.post.mk>

Property changes on: head/math/py-matplotlib/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/math/py-matplotlib/files/patch-setupext.py
===================================================================
--- head/math/py-matplotlib/files/patch-setupext.py	(revision 148110)
+++ head/math/py-matplotlib/files/patch-setupext.py	(revision 148111)
@@ -1,12 +1,24 @@
---- setupext.py.orig	Tue Apr 12 16:09:32 2005
-+++ setupext.py	Tue Apr 12 16:10:28 2005
-@@ -308,7 +308,7 @@
+--- setupext.py.orig	Tue Mar 29 19:25:37 2005
++++ setupext.py	Sat Nov  5 20:26:49 2005
+@@ -38,7 +38,8 @@
+     'darwin' : ['/usr/local', '/usr', '/sw', '/usr/X11R6'],
+     'freebsd4' : ['/usr/local', '/usr'],
+     'freebsd5' : ['/usr/local', '/usr'],
+-    'freebsd6' : ['/usr/local', '/usr'],    
++    'freebsd6' : ['/usr/local', '/usr'],
++    'freebsd7' : ['/usr/local', '/usr'],
+     'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
+ }
+ 
+@@ -306,9 +307,9 @@
+ 
+     # you're still here? ok we'll try it this way
      o = find_tcltk() # todo: try/except
 -    module.include_dirs.extend([o.tcl_inc, o.tk_inc])
 +    module.include_dirs.extend(["/usr/local/include/tcl8.4", "/usr/local/include/tk8.4"])
      module.library_dirs.extend([o.tcl_lib, o.tk_lib])
 -    module.libraries.extend(['tk'+o.tkv, 'tcl'+o.tkv])
 +    module.libraries.extend(['tk84', 'tcl84'])
  
  
  def add_windowing_flags(module):

Property changes on: head/math/py-matplotlib/files/patch-setupext.py
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property