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

Update to git-1.6.3.1.

Browse Source 
Also:
- install gitweb and related stuff (from Simon Kuhnle)
- fix paths in some manpages (noticed by mk@)
- 64bit for date.c fix went upstream

Thanks guys!
This commit is contained in:
bernd 2009-05-18 19:23:58 +00:00
parent 794450d76b
commit 5fccd654b3
12 changed files with 85 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devel/git/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.45 2009/04/05 10:05:35 bernd Exp $
# $OpenBSD: Makefile,v 1.46 2009/05/18 19:23:58 bernd Exp $
COMMENT-main= GIT - Tree History Storage Tool
COMMENT-svn= GIT - subversion interoperability tools
COMMENT-x11= GIT - graphical tools
V= 1.6.2.2
V= 1.6.3.1
DISTNAME= git-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-svn= git-svn-${V}
@ -68,8 +68,10 @@ USE_GMAKE= Yes
REGRESS_DEPENDS= :zip-*:archivers/zip \
:cvsps-*:devel/cvsps \
::devel/subversion,-perl \
::sysutils/ggrep
::devel/subversion,-perl
GITWEB= README INSTALL git-favicon.png git-logo.png \
gitweb.cgi gitweb.css
post-extract:
@mkdir -p ${WRKSRC}/doc
@ -77,6 +79,10 @@ post-extract:
@${TAR} -C ${WRKSRC}/doc -xzf ${FULLDISTDIR}/${distfile}${EXTRACT_SUFX}
.endfor
@rm -f ${WRKSRC}/doc/man1/git-p4import.1
@cd ${WRKSRC} && perl -pi -e "s|/usr/share/git|${TRUEPREFIX}/share/git|g" \
Documentation/git-clone.txt Documentation/git-init.txt \
doc/man1/git-clone.1 doc/man1/git-init.1 doc/git-clone.txt \
doc/git-init.txt doc/git-clone.html doc/git-init.html
post-install:
${INSTALL_DATA} ${WRKBUILD}/libgit.a ${PREFIX}/lib
@ -92,6 +98,9 @@ post-install:
${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/post-receive-email \
${PREFIX}/share/git-core/templates/hooks/post-receive-email.sample
chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git
${INSTALL_DATA_DIR} ${PREFIX}/share/gitweb
cd ${WRKSRC}/gitweb && \
${INSTALL_DATA} ${GITWEB} ${PREFIX}/share/gitweb
do-regress:
cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} \

30
devel/git/distinfo
View File

