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

Update to git-1.5.1.1 and take maintainership.

Browse Source 
tested by grunk@, ok matthieu@
This commit is contained in:
bernd 2007-04-20 08:44:40 +00:00
parent 96407a3c43
commit 4eb7f4a98a
5 changed files with 70 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devel/git/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2007/04/13 10:19:45 bernd Exp $
# $OpenBSD: Makefile,v 1.9 2007/04/20 08:44:40 bernd Exp $
COMMENT-main= "GIT - Tree History Storage Tool"
COMMENT-svn= "GIT - subversion interoperability tools"
V= 1.5.0.5
V= 1.5.1.1
DISTNAME= git-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-svn= git-svn-${V}
@ -11,7 +11,7 @@ CATEGORIES= devel
HOMEPAGE= http://git.or.cz/
MAINTAINER= Matthieu Herrb <matthieu@openbsd.org>
MAINTAINER= Bernd Ahlers <bernd@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
@ -50,7 +50,8 @@ RUN_DEPENDS-svn= ::${BASE_PKGPATH} \
LIB_DEPENDS-svn=
PKG_ARCH-svn= *
MAKE_ENV= prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}"
MAKE_ENV= prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
SYSCONFDIR=${SYSCONFDIR}
USE_X11= Yes
USE_GMAKE= Yes
@ -72,6 +73,6 @@ post-install:
${PREFIX}/share/doc/git
do-regress:
cd ${WRKSRC}/t && NO_SVN_TESTS=Yes ${MAKE_PROGRAM} TAR=${TAR}
cd ${WRKSRC} && NO_SVN_TESTS=Yes ${MAKE_PROGRAM} TAR=${TAR} test
.include <bsd.port.mk>

30
devel/git/distinfo
View File

