Import of pkgsrc-2016Q3

This commit is contained in:
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
+13 -5
View File
@@ -1,19 +1,27 @@
$NetBSD: patch-setup.py,v 1.1 2014/09/02 13:48:13 he Exp $
$NetBSD: patch-setup.py,v 1.2 2016/03/06 15:07:07 adam Exp $
Prefer setup from setuptools, the older one may not
support install_requires or setup_requires
--- setup.py.orig 2014-07-06 05:19:54.000000000 +0000
--- setup.py.orig 2015-08-25 21:54:04.000000000 +0000
+++ setup.py
@@ -8,7 +8,10 @@ A distutils Python setup file. For setup
import os
import sys
-from distutils.core import setup
-from distutils.core import setup, Command
+try:
+ from setuptools import setup
+ from setuptools import setup, Command
+except ImportError:
+ from distutils.core import setup
+ from distutils.core import setup, Command
if os.path.exists('MANIFEST'):
os.remove('MANIFEST')
@@ -64,7 +67,6 @@ def main():
version = release.version,
options = {
'build_scripts': {
- 'executable': '/usr/bin/env python',
},
},
)