summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorbsiegert <bsiegert>2014-11-20 21:43:10 +0000
committerbsiegert <bsiegert>2014-11-20 21:43:10 +0000
commitfe801ca0309a6341626a00508bed993cea5c2332 (patch)
treee402495e253a14538992ed70597463aedddfd1ef /devel
parentc138360e32dee1e1c84fab33f83190f9df332e8d (diff)
downloadpkgsrc-fe801ca0309a6341626a00508bed993cea5c2332.tar.gz
Do not attempt to set ownership of some files, this breaks unprivileged
builds on Mac OS X Tiger. Patch provided by Sevan Janiyan in PR pkg/49051.
Diffstat (limited to 'devel')
-rw-r--r--devel/git-base/distinfo4
-rw-r--r--devel/git-base/patches/patch-aa9
2 files changed, 9 insertions, 4 deletions
diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index 8fd5e429af4..8d4a179dc5e 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2014/11/01 11:34:00 adam Exp $
+$NetBSD: distinfo,v 1.19 2014/11/20 21:43:10 bsiegert Exp $
SHA1 (git-2.1.3.tar.xz) = 42a850edee36170f70a1b6231b80c50f77ac237e
RMD160 (git-2.1.3.tar.xz) = 83dd698c1dadc9c5a45a2094c32536b64c8452d2
Size (git-2.1.3.tar.xz) = 3542704 bytes
-SHA1 (patch-aa) = 62170081fcf3831ba7316b5914657063c668a80b
+SHA1 (patch-aa) = 8c1096065d26b93a6e10bc6926d3fc3686f711f2
SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba
SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
SHA1 (patch-af) = d1aae6d9b15f7932912a97457d8a95364b685b07
diff --git a/devel/git-base/patches/patch-aa b/devel/git-base/patches/patch-aa
index 36d905f5d72..573becba810 100644
--- a/devel/git-base/patches/patch-aa
+++ b/devel/git-base/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2014/08/01 19:18:39 schmonz Exp $
+$NetBSD: patch-aa,v 1.4 2014/11/20 21:43:10 bsiegert Exp $
--- Makefile.orig 2014-05-30 21:38:10.000000000 +0000
+++ Makefile
@@ -36,7 +36,12 @@ $NetBSD: patch-aa,v 1.3 2014/08/01 19:18:39 schmonz Exp $
export DIFF TAR INSTALL DESTDIR SHELL_PATH
-@@ -2353,7 +2347,6 @@ ifndef NO_GETTEXT
+@@ -2349,11 +2343,10 @@ install: all
+ ifndef NO_GETTEXT
+ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
+ (cd po/build/locale && $(TAR) cf - .) | \
+- (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xof -)
++ (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xf -)
endif
ifndef NO_PERL
$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install