@ -1,15 +1,15 @@
MD5 (git-1.5.0.5.tar.gz) = m4h4zydO+nJGMfB5Fjl0AA==
MD5 (git-htmldocs-1.5.0.5.tar.gz) = 5BdUfQNk3bRxrg8YPWRTug==
MD5 (git-manpages-1.5.0.5.tar.gz) = Rw9sy8qm86WBXNrRkvcXBQ==
RMD160 (git-1.5.0.5.tar.gz) = ez9wVhgdSYz+OG/Wqu2YpVoeoVs=
RMD160 (git-htmldocs-1.5.0.5.tar.gz) = RAFshKvjkZkdfadGf8TWsAktyaw=
RMD160 (git-manpages-1.5.0.5.tar.gz) = jBLxqUXlpQAqF1WQR+kbdUcPRYo=
SHA1 (git-1.5.0.5.tar.gz) = BRAUhSOmKW944rbr5e7C3WKtUhA=
SHA1 (git-htmldocs-1.5.0.5.tar.gz) = W6KExoW1bZYSRgu0+uGE1QqkkEk=
SHA1 (git-manpages-1.5.0.5.tar.gz) = VgsGisWQid6YONDWZ8pXZzI8z24=
SHA256 (git-1.5.0.5.tar.gz) = LXwYzsL1Ts8bciwz/ITGGbAHey37oxPo6MAMLReFRak=
SHA256 (git-htmldocs-1.5.0.5.tar.gz) = cn28TsRd8WedLqHP/XX5zqW825l5LqY4m8kmHGbuv1M=
SHA256 (git-manpages-1.5.0.5.tar.gz) = 3vPI07eZs0rTpk5xD56pJZxNLbUO8cNCzuPUVBjU520=
SIZE (git-1.5.0.5.tar.gz) = 1246090
SIZE (git-htmldocs-1.5.0.5.tar.gz) = 660297
SIZE (git-manpages-1.5.0.5.tar.gz) = 192857
MD5 (git-1.5.1.1.tar.gz) = d/tTzvB2LOKnEK7dvBKqYA==
MD5 (git-htmldocs-1.5.1.1.tar.gz) = ZL2uT4Nlk/nCdRvvLDurKw==
MD5 (git-manpages-1.5.1.1.tar.gz) = KwyAH2zlp5jAl8e6UFkiZw==
RMD160 (git-1.5.1.1.tar.gz) = 77yOW0mDFWGRXytnTvylpsX/xqI=
RMD160 (git-htmldocs-1.5.1.1.tar.gz) = PUSz6/97FjZnGb07L608GVf2bxM=
RMD160 (git-manpages-1.5.1.1.tar.gz) = cjArgwB+dmTJWqF+MXnVzeRWQP0=
SHA1 (git-1.5.1.1.tar.gz) = bQYH4SXoRm6Fr0Ef3olO5++WCY0=
SHA1 (git-htmldocs-1.5.1.1.tar.gz) = YM+ocv3AYi2obLua38kIoezDLkw=
SHA1 (git-manpages-1.5.1.1.tar.gz) = 8SPLlRMyiAy9eVc4lNcnDOm/osQ=
SHA256 (git-1.5.1.1.tar.gz) = DMYoxRBaVud5VKPDty4R+pK5lsCyEB9fTVRa6iwhur8=
SHA256 (git-htmldocs-1.5.1.1.tar.gz) = ZpBadT8wqJrIyPPZ54Da7fgQOVtHbnattJuW8PvzokQ=
SHA256 (git-manpages-1.5.1.1.tar.gz) = CBqtDYNzEe6GyXSpuLB4OA3yjMWiFkTbjWWcwiJjsPY=
SIZE (git-1.5.1.1.tar.gz) = 1322959
SIZE (git-htmldocs-1.5.1.1.tar.gz) = 683978
SIZE (git-manpages-1.5.1.1.tar.gz) = 197170

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.5 2007/04/13 10:19:45 bernd Exp $
--- Makefile.orig Sun Mar 18 23:08:11 2007
+++ Makefile Tue Apr 3 16:01:33 2007
@@ -121,13 +121,13 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo
$OpenBSD: patch-Makefile,v 1.6 2007/04/20 08:44:40 bernd Exp $
--- Makefile.orig Thu Apr 12 03:41:44 2007
+++ Makefile Fri Apr 13 13:16:37 2007
@@ -123,17 +123,17 @@ 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,12 @@ $OpenBSD: patch-Makefile,v 1.5 2007/04/13 10:19:45 bernd Exp $
bindir = $(prefix)/bin
gitexecdir = $(bindir)
template_dir = $(prefix)/share/git-core/templates/
@@ -151,7 +151,7 @@ GITWEB_SITE_FOOTER =
-ETC_GITCONFIG = $(prefix)/etc/gitconfig
+ETC_GITCONFIG = $(SYSCONFDIR)/gitconfig
# DESTDIR=
# default configuration for gitweb
@@ -154,7 +154,7 @@ GITWEB_SITE_FOOTER =
export prefix bindir gitexecdir template_dir
@ -26,7 +31,7 @@ $OpenBSD: patch-Makefile,v 1.5 2007/04/13 10:19:45 bernd Exp $
AR = ar
TAR = tar
INSTALL = install
@@ -393,7 +393,6 @@ ifeq ($(uname_S),FreeBSD)
@@ -402,7 +402,6 @@ ifeq ($(uname_S),FreeBSD)
BASIC_LDFLAGS += -L/usr/local/lib
endif
ifeq ($(uname_S),OpenBSD)
@ -34,7 +39,7 @@ $OpenBSD: patch-Makefile,v 1.5 2007/04/13 10:19:45 bernd Exp $
NEEDS_LIBICONV = YesPlease
BASIC_CFLAGS += -I/usr/local/include
BASIC_LDFLAGS += -L/usr/local/lib
@@ -473,7 +472,7 @@ ifndef NO_CURL
@@ -482,7 +481,7 @@ ifndef NO_CURL
endif
ifndef NO_OPENSSL
@ -43,3 +48,12 @@ $OpenBSD: patch-Makefile,v 1.5 2007/04/13 10:19:45 bernd Exp $
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/lib $(CC_LD_DYNPATH)$(OPENSSLDIR)/lib
@@ -861,7 +860,7 @@ GIT-CFLAGS: .FORCE-GIT-CFLAGS
export NO_SVN_TESTS
-test: all test-chmtime$X
+test: test-chmtime$X
$(MAKE) -C t/ all
test-date$X: test-date.c date.o ctype.o

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

