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

Update to git-1.5.2.1.

Browse Source 
Initial diff from Daniel Dickman. Thank you!
This commit is contained in:
bernd 2007-06-14 21:44:49 +00:00
parent 98e69d17a9
commit 81bcd23cb9
6 changed files with 75 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devel/git/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2007/05/08 09:48:07 bernd Exp $
# $OpenBSD: Makefile,v 1.12 2007/06/14 21:44:49 bernd Exp $
COMMENT-main= "GIT - Tree History Storage Tool"
COMMENT-svn= "GIT - subversion interoperability tools"
V= 1.5.1.3
V= 1.5.2.1
DISTNAME= git-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-svn= git-svn-${V}
@ -50,7 +50,8 @@ LIB_DEPENDS-svn=
PKG_ARCH-svn= *
MAKE_ENV= prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
SYSCONFDIR=${SYSCONFDIR}
SYSCONFDIR=${SYSCONFDIR} \
TCLTK_PATH=${LOCALBASE}/bin/wish8.4
USE_X11= Yes
USE_GMAKE= Yes

30
devel/git/distinfo
View File

@ -1,15 +1,15 @@
MD5 (git-1.5.1.3.tar.gz) = 1u1pXj6iyVK6mYiOXS5TCg==
MD5 (git-htmldocs-1.5.1.3.tar.gz) = dx5dOOtdOfBeiMTYA29G3A==
MD5 (git-manpages-1.5.1.3.tar.gz) = tkVBrH79vvSzDOCQLgTqnA==
RMD160 (git-1.5.1.3.tar.gz) = UBDHr5+BJXR3NkafsvPEUnVGuvY=
RMD160 (git-htmldocs-1.5.1.3.tar.gz) = jSvTwIDOQOlbWvJPURkKtviX/rQ=
RMD160 (git-manpages-1.5.1.3.tar.gz) = fkUOZ1HIZka5mDtt4eoul8i7WYA=
SHA1 (git-1.5.1.3.tar.gz) = InMLsdOKL7L2HTGUBK1TvIp5SSc=
SHA1 (git-htmldocs-1.5.1.3.tar.gz) = R/aodgJI+v2BFM/qrceUxRORNH0=
SHA1 (git-manpages-1.5.1.3.tar.gz) = UB7XbuC3oZ/iR93WzKSVkQjoVTg=
SHA256 (git-1.5.1.3.tar.gz) = Kb6P67ByvnHOdIBXGNWpF3F2gDAeSXRxoYo+yafyF6Q=
SHA256 (git-htmldocs-1.5.1.3.tar.gz) = SKHEBfN7wOQ5U0uvin5B6fufOLoAvmS/OVeqISgRKbM=
SHA256 (git-manpages-1.5.1.3.tar.gz) = n+e6xs8a+jtJPv2SgXCBN6AiBg0ejnKZE0zyiRstGEs=
SIZE (git-1.5.1.3.tar.gz) = 1328539
SIZE (git-htmldocs-1.5.1.3.tar.gz) = 693149
SIZE (git-manpages-1.5.1.3.tar.gz) = 200101
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

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.8 2007/05/08 09:48:07 bernd Exp $
--- Makefile.orig Tue May 1 04:46:26 2007
+++ Makefile Sat May 5 09:29:24 2007
@@ -123,13 +123,13 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo
$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
# CFLAGS and LDFLAGS are for the users to override from the command line.
@ -16,8 +16,8 @@ $OpenBSD: patch-Makefile,v 1.8 2007/05/08 09:48:07 bernd Exp $
+#prefix = $(HOME)
bindir = $(prefix)/bin
gitexecdir = $(bindir)
template_dir = $(prefix)/share/git-core/templates/
@@ -138,7 +138,7 @@ sysconfdir = /etc
sharedir = $(prefix)/share/
@@ -151,7 +151,7 @@ sysconfdir = /etc
else
sysconfdir = $(prefix)/etc
endif
@ -26,16 +26,23 @@ $OpenBSD: patch-Makefile,v 1.8 2007/05/08 09:48:07 bernd Exp $
# DESTDIR=
# default configuration for gitweb
@@ -159,7 +159,7 @@ GITWEB_SITE_FOOTER =
@@ -172,13 +172,13 @@ GITWEB_SITE_FOOTER =
export prefix bindir gitexecdir template_dir sysconfdir
export prefix bindir gitexecdir sharedir template_dir sysconfdir
-CC = gcc
+CC ?= gcc
AR = ar
TAR = tar
INSTALL = install
@@ -407,10 +407,9 @@ ifeq ($(uname_S),FreeBSD)
RPMBUILD = rpmbuild
TCL_PATH = tclsh
-TCLTK_PATH = wish
+TCLTK_PATH ?= wish
export TCL_PATH TCLTK_PATH
@@ -448,10 +448,9 @@ ifeq ($(uname_S),FreeBSD)
BASIC_LDFLAGS += -L/usr/local/lib
endif
ifeq ($(uname_S),OpenBSD)
@ -48,7 +55,7 @@ $OpenBSD: patch-Makefile,v 1.8 2007/05/08 09:48:07 bernd Exp $
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -487,7 +486,7 @@ ifndef NO_CURL
@@ -528,7 +527,7 @@ ifndef NO_CURL
endif
ifndef NO_OPENSSL
@ -57,12 +64,12 @@ $OpenBSD: patch-Makefile,v 1.8 2007/05/08 09:48:07 bernd Exp $
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/lib $(CC_LD_DYNPATH)$(OPENSSLDIR)/lib
@@ -866,7 +865,7 @@ GIT-CFLAGS: .FORCE-GIT-CFLAGS
@@ -951,7 +950,7 @@ all:: $(TEST_PROGRAMS)
export NO_SVN_TESTS
-test: all test-chmtime$X
+test: test-chmtime$X
-test: all
+test:
$(MAKE) -C t/ all
test-date$X: test-date.c date.o ctype.o

