Simple update including various fixes, changelog since 2.5.0: https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.15.1.txt
While here, switch HOMEPAGE to HTTPS. Tests pass on amd64: fixed 2 success 16486 failed 0 broken 223 total 17013 Feedback? Any takers? diff --git a/devel/git/Makefile b/devel/git/Makefile index bd314fb5595..0c074effda6 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storage Tool COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V = 2.15.0 +V = 2.15.1 REVISION-main = 0 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} @@ -12,7 +12,7 @@ PKGNAME-svn = git-svn-${V} PKGNAME-x11 = git-x11-${V} CATEGORIES = devel -HOMEPAGE = http://git-scm.com/ +HOMEPAGE = https://git-scm.com/ MAINTAINER = Benoit Lecocq <ben...@openbsd.org> diff --git a/devel/git/distinfo b/devel/git/distinfo index ee700f50c28..e9a3ef36b52 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,4 +1,4 @@ -SHA256 (git-2.15.0.tar.gz) = JXYsxQEDpqBmXEbqM86wV47uAcGbagj9OT6GCMy9s9o= -SHA256 (git-manpages-2.15.0.tar.gz) = OxuevwLUqm50G+zR7ZMZWXSIdD+Tn9qzuJTsUtJUCO8= -SIZE (git-2.15.0.tar.gz) = 7188145 -SIZE (git-manpages-2.15.0.tar.gz) = 671471 +SHA256 (git-2.15.1.tar.gz) = hfyoeBqDyWum2zhMwapqXuHjRHRrr6wcvh8P5tEQnIQ= +SHA256 (git-manpages-2.15.1.tar.gz) = RyRUxJTJp/UK04Bgw+7DcvYX3mVLIPPrO+WfwXpoP6E= +SIZE (git-2.15.1.tar.gz) = 7190225 +SIZE (git-manpages-2.15.1.tar.gz) = 671818 diff --git a/devel/git/patches/patch-Makefile b/devel/git/patches/patch-Makefile index 7dbd1ec970c..910b275ceef 100644 --- a/devel/git/patches/patch-Makefile +++ b/devel/git/patches/patch-Makefile @@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.74 2017/11/08 09:17:14 benoit Exp $ Index: Makefile --- Makefile.orig +++ Makefile -@@ -2435,7 +2435,7 @@ export TEST_NO_MALLOC_CHECK +@@ -2436,7 +2436,7 @@ export TEST_NO_MALLOC_CHECK ### Testing rules diff --git a/devel/git/patches/patch-config_mak_uname b/devel/git/patches/patch-config_mak_uname index c65904e25d0..503962e99bb 100644 --- a/devel/git/patches/patch-config_mak_uname +++ b/devel/git/patches/patch-config_mak_uname @@ -5,7 +5,7 @@ OpenBSD wants DIR_HAS_BSD_GROUP_SEMANTICS, just like FreeBSD Index: config.mak.uname --- config.mak.uname.orig +++ config.mak.uname -@@ -211,6 +211,7 @@ endif +@@ -212,6 +212,7 @@ endif ifeq ($(uname_S),OpenBSD) NO_STRCASESTR = YesPlease NO_MEMMEM = YesPlease diff --git a/devel/git/patches/patch-t_test-lib_sh b/devel/git/patches/patch-t_test-lib_sh index 7605404a9d4..b03ff9daf04 100644 --- a/devel/git/patches/patch-t_test-lib_sh +++ b/devel/git/patches/patch-t_test-lib_sh @@ -20,7 +20,7 @@ Index: t/test-lib.sh # if --tee was passed, write the output not only to the terminal, but # additionally to the file test-results/$BASENAME.out, too. case "$GIT_TEST_TEE_STARTED, $* " in -@@ -1014,6 +1019,15 @@ case $uname_s in +@@ -1015,6 +1020,15 @@ case $uname_s in test_set_prereq CYGWIN test_set_prereq SED_STRIPS_CR test_set_prereq GREP_STRIPS_CR