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

t-1.6.2.2.

Browse Source 
Also:
- Update HOMEPAGE. (reminded by Toni Mueller)
- Fix 64-bit problem. (found on sparc64)

Tested by sturm@. Thanks!
This commit is contained in:
bernd 2009-04-05 10:05:35 +00:00
parent a351a54c1a
commit 1662925683
9 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/git/Makefile
View File

@ -1,17 +1,17 @@
# $OpenBSD: Makefile,v 1.44 2009/03/24 05:11:50 jakemsr Exp $
# $OpenBSD: Makefile,v 1.45 2009/04/05 10:05:35 bernd Exp $
COMMENT-main= GIT - Tree History Storage Tool
COMMENT-svn= GIT - subversion interoperability tools
COMMENT-x11= GIT - graphical tools
V= 1.6.1.3
V= 1.6.2.2
DISTNAME= git-${V}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-main= ${DISTNAME}
PKGNAME-svn= git-svn-${V}
PKGNAME-x11= git-x11-${V}p0
PKGNAME-x11= git-x11-${V}
CATEGORIES= devel
HOMEPAGE= http://git.or.cz/
HOMEPAGE= http://git-scm.com/
MAINTAINER= Bernd Ahlers <bernd@openbsd.org>
@ -54,7 +54,7 @@ RUN_DEPENDS-svn= ::${BASE_PKGPATH} \
LIB_DEPENDS-svn=
PKG_ARCH-svn= *
RUN_DEPENDS-x11= :${PKGNAME}:${BASE_PKGPATH},-main \
RUN_DEPENDS-x11= ::${BASE_PKGPATH},-main \
${MODTK_RUN_DEPENDS}
LIB_DEPENDS-x11=
PKG_ARCH-x11= *

30
devel/git/distinfo
View File

@ -1,15 +1,15 @@
MD5 (git-1.6.1.3.tar.gz) = 7GM7HTTWLEFe75h48OPBsg==
MD5 (git-htmldocs-1.6.1.3.tar.gz) = FW4tuqc/g9xqKNKwmkSSqQ==
MD5 (git-manpages-1.6.1.3.tar.gz) = 4MzoTAeFzlpNGXiMZHxiwQ==
RMD160 (git-1.6.1.3.tar.gz) = dzSHq6WpPyss5Bwpe9EzRdkpEVY=
RMD160 (git-htmldocs-1.6.1.3.tar.gz) = vh56sWgYq85ijlQhbs/hAjmUoIQ=
RMD160 (git-manpages-1.6.1.3.tar.gz) = s7onf6rHR8qBeehAOIrk5/F6ll4=
SHA1 (git-1.6.1.3.tar.gz) = 7KKSHo07CuiH3U5Tfhf9dCEh5f4=
SHA1 (git-htmldocs-1.6.1.3.tar.gz) = hsnhQAT0oMMxbfbllecaiec6jdc=
SHA1 (git-manpages-1.6.1.3.tar.gz) = InsvqZRLvN92+mbsLNpjLZhjeoc=
SHA256 (git-1.6.1.3.tar.gz) = YGWwAXA9T0aQ+JP7n/bpIFbkCBzqAfqRj70vSUoT3Ow=
SHA256 (git-htmldocs-1.6.1.3.tar.gz) = dHd7rqibJ5zITuXdKEQsq+OwKyffansGgj8S6NSFNwo=
SHA256 (git-manpages-1.6.1.3.tar.gz) = AhVdiUcKkjYoTG3zTGIPqJJfxBSJZizRqB93/neXako=
SIZE (git-1.6.1.3.tar.gz) = 2389893
SIZE (git-htmldocs-1.6.1.3.tar.gz) = 1009736
SIZE (git-manpages-1.6.1.3.tar.gz) = 328321
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

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