@ -1,15 +1,15 @@
MD5 (git-1.6.2.2.tar.gz) = PvK1o5KoQryutqVw32dLGQ==
MD5 (git-htmldocs-1.6.2.2.tar.gz) = oQn3k1/L5uiaAw6zFqlzLA==
MD5 (git-manpages-1.6.2.2.tar.gz) = eAxVbY70WBHepnEqRqog5A==
RMD160 (git-1.6.2.2.tar.gz) = R8iqRE7T2ApaIdaCP69g+gPM61o=
RMD160 (git-htmldocs-1.6.2.2.tar.gz) = ixM3cj/qUTdM6kq63OEl+G2FyBk=
RMD160 (git-manpages-1.6.2.2.tar.gz) = 8wI/kcoh61Hqv8DP4vKto8BFgN0=
SHA1 (git-1.6.2.2.tar.gz) = 0W1gmE2TFDQsT14LwZhBFMpHf0c=
SHA1 (git-htmldocs-1.6.2.2.tar.gz) = R2xZESkLDzfUcsyplEuMYX1IF7E=
SHA1 (git-manpages-1.6.2.2.tar.gz) = DQFpjQy9Za9I2pkMrcyHUN6O0Fc=
SHA256 (git-1.6.2.2.tar.gz) = 9RLDkerxFxMpla9DUvvOmtgP79bLaVeT7y4K1jISK+g=
SHA256 (git-htmldocs-1.6.2.2.tar.gz) = EduVVy5/h+ov9nfmuNZt393GhhAybfuOqRTK6st1eLQ=
SHA256 (git-manpages-1.6.2.2.tar.gz) = MeHLofKMtJ/lVTuAMlE2I6/jEYEsLfaQUXU1WaSMzZ8=
SIZE (git-1.6.2.2.tar.gz) = 2445856
SIZE (git-htmldocs-1.6.2.2.tar.gz) = 1030406
SIZE (git-manpages-1.6.2.2.tar.gz) = 335785
MD5 (git-1.6.3.1.tar.gz) = G2lY3FE3RBS5AHQ8j5hQxw==
MD5 (git-htmldocs-1.6.3.1.tar.gz) = SK5NRgZvsyGdDczRv4idRA==
MD5 (git-manpages-1.6.3.1.tar.gz) = jFBlKwT4C0V29PpH1M773g==
RMD160 (git-1.6.3.1.tar.gz) = ZNMCr1jWn2e71Vu9aVNTO2zWD+I=
RMD160 (git-htmldocs-1.6.3.1.tar.gz) = o1VjtAkjwErNKTLns6Dvw7UinvY=
RMD160 (git-manpages-1.6.3.1.tar.gz) = jDQ0TOuII/qYqI+j2YlRPS5IP3g=
SHA1 (git-1.6.3.1.tar.gz) = lqSi8zTLO1Vr4joUb71n/4rP9IE=
SHA1 (git-htmldocs-1.6.3.1.tar.gz) = 4Q87SOQXqAx7OfXfJLdJpKgBv8w=
SHA1 (git-manpages-1.6.3.1.tar.gz) = 6qJmutFHu3380cBFuPIvFUJZ6y0=
SHA256 (git-1.6.3.1.tar.gz) = ISISQGUZKwKBYpwFc2tnMTc9FufiKcAJfKculw3pkuI=
SHA256 (git-htmldocs-1.6.3.1.tar.gz) = 9e4J3YppA1ZnFS3gs9uJ6Saqby7d/M8vdL7Cpfb/b4k=
SHA256 (git-manpages-1.6.3.1.tar.gz) = kkbPCv9K5h6xWRCnhqOKKIyqpec3DX7+OiJs9OZMj0s=
SIZE (git-1.6.3.1.tar.gz) = 2510588
SIZE (git-htmldocs-1.6.3.1.tar.gz) = 1048669
SIZE (git-manpages-1.6.3.1.tar.gz) = 346096

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

@ -1,6 +1,6 @@
--- Makefile.orig Wed Mar 4 09:18:50 2009
+++ Makefile Sat Mar 7 14:14:19 2009
@@ -173,7 +173,7 @@ uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo
--- Makefile.orig Thu May 7 06:29:04 2009
+++ Makefile Fri May 8 09:52:09 2009
@@ -189,7 +189,7 @@ uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo
# CFLAGS and LDFLAGS are for the users to override from the command line.
@ -9,7 +9,7 @@
LDFLAGS =
ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
@@ -191,22 +191,16 @@ STRIP ?= strip
@@ -207,22 +207,16 @@ STRIP ?= strip
# runtime figures out where they are based on the path to the executable.
# This can help installing the suite in a relocatable way.
@ -36,7 +36,7 @@
lib = lib
# DESTDIR=
@@ -230,16 +224,16 @@ GITWEB_SITE_FOOTER =
@@ -246,16 +240,16 @@ GITWEB_SITE_FOOTER =
export prefix bindir sharedir sysconfdir
@ -57,7 +57,7 @@
export TCL_PATH TCLTK_PATH
@@ -714,12 +708,11 @@ ifeq ($(uname_S),FreeBSD)
@@ -747,12 +741,11 @@ ifeq ($(uname_S),FreeBSD)
endif
endif
ifeq ($(uname_S),OpenBSD)
@ -73,7 +73,7 @@
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -879,7 +872,7 @@ ifndef NO_POSIX_ONLY_PROGRAMS
@@ -918,7 +911,7 @@ ifndef NO_POSIX_ONLY_PROGRAMS
PROGRAMS += git-imap-send$X
endif
ifndef NO_OPENSSL
@ -82,7 +82,7 @@
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
@@ -1400,7 +1393,7 @@ all:: $(TEST_PROGRAMS)
@@ -1479,7 +1472,7 @@ all:: $(TEST_PROGRAMS)
export NO_SVN_TESTS

