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

Update to 1.7.5. ok bernd

Browse Source
This commit is contained in:
stsp 2011-04-29 11:09:10 +00:00
parent 918d66b089
commit c93b5f15db
7 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/git/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.75 2011/01/06 20:23:57 bernd Exp $
# $OpenBSD: Makefile,v 1.76 2011/04/29 11:09:10 stsp Exp $
COMMENT-main = GIT - Tree History Storage Tool
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
V = 1.7.3.5
V = 1.7.5
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}

30
devel/git/distinfo
View File

@ -1,15 +1,15 @@
MD5 (git-1.7.3.5.tar.gz) = VaGtyWYgXOQ9SrOzHjWxdA==
MD5 (git-htmldocs-1.7.3.5.tar.gz) = tY/63GqroD8Q1GhKN1QL2w==
MD5 (git-manpages-1.7.3.5.tar.gz) = KFpfFT/5GfRJjdjua2e5XA==
RMD160 (git-1.7.3.5.tar.gz) = JFRoPTNXGd1OOnyWv4lK127e62w=
RMD160 (git-htmldocs-1.7.3.5.tar.gz) = Cc5ElLlwWgP4bxLWe95EqaSM80M=
RMD160 (git-manpages-1.7.3.5.tar.gz) = gD7FEoaj5XBy0XBSLivavguSfSI=
SHA1 (git-1.7.3.5.tar.gz) = GuDylhNbZFxJELsWVEo1OEueJ60=
SHA1 (git-htmldocs-1.7.3.5.tar.gz) = WTS5gH4MCX0YMhx09WHBCMLI7iM=
SHA1 (git-manpages-1.7.3.5.tar.gz) = FLLFGUonmd2OFSWBhrkNnOGRaIc=
SHA256 (git-1.7.3.5.tar.gz) = 6HgyLkDDTxb9oYBIT+ADLXz5y9I+aCMoSkhdkSbyi+g=
SHA256 (git-htmldocs-1.7.3.5.tar.gz) = ILjlcFw3hQTczXWP0h6rJPrlrTFVcU77Dl+XbvQwwtA=
SHA256 (git-manpages-1.7.3.5.tar.gz) = hsAJCG6yYf5bgymqFj1x/1S8GZtqIqSwOVwBfRSVLX0=
SIZE (git-1.7.3.5.tar.gz) = 3178588
SIZE (git-htmldocs-1.7.3.5.tar.gz) = 1298811
SIZE (git-manpages-1.7.3.5.tar.gz) = 431006
MD5 (git-1.7.5.tar.gz) = F1jbqNjakAzjgc+ckVC4Og==
MD5 (git-htmldocs-1.7.5.tar.gz) = uLSKxOQKDRgf+R4Srn5tlQ==
MD5 (git-manpages-1.7.5.tar.gz) = Ss/T3KhXJlhUnnuCJHB56Q==
RMD160 (git-1.7.5.tar.gz) = PmVe58GlkmeK2ohFBEgZ5RZhMkU=
RMD160 (git-htmldocs-1.7.5.tar.gz) = MiDoPu7Lsl/yvBrZkYjqLqm9C2k=
RMD160 (git-manpages-1.7.5.tar.gz) = u49D3Y/DpnM3gMmwVuP5fzgj8ag=
SHA1 (git-1.7.5.tar.gz) = HZ/qpsMqAh7EbVBrzUXzP1eAq2M=
SHA1 (git-htmldocs-1.7.5.tar.gz) = zceqavsNqtp7atN1e2zlqlnD6ZQ=
SHA1 (git-manpages-1.7.5.tar.gz) = y4n2StC7yJJ45BXGkW96u/vUo2E=
SHA256 (git-1.7.5.tar.gz) = I+4AVOAFS8q/1GPFIJh9mbtJm7eXnWRYk0EWj7yRVMY=
SHA256 (git-htmldocs-1.7.5.tar.gz) = OyRloUDT7J7p4wes7Ca6bmFoQzUKrkHAt+Nr5HXzDRQ=
SHA256 (git-manpages-1.7.5.tar.gz) = +EXeISuuJ3XY9WTnpdH1tzH86qwdIMvMiOsCqmEtpM0=
SIZE (git-1.7.5.tar.gz) = 3326636
SIZE (git-htmldocs-1.7.5.tar.gz) = 1324707
SIZE (git-manpages-1.7.5.tar.gz) = 438749

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

