pkg/41356: update devel/scmgit* to 1.6.2.5

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/41356: update devel/scmgit* to 1.6.2.5
From: Jukka Salmi <j+nbsd%salmi.ch@localhost>
Date: Tue, 5 May 2009 10:15:01 +0000 (UTC)
>Number:         41356
>Category:       pkg
>Synopsis:       update devel/scmgit* to 1.6.2.5
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue May 05 10:15:01 +0000 2009
>Originator:     Jukka Salmi
>Release:        pkgsrc HEAD
>Organization:
>Environment:
n/a
>Description:
The attached patch (which is also available from [1]here) updates the three git
pkgsrc packages from 1.6.0.6 to the latest released version (as of today...).

[1] http://salmi.ch/~jukka/patches/pkgsrc/devel/scmgit_1606_1625.diff
>How-To-Repeat:
n/a
>Fix:
Index: devel/scmgit/Makefile.version
===================================================================
RCS file: /cvsroot/pkgsrc/devel/scmgit/Makefile.version,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.version
--- devel/scmgit/Makefile.version       9 Jan 2009 13:42:15 -0000       1.7
+++ devel/scmgit/Makefile.version       5 May 2009 09:53:34 -0000
@@ -1,3 +1,3 @@
 # $NetBSD: Makefile.version,v 1.7 2009/01/09 13:42:15 tonnerre Exp $
 #
-GIT_VERSION=   1.6.0.6
+GIT_VERSION=   1.6.2.5
Index: devel/scmgit-base/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/scmgit-base/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- devel/scmgit-base/PLIST     9 Jan 2009 13:42:15 -0000       1.10
+++ devel/scmgit-base/PLIST     5 May 2009 09:53:34 -0000
@@ -55,7 +55,9 @@ libexec/git-core/git-gc
 libexec/git-core/git-get-tar-commit-id
 libexec/git-core/git-grep
 ${PLIST.gui}libexec/git-core/git-gui
+${PLIST.gui}libexec/git-core/git-gui--askpass
 libexec/git-core/git-hash-object
+libexec/git-core/git-help
 libexec/git-core/git-http-fetch
 libexec/git-core/git-http-push
 libexec/git-core/git-imap-send
@@ -122,6 +124,7 @@ libexec/git-core/git-show
 libexec/git-core/git-show-branch
 libexec/git-core/git-show-index
 libexec/git-core/git-show-ref
+libexec/git-core/git-stage
 libexec/git-core/git-stash
 libexec/git-core/git-status
 libexec/git-core/git-stripspace
@@ -184,21 +187,28 @@ ${PLIST.macosx}share/git-gui/lib/git-gui
 ${PLIST.gui}share/git-gui/lib/index.tcl
 ${PLIST.gui}share/git-gui/lib/logo.tcl
 ${PLIST.gui}share/git-gui/lib/merge.tcl
+${PLIST.gui}share/git-gui/lib/mergetool.tcl
 ${PLIST.gui}share/git-gui/lib/msgs/de.msg
 ${PLIST.gui}share/git-gui/lib/msgs/fr.msg
 ${PLIST.gui}share/git-gui/lib/msgs/hu.msg
 ${PLIST.gui}share/git-gui/lib/msgs/it.msg
 ${PLIST.gui}share/git-gui/lib/msgs/ja.msg
+${PLIST.gui}share/git-gui/lib/msgs/nb.msg
 ${PLIST.gui}share/git-gui/lib/msgs/ru.msg
 ${PLIST.gui}share/git-gui/lib/msgs/sv.msg
 ${PLIST.gui}share/git-gui/lib/msgs/zh_cn.msg
 ${PLIST.gui}share/git-gui/lib/option.tcl
 ${PLIST.gui}share/git-gui/lib/remote.tcl
+${PLIST.gui}share/git-gui/lib/remote_add.tcl
 ${PLIST.gui}share/git-gui/lib/remote_branch_delete.tcl
