From owner-svn-ports-head@freebsd.org Wed Oct 7 12:50:44 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 191939D14B9; Wed, 7 Oct 2015 12:50:44 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E6CF7CA6; Wed, 7 Oct 2015 12:50:43 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t97Cohtj017913; Wed, 7 Oct 2015 12:50:43 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t97CohHB017912; Wed, 7 Oct 2015 12:50:43 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201510071250.t97CohHB017912@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Wed, 7 Oct 2015 12:50:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398761 - head/math/py-matplotlib X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Oct 2015 12:50:44 -0000 Author: olgeni Date: Wed Oct 7 12:50:42 2015 New Revision: 398761 URL: https://svnweb.freebsd.org/changeset/ports/398761 Log: Unbreak math/py-matplotlib when some options are disabled (original PR). The previous version tried to ${STRIP} non-existing files. Some additional fixes: - Fix WXAGGBACKEND_VARS, which was overwritten and broke the WX build - Fix permissions in .py files - Sort entries in post-install - Whitespace fixes PR: 203417 Submitted by: Tomi Kause Reviewed by: olgeni Approved by: maintainer Modified: head/math/py-matplotlib/Makefile Modified: head/math/py-matplotlib/Makefile ============================================================================== --- head/math/py-matplotlib/Makefile Wed Oct 7 12:45:47 2015 (r398760) +++ head/math/py-matplotlib/Makefile Wed Oct 7 12:50:42 2015 (r398761) @@ -24,7 +24,7 @@ USES= pkgconfig python shebangfix uniqu USE_PYTHON= autoplist distutils CFLAGS+= -I${LOCALBASE}/include -OPTIONS_DEFINE= EXAMPLES GTKBACKEND GTKAGGBACKEND TKAGGBACKEND WXAGGBACKEND +OPTIONS_DEFINE= EXAMPLES GTKBACKEND GTKAGGBACKEND TKAGGBACKEND WXAGGBACKEND OPTIONS_DEFAULT= GTKBACKEND GTKAGGBACKEND TKAGGBACKEND OPTIONS_SUB= yes GTKBACKEND_DESC= GTK backend support @@ -43,9 +43,8 @@ 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= WXAGG_BACKEND=True WX_COMPS=python:lib WX_UNICODE=yes WXAGGBACKEND_VARS_OFF= WXAGG_BACKEND=False PORTEXAMPLES= * @@ -58,7 +57,7 @@ WXAGGBACKEND_BUILD_DEPENDS= Xvfb:${PORTS .endif post-extract: - ${CHMOD} -R ga+r ${WRKDIR} + ${FIND} ${WRKSRC} -name \*.py | ${XARGS} ${CHMOD} -x post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ @@ -76,19 +75,25 @@ post-patch: ${WRKSRC}/setup.cfg post-install: + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_cntr.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_delaunay.so ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_image.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_path.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_png.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_qhull.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/_tri.so ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/backends/_backend_agg.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/ft2font.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/ttconv.so + +post-install-GTKAGGBACKEND-on: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/backends/_gtkagg.so + +post-install-TKAGGBACKEND-on: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/backends/_tkagg.so + +post-install-GTKBACKEND-on: ${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}