Date: Sat, 11 Jun 2016 02:33:46 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416700 - in head/databases/rrdtool: . files Message-ID: <201606110233.u5B2Xkve011277@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Sat Jun 11 02:33:45 2016 New Revision: 416700 URL: https://svnweb.freebsd.org/changeset/ports/416700 Log: Fix installation of the python bindnings when py-setuptools* is installed. When py-setuptools is installed, metadata for the python package is handled differently than when building the package in for instance poudriere. Fix the python bindings install script to always act the same way, regardless of setuptools. PR: 206769 Submitted by: Reid Linnemann <linnemannr@gmail.com> Reported by: dewayne@heuristicsystems.com.au Sponsored by: BSDCan 2016 Hackerlounge Added: head/databases/rrdtool/files/patch-bindings_python_setup.py (contents, props changed) Modified: head/databases/rrdtool/Makefile Modified: head/databases/rrdtool/Makefile ============================================================================== --- head/databases/rrdtool/Makefile Sat Jun 11 00:49:52 2016 (r416699) +++ head/databases/rrdtool/Makefile Sat Jun 11 02:33:45 2016 (r416700) @@ -3,6 +3,7 @@ PORTNAME= rrdtool PORTVERSION= 1.6.0 +PORTREVISION= 1 CATEGORIES= databases graphics MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ Added: head/databases/rrdtool/files/patch-bindings_python_setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rrdtool/files/patch-bindings_python_setup.py Sat Jun 11 02:33:45 2016 (r416700) @@ -0,0 +1,16 @@ +--- bindings/python/setup.py.orig 2015-11-10 15:07:11 UTC ++++ bindings/python/setup.py +@@ -28,12 +28,7 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + # + +-try: +- # Attempt to build using Distribute, which also supports bdist_wheel +- from setuptools import setup +- from setuptools.extension import Extension +-except ImportError: +- from distutils.core import setup, Extension ++from distutils.core import setup, Extension + import sys, os + + TOP_SRCDIR = os.environ.get('ABS_TOP_SRCDIR', '../..')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606110233.u5B2Xkve011277>