kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changes 1.8.5.1:

Browse source 
* "git submodule init" copied "submodule.$name.update" settings from
   .gitmodules to .git/config without making sure if the suggested
   value was sensible.
This commit is contained in:
adam 2013-12-04 12:51:06 +00:00
parent 3691f7671d
commit d7521cb02b
4 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/git-base/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2013/09/09 13:54:44 wiz Exp $
@comment $NetBSD: PLIST,v 1.2 2013/12/04 12:51:06 adam Exp $
bin/git
bin/git-cvsserver
bin/git-receive-pack
@ -210,6 +210,7 @@ libexec/git-core/mergetools/araxis
libexec/git-core/mergetools/bc3
libexec/git-core/mergetools/codecompare
libexec/git-core/mergetools/deltawalker
libexec/git-core/mergetools/diffmerge
libexec/git-core/mergetools/diffuse
libexec/git-core/mergetools/ecmerge
libexec/git-core/mergetools/emerge

10
devel/git-base/distinfo
View file

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.5 2013/11/12 11:22:10 adam Exp $
$NetBSD: distinfo,v 1.6 2013/12/04 12:51:06 adam Exp $
SHA1 (git-1.8.4.3.tar.gz) = 43b1edc95b3ab77f9739d789b906ded0585fe7a2
RMD160 (git-1.8.4.3.tar.gz) = a9e3ed9dc884fbec23f363924a255d6d59fe7e92
Size (git-1.8.4.3.tar.gz) = 4677332 bytes
SHA1 (patch-aa) = 47e743aedffe231477d82d1190787af64faaa4b4
SHA1 (git-1.8.5.1.tar.gz) = dcd244c7198e8afe42ab223f7b3c9b1ae01749c3
RMD160 (git-1.8.5.1.tar.gz) = 25c7af0cdaf837187868230d36fec413ee24ceb1
Size (git-1.8.5.1.tar.gz) = 4755019 bytes
SHA1 (patch-aa) = 31f3759c6cf3bfd28d154b3abaa95d396b72502b
SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
SHA1 (patch-af) = d4741caeaed3ef6cfabf415f9fdbc95968307131

16
devel/git-base/patches/patch-aa
View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.1 2013/09/09 13:54:44 wiz Exp $
$NetBSD: patch-aa,v 1.2 2013/12/04 12:51:06 adam Exp $
--- Makefile.orig 2012-10-21 21:32:15.000000000 +0000
--- Makefile.orig 2013-12-03 19:35:24.000000000 +0000
+++ Makefile
@@ -343,8 +343,6 @@ endif
@@ -351,8 +351,6 @@ GIT-VERSION-FILE: FORCE
CFLAGS = -g -O2 -Wall
LDFLAGS =
@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1 2013/09/09 13:54:44 wiz Exp $
STRIP ?= strip
# Among the variables below, these:
@@ -379,13 +377,9 @@ pathsep = :
@@ -393,13 +391,9 @@ htmldir_relative = $(patsubst $(prefix)/
export prefix bindir sharedir sysconfdir gitwebdir localedir
@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.1 2013/09/09 13:54:44 wiz Exp $
RPMBUILD = rpmbuild
TCL_PATH = tclsh
TCLTK_PATH = wish
@@ -2038,8 +2031,8 @@ ifdef DEFAULT_HELP_FORMAT
@@ -1630,8 +1624,8 @@ ifdef DEFAULT_HELP_FORMAT
BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
endif
@ -36,11 +36,11 @@ $NetBSD: patch-aa,v 1.1 2013/09/09 13:54:44 wiz Exp $
export DIFF TAR INSTALL DESTDIR SHELL_PATH
@@ -2732,7 +2725,6 @@ ifndef NO_GETTEXT
@@ -2338,7 +2332,6 @@ ifndef NO_GETTEXT
endif
ifndef NO_PERL
$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
- $(MAKE) -C gitweb install
endif
ifndef NO_PYTHON
$(MAKE) -C git_remote_helpers prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
ifndef NO_TCLTK
$(MAKE) -C gitk-git install

4
devel/git/Makefile.version
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile.version,v 1.4 2013/11/12 11:22:10 adam Exp $
# $NetBSD: Makefile.version,v 1.5 2013/12/04 12:51:06 adam Exp $
#
# used by devel/git/Makefile.common
# used by www/gitweb/Makefile
GIT_VERSION= 1.8.4.3
GIT_VERSION= 1.8.5.1