cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to git-2.8.0.

Browse Source
This commit is contained in:
benoit 2016-04-02 15:03:37 +00:00
parent 23da09531d
commit a40917f2ea
4 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/git/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.149 2016/03/22 18:04:16 juanfra Exp $
# $OpenBSD: Makefile,v 1.150 2016/04/02 15:03:37 benoit Exp $
COMMENT-main = GIT - Tree History Storage Tool
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
V = 2.7.4
REVISION = 0
V = 2.8.0
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}

8
devel/git/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (git-2.7.4.tar.gz) = cQTE9dlIp1tJmpVFJMsoH+MMZknYq+IJgpNvdewfJ1s=
SHA256 (git-manpages-2.7.4.tar.gz) = Df4ZMa0wKHNHDgKAJI46pQUCte3QDcw+nJFzZntv6mo=
SIZE (git-2.7.4.tar.gz) = 5723935
SIZE (git-manpages-2.7.4.tar.gz) = 612997
SHA256 (git-2.8.0.tar.gz) = LG7uVQYjfgiG35lz/Xk4obJhHsk9B/ZO00R0k+uskNE=
SHA256 (git-manpages-2.8.0.tar.gz) = LEiQKmnfO+w7i48DUKZf0bZi0vQ28OZNR17NHHgHZ7Y=
SIZE (git-2.8.0.tar.gz) = 5835727
SIZE (git-manpages-2.8.0.tar.gz) = 616724

12
devel/git/patches/patch-Makefile
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile,v 1.61 2016/01/05 08:31:59 benoit Exp $
$OpenBSD: patch-Makefile,v 1.62 2016/04/02 15:03:37 benoit Exp $
No need for librt on OpenBSD
Workaround for ar(1) not having 's' on VAX by calling ranlib
--- Makefile.orig Tue Jan 5 00:31:57 2016
+++ Makefile Tue Jan 5 08:13:53 2016
@@ -1455,7 +1455,6 @@ endif
--- Makefile.orig Mon Mar 28 22:17:31 2016
+++ Makefile Sat Apr 2 16:49:57 2016
@@ -1471,7 +1471,6 @@ endif
ifdef HAVE_CLOCK_GETTIME
BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
@ -14,7 +14,7 @@ Workaround for ar(1) not having 's' on VAX by calling ranlib
endif
ifdef HAVE_CLOCK_MONOTONIC
@@ -2015,13 +2014,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
@@ -2032,13 +2031,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
$(LIB_FILE): $(LIB_OBJS)
@ -31,7 +31,7 @@ Workaround for ar(1) not having 's' on VAX by calling ranlib
export DEFAULT_EDITOR DEFAULT_PAGER
@@ -2204,7 +2203,7 @@ export TEST_NO_MALLOC_CHECK
@@ -2223,7 +2222,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules

19
devel/git/patches/patch-git-compat-util_h
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-git-compat-util_h,v 1.1 2016/03/22 18:04:16 juanfra Exp $
git-compat-util: st_add4: work around gcc 4.2.x compiler crash
https://github.com/git/git/commit/d616fbf256ef3102669d450ddadd8469fefcf95c
--- git-compat-util.h.orig Thu Mar 17 21:47:59 2016
+++ git-compat-util.h Tue Mar 22 00:21:14 2016
@@ -715,8 +715,8 @@ static inline size_t st_add(size_t a, size_t b)
(uintmax_t)a, (uintmax_t)b);
return a + b;
}
-#define st_add3(a,b,c) st_add((a),st_add((b),(c)))
-#define st_add4(a,b,c,d) st_add((a),st_add3((b),(c),(d)))
+#define st_add3(a,b,c) st_add(st_add((a),(b)),(c))
+#define st_add4(a,b,c,d) st_add(st_add3((a),(b),(c)),(d))
static inline size_t st_mult(size_t a, size_t b)
{