Index: head/math/py-matplotlib/Makefile
===================================================================
--- head/math/py-matplotlib/Makefile	(revision 396885)
+++ head/math/py-matplotlib/Makefile	(revision 396886)
@@ -1,119 +1,98 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	matplotlib
 PORTVERSION=	1.4.3
 CATEGORIES=	math python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	mainland@apeiron.net
 COMMENT=	Plotting library uses a syntax familiar to MATLAB users
 
 LICENSE=	PSFL
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libpng.so:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:${PORTSDIR}/devel/py-dateutil \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
 		${PYTHON_PKGNAMEPREFIX}parsing>=0:${PORTSDIR}/devel/py-parsing
 
-USES=		pkgconfig shebangfix python
-USE_PYTHON=	distutils autoplist
+USES=		pkgconfig python shebangfix uniquefiles:dirs
+USE_PYTHON=	autoplist distutils
 CFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	EXAMPLES GTKBACKEND GTKAGGBACKEND TKAGGBACKEND WXAGGBACKEND
 OPTIONS_DEFAULT=	GTKBACKEND GTKAGGBACKEND TKAGGBACKEND
+OPTIONS_SUB=		yes
 GTKBACKEND_DESC=	GTK backend support
+GTKBACKEND_VARS=	GTK_BACKEND=True
+GTKBACKEND_VARS_OFF=	GTK_BACKEND=False
+GTKBACKEND_USE=		GNOME=gtk20,pygtk2
 GTKAGGBACKEND_DESC=	GTKAgg backend support
+GTKAGGBACKEND_USE=	GNOME=gtk20,pygtk2
+GTKAGGBACKEND_VARS=	GTKAGG_BACKEND=True
+GTKAGGBACKEND_VARS_OFF=	GTKAGG_BACKEND=False
 TKAGGBACKEND_DESC=	TKAgg backend support
+TKAGGBACKEND_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+TKAGGBACKEND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+TKAGGBACKEND_USES=	tk:run
+TKAGGBACKEND_VARS=	TKAGG_BACKEND=True
+TKAGGBACKEND_VARS_OFF=	TKAGG_BACKEND=False
 WXAGGBACKEND_DESC=	WXAgg backend support
+WXAGGBACKEND_USE=	WX=2.8+
+WXAGGBACKEND_VARS=	WX_COMPS=python:lib,WX_UNICODE=yes
+WXAGGBACKEND_CONFIGURE_ENV=	WX_CONFIG="${WX_CONFIG}"
+WXAGGBACKEND_VARS=	WXAGG_BACKEND=True
+WXAGGBACKEND_VARS_OFF=	WXAGG_BACKEND=False
 
 PORTEXAMPLES=	*
+UNIQUENAME=	${PORTNAME}
 
-.include <bsd.port.options.mk>
-
-.if defined(PACKAGE_BUILDING) && \
-    ( ${PORT_OPTIONS:MGTKBACKEND} || ${PORT_OPTIONS:MGTKAGGBACKEND} || \
-    ${PORT_OPTIONS:MTKAGGBACKEND} || ${PORT_OPTIONS:MWXAGGBACKEND} )
-BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
+.if defined(PACKAGE_BUILDING)
+GTKBACKEND_BUILD_DEPENDS=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
+GTKAGGBACKEND_BUILD_DEPENDS=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
+TKAGGBACKEND_BUILD_DEPENDS=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
+WXAGGBACKEND_BUILD_DEPENDS=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
 .endif
 