@ -1,6 +1,6 @@
--- Makefile.orig Thu Dec 25 06:33:25 2008
+++ Makefile Mon Jan 26 09:09:19 2009
@@ -170,7 +170,7 @@ uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo
--- 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
# CFLAGS and LDFLAGS are for the users to override from the command line.
@ -9,33 +9,36 @@
LDFLAGS =
ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
@@ -186,11 +186,11 @@ STRIP ?= strip
@@ -191,22 +191,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.
-prefix = $(HOME)
+#prefix = $(HOME)
bindir = $(prefix)/bin
-mandir = $(prefix)/share/man
+mandir = $(prefix)/man
infodir = $(prefix)/share/info
-gitexecdir = $(prefix)/libexec/git-core
+gitexecdir = $(prefix)/libexec/git
bindir_relative = bin
bindir = $(prefix)/$(bindir_relative)
-mandir = share/man
+mandir = man
infodir = share/info
-gitexecdir = libexec/git-core
+gitexecdir = libexec/git
sharedir = $(prefix)/share
template_dir = $(sharedir)/git-core/templates
htmldir=$(sharedir)/doc/git-doc
@@ -200,7 +200,7 @@ else
sysconfdir = $(prefix)/etc
endif
lib = lib
template_dir = share/git-core/templates
htmldir = share/doc/git-doc
-ifeq ($(prefix),/usr)
-sysconfdir = /etc
-ETC_GITCONFIG = $(sysconfdir)/gitconfig
-else
-sysconfdir = $(prefix)/etc
-ETC_GITCONFIG = etc/gitconfig
-endif
+ETC_GITCONFIG = $(SYSCONFDIR)/gitconfig
lib = lib
# DESTDIR=
# default configuration for gitweb
@@ -223,16 +223,16 @@ GITWEB_SITE_FOOTER =
@@ -230,16 +224,16 @@ GITWEB_SITE_FOOTER =
export prefix bindir sharedir htmldir sysconfdir
export prefix bindir sharedir sysconfdir
-CC = gcc
+CC ?= gcc
@ -54,7 +57,7 @@
export TCL_PATH TCLTK_PATH
@@ -703,12 +703,11 @@ ifeq ($(uname_S),FreeBSD)
@@ -714,12 +708,11 @@ ifeq ($(uname_S),FreeBSD)
endif
endif
ifeq ($(uname_S),OpenBSD)
@ -70,16 +73,7 @@
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -793,7 +792,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/regex/regex.o compat/winansi.o
EXTLIBS += -lws2_32
X = .exe
- gitexecdir = ../libexec/git-core
+ gitexecdir = ../libexec/git
template_dir = ../share/git-core/templates/
ETC_GITCONFIG = ../etc/gitconfig
endif
@@ -864,7 +863,7 @@ ifndef NO_POSIX_ONLY_PROGRAMS
@@ -879,7 +872,7 @@ ifndef NO_POSIX_ONLY_PROGRAMS
PROGRAMS += git-imap-send$X
endif
ifndef NO_OPENSSL
@ -88,7 +82,7 @@
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
@@ -1363,7 +1362,7 @@ all:: $(TEST_PROGRAMS)
@@ -1400,7 +1393,7 @@ all:: $(TEST_PROGRAMS)
export NO_SVN_TESTS
@ -96,4 +90,4 @@
+test:
$(MAKE) -C t/ all
test-date$X: date.o ctype.o
test-ctype$X: ctype.o

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

@ -1,9 +1,9 @@
$OpenBSD: patch-builtin-help_c,v 1.1 2009/01/24 14:31:29 bernd Exp $
$OpenBSD: patch-builtin-help_c,v 1.2 2009/04/05 10:05:35 bernd Exp $
Fix "warning: missing sentinel in function call" on 64bit archs.
--- builtin-help.c.orig Fri Jan 23 09:33:07 2009
+++ builtin-help.c Fri Jan 23 09:34:57 2009
--- 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
if (!path)
path = "emacsclient";
@ -43,7 +43,7 @@ Fix "warning: missing sentinel in function call" on 64bit archs.
@@ -376,7 +376,7 @@ static void show_info_page(const char *git_cmd)
{
const char *page = cmd_to_page(git_cmd);
setenv("INFOPATH", GIT_INFO_PATH, 1);
setenv("INFOPATH", system_path(GIT_INFO_PATH), 1);
- execlp("info", "info", "gitman", page, NULL);
+ execlp("info", "info", "gitman", page, (void *)NULL);
}

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

@ -0,0 +1,23 @@
$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;