@ -1,6 +1,6 @@
--- Makefile.orig Fri Oct 22 05:49:16 2010
+++ Makefile Mon Oct 25 14:47:08 2010
@@ -257,7 +257,7 @@ endif
--- Makefile.orig Sun Apr 24 19:48:31 2011
+++ Makefile Thu Apr 28 18:00:03 2011
@@ -262,7 +262,7 @@ endif
# CFLAGS and LDFLAGS are for the users to override from the command line.
@ -9,7 +9,7 @@
LDFLAGS =
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
@@ -275,30 +275,24 @@ STRIP ?= strip
@@ -281,32 +281,25 @@ 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.
@ -29,11 +29,14 @@
-ifeq ($(prefix),/usr)
-sysconfdir = /etc
-ETC_GITCONFIG = $(sysconfdir)/gitconfig
-ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
-else
-sysconfdir = $(prefix)/etc
-ETC_GITCONFIG = etc/gitconfig
-ETC_GITATTRIBUTES = etc/gitattributes
-endif
+ETC_GITCONFIG = $(SYSCONFDIR)/gitconfig
+ETC_GITATTRIBUTES = $(SYSCONFDIR)/gitattributes
lib = lib
# DESTDIR=
pathsep = :
@ -45,20 +48,21 @@
AR = ar
RM = rm -f
DIFF = diff
@@ -306,9 +300,9 @@ TAR = tar
@@ -314,10 +307,10 @@ TAR = tar
FIND = find
INSTALL = install
RPMBUILD = rpmbuild
-TCL_PATH = tclsh
-TCLTK_PATH = wish
-PTHREAD_LIBS = -lpthread
+TCL_PATH ?= tclsh
+TCLTK_PATH ?= wish
XGETTEXT = xgettext
-PTHREAD_LIBS = -lpthread
+PTHREAD_LIBS = -pthread
PTHREAD_CFLAGS =
GCOV = gcov
@@ -924,13 +918,14 @@ ifeq ($(uname_S),FreeBSD)
@@ -942,13 +935,14 @@ ifeq ($(uname_S),FreeBSD)
HAVE_PATHS_H = YesPlease
endif
ifeq ($(uname_S),OpenBSD)
@ -76,16 +80,16 @@
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -1247,7 +1242,7 @@ ifndef NO_POSIX_ONLY_PROGRAMS
PROGRAM_OBJS += daemon.o
endif
@@ -1289,7 +1283,7 @@ endif
EXTLIBS += -lz
ifndef NO_OPENSSL
- OPENSSL_LIBSSL = -lssl
+ OPENSSL_LIBSSL = -lssl -lcrypto
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
@@ -2037,7 +2032,7 @@ export NO_SVN_TESTS
@@ -2135,7 +2129,7 @@ export NO_SVN_TESTS
### Testing rules

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

