Hi!
Update to git-2.10.1.
Remove two now useless patch chunks:
- linking with -lrt is now protected by NEEDS_LIBRT
- vax is dead
Ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.161
diff -u -p -u -p -r1.161 Makefile
--- Makefile 26 Sep 2016 13:10:39 -0000 1.161
+++ Makefile 11 Oct 2016 10:27:51 -0000
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V = 2.9.3
+V = 2.10.1
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.123
diff -u -p -u -p -r1.123 distinfo
--- distinfo 17 Aug 2016 06:57:50 -0000 1.123
+++ distinfo 11 Oct 2016 10:27:51 -0000
@@ -1,4 +1,4 @@
-SHA256 (git-2.9.3.tar.gz) = olK2Y2sS1bpXcyyEaXAVRMJsKxaJkzvRtCXmA8uyR8A=
-SHA256 (git-manpages-2.9.3.tar.gz) =
jqGlWwSPr78MDG/LyktbD16ZF4kyIfxzRcCQUdZYMs4=
-SIZE (git-2.9.3.tar.gz) = 5918768
-SIZE (git-manpages-2.9.3.tar.gz) = 629834
+SHA256 (git-2.10.1.tar.gz) = eFU/eG8aZstomDwXC+SCVYAoozdgVsDy7TZvMxseNfI=
+SHA256 (git-manpages-2.10.1.tar.gz) =
RXJHeo/6aZY/K+fW4P5juBkt4sMB7fPjeoiPkEu/0S4=
+SIZE (git-2.10.1.tar.gz) = 6057915
+SIZE (git-manpages-2.10.1.tar.gz) = 636238
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.63
diff -u -p -u -p -r1.63 patch-Makefile
--- patches/patch-Makefile 25 May 2016 07:13:05 -0000 1.63
+++ patches/patch-Makefile 11 Oct 2016 10:27:51 -0000
@@ -1,37 +1,7 @@
$OpenBSD: patch-Makefile,v 1.63 2016/05/25 07:13:05 benoit Exp $
-
-No need for librt on OpenBSD
-
-Workaround for ar(1) not having 's' on VAX by calling ranlib
-
---- Makefile.orig Thu May 19 19:17:58 2016
-+++ Makefile Wed May 25 08:57:19 2016
-@@ -1465,7 +1465,6 @@ endif
-
- ifdef HAVE_CLOCK_GETTIME
- BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
-- EXTLIBS += -lrt
- endif
-
- ifdef HAVE_CLOCK_MONOTONIC
-@@ -2026,13 +2025,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
- $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
-
- $(LIB_FILE): $(LIB_OBJS)
-- $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $^ && ranlib $@
-
- $(XDIFF_LIB): $(XDIFF_OBJS)
-- $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $^ && ranlib $@
-
- $(VCSSVN_LIB): $(VCSSVN_OBJS)
-- $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $^ && ranlib $@
-
- export DEFAULT_EDITOR DEFAULT_PAGER
-
-@@ -2217,7 +2216,7 @@ export TEST_NO_MALLOC_CHECK
+--- Makefile.orig Tue Oct 4 00:19:09 2016
++++ Makefile Tue Oct 11 11:46:07 2016
+@@ -2269,7 +2269,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules
Index: patches/patch-t_test-lib_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 17 Aug 2016 06:57:50 -0000 1.14
+++ patches/patch-t_test-lib_sh 11 Oct 2016 10:27:51 -0000
@@ -5,8 +5,8 @@ wants it badly.
Fix sum() function
---- t/test-lib.sh.orig Fri Aug 12 21:38:45 2016
-+++ t/test-lib.sh Mon Aug 15 22:12:19 2016
+--- t/test-lib.sh.orig Tue Oct 4 00:19:09 2016
++++ t/test-lib.sh Tue Oct 11 11:41:06 2016
@@ -48,6 +48,11 @@ fi
. "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
export PERL_PATH SHELL_PATH
@@ -19,7 +19,7 @@ Fix sum() function
# 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
-@@ -963,6 +968,12 @@ case $(uname -s) in
+@@ -964,6 +969,12 @@ case $(uname -s) in
test_set_prereq CYGWIN
test_set_prereq SED_STRIPS_CR
test_set_prereq GREP_STRIPS_CR
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.73
diff -u -p -u -p -r1.73 PLIST-main
--- pkg/PLIST-main 28 Jun 2016 07:27:14 -0000 1.73
+++ pkg/PLIST-main 11 Oct 2016 10:27:51 -0000
@@ -391,6 +391,7 @@ share/git-core/templates/hooks/pre-apply
share/git-core/templates/hooks/pre-commit.sample
share/git-core/templates/hooks/pre-push.sample
share/git-core/templates/hooks/pre-rebase.sample
+share/git-core/templates/hooks/pre-receive.sample
share/git-core/templates/hooks/prepare-commit-msg.sample
share/git-core/templates/hooks/setgitperms.perl
share/git-core/templates/hooks/update.sample
