From owner-svn-ports-all@freebsd.org Sat Jun 11 02:33:47 2016 Return-Path: Delivered-To: svn-ports-all@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 661D5AEF71A; Sat, 11 Jun 2016 02:33:47 +0000 (UTC) (envelope-from zeising@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 0C88E2E4A; Sat, 11 Jun 2016 02:33:46 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5B2XkPJ011279; Sat, 11 Jun 2016 02:33:46 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5B2Xkve011277; Sat, 11 Jun 2016 02:33:46 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201606110233.u5B2Xkve011277@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Sat, 11 Jun 2016 02:33:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416700 - in head/databases/rrdtool: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jun 2016 02:33:47 -0000 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 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', '../..')