-.if ${PORT_OPTIONS:MGTKBACKEND} || ${PORT_OPTIONS:MGTKAGGBACKEND}
-USE_GNOME=	gtk20 pygtk2
-.endif
-
-.if ${PORT_OPTIONS:MGTKBACKEND}
-GTK_BACKEND=	True
-
-PLIST_SUB+=	GTKBACKEND=""
-.else
-GTK_BACKEND=	False
-
-PLIST_SUB+=	GTKBACKEND="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGTKAGGBACKEND}
-GTKAGG_BACKEND=	True
-
-PLIST_SUB+=	GTKAGGBACKEND=""
-.else
-GTKAGG_BACKEND=	False
-
-PLIST_SUB+=	GTKAGGBACKEND="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTKAGGBACKEND}
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-
-USES+=		tk:run
-
-TKAGG_BACKEND=	True
-
-PLIST_SUB+=	TKAGGBACKEND=""
-.else
-TKAGG_BACKEND=	False
-
-PLIST_SUB+=	TKAGGBACKEND="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MWXAGGBACKEND}
-USE_WX=		2.8+
-WX_COMPS=	python:lib
-WX_UNICODE=	yes
-CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
-
-WXAGG_BACKEND=	True
-.else
-WXAGG_BACKEND=	False
-.endif
-
-EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 post-extract:
 	${CHMOD} -R ga+r ${WRKDIR}
 
 post-patch:
 	${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_SHLIB_VER}|g' \
 			 -e 's|%%TK_VER%%|${TK_SHLIB_VER}|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 ${PORT_OPTIONS:MEXAMPLES}
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_image.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/backends/_backend_agg.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/backends/_gtkagg.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/backends/_tkagg.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/backends/_backend_gdk.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_qhull.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/ttconv.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_delaunay.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_png.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_tri.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_path.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_cntr.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/ft2font.so
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
Index: head/math/py-matplotlib/files/patch-setup.cfg
===================================================================
--- head/math/py-matplotlib/files/patch-setup.cfg	(revision 396885)
+++ head/math/py-matplotlib/files/patch-setup.cfg	(revision 396886)
@@ -1,86 +1,86 @@
---- setup.cfg	1969-12-31 19:00:00.000000000 -0500
-+++ setup.cfg	2010-07-06 10:44:15.000000000 -0400
+--- setup.cfg.orig	2015-09-05 07:46:40 UTC
++++ setup.cfg
 @@ -0,0 +1,83 @@
 +# Rename this file to setup.cfg to modify matplotlib's
 +# build options.
 +
 +[egg_info]
 +tag_svn_revision = 1
 +
 +[directories]
 +# Uncomment to override the default basedir in setupext.py.
 +# This can be a single directory or a space-delimited list of directories.
 +#basedirlist = /usr
 +
 +[status]
 +# To suppress display of the dependencies and their versions
 +# at the top of the build log, uncomment the following line:
 +#suppress = True
 +#
 +# Uncomment to insert lots of diagnostic prints in extension code
 +#verbose = True
 +
 +[provide_packages]
 +# By default, matplotlib checks for a few dependencies and
 +# installs them if missing. This feature can be turned off
 +# by uncommenting the following lines. Acceptible values are:
 +#     True: install, overwrite an existing installation
 +#     False: do not install
 +#     auto: install only if the package is unavailable. This
 +#           is the default behavior
 +#
 +## Date/timezone support:
 +pytz = False
 +dateutil = False
 +
 +[gui_support]
 +# Matplotlib supports multiple GUI toolkits, including Cocoa,
 +# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of
 +# these toolkits requires AGG, the Anti-Grain Geometry library,
 +# which is provided by matplotlib and built by default.
 +#
 +# Some backends are written in pure Python, and others require
 +# extension code to be compiled. By default, matplotlib checks
 +# for these GUI toolkits during installation and, if present,
 +# compiles the required extensions to support the toolkit. GTK
 +# support requires the GTK runtime environment and PyGTK. Wx
 +# support requires wxWidgets and wxPython. Tk support requires
 +# Tk and Tkinter. The other GUI toolkits do not require any
 +# extension code, and can be used as long as the libraries are
 +# installed on your system.
 +#
 +# You can uncomment any the following lines if you know you do
 +# not want to use the GUI toolkit. Acceptible values are:
 +#     True: build the extension. Exits with a warning if the
 +#           required dependencies are not available
 +#     False: do not build the extension
 +#     auto: build if the required dependencies are available,
 +#           otherwise skip silently. This is the default
 +#           behavior
 +#
 +gtk = %%GTK_BACKEND%%
 +gtkagg = %%GTKAGG_BACKEND%%
 +tkagg = %%TKAGG_BACKEND%%
 +wxagg = %%WXAGG_BACKEND%%
 +#macosx = False
 +
 +[rc_options]
 +# User-configurable options
 +#
 +# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo,
 +# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
 +#
 +# The Agg, Ps, Pdf and SVG backends do not require external
 +# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg
 +# if you have disabled the relevent extension modules.  Agg will be used
 +# by default.
 +#
 +#backend = Agg
 +#
 +# The numerix module was historically used to provide
 +# compatibility between the Numeric, numarray, and NumPy array
 +# packages. Now that NumPy has emerge as the universal array
 +# package for python, numerix is not really necessary and is
 +# maintained to provide backward compatibility. Do not change
 +# this unless you have a compelling reason to do so.
 +#numerix = numpy