+${PLIST.gui}share/git-gui/lib/search.tcl
 ${PLIST.gui}share/git-gui/lib/shortcut.tcl
 ${PLIST.gui}share/git-gui/lib/spellcheck.tcl
+${PLIST.gui}share/git-gui/lib/sshkey.tcl
 ${PLIST.gui}share/git-gui/lib/status_bar.tcl
 ${PLIST.gui}share/git-gui/lib/tclIndex
+${PLIST.gui}share/git-gui/lib/tools.tcl
+${PLIST.gui}share/git-gui/lib/tools_dlg.tcl
 ${PLIST.gui}share/git-gui/lib/transport.tcl
 ${PLIST.gui}share/git-gui/lib/win32.tcl
 ${PLIST.gui}share/git-gui/lib/win32_shortcut.js
Index: devel/scmgit-base/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/scmgit-base/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- devel/scmgit-base/distinfo  9 Jan 2009 13:42:15 -0000       1.16
+++ devel/scmgit-base/distinfo  5 May 2009 09:53:34 -0000
@@ -1,14 +1,14 @@
 $NetBSD: distinfo,v 1.16 2009/01/09 13:42:15 tonnerre Exp $
 
-SHA1 (git-1.6.0.6.tar.gz) = 4116e06859ce3b37a6e56198e5a9207e2b5d0d02
-RMD160 (git-1.6.0.6.tar.gz) = 6424a051bf656f239fe0deed5bd388a6f7290a64
-Size (git-1.6.0.6.tar.gz) = 2253596 bytes
-SHA1 (patch-aa) = 9b5b686a8f96bd71380fb1ff2c562ff732c0b831
+SHA1 (git-1.6.2.5.tar.gz) = f5214606f19c070b1163b8050efb98cf763dfa8c
+RMD160 (git-1.6.2.5.tar.gz) = c0882a36ddea53899ec215606d563f9937ddac84
+Size (git-1.6.2.5.tar.gz) = 2450744 bytes
+SHA1 (patch-aa) = 55f53ed1537d8ea75061d63a9efce98fa5bb96c6
 SHA1 (patch-ab) = b8cbeacd7d44791a5151deaa97d1d283ac9296d1
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ad) = 50def978931bd72c0ad86cebcafc2dd68a06f578
 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
-SHA1 (patch-af) = 3a86d5563bcfb9069d31f480a7271f6eb18ea1bd
+SHA1 (patch-af) = 80fd311204b8993ff91d6a32e9b1a3f971882e39
 SHA1 (patch-ag) = a6c586cdfbad923a3497fa4ab0c73840dc035737
 SHA1 (patch-ah) = d60b5304109f64f70146a222f6eb1deeb58dd6ac
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
Index: devel/scmgit-base/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/devel/scmgit-base/patches/patch-aa,v
retrieving revision 1.6
diff -u -p -r1.6 patch-aa
--- devel/scmgit-base/patches/patch-aa  9 Jan 2009 13:42:15 -0000       1.6
+++ devel/scmgit-base/patches/patch-aa  5 May 2009 09:53:34 -0000
@@ -1,10 +1,10 @@
 $NetBSD: patch-aa,v 1.6 2009/01/09 13:42:15 tonnerre Exp $
 
---- Makefile.orig      2008-12-20 06:54:30.000000000 +0100
-+++ Makefile
-@@ -217,12 +217,8 @@ GITWEB_SITE_FOOTER =
+--- Makefile.orig      2009-04-20 06:16:15.000000000 +0200
++++ Makefile   2009-05-04 15:24:04.000000000 +0200
+@@ -230,12 +230,8 @@
  
- export prefix bindir sharedir htmldir sysconfdir
+ export prefix bindir sharedir sysconfdir
  
 -CC = gcc
 -AR = ar
@@ -15,8 +15,8 @@ $NetBSD: patch-aa,v 1.6 2009/01/09 13:42
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -630,9 +626,10 @@ ifeq ($(uname_S),Darwin)
-       COMPAT_OBJS += compat/regex/regex.o
+@@ -657,9 +653,10 @@
+       THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
 +      NEEDS_LIBICONV = YesPlease
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.6 2009/01/09 13:42
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease
        NO_HSTRERROR = YesPlease
