diff --git a/devel/git/Makefile b/devel/git/Makefile index 7f21ea9102a..4734cb62230 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.12 2007/06/14 21:44:49 bernd Exp $ +# $OpenBSD: Makefile,v 1.13 2007/07/12 18:26:04 bernd Exp $ COMMENT-main= "GIT - Tree History Storage Tool" COMMENT-svn= "GIT - subversion interoperability tools" -V= 1.5.2.1 +V= 1.5.2.3 DISTNAME= git-${V} PKGNAME-main= ${DISTNAME} PKGNAME-svn= git-svn-${V} @@ -62,6 +62,7 @@ post-extract: @rm -f ${WRKDIR}/man1/git-p4import.1 post-install: + ${INSTALL_DATA} ${WRKBUILD}/libgit.a ${PREFIX}/lib ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKBUILD}/contrib/emacs/*.el \ ${PREFIX}/share/emacs/site-lisp diff --git a/devel/git/distinfo b/devel/git/distinfo index ea6d5c7dcbc..c614e5af52a 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,15 +1,15 @@ -MD5 (git-1.5.2.1.tar.gz) = 5lsIwuGkESwxOcFaxaE+cQ== -MD5 (git-htmldocs-1.5.2.1.tar.gz) = WTB73lWpWWPk3rXVppO6uQ== -MD5 (git-manpages-1.5.2.1.tar.gz) = 50LSlWRr6fXXOshlT8pIeg== -RMD160 (git-1.5.2.1.tar.gz) = rq3zn9XMHKY1MktmAcVd6hJn5CI= -RMD160 (git-htmldocs-1.5.2.1.tar.gz) = erRsFg0r8dQs0DM3U0h1BrWkg4w= -RMD160 (git-manpages-1.5.2.1.tar.gz) = QhWBYdjkUzWmm5CJMUJ29wWdh1c= -SHA1 (git-1.5.2.1.tar.gz) = Wo4WWsvnnB7f9OYI1NDsS5FSV8g= -SHA1 (git-htmldocs-1.5.2.1.tar.gz) = +Q/oAOqyC1+CQcx16m6jejmVrrU= -SHA1 (git-manpages-1.5.2.1.tar.gz) = /MOI6sVvwzhirueupJk1YPmACMk= -SHA256 (git-1.5.2.1.tar.gz) = 06Eyi0SAfXATMm+FHTRtRKuvqPb3XKlydEIR2J0Z3uQ= -SHA256 (git-htmldocs-1.5.2.1.tar.gz) = rs3WqVKKgRzzCuoZcQpO2i3hx0HOwKQ9xFkJYGA2PXw= -SHA256 (git-manpages-1.5.2.1.tar.gz) = /LPR4tOWNbiU0cpuWvTaVMJTmdCf+ZBTt0hcXHoA5Us= -SIZE (git-1.5.2.1.tar.gz) = 1403569 -SIZE (git-htmldocs-1.5.2.1.tar.gz) = 735307 -SIZE (git-manpages-1.5.2.1.tar.gz) = 209060 +MD5 (git-1.5.2.3.tar.gz) = 4g3Q2VemvPAQbQaFDwJjHg== +MD5 (git-htmldocs-1.5.2.3.tar.gz) = HQKGskNoNp+SYOo+zhodhw== +MD5 (git-manpages-1.5.2.3.tar.gz) = 0uoGqCmzcG94iPU3u345Zw== +RMD160 (git-1.5.2.3.tar.gz) = jgKG597EPWsN+6MS9YldcmB3irY= +RMD160 (git-htmldocs-1.5.2.3.tar.gz) = 5xRMCbraYZmzuIhNgaduUpek/6s= +RMD160 (git-manpages-1.5.2.3.tar.gz) = 4yZVh3QSslbI+BGW22ZxzwtmZtA= +SHA1 (git-1.5.2.3.tar.gz) = b6OIiEDKbefY1bf9rEaEk5PYk90= +SHA1 (git-htmldocs-1.5.2.3.tar.gz) = jfyl8ZjVkpFcbjYAJlFksRHtPuk= +SHA1 (git-manpages-1.5.2.3.tar.gz) = TiIn+3tCap9VwxAF/OaCJvouwzU= +SHA256 (git-1.5.2.3.tar.gz) = /vv36YeLUdKN7d4uZ+QVoNljkLE9AdgzPyqxfzBRu2E= +SHA256 (git-htmldocs-1.5.2.3.tar.gz) = wzy/QV4bGGsNaxbnp8rjsbCtMFD+NO/Hpt1R4DIublI= +SHA256 (git-manpages-1.5.2.3.tar.gz) = SBYaOycbL3oOPQioYPb6frLJwiwacABhulCOWOaiY1A= +SIZE (git-1.5.2.3.tar.gz) = 1411121 +SIZE (git-htmldocs-1.5.2.3.tar.gz) = 737035 +SIZE (git-manpages-1.5.2.3.tar.gz) = 209221 diff --git a/devel/git/patches/patch-Makefile b/devel/git/patches/patch-Makefile index a007ee9fee1..db095efdbf5 100644 --- a/devel/git/patches/patch-Makefile +++ b/devel/git/patches/patch-Makefile @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile,v 1.9 2007/06/14 21:44:49 bernd Exp $ ---- Makefile.orig Sun Jun 3 01:21:54 2007 -+++ Makefile Thu Jun 14 23:30:38 2007 -@@ -135,13 +135,13 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo +$OpenBSD: patch-Makefile,v 1.10 2007/07/12 18:26:04 bernd Exp $ +--- Makefile.orig Sat Jun 16 17:31:24 2007 ++++ Makefile Sun Jun 17 19:42:08 2007 +@@ -137,13 +137,13 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo # CFLAGS and LDFLAGS are for the users to override from the command line. @@ -17,7 +17,7 @@ $OpenBSD: patch-Makefile,v 1.9 2007/06/14 21:44:49 bernd Exp $ bindir = $(prefix)/bin gitexecdir = $(bindir) sharedir = $(prefix)/share/ -@@ -151,7 +151,7 @@ sysconfdir = /etc +@@ -153,7 +153,7 @@ sysconfdir = /etc else sysconfdir = $(prefix)/etc endif @@ -26,7 +26,7 @@ $OpenBSD: patch-Makefile,v 1.9 2007/06/14 21:44:49 bernd Exp $ # DESTDIR= # default configuration for gitweb -@@ -172,13 +172,13 @@ GITWEB_SITE_FOOTER = +@@ -174,13 +174,13 @@ GITWEB_SITE_FOOTER = export prefix bindir gitexecdir sharedir template_dir sysconfdir @@ -42,7 +42,7 @@ $OpenBSD: patch-Makefile,v 1.9 2007/06/14 21:44:49 bernd Exp $ export TCL_PATH TCLTK_PATH -@@ -448,10 +448,9 @@ ifeq ($(uname_S),FreeBSD) +@@ -451,10 +451,9 @@ ifeq ($(uname_S),FreeBSD) BASIC_LDFLAGS += -L/usr/local/lib endif ifeq ($(uname_S),OpenBSD) @@ -55,7 +55,7 @@ $OpenBSD: patch-Makefile,v 1.9 2007/06/14 21:44:49 bernd Exp $ endif ifeq ($(uname_S),NetBSD) ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2) -@@ -528,7 +527,7 @@ ifndef NO_CURL +@@ -531,7 +530,7 @@ ifndef NO_CURL endif ifndef NO_OPENSSL @@ -64,7 +64,7 @@ $OpenBSD: patch-Makefile,v 1.9 2007/06/14 21:44:49 bernd Exp $ ifdef OPENSSLDIR BASIC_CFLAGS += -I$(OPENSSLDIR)/include OPENSSL_LINK = -L$(OPENSSLDIR)/lib $(CC_LD_DYNPATH)$(OPENSSLDIR)/lib -@@ -951,7 +950,7 @@ all:: $(TEST_PROGRAMS) +@@ -962,7 +961,7 @@ all:: $(TEST_PROGRAMS) export NO_SVN_TESTS diff --git a/devel/git/patches/patch-git-cvsimport_perl b/devel/git/patches/patch-git-cvsimport_perl new file mode 100644 index 00000000000..37024beeb50 --- /dev/null +++ b/devel/git/patches/patch-git-cvsimport_perl @@ -0,0 +1,18 @@ +$OpenBSD: patch-git-cvsimport_perl,v 1.1 2007/07/12 18:26:04 bernd Exp $ + +Backport commit 7051c3b1294a110a862a7b48e983490fba32389f from the git +repository to fix a problem with git-cvsimport. + +Fixed in git > 1.5.2.3. + +--- git-cvsimport.perl.orig Thu Jul 12 19:24:26 2007 ++++ git-cvsimport.perl Thu Jul 12 19:24:54 2007 +@@ -1020,7 +1020,7 @@ if ($orig_branch) { + unless -f "$git_dir/refs/heads/master"; + system('git-update-ref', 'HEAD', "$orig_branch"); + unless ($opt_i) { +- system('git checkout'); ++ system('git checkout -f'); + die "checkout failed: $?\n" if $?; + } + } diff --git a/devel/git/pkg/PLIST-main b/devel/git/pkg/PLIST-main index f388129de6f..e55b97453a6 100644 --- a/devel/git/pkg/PLIST-main +++ b/devel/git/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.4 2007/06/14 21:44:49 bernd Exp $ +@comment $OpenBSD: PLIST-main,v 1.5 2007/07/12 18:26:04 bernd Exp $ @pkgpath devel/git bin/git bin/git-add @@ -142,6 +142,7 @@ bin/git-verify-tag bin/git-whatchanged bin/git-write-tree bin/gitk +lib/libgit.a libdata/perl5/site_perl/Git.pm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/ @man man/man1/git-add.1 @@ -294,6 +295,8 @@ share/doc/git/RelNotes-1.5.1.5.txt share/doc/git/RelNotes-1.5.1.6.txt share/doc/git/RelNotes-1.5.1.txt share/doc/git/RelNotes-1.5.2.1.txt +share/doc/git/RelNotes-1.5.2.2.txt +share/doc/git/RelNotes-1.5.2.3.txt share/doc/git/RelNotes-1.5.2.txt share/doc/git/blame-options.txt share/doc/git/cmds-ancillaryinterrogators.txt