summaryrefslogtreecommitdiff
path: root/devel/mercurial
diff options
context:
space:
mode:
authoradam <adam>2012-03-15 19:43:06 +0000
committeradam <adam>2012-03-15 19:43:06 +0000
commitca56e0bbdb7a4e9fd2756ad1ae7a9c472d45fc29 (patch)
treeec84c096d10d2d17831e450a25e892577e6a51c9 /devel/mercurial
parenteeab03ed55ff0187ec1d56cb5ce82f7f6e94f11a (diff)
downloadpkgsrc-ca56e0bbdb7a4e9fd2756ad1ae7a9c472d45fc29.tar.gz
Fix error in setup.py which affects builing on Mac OS X.
Diffstat (limited to 'devel/mercurial')
-rw-r--r--devel/mercurial/distinfo3
-rw-r--r--devel/mercurial/patches/patch-setup.py15
2 files changed, 17 insertions, 1 deletions
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 008fc1499d5..617ebd00749 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.55 2012/03/02 14:01:17 wiz Exp $
+$NetBSD: distinfo,v 1.56 2012/03/15 19:43:06 adam Exp $
SHA1 (mercurial-2.1.1.tar.gz) = d6cc4b649b6705113732e62756788542897ba008
RMD160 (mercurial-2.1.1.tar.gz) = e17a995a069d1a7a46537a49189520df953acb6f
Size (mercurial-2.1.1.tar.gz) = 3313261 bytes
+SHA1 (patch-setup.py) = cb22596142587a60c61fa7a9a4c60a7a388d0e54
diff --git a/devel/mercurial/patches/patch-setup.py b/devel/mercurial/patches/patch-setup.py
new file mode 100644
index 00000000000..6d925ef0b2b
--- /dev/null
+++ b/devel/mercurial/patches/patch-setup.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-setup.py,v 1.1 2012/03/15 19:43:06 adam Exp $
+
+Fix double splitlines(); affects builing on Mac OS X.
+
+--- setup.py.orig 2012-03-15 19:37:26.000000000 +0000
++++ setup.py
+@@ -452,7 +452,7 @@ if os.name == 'nt':
+ if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
+ # XCode 4.0 dropped support for ppc architecture, which is hardcoded in
+ # distutils.sysconfig
+- version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[0].splitlines()
++ version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[0]
+ if version:
+ version = version.splitlines()[0]
+ xcode4 = (version.startswith('Xcode') and