-@@ -650,8 +647,6 @@ ifeq ($(uname_S),SunOS)
+@@ -677,8 +674,6 @@
                NO_C99_FORMAT = YesPlease
                NO_STRTOUMAX = YesPlease
        endif
@@ -36,8 +36,8 @@ $NetBSD: patch-aa,v 1.6 2009/01/09 13:42
        BASIC_CFLAGS += -D__EXTENSIONS__
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -688,9 +683,7 @@ ifeq ($(uname_S),OpenBSD)
-       BASIC_LDFLAGS += -L/usr/local/lib
+@@ -720,9 +715,7 @@
+       THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),NetBSD)
 -      ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -45,9 +45,9 @@ $NetBSD: patch-aa,v 1.6 2009/01/09 13:42
 -      endif
 +      NEEDS_LIBICONV = YesPlease
        BASIC_CFLAGS += -I/usr/pkg/include
-       BASIC_LDFLAGS += -L/usr/pkg/lib
-       ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
-@@ -1053,7 +1046,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
+       BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
+       THREADED_DELTA_SEARCH = YesPlease
+@@ -1114,7 +1107,7 @@
  PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
  TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.6 2009/01/09 13:42
  
  BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
        $(COMPAT_CFLAGS)
-@@ -1361,10 +1354,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
+@@ -1450,10 +1443,10 @@
  export gitexec_instdir
  
  install: all
Index: devel/scmgit-base/patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/devel/scmgit-base/patches/patch-af,v
retrieving revision 1.3
diff -u -p -r1.3 patch-af
--- devel/scmgit-base/patches/patch-af  20 Aug 2008 03:04:20 -0000      1.3
+++ devel/scmgit-base/patches/patch-af  5 May 2009 09:53:34 -0000
@@ -1,11 +1,11 @@
 $NetBSD: patch-af,v 1.3 2008/08/20 03:04:20 bjs Exp $
 
---- Documentation/Makefile.orig        2008-08-17 16:43:06.000000000 -0400
-+++ Documentation/Makefile
-@@ -87,16 +87,16 @@ man7: $(DOC_MAN7)
- info: git.info gitman.info
+--- Documentation/Makefile.orig        2009-04-20 06:16:15.000000000 +0200
++++ Documentation/Makefile     2009-05-04 16:33:22.000000000 +0200
+@@ -94,16 +94,16 @@ pdf: user-manual.pdf
+ install: install-man
  
- install: man
+ install-man: man
 -      $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
 -      $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
 -      $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir)
Index: devel/scmgit-docs/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/scmgit-docs/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- devel/scmgit-docs/PLIST     24 Jun 2008 08:21:04 -0000      1.4
+++ devel/scmgit-docs/PLIST     5 May 2009 09:53:34 -0000
@@ -108,6 +108,7 @@ man/man1/git-show-branch.1
 man/man1/git-show-index.1
 man/man1/git-show-ref.1
 man/man1/git-show.1
+man/man1/git-stage.1
 man/man1/git-stash.1
 man/man1/git-status.1
 man/man1/git-stripspace.1
@@ -143,3 +144,4 @@ man/man7/gitdiffcore.7
 man/man7/gitglossary.7
 man/man7/gittutorial-2.7
 man/man7/gittutorial.7
+man/man7/gitworkflows.7
Prev by Date: pkg/41355: textproc/py-sphinx depends on textproc/py-docutils which doesn't build with python 2.6
Next by Date: Re: pkg/41356 (update devel/scmgit* to 1.6.2.5)
Previous by Thread: pkg/41355: textproc/py-sphinx depends on textproc/py-docutils which doesn't build with python 2.6
Next by Thread: Re: pkg/41356 (update devel/scmgit* to 1.6.2.5)
Indexes:
Home | Main Index | Thread Index | Old Index