@ -1,10 +1,10 @@
$OpenBSD: patch-gitweb_gitweb_perl,v 1.17 2010/10/07 09:42:23 bernd Exp $
$OpenBSD: patch-gitweb_gitweb_perl,v 1.18 2011/04/29 11:09:12 stsp Exp $
This prevents the following error: '-T and -B not implemented on filehandles'
--- gitweb/gitweb.perl.orig Sun Sep 19 01:43:54 2010
+++ gitweb/gitweb.perl Tue Sep 21 14:44:36 2010
@@ -5510,7 +5510,7 @@ sub git_blob_plain {
--- gitweb/gitweb.perl.orig Sun Apr 24 19:48:31 2011
+++ gitweb/gitweb.perl Thu Apr 28 17:43:42 2011
@@ -5841,7 +5841,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)
@@ -5563,7 +5563,7 @@ sub git_blob {
@@ -5894,7 +5894,7 @@ sub git_blob {
}
my $have_blame = gitweb_check_feature('blame');

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

@ -1,12 +1,12 @@
$OpenBSD: patch-imap-send_c,v 1.9 2010/10/07 09:42:23 bernd Exp $
--- imap-send.c.orig Fri Aug 20 01:44:47 2010
+++ imap-send.c Thu Sep 2 11:12:51 2010
$OpenBSD: patch-imap-send_c,v 1.10 2011/04/29 11:09:12 stsp Exp $
--- imap-send.c.orig Sun Apr 24 19:48:31 2011
+++ imap-send.c Thu Apr 28 18:00:41 2011
@@ -1068,7 +1068,7 @@ static struct store *imap_open_store(struct imap_serve
/* open connection to IMAP server */
if (srvc->tunnel) {
- const char *argv[] = { srvc->tunnel, NULL };
+ const char *argv[] = { srvc->tunnel, (void *)NULL };
struct child_process tunnel = {0};
struct child_process tunnel = {NULL};
imap_info("Starting tunnel '%s'... ", srvc->tunnel);

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.48 2010/11/05 08:23:04 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.49 2011/04/29 11:09:12 stsp Exp $
@pkgpath devel/git
@bin bin/git
bin/git-cvsserver
@ -113,6 +113,8 @@ libexec/git/git-rebase--interactive
@bin libexec/git/git-reflog
libexec/git/git-relink
@bin libexec/git/git-remote
@bin libexec/git/git-remote-ext
@bin libexec/git/git-remote-fd
@bin libexec/git/git-remote-ftp
@bin libexec/git/git-remote-ftps
@bin libexec/git/git-remote-http
@ -250,6 +252,8 @@ libexec/git/git-web--browse
@man man/man1/git-receive-pack.1
@man man/man1/git-reflog.1
@man man/man1/git-relink.1
@man man/man1/git-remote-ext.1
@man man/man1/git-remote-fd.1
@man man/man1/git-remote-helpers.1
@man man/man1/git-remote.1
@man man/man1/git-repack.1
@ -513,6 +517,10 @@ share/doc/git/git-reflog.html
share/doc/git/git-reflog.txt
share/doc/git/git-relink.html
share/doc/git/git-relink.txt
share/doc/git/git-remote-ext.html
share/doc/git/git-remote-ext.txt
share/doc/git/git-remote-fd.html
share/doc/git/git-remote-fd.txt
share/doc/git/git-remote-helpers.html
share/doc/git/git-remote-helpers.txt
share/doc/git/git-remote.html

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-x11,v 1.8 2010/04/02 16:08:09 bernd Exp $
@comment $OpenBSD: PLIST-x11,v 1.9 2011/04/29 11:09:12 stsp Exp $
@conflict git-<1.6.5.3p0
bin/gitk
libexec/git/git-citool
@ -48,6 +48,7 @@ share/git-gui/lib/msgs/hu.msg
share/git-gui/lib/msgs/it.msg
share/git-gui/lib/msgs/ja.msg
share/git-gui/lib/msgs/nb.msg
share/git-gui/lib/msgs/pt_br.msg
share/git-gui/lib/msgs/ru.msg
share/git-gui/lib/msgs/sv.msg
share/git-gui/lib/msgs/zh_cn.msg
@ -76,5 +77,6 @@ share/gitk/lib/msgs/fr.msg
share/gitk/lib/msgs/hu.msg
share/gitk/lib/msgs/it.msg
share/gitk/lib/msgs/ja.msg
share/gitk/lib/msgs/pt_br.msg
share/gitk/lib/msgs/ru.msg
share/gitk/lib/msgs/sv.msg