@ -0,0 +1,12 @@
$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"

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.1 2007/04/13 10:19:45 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2007/04/20 08:44:40 bernd Exp $
@pkgpath devel/git
bin/git
bin/git-add
@ -13,6 +13,7 @@ bin/git-archive
bin/git-bisect
bin/git-blame
bin/git-branch
bin/git-bundle
bin/git-cat-file
bin/git-check-ref-format
bin/git-checkout
@ -35,10 +36,10 @@ bin/git-describe
bin/git-diff
bin/git-diff-files
bin/git-diff-index
bin/git-diff-stages
bin/git-diff-tree
bin/git-fast-import
bin/git-fetch
bin/git-fetch--tool
bin/git-fetch-pack
bin/git-fmt-merge-msg
bin/git-for-each-ref
@ -76,6 +77,7 @@ bin/git-merge-recursive
bin/git-merge-resolve
bin/git-merge-stupid
bin/git-merge-tree
bin/git-mergetool
bin/git-mktag
bin/git-mktree
bin/git-mv
@ -102,7 +104,6 @@ bin/git-repo-config
bin/git-request-pull
bin/git-rerere
bin/git-reset
bin/git-resolve
bin/git-rev-list
bin/git-rev-parse
bin/git-revert
@ -154,6 +155,7 @@ libdata/perl5/site_perl/Git.pm
@man man/man1/git-bisect.1
@man man/man1/git-blame.1
@man man/man1/git-branch.1
@man man/man1/git-bundle.1
@man man/man1/git-cat-file.1
@man man/man1/git-check-ref-format.1
@man man/man1/git-checkout-index.1
@ -174,7 +176,6 @@ libdata/perl5/site_perl/Git.pm
@man man/man1/git-describe.1
@man man/man1/git-diff-files.1
@man man/man1/git-diff-index.1
@man man/man1/git-diff-stages.1
@man man/man1/git-diff-tree.1
@man man/man1/git-diff.1
@man man/man1/git-fast-import.1
@ -210,6 +211,7 @@ libdata/perl5/site_perl/Git.pm
@man man/man1/git-merge-one-file.1
@man man/man1/git-merge-tree.1
@man man/man1/git-merge.1
@man man/man1/git-mergetool.1
@man man/man1/git-mktag.1
@man man/man1/git-mktree.1
@man man/man1/git-mv.1
@ -236,7 +238,6 @@ libdata/perl5/site_perl/Git.pm
@man man/man1/git-request-pull.1
@man man/man1/git-rerere.1
@man man/man1/git-reset.1
@man man/man1/git-resolve.1
@man man/man1/git-rev-list.1
@man man/man1/git-rev-parse.1
@man man/man1/git-revert.1
@ -279,7 +280,11 @@ share/doc/git/RelNotes-1.5.0.2.txt
share/doc/git/RelNotes-1.5.0.3.txt
share/doc/git/RelNotes-1.5.0.4.txt
share/doc/git/RelNotes-1.5.0.5.txt
share/doc/git/RelNotes-1.5.0.6.txt
share/doc/git/RelNotes-1.5.0.7.txt
share/doc/git/RelNotes-1.5.0.txt
share/doc/git/RelNotes-1.5.1.1.txt
share/doc/git/RelNotes-1.5.1.txt
share/doc/git/cmds-ancillaryinterrogators.txt
share/doc/git/cmds-ancillarymanipulators.txt
share/doc/git/cmds-foreignscminterface.txt
@ -324,6 +329,8 @@ share/doc/git/git-blame.html
share/doc/git/git-blame.txt
share/doc/git/git-branch.html
share/doc/git/git-branch.txt
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-ref-format.html
@ -364,8 +371,6 @@ share/doc/git/git-diff-files.html
share/doc/git/git-diff-files.txt
share/doc/git/git-diff-index.html
share/doc/git/git-diff-index.txt
share/doc/git/git-diff-stages.html
share/doc/git/git-diff-stages.txt
share/doc/git/git-diff-tree.html
share/doc/git/git-diff-tree.txt
share/doc/git/git-diff.html
@ -436,6 +441,8 @@ share/doc/git/git-merge-tree.html
share/doc/git/git-merge-tree.txt
share/doc/git/git-merge.html
share/doc/git/git-merge.txt
share/doc/git/git-mergetool.html
share/doc/git/git-mergetool.txt
share/doc/git/git-mktag.html
share/doc/git/git-mktag.txt
share/doc/git/git-mktree.html
@ -490,8 +497,6 @@ share/doc/git/git-rerere.html
share/doc/git/git-rerere.txt
share/doc/git/git-reset.html
share/doc/git/git-reset.txt
share/doc/git/git-resolve.html
share/doc/git/git-resolve.txt
share/doc/git/git-rev-list.html
share/doc/git/git-rev-list.txt
share/doc/git/git-rev-parse.html
@ -586,6 +591,7 @@ share/doc/git/howto/revert-branch-rebase.txt
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
@ -615,6 +621,7 @@ share/git-core/templates/hooks/
share/git-core/templates/hooks/applypatch-msg
share/git-core/templates/hooks/commit-msg
share/git-core/templates/hooks/post-commit
share/git-core/templates/hooks/post-receive
share/git-core/templates/hooks/post-update
share/git-core/templates/hooks/pre-applypatch
share/git-core/templates/hooks/pre-commit