Hi!
The diff below updates devel/git to its latest version.
Works for me on amd64.
ciao,
David
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.102
diff -u -p -u -p -r1.102 Makefile
--- Makefile 11 Aug 2013 11:48:43 -0000 1.102
+++ Makefile 12 Sep 2013 14:15:26 -0000
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V = 1.8.3.4
+V = 1.8.4
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 distinfo
--- distinfo 11 Aug 2013 11:48:43 -0000 1.72
+++ distinfo 12 Sep 2013 14:15:26 -0000
@@ -1,4 +1,4 @@
-SHA256 (git-1.8.3.4.tar.gz) = 36LN8t+StKvpVrHnWGAwOBxOOeiRYat4mmYNjR8k2dk=
-SHA256 (git-manpages-1.8.3.4.tar.gz) =
aUPDsjYsEHqzLY7YG49IEcblou3dkbjkGIzPa0vit0A=
-SIZE (git-1.8.3.4.tar.gz) = 4479898
-SIZE (git-manpages-1.8.3.4.tar.gz) = 545017
+SHA256 (git-1.8.4.tar.gz) = UehSLCVu+Akcb9WEa5zvi6TnZIGRk7W2zsVw9TDmy5Q=
+SHA256 (git-manpages-1.8.4.tar.gz) =
hUVS5pOyKn/xwl0tcQ2HyPfa0UiIyUbBC+YIk/3uCR8=
+SIZE (git-1.8.4.tar.gz) = 4657759
+SIZE (git-manpages-1.8.4.tar.gz) = 564928
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 patch-Makefile
--- patches/patch-Makefile 11 Aug 2013 11:48:43 -0000 1.41
+++ patches/patch-Makefile 12 Sep 2013 14:15:26 -0000
@@ -1,24 +1,24 @@
$OpenBSD: patch-Makefile,v 1.41 2013/08/11 11:48:43 benoit Exp $
---- Makefile.orig Mon Jul 22 20:59:55 2013
-+++ Makefile Sun Aug 11 12:34:59 2013
-@@ -2059,13 +2059,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
+--- Makefile.orig Thu Sep 12 13:47:54 2013
++++ Makefile Thu Sep 12 13:49:48 2013
+@@ -2074,13 +2074,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
$(LIB_FILE): $(LIB_OBJS)
-- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
-+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $(LIB_OBJS) && ranlib $@
+- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
++ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $^ && ranlib $@
$(XDIFF_LIB): $(XDIFF_OBJS)
-- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
-+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $(XDIFF_OBJS) && ranlib $@
+- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
++ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $^ && ranlib $@
$(VCSSVN_LIB): $(VCSSVN_OBJS)
-- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(VCSSVN_OBJS)
-+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $(VCSSVN_OBJS) && ranlib $@
+- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
++ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $^ && ranlib $@
export DEFAULT_EDITOR DEFAULT_PAGER
-@@ -2239,7 +2239,7 @@ export TEST_NO_MALLOC_CHECK
+@@ -2258,7 +2258,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules
Index: patches/patch-gitweb_gitweb_perl
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-gitweb_gitweb_perl,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-gitweb_gitweb_perl
--- patches/patch-gitweb_gitweb_perl 25 Jan 2013 08:14:59 -0000 1.22
+++ patches/patch-gitweb_gitweb_perl 12 Sep 2013 14:15:26 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-gitweb_gitweb_perl,v 1.2
This prevents the following error: '-T and -B not implemented on filehandles'
---- gitweb/gitweb.perl.orig Mon Jan 14 20:22:04 2013
-+++ gitweb/gitweb.perl Wed Jan 23 14:53:15 2013
-@@ -6902,7 +6902,7 @@ sub git_blob_plain {
+--- gitweb/gitweb.perl.orig Fri Aug 23 21:38:43 2013
++++ gitweb/gitweb.perl Thu Sep 12 13:47:09 2013
+@@ -6907,7 +6907,7 @@ sub git_blob_plain {
$expires = "+1d";
}
@@ -13,7 +13,7 @@ This prevents the following error: '-T a
or die_error(500, "Open git-cat-file blob '$hash' failed");
# content-type (can include charset)
-@@ -6964,7 +6964,7 @@ sub git_blob {
+@@ -6969,7 +6969,7 @@ sub git_blob {
}
my $have_blame = gitweb_check_feature('blame');
Index: patches/patch-t_t0000-basic_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_t0000-basic_sh,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-t_t0000-basic_sh
--- patches/patch-t_t0000-basic_sh 11 Aug 2013 11:48:43 -0000 1.5
+++ patches/patch-t_t0000-basic_sh 12 Sep 2013 14:15:26 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-t_t0000-basic_sh,v 1.5 2013/08/11 11:48:43 benoit Exp $
---- t/t0000-basic.sh.orig Mon Jul 22 20:59:55 2013
-+++ t/t0000-basic.sh Sun Aug 11 12:34:59 2013
-@@ -571,7 +571,7 @@ test_expect_success 'update-index D/F conflict' '
+--- t/t0000-basic.sh.orig Fri Aug 23 21:38:43 2013
++++ t/t0000-basic.sh Thu Sep 12 13:47:09 2013
+@@ -631,7 +631,7 @@ test_expect_success 'update-index D/F conflict' '
test $numpath0 = 1
'
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 PLIST-main
--- pkg/PLIST-main 2 May 2013 10:01:34 -0000 1.54
+++ pkg/PLIST-main 12 Sep 2013 14:15:26 -0000
@@ -29,6 +29,7 @@ libexec/git/git-bisect
@bin libexec/git/git-cat-file
@bin libexec/git/git-check-attr
@bin libexec/git/git-check-ignore
+@bin libexec/git/git-check-mailmap
@bin libexec/git/git-check-ref-format
@bin libexec/git/git-checkout
@bin libexec/git/git-checkout-index
@@ -131,7 +132,6 @@ libexec/git/git-relink
@bin libexec/git/git-remote-ftps
@bin libexec/git/git-remote-http
@bin libexec/git/git-remote-https
-libexec/git/git-remote-testpy
@bin libexec/git/git-remote-testsvn
libexec/git/git-repack
@bin libexec/git/git-replace
@@ -208,6 +208,7 @@ libexec/git/mergetools/xxdiff
@man man/man1/git-cat-file.1
@man man/man1/git-check-attr.1
@man man/man1/git-check-ignore.1
+@man man/man1/git-check-mailmap.1
@man man/man1/git-check-ref-format.1
@man man/man1/git-checkout-index.1
@man man/man1/git-checkout.1
@@ -392,6 +393,7 @@ share/gitweb/static/gitweb.css
share/gitweb/static/gitweb.js
share/locale/da/LC_MESSAGES/git.mo
share/locale/de/LC_MESSAGES/git.mo
+share/locale/fr/LC_MESSAGES/git.mo
share/locale/is/
share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/git.mo