21
devel/git/patches/patch-git-svn_perl
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-git-svn_perl,v 1.1 2009/01/29 23:16:35 bernd Exp $
In svn 1.5.5 the output of "svn info" for added directories was changed
and now shows the repository UUID. This patch implements the same
behavior for "git svn info" and makes t9119-git-svn-info.17 pass if
svn 1.5.5 is used.
Patch from Marcel Koeppen, found on the git mailing list.
--- git-svn.perl.orig Thu Jan 29 10:43:46 2009
+++ git-svn.perl Thu Jan 29 20:13:00 2009
@@ -911,7 +911,8 @@ sub cmd_info {
if ($@) {
$result .= "Repository Root: (offline)\n";
}
- $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A";
+ $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
+ ($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir");
$result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
$result .= "Node Kind: " .

10
devel/git/patches/patch-gitweb_gitweb_perl
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-gitweb_gitweb_perl,v 1.9 2009/01/29 23:16:35 bernd Exp $
$OpenBSD: patch-gitweb_gitweb_perl,v 1.10 2009/04/05 10:05:35 bernd Exp $
This prevents the following error: '-T and -B not implemented on filehandles'
--- gitweb/gitweb.perl.orig Mon Jan 26 01:48:26 2009
+++ gitweb/gitweb.perl Mon Jan 26 16:24:54 2009
@@ -4725,7 +4725,7 @@ sub git_blob_plain {
--- gitweb/gitweb.perl.orig Wed Mar 4 09:18:50 2009
+++ gitweb/gitweb.perl Sat Mar 7 14:12:04 2009
@@ -4774,7 +4774,7 @@ sub git_blob_plain {
$expires = "+1d";
}
@ -13,7 +13,7 @@ This prevents the following error: '-T and -B not implemented on filehandles'
or die_error(500, "Open git-cat-file blob '$hash' failed");
# content-type (can include charset)
@@ -4768,7 +4768,7 @@ sub git_blob {
@@ -4828,7 +4828,7 @@ sub git_blob {
}
my $have_blame = gitweb_check_feature('blame');

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

@ -1,10 +1,10 @@
$OpenBSD: patch-imap-send_c,v 1.2 2009/03/24 05:11:50 jakemsr Exp $
$OpenBSD: patch-imap-send_c,v 1.3 2009/04/05 10:05:35 bernd Exp $
Fix "warning: missing sentinel in function call" on 64bit archs.
--- imap-send.c.orig Sat Feb 7 11:46:30 2009
+++ imap-send.c Mon Mar 23 00:32:21 2009
@@ -496,7 +496,7 @@ static void arc4_init(void)
--- 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)
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);
}
@@ -1009,7 +1009,7 @@ static struct store *imap_open_store(struct imap_serve
@@ -1010,7 +1010,7 @@ static struct store *imap_open_store(struct imap_serve
_exit(127);
close(a[0]);
close(a[1]);

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.25 2009/02/09 19:45:19 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.26 2009/04/05 10:05:35 bernd Exp $
@pkgpath devel/git
@bin bin/git
bin/git-cvsserver
@ -353,7 +353,11 @@ share/doc/git/RelNotes-1.6.0.txt
share/doc/git/RelNotes-1.6.1.1.txt
share/doc/git/RelNotes-1.6.1.2.txt
share/doc/git/RelNotes-1.6.1.3.txt
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.txt
share/doc/git/blame-options.txt
share/doc/git/cmds-ancillaryinterrogators.txt
share/doc/git/cmds-ancillarymanipulators.txt
@ -678,6 +682,7 @@ share/doc/git/howto/using-merge-subtree.html
share/doc/git/howto/using-merge-subtree.txt
share/doc/git/i18n.txt
share/doc/git/index.html
share/doc/git/mailmap.txt
share/doc/git/merge-config.txt
share/doc/git/merge-options.txt
share/doc/git/merge-strategies.txt
@ -693,7 +698,6 @@ share/emacs/
share/emacs/site-lisp/
share/emacs/site-lisp/git-blame.el
share/emacs/site-lisp/git.el
share/emacs/site-lisp/vc-git.el
share/git-core/
share/git-core/templates/
share/git-core/templates/branches/