14
devel/git/patches/patch-builtin-help_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-builtin-help_c,v 1.2 2009/04/05 10:05:35 bernd Exp $
$OpenBSD: patch-builtin-help_c,v 1.3 2009/05/18 19:23:58 bernd Exp $
Fix "warning: missing sentinel in function call" on 64bit archs.
--- builtin-help.c.orig Wed Mar 4 09:18:50 2009
+++ builtin-help.c Sat Mar 7 14:15:22 2009
@@ -123,7 +123,7 @@ static void exec_woman_emacs(const char* path, const c
--- builtin-help.c.orig Thu May 7 06:29:04 2009
+++ builtin-help.c Fri May 8 09:52:09 2009
@@ -123,7 +123,7 @@ static void exec_woman_emacs(const char *path, const c
if (!path)
path = "emacsclient";
strbuf_addf(&man_page, "(woman \"%s\")", page);
@ -13,7 +13,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
warning("failed to exec '%s': %s", path, strerror(errno));
}
}
@@ -151,7 +151,7 @@ static void exec_man_konqueror(const char* path, const
@@ -151,7 +151,7 @@ static void exec_man_konqueror(const char *path, const
} else
path = "kfmclient";
strbuf_addf(&man_page, "man:%s(1)", page);
@ -22,7 +22,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
warning("failed to exec '%s': %s", path, strerror(errno));
}
}
@@ -160,7 +160,7 @@ static void exec_man_man(const char* path, const char
@@ -160,7 +160,7 @@ static void exec_man_man(const char *path, const char
{
if (!path)
path = "man";
@ -40,7 +40,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
warning("failed to exec '%s': %s", cmd, strerror(errno));
}
@@ -376,7 +376,7 @@ static void show_info_page(const char *git_cmd)
@@ -375,7 +375,7 @@ static void show_info_page(const char *git_cmd)
{
const char *page = cmd_to_page(git_cmd);
setenv("INFOPATH", system_path(GIT_INFO_PATH), 1);

23
devel/git/patches/patch-date_c
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-date_c,v 1.1 2009/04/05 10:05:35 bernd Exp $
Fix problem on 64-bit archs. (at least on sparc64)
--- date.c.orig Sun Apr 5 03:11:19 2009
+++ date.c Sun Apr 5 03:13:04 2009
@@ -871,13 +871,15 @@ unsigned long approxidate(const char *date)
int number = 0;
struct tm tm, now;
struct timeval tv;
+ time_t time_sec;
char buffer[50];
if (parse_date(date, buffer, sizeof(buffer)) > 0)
return strtoul(buffer, NULL, 10);
gettimeofday(&tv, NULL);
- localtime_r(&tv.tv_sec, &tm);
+ time_sec = tv.tv_sec;
+ localtime_r(&time_sec, &tm);
now = tm;
for (;;) {
unsigned char c = *date;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-git-gui_git-gui_sh,v 1.6 2009/01/24 14:31:29 bernd Exp $
--- git-gui/git-gui.sh.orig Thu Dec 25 06:33:25 2008
+++ git-gui/git-gui.sh Thu Dec 25 19:25:32 2008
@@ -3430,7 +3430,9 @@ if {[winfo exists $ui_comm]} {
$OpenBSD: patch-git-gui_git-gui_sh,v 1.7 2009/05/18 19:23:58 bernd Exp $
--- git-gui/git-gui.sh.orig Thu May 7 06:29:04 2009
+++ git-gui/git-gui.sh Fri May 8 09:52:09 2009
@@ -3456,7 +3456,9 @@ if {[winfo exists $ui_comm]} {
# in pipe mode to spellcheck the commit message.
#
set spell_cmd [list |]

10
devel/git/patches/patch-imap-send_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-imap-send_c,v 1.3 2009/04/05 10:05:35 bernd Exp $
$OpenBSD: patch-imap-send_c,v 1.4 2009/05/18 19:23:58 bernd Exp $
Fix "warning: missing sentinel in function call" on 64bit archs.
--- imap-send.c.orig Thu Apr 2 23:26:45 2009
+++ imap-send.c Fri Apr 3 13:14:50 2009
@@ -497,7 +497,7 @@ static void arc4_init(void)
--- imap-send.c.orig Thu May 7 06:29:04 2009
+++ imap-send.c Fri May 8 09:52:09 2009
@@ -498,7 +498,7 @@ static void arc4_init(void)
int i, fd;
unsigned char j, si, dat[128];
@ -13,7 +13,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
fprintf(stderr, "Fatal: no random number source available.\n");
exit(3);
}
@@ -1010,7 +1010,7 @@ static struct store *imap_open_store(struct imap_serve
@@ -1011,7 +1011,7 @@ static struct store *imap_open_store(struct imap_serve
_exit(127);
close(a[0]);
close(a[1]);

39
devel/git/patches/patch-t_t8005-blame-i18n_sh
View File

@ -1,39 +0,0 @@
$OpenBSD: patch-t_t8005-blame-i18n_sh,v 1.1 2009/01/24 14:31:29 bernd Exp $
--- t/t8005-blame-i18n.sh.orig Thu Dec 25 19:40:20 2008
+++ t/t8005-blame-i18n.sh Thu Dec 25 19:41:09 2008
@@ -36,7 +36,7 @@ EOF
test_expect_success \
'blame respects i18n.commitencoding' '
git blame --incremental file | \
- grep "^\(author\|summary\) " > actual &&
+ ggrep "^\(author\|summary\) " > actual &&
test_cmp actual expected
'
@@ -53,7 +53,7 @@ test_expect_success \
'blame respects i18n.logoutputencoding' '
git config i18n.logoutputencoding cp1251 &&
git blame --incremental file | \
- grep "^\(author\|summary\) " > actual &&
+ ggrep "^\(author\|summary\) " > actual &&
test_cmp actual expected
'
@@ -69,7 +69,7 @@ EOF
test_expect_success \
'blame respects --encoding=utf-8' '
git blame --incremental --encoding=utf-8 file | \
- grep "^\(author\|summary\) " > actual &&
+ ggrep "^\(author\|summary\) " > actual &&
test_cmp actual expected
'
@@ -85,7 +85,7 @@ EOF
test_expect_success \
'blame respects --encoding=none' '
git blame --incremental --encoding=none file | \
- grep "^\(author\|summary\) " > actual &&
+ ggrep "^\(author\|summary\) " > actual &&
test_cmp actual expected
'

8
devel/git/patches/patch-t_t9200-git-cvsexportcommit_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-t_t9200-git-cvsexportcommit_sh,v 1.1 2008/04/01 22:36:30 bernd Exp $
--- t/t9200-git-cvsexportcommit.sh.orig Fri Mar 28 23:04:03 2008
+++ t/t9200-git-cvsexportcommit.sh Fri Mar 28 23:04:12 2008
@@ -30,7 +30,7 @@ exit 1
$OpenBSD: patch-t_t9200-git-cvsexportcommit_sh,v 1.2 2009/05/18 19:23:58 bernd Exp $
--- t/t9200-git-cvsexportcommit.sh.orig Thu May 7 06:29:04 2009
+++ t/t9200-git-cvsexportcommit.sh Fri May 8 09:52:09 2009
@@ -34,7 +34,7 @@ exit 1
check_entries () {
# $1 == directory, $2 == expected

8
devel/git/patches/patch-t_t9400-git-cvsserver-server_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-t_t9400-git-cvsserver-server_sh,v 1.1 2008/09/27 21:47:20 bernd Exp $
--- t/t9400-git-cvsserver-server.sh.orig Sat Sep 13 04:29:50 2008
+++ t/t9400-git-cvsserver-server.sh Sat Sep 13 16:03:31 2008
@@ -484,8 +484,8 @@ test_expect_success 'cvs status (no subdirs in header)
$OpenBSD: patch-t_t9400-git-cvsserver-server_sh,v 1.2 2009/05/18 19:23:58 bernd Exp $
--- t/t9400-git-cvsserver-server.sh.orig Thu May 7 06:29:04 2009
+++ t/t9400-git-cvsserver-server.sh Fri May 8 09:52:09 2009
@@ -486,8 +486,8 @@ test_expect_success 'cvs status (no subdirs in header)
cd "$WORKDIR"
test_expect_success 'cvs co -c (shows module database)' '
GIT_CONFIG="$git_config" cvs co -c > out &&

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.26 2009/04/05 10:05:35 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.27 2009/05/18 19:23:58 bernd Exp $
@pkgpath devel/git
@bin bin/git
bin/git-cvsserver
@ -18,6 +18,7 @@ libexec/git/git-am
libexec/git/git-archimport
@bin libexec/git/git-archive
libexec/git/git-bisect
@bin libexec/git/git-bisect--helper
@bin libexec/git/git-blame
@bin libexec/git/git-branch
@bin libexec/git/git-bundle
@ -43,6 +44,8 @@ libexec/git/git-cvsserver
@bin libexec/git/git-diff-files
@bin libexec/git/git-diff-index
@bin libexec/git/git-diff-tree
libexec/git/git-difftool
libexec/git/git-difftool--helper
@bin libexec/git/git-fast-export
@bin libexec/git/git-fast-import
@bin libexec/git/git-fetch
@ -86,6 +89,7 @@ libexec/git/git-merge-resolve
@bin libexec/git/git-merge-subtree
@bin libexec/git/git-merge-tree
libexec/git/git-mergetool
libexec/git/git-mergetool--lib
@bin libexec/git/git-mktag
@bin libexec/git/git-mktree
@bin libexec/git/git-mv
@ -179,6 +183,7 @@ libexec/git/git-web--browse
@man man/man1/git-diff-index.1
@man man/man1/git-diff-tree.1
@man man/man1/git-diff.1
@man man/man1/git-difftool.1
@man man/man1/git-fast-export.1
@man man/man1/git-fast-import.1
@man man/man1/git-fetch-pack.1
@ -214,6 +219,7 @@ libexec/git/git-web--browse
@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--lib.1
@man man/man1/git-mergetool.1
@man man/man1/git-mktag.1
@man man/man1/git-mktree.1
@ -357,7 +363,12 @@ share/doc/git/RelNotes-1.6.1.4.txt
share/doc/git/RelNotes-1.6.1.txt
share/doc/git/RelNotes-1.6.2.1.txt
share/doc/git/RelNotes-1.6.2.2.txt
share/doc/git/RelNotes-1.6.2.3.txt
share/doc/git/RelNotes-1.6.2.4.txt
share/doc/git/RelNotes-1.6.2.5.txt
share/doc/git/RelNotes-1.6.2.txt
share/doc/git/RelNotes-1.6.3.1.txt
share/doc/git/RelNotes-1.6.3.txt
share/doc/git/blame-options.txt
share/doc/git/cmds-ancillaryinterrogators.txt
share/doc/git/cmds-ancillarymanipulators.txt
@ -439,6 +450,8 @@ share/doc/git/git-diff-tree.html
share/doc/git/git-diff-tree.txt
share/doc/git/git-diff.html
share/doc/git/git-diff.txt
share/doc/git/git-difftool.html
share/doc/git/git-difftool.txt
share/doc/git/git-fast-export.html
share/doc/git/git-fast-export.txt
share/doc/git/git-fast-import.html
@ -509,6 +522,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--lib.html
share/doc/git/git-mergetool--lib.txt
share/doc/git/git-mergetool.html
share/doc/git/git-mergetool.txt
share/doc/git/git-mktag.html
@ -716,3 +731,10 @@ share/git-core/templates/hooks/prepare-commit-msg.sample
share/git-core/templates/hooks/update.sample
share/git-core/templates/info/
share/git-core/templates/info/exclude
share/gitweb/
share/gitweb/INSTALL
share/gitweb/README
share/gitweb/git-favicon.png
share/gitweb/git-logo.png
share/gitweb/gitweb.cgi
share/gitweb/gitweb.css

3
devel/git/pkg/PLIST-x11
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-x11,v 1.5 2009/01/24 14:31:29 bernd Exp $
@comment $OpenBSD: PLIST-x11,v 1.6 2009/05/18 19:23:58 bernd Exp $
@conflict git-<=1.5.4.2p0
bin/gitk
libexec/git/git-citool
@ -70,4 +70,5 @@ share/gitk/lib/msgs/
share/gitk/lib/msgs/de.msg
share/gitk/lib/msgs/es.msg
share/gitk/lib/msgs/it.msg
share/gitk/lib/msgs/ru.msg
share/gitk/lib/msgs/sv.msg