11
devel/git/patches/patch-git-gui_git-gui_sh
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-git-gui_git-gui_sh,v 1.1 2007/04/13 10:19:45 bernd Exp $
--- git-gui/git-gui.sh.orig Tue Apr 10 15:32:04 2007
+++ git-gui/git-gui.sh Tue Apr 10 15:32:17 2007
@@ -1,6 +1,6 @@
#!/bin/sh
# Tcl ignores the next line -*- tcl -*- \
-exec wish "$0" -- "$@"
+exec wish8.4 "$0" -- "$@"
set appvers {@@GITGUI_VERSION@@}
set copyright {

12
devel/git/patches/patch-t_t4200-rerere_sh
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-t_t4200-rerere_sh,v 1.1 2007/04/20 08:44:40 bernd Exp $
--- t/t4200-rerere.sh.orig Fri Apr 13 12:55:43 2007
+++ t/t4200-rerere.sh Fri Apr 13 12:55:43 2007
@@ -44,7 +44,7 @@ mkdir .git/rr-cache
test_expect_failure 'conflicting merge' 'git pull . first'
-sha1=$(sed -e 's/\t.*//' .git/rr-cache/MERGE_RR)
+sha1=$(sed -e 's/ .*//' .git/rr-cache/MERGE_RR)
rr=.git/rr-cache/$sha1
test_expect_success 'recorded preimage' "grep ======= $rr/preimage"

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.3 2007/05/08 09:48:07 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2007/06/14 21:44:49 bernd Exp $
@pkgpath devel/git
bin/git
bin/git-add
@ -15,6 +15,7 @@ bin/git-blame
bin/git-branch
bin/git-bundle
bin/git-cat-file
bin/git-check-attr
bin/git-check-ref-format
bin/git-checkout
bin/git-checkout-index
@ -76,6 +77,7 @@ bin/git-merge-ours
bin/git-merge-recursive
bin/git-merge-resolve
bin/git-merge-stupid
bin/git-merge-subtree
bin/git-merge-tree
bin/git-mergetool
bin/git-mktag
@ -155,6 +157,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@man man/man1/git-branch.1
@man man/man1/git-bundle.1
@man man/man1/git-cat-file.1
@man man/man1/git-check-attr.1
@man man/man1/git-check-ref-format.1
@man man/man1/git-checkout-index.1
@man man/man1/git-checkout.1
@ -272,6 +275,8 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@man man/man1/git.1
@man man/man1/gitk.1
@man man/man3p/Git.3p
@man man/man5/gitattributes.5
@man man/man5/gitignore.5
share/doc/git/
share/doc/git/RelNotes-1.5.0.1.txt
share/doc/git/RelNotes-1.5.0.2.txt
@ -284,7 +289,12 @@ share/doc/git/RelNotes-1.5.0.txt
share/doc/git/RelNotes-1.5.1.1.txt
share/doc/git/RelNotes-1.5.1.2.txt
share/doc/git/RelNotes-1.5.1.3.txt
share/doc/git/RelNotes-1.5.1.4.txt
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.txt
share/doc/git/blame-options.txt
share/doc/git/cmds-ancillaryinterrogators.txt
share/doc/git/cmds-ancillarymanipulators.txt
@ -334,6 +344,8 @@ share/doc/git/git-bundle.html
share/doc/git/git-bundle.txt
share/doc/git/git-cat-file.html
share/doc/git/git-cat-file.txt
share/doc/git/git-check-attr.html
share/doc/git/git-check-attr.txt
share/doc/git/git-check-ref-format.html
share/doc/git/git-check-ref-format.txt
share/doc/git/git-checkout-index.html
@ -572,6 +584,10 @@ share/doc/git/git-write-tree.html
share/doc/git/git-write-tree.txt
share/doc/git/git.html
share/doc/git/git.txt
share/doc/git/gitattributes.html
share/doc/git/gitattributes.txt
share/doc/git/gitignore.html
share/doc/git/gitignore.txt
share/doc/git/gitk.html
share/doc/git/gitk.txt
share/doc/git/glossary.html
@ -581,9 +597,6 @@ share/doc/git/hooks.txt
share/doc/git/howto/
share/doc/git/howto-index.html
share/doc/git/howto-index.txt
share/doc/git/howto/dangling-objects.txt
share/doc/git/howto/isolate-bugs-with-bisect.txt
share/doc/git/howto/make-dist.txt
share/doc/git/howto/rebase-and-edit.txt
share/doc/git/howto/rebase-from-internal-branch.txt
share/doc/git/howto/rebuild-from-update-hook.txt
@ -593,12 +606,12 @@ share/doc/git/howto/separating-topic-branches.txt
share/doc/git/howto/setup-git-server-over-http.txt
share/doc/git/howto/update-hook-example.txt
share/doc/git/howto/use-git-daemon.txt
share/doc/git/howto/using-topic-branches.txt
share/doc/git/i18n.txt
share/doc/git/index.html
share/doc/git/merge-options.txt
share/doc/git/merge-strategies.txt
share/doc/git/pretty-formats.txt
share/doc/git/pretty-options.txt
share/doc/git/pull-fetch-param.txt
share/doc/git/repository-layout.html
share/doc/git/repository-layout.txt
@ -630,3 +643,21 @@ share/git-core/templates/hooks/pre-rebase
share/git-core/templates/hooks/update
share/git-core/templates/info/
share/git-core/templates/info/exclude
share/git-gui/
share/git-gui/lib/
share/git-gui/lib/blame.tcl
share/git-gui/lib/branch.tcl
share/git-gui/lib/browser.tcl
share/git-gui/lib/class.tcl
share/git-gui/lib/commit.tcl
share/git-gui/lib/console.tcl
share/git-gui/lib/database.tcl
share/git-gui/lib/diff.tcl
share/git-gui/lib/error.tcl
share/git-gui/lib/index.tcl
share/git-gui/lib/merge.tcl
share/git-gui/lib/option.tcl
share/git-gui/lib/remote.tcl
share/git-gui/lib/shortcut.tcl
share/git-gui/lib/tclIndex
share/git-gui/lib/transport.tcl