cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to git-1.5.2.3.

Browse Source 
Diff from Daniel Dickman. Thank you!
This commit is contained in:
bernd 2007-07-12 18:26:04 +00:00
parent 04b7d17b5c
commit 786de2fdd3
5 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/git/Makefile
View File

@ -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-main= "GIT - Tree History Storage Tool"
COMMENT-svn= "GIT - subversion interoperability tools" COMMENT-svn= "GIT - subversion interoperability tools"
V= 1.5.2.1 V= 1.5.2.3
DISTNAME= git-${V} DISTNAME= git-${V}
PKGNAME-main= ${DISTNAME} PKGNAME-main= ${DISTNAME}
PKGNAME-svn= git-svn-${V} PKGNAME-svn= git-svn-${V}
@ -62,6 +62,7 @@ post-extract:
@rm -f ${WRKDIR}/man1/git-p4import.1 @rm -f ${WRKDIR}/man1/git-p4import.1
post-install: post-install:
${INSTALL_DATA} ${WRKBUILD}/libgit.a ${PREFIX}/lib
${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
${INSTALL_DATA} ${WRKBUILD}/contrib/emacs/*.el \ ${INSTALL_DATA} ${WRKBUILD}/contrib/emacs/*.el \
${PREFIX}/share/emacs/site-lisp ${PREFIX}/share/emacs/site-lisp

30
devel/git/distinfo
View File

@ -1,15 +1,15 @@
MD5 (git-1.5.2.1.tar.gz) = 5lsIwuGkESwxOcFaxaE+cQ== MD5 (git-1.5.2.3.tar.gz) = 4g3Q2VemvPAQbQaFDwJjHg==
MD5 (git-htmldocs-1.5.2.1.tar.gz) = WTB73lWpWWPk3rXVppO6uQ== MD5 (git-htmldocs-1.5.2.3.tar.gz) = HQKGskNoNp+SYOo+zhodhw==
MD5 (git-manpages-1.5.2.1.tar.gz) = 50LSlWRr6fXXOshlT8pIeg== MD5 (git-manpages-1.5.2.3.tar.gz) = 0uoGqCmzcG94iPU3u345Zw==
RMD160 (git-1.5.2.1.tar.gz) = rq3zn9XMHKY1MktmAcVd6hJn5CI= RMD160 (git-1.5.2.3.tar.gz) = jgKG597EPWsN+6MS9YldcmB3irY=
RMD160 (git-htmldocs-1.5.2.1.tar.gz) = erRsFg0r8dQs0DM3U0h1BrWkg4w= RMD160 (git-htmldocs-1.5.2.3.tar.gz) = 5xRMCbraYZmzuIhNgaduUpek/6s=
RMD160 (git-manpages-1.5.2.1.tar.gz) = QhWBYdjkUzWmm5CJMUJ29wWdh1c= RMD160 (git-manpages-1.5.2.3.tar.gz) = 4yZVh3QSslbI+BGW22ZxzwtmZtA=
SHA1 (git-1.5.2.1.tar.gz) = Wo4WWsvnnB7f9OYI1NDsS5FSV8g= SHA1 (git-1.5.2.3.tar.gz) = b6OIiEDKbefY1bf9rEaEk5PYk90=
SHA1 (git-htmldocs-1.5.2.1.tar.gz) = +Q/oAOqyC1+CQcx16m6jejmVrrU= SHA1 (git-htmldocs-1.5.2.3.tar.gz) = jfyl8ZjVkpFcbjYAJlFksRHtPuk=
SHA1 (git-manpages-1.5.2.1.tar.gz) = /MOI6sVvwzhirueupJk1YPmACMk= SHA1 (git-manpages-1.5.2.3.tar.gz) = TiIn+3tCap9VwxAF/OaCJvouwzU=
SHA256 (git-1.5.2.1.tar.gz) = 06Eyi0SAfXATMm+FHTRtRKuvqPb3XKlydEIR2J0Z3uQ= SHA256 (git-1.5.2.3.tar.gz) = /vv36YeLUdKN7d4uZ+QVoNljkLE9AdgzPyqxfzBRu2E=
SHA256 (git-htmldocs-1.5.2.1.tar.gz) = rs3WqVKKgRzzCuoZcQpO2i3hx0HOwKQ9xFkJYGA2PXw= SHA256 (git-htmldocs-1.5.2.3.tar.gz) = wzy/QV4bGGsNaxbnp8rjsbCtMFD+NO/Hpt1R4DIublI=
SHA256 (git-manpages-1.5.2.1.tar.gz) = /LPR4tOWNbiU0cpuWvTaVMJTmdCf+ZBTt0hcXHoA5Us= SHA256 (git-manpages-1.5.2.3.tar.gz) = SBYaOycbL3oOPQioYPb6frLJwiwacABhulCOWOaiY1A=
SIZE (git-1.5.2.1.tar.gz) = 1403569 SIZE (git-1.5.2.3.tar.gz) = 1411121
SIZE (git-htmldocs-1.5.2.1.tar.gz) = 735307 SIZE (git-htmldocs-1.5.2.3.tar.gz) = 737035
SIZE (git-manpages-1.5.2.1.tar.gz) = 209060 SIZE (git-manpages-1.5.2.3.tar.gz) = 209221

18
devel/git/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.9 2007/06/14 21:44:49 bernd Exp $ $OpenBSD: patch-Makefile,v 1.10 2007/07/12 18:26:04 bernd Exp $
--- Makefile.orig Sun Jun 3 01:21:54 2007 --- Makefile.orig Sat Jun 16 17:31:24 2007
+++ Makefile Thu Jun 14 23:30:38 2007 +++ Makefile Sun Jun 17 19:42:08 2007
@@ -135,13 +135,13 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo @@ -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. # 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 bindir = $(prefix)/bin
gitexecdir = $(bindir) gitexecdir = $(bindir)
sharedir = $(prefix)/share/ sharedir = $(prefix)/share/
@@ -151,7 +151,7 @@ sysconfdir = /etc @@ -153,7 +153,7 @@ sysconfdir = /etc
else else
sysconfdir = $(prefix)/etc sysconfdir = $(prefix)/etc
endif endif
@ -26,7 +26,7 @@ $OpenBSD: patch-Makefile,v 1.9 2007/06/14 21:44:49 bernd Exp $
# DESTDIR= # DESTDIR=
# default configuration for gitweb # 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 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 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 BASIC_LDFLAGS += -L/usr/local/lib
endif endif
ifeq ($(uname_S),OpenBSD) ifeq ($(uname_S),OpenBSD)
@ -55,7 +55,7 @@ $OpenBSD: patch-Makefile,v 1.9 2007/06/14 21:44:49 bernd Exp $
endif endif
ifeq ($(uname_S),NetBSD) ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2) ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -528,7 +527,7 @@ ifndef NO_CURL @@ -531,7 +530,7 @@ ifndef NO_CURL
endif endif
ifndef NO_OPENSSL ifndef NO_OPENSSL
@ -64,7 +64,7 @@ $OpenBSD: patch-Makefile,v 1.9 2007/06/14 21:44:49 bernd Exp $
ifdef OPENSSLDIR ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/lib $(CC_LD_DYNPATH)$(OPENSSLDIR)/lib 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 export NO_SVN_TESTS

18
devel/git/patches/patch-git-cvsimport_perl Normal file
View File

@ -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 $?;
}
}

5
devel/git/pkg/PLIST-main
View File

@ -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 @pkgpath devel/git
bin/git bin/git
bin/git-add bin/git-add
@ -142,6 +142,7 @@ bin/git-verify-tag
bin/git-whatchanged bin/git-whatchanged
bin/git-write-tree bin/git-write-tree
bin/gitk bin/gitk
lib/libgit.a
libdata/perl5/site_perl/Git.pm libdata/perl5/site_perl/Git.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@man man/man1/git-add.1 @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.6.txt
share/doc/git/RelNotes-1.5.1.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.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/RelNotes-1.5.2.txt
share/doc/git/blame-options.txt share/doc/git/blame-options.txt
share/doc/git/cmds-ancillaryinterrogators.txt share/doc/git/cmds-ancillaryinterrogators.txt