From owner-svn-ports-head@FreeBSD.ORG Wed Nov 27 19:21:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B17BC66E; Wed, 27 Nov 2013 19:21:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9F9FD22EE; Wed, 27 Nov 2013 19:21:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rARJL1ue001598; Wed, 27 Nov 2013 19:21:01 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rARJL0lx001591; Wed, 27 Nov 2013 19:21:00 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201311271921.rARJL0lx001591@svn.freebsd.org> From: William Grzybowski Date: Wed, 27 Nov 2013 19:21:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335046 - in head: science/py-obspy/files sysutils/py-filelike/files www/py-amf/files www/py-cssmin/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-head@freebsd.org X-Mailman-Version: 2.1.16 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, 27 Nov 2013 19:21:01 -0000 Author: wg Date: Wed Nov 27 19:21:00 2013 New Revision: 335046 URL: http://svnweb.freebsd.org/changeset/ports/335046 Log: - Fix build with distribute -> setuptools change Approved by: portmgr (bapt, implicit) Added: head/sysutils/py-filelike/files/ head/sysutils/py-filelike/files/patch-setup.py (contents, props changed) head/www/py-amf/files/ head/www/py-amf/files/patch-setup.py (contents, props changed) head/www/py-cssmin/files/ head/www/py-cssmin/files/patch-setup.py (contents, props changed) Modified: head/science/py-obspy/files/patch-setup.py Modified: head/science/py-obspy/files/patch-setup.py ============================================================================== --- head/science/py-obspy/files/patch-setup.py Wed Nov 27 19:17:18 2013 (r335045) +++ head/science/py-obspy/files/patch-setup.py Wed Nov 27 19:21:00 2013 (r335046) @@ -1,13 +1,30 @@ ---- setup.py.orig 2012-12-17 14:04:38.000000000 +0000 -+++ setup.py 2013-05-16 15:35:53.000000000 +0000 -@@ -362,8 +362,8 @@ +--- ./setup.py.orig 2013-06-28 18:07:26.000000000 -0300 ++++ ./setup.py 2013-11-27 17:04:07.589319517 -0200 +@@ -27,7 +27,6 @@ + from distutils.unixccompiler import UnixCCompiler + from setuptools import find_packages, setup + from setuptools.extension import Extension +-import distribute_setup + import glob + import os + import platform +@@ -370,8 +369,8 @@ # otherwise we just use the original compile method UnixCCompiler.linker_so = None return self._original_compile(obj, src, *args, **kwargs) - UnixCCompiler.linker_so = ["gfortran"] - self.compiler_so = ["gfortran"] -+ UnixCCompiler.linker_so = ["FC"] -+ self.compiler_so = ["FC"] ++ UnixCCompiler.linker_so = ["gfortran46"] ++ self.compiler_so = ["gfortran46"] cc_args = ['-c', '-fno-underscoring'] - if sys.platform == 'darwin': - self.compiler_so = _darwin_compiler_fixup(self.compiler_so, + cc_args.append('-fPIC') + try: +@@ -629,8 +628,6 @@ + + + def setupPackage(gfortran=True, ccompiler=True): +- # automatically install distribute if the user does not have it installed +- distribute_setup.use_setuptools() + # use lib2to3 for Python 3.x + if sys.version_info[0] == 3: + convert2to3() Added: head/sysutils/py-filelike/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/py-filelike/files/patch-setup.py Wed Nov 27 19:21:00 2013 (r335046) @@ -0,0 +1,10 @@ +--- ./setup.py.orig 2013-11-27 16:56:21.489321513 -0200 ++++ ./setup.py 2013-11-27 16:57:06.823319522 -0200 +@@ -1,7 +1,5 @@ + + import sys +-import distribute_setup +-distribute_setup.use_setuptools() + from setuptools import setup, find_packages + + Added: head/www/py-amf/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-amf/files/patch-setup.py Wed Nov 27 19:21:00 2013 (r335046) @@ -0,0 +1,14 @@ +--- ./setup.py.orig 2013-11-27 16:59:40.606322333 -0200 ++++ ./setup.py 2013-11-27 17:00:06.922319988 -0200 +@@ -3,11 +3,6 @@ + # Copyright (c) The PyAMF Project. + # See LICENSE.txt for details. + +-from distribute_setup import use_setuptools +- +-# 15 seconds is far too long .... +-use_setuptools(download_delay=3) +- + # import ordering is important + import setupinfo + from setuptools import setup, find_packages Added: head/www/py-cssmin/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-cssmin/files/patch-setup.py Wed Nov 27 19:21:00 2013 (r335046) @@ -0,0 +1,10 @@ +--- ./setup.py.orig 2013-11-27 16:51:22.144320041 -0200 ++++ ./setup.py 2013-11-27 16:51:29.013319136 -0200 +@@ -4,7 +4,6 @@ + import os + import re + +-from distribute_setup import use_setuptools; use_setuptools() + from setuptools import setup, find_packages + +