Hi!
An update to git-2.1.1
All tests successful on amd64.
ok?
Cheers,
David
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.115
diff -u -p -u -p -r1.115 Makefile
--- Makefile 19 Aug 2014 19:44:39 -0000 1.115
+++ Makefile 26 Sep 2014 11:16:06 -0000
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V = 2.1.0
+V = 2.1.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.85
diff -u -p -u -p -r1.85 distinfo
--- distinfo 19 Aug 2014 19:44:39 -0000 1.85
+++ distinfo 26 Sep 2014 11:16:06 -0000
@@ -1,4 +1,4 @@
-SHA256 (git-2.1.0.tar.gz) = 1bA1cX9iEwy/FU1sFAPGhQtIYiO9b4fiCClr6Kykdus=
-SHA256 (git-manpages-2.1.0.tar.gz) =
Op6lv5w2m1ZFnE3XZGOtuU5CmPZ58v/9ytxEfInou3w=
-SIZE (git-2.1.0.tar.gz) = 4975916
-SIZE (git-manpages-2.1.0.tar.gz) = 577429
+SHA256 (git-2.1.1.tar.gz) = z/9Jorb6OyOT26O7qIpZeFpGH23H4psJGVtrF0oJIdE=
+SHA256 (git-manpages-2.1.1.tar.gz) =
6xPVX1n1TX6AM7kDaZLmy0N4Q5Li55cYgOlox+JP0sc=
+SIZE (git-2.1.1.tar.gz) = 5084177
+SIZE (git-manpages-2.1.1.tar.gz) = 577497
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.48
diff -u -p -u -p -r1.48 patch-Makefile
--- patches/patch-Makefile 19 Aug 2014 19:44:39 -0000 1.48
+++ patches/patch-Makefile 26 Sep 2014 11:16:06 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.48 2014/08/19 19:44:39 pascal Exp $
---- Makefile.orig Sat Aug 16 00:26:55 2014
-+++ Makefile Tue Aug 19 14:09:04 2014
-@@ -2093,13 +2093,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
+--- Makefile.orig Fri Sep 19 23:45:27 2014
++++ Makefile Fri Sep 26 10:06:30 2014
+@@ -2097,13 +2097,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
$(LIB_FILE): $(LIB_OBJS)
@@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.48 2014/08/
export DEFAULT_EDITOR DEFAULT_PAGER
-@@ -2280,7 +2280,7 @@ export TEST_NO_MALLOC_CHECK
+@@ -2284,7 +2284,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.3
diff -u -p -u -p -r1.3 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 19 Aug 2014 19:44:39 -0000 1.3
+++ patches/patch-t_test-lib_sh 26 Sep 2014 11:16:06 -0000
@@ -3,8 +3,10 @@ $OpenBSD: patch-t_test-lib_sh,v 1.3 2014
Force usage of GNU tar in the test suite: 't5004-archive-corner-cases.sh'
wants it badly.
---- t/test-lib.sh.orig Sat Aug 16 00:26:55 2014
-+++ t/test-lib.sh Tue Aug 19 14:43:36 2014
+Fix sum() function
+
+--- t/test-lib.sh.orig Fri Sep 19 23:45:27 2014
++++ t/test-lib.sh Fri Sep 26 11:30:55 2014
@@ -51,6 +51,11 @@ fi
. "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
export PERL_PATH SHELL_PATH
@@ -17,3 +19,16 @@ wants it badly.
# 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
+@@ -882,6 +887,12 @@ case $(uname -s) in
+ test_set_prereq CYGWIN
+ test_set_prereq SED_STRIPS_CR
+ test_set_prereq GREP_STRIPS_CR
++ ;;
++*OpenBSD*)
++ # sum(1) is cksum(1) on OpenBSD
++ sum () {
++ cksum "$@"
++ }
+ ;;
+ *)
+ test_set_prereq POSIXPERM
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.59
diff -u -p -u -p -r1.59 PLIST-main
--- pkg/PLIST-main 19 Aug 2014 19:44:39 -0000 1.59
+++ pkg/PLIST-main 26 Sep 2014 11:16:06 -0000
@@ -393,6 +393,7 @@ share/gitweb/static/git-logo.png
share/gitweb/static/gitweb.css
share/gitweb/static/gitweb.js
share/locale/bg/LC_MESSAGES/git.mo
+share/locale/ca/LC_MESSAGES/git.mo
share/locale/de/LC_MESSAGES/git.mo
share/locale/fr/LC_MESSAGES/git.mo
share/locale/is/
