[pkgsrc/trunk]: pkgsrc/devel Update scmgit{,-base,-docs} to 1.6.2.5.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel Update scmgit{,-base,-docs} to 1.6.2.5.
From: minskim <minskim%pkgsrc.org@localhost>
Date: Mon, 16 Jan 2023 19:14:07 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9243c999177
branches:  trunk
changeset: 392650:f9243c999177
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue May 05 06:21:16 2009 +0000

description:
Update scmgit{,-base,-docs} to 1.6.2.5.

Major changes in 1.6.1:

When some commands (e.g. "git log", "git diff") spawn pager
internally, we used to make the pager the parent process of the git
command that produces output.  This meant that the exit status of the
whole thing comes from the pager, not the underlying git command.  We
swapped the order of the processes around and you will see the exit
code from the command from now on.

Major changes in 1.6.2:

With the next major release, "git push" into a branch that is
currently checked out will be refused by default.  You can choose what
should happen upon such a push by setting the configuration variable
receive.denyCurrentBranch in the receiving repository.

To ease the transition plan, the receiving repository of such a push
running this release will issue a big warning when the configuration
variable is missing.

For a similar reason, "git push $there :$killed" to delete the branch
$killed in a remote repository $there, if $killed branch is the
current branch pointed at by its HEAD, gets a large warning.  You can
choose what should happen upon such a push by setting the
configuration variable receive.denyDeleteCurrent in the receiving
repository.

diffstat:

 devel/scmgit-base/PLIST            |  12 +++++++++++-
 devel/scmgit-base/distinfo         |  12 ++++++------
 devel/scmgit-base/patches/patch-aa |  26 +++++++++++++-------------
 devel/scmgit-base/patches/patch-af |  10 +++++-----
 devel/scmgit-docs/PLIST            |   4 +++-
 devel/scmgit/Makefile              |   6 +++---
 devel/scmgit/Makefile.version      |   4 ++--
 7 files changed, 43 insertions(+), 31 deletions(-)

diffs (221 lines):

diff -r 6060f6fbbe20 -r f9243c999177 devel/scmgit-base/PLIST
--- a/devel/scmgit-base/PLIST   Tue May 05 05:55:55 2009 +0000
+++ b/devel/scmgit-base/PLIST   Tue May 05 06:21:16 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/01/09 13:42:15 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/05/05 06:21:16 minskim Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -55,7 +55,9 @@
 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-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.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
diff -r 6060f6fbbe20 -r f9243c999177 devel/scmgit-base/distinfo
--- a/devel/scmgit-base/distinfo        Tue May 05 05:55:55 2009 +0000
+++ b/devel/scmgit-base/distinfo        Tue May 05 06:21:16 2009 +0000
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.16 2009/01/09 13:42:15 tonnerre Exp $
+$NetBSD: distinfo,v 1.17 2009/05/05 06:21:16 minskim 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) = dd10721b1c0ba6faab248114ea46ed801ad9d009
 SHA1 (patch-ab) = b8cbeacd7d44791a5151deaa97d1d283ac9296d1
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ad) = 50def978931bd72c0ad86cebcafc2dd68a06f578
 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
-SHA1 (patch-af) = 3a86d5563bcfb9069d31f480a7271f6eb18ea1bd
+SHA1 (patch-af) = ea0ac503103429f32d26bd42c37a9ed563ff17b8
 SHA1 (patch-ag) = a6c586cdfbad923a3497fa4ab0c73840dc035737
 SHA1 (patch-ah) = d60b5304109f64f70146a222f6eb1deeb58dd6ac
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
diff -r 6060f6fbbe20 -r f9243c999177 devel/scmgit-base/patches/patch-aa
--- a/devel/scmgit-base/patches/patch-aa        Tue May 05 05:55:55 2009 +0000
+++ b/devel/scmgit-base/patches/patch-aa        Tue May 05 06:21:16 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.6 2009/01/09 13:42:15 tonnerre Exp $
+$NetBSD: patch-aa,v 1.7 2009/05/05 06:21:16 minskim Exp $
 
---- Makefile.orig      2008-12-20 06:54:30.000000000 +0100
+--- Makefile.orig      2009-03-04 08:18:50.000000000 +0000
 +++ Makefile
-@@ -217,12 +217,8 @@ GITWEB_SITE_FOOTER =
+@@ -230,12 +230,8 @@ GITWEB_SITE_FOOTER =
  
- export prefix bindir sharedir htmldir sysconfdir
+ export prefix bindir sharedir sysconfdir
  
 -CC = gcc
 -AR = ar
@@ -15,8 +15,8 @@
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -630,9 +626,10 @@ ifeq ($(uname_S),Darwin)
-       COMPAT_OBJS += compat/regex/regex.o
+@@ -659,9 +655,10 @@ ifeq ($(uname_S),Darwin)
+       THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
 +      NEEDS_LIBICONV = YesPlease
@@ -27,7 +27,7 @@
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease
        NO_HSTRERROR = YesPlease
-@@ -650,8 +647,6 @@ ifeq ($(uname_S),SunOS)
+@@ -679,8 +676,6 @@ ifeq ($(uname_S),SunOS)
                NO_C99_FORMAT = YesPlease
                NO_STRTOUMAX = YesPlease
        endif
@@ -36,8 +36,8 @@
        BASIC_CFLAGS += -D__EXTENSIONS__
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -688,9 +683,7 @@ ifeq ($(uname_S),OpenBSD)
-       BASIC_LDFLAGS += -L/usr/local/lib
+@@ -722,9 +717,7 @@ ifeq ($(uname_S),OpenBSD)
+       THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),NetBSD)
 -      ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -45,9 +45,9 @@
 -      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
+@@ -1116,7 +1109,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
  PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
  TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  
@@ -56,7 +56,7 @@
  
  BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
        $(COMPAT_CFLAGS)
-@@ -1361,10 +1354,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
+@@ -1452,10 +1445,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
  export gitexec_instdir
  
  install: all
diff -r 6060f6fbbe20 -r f9243c999177 devel/scmgit-base/patches/patch-af
--- a/devel/scmgit-base/patches/patch-af        Tue May 05 05:55:55 2009 +0000
+++ b/devel/scmgit-base/patches/patch-af        Tue May 05 06:21:16 2009 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.3 2008/08/20 03:04:20 bjs Exp $
+$NetBSD: patch-af,v 1.4 2009/05/05 06:21:16 minskim Exp $
 
---- Documentation/Makefile.orig        2008-08-17 16:43:06.000000000 -0400
+--- Documentation/Makefile.orig        2009-03-04 08:18:50.000000000 +0000
 +++ Documentation/Makefile
-@@ -87,16 +87,16 @@ man7: $(DOC_MAN7)
- info: git.info gitman.info
+@@ -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)
diff -r 6060f6fbbe20 -r f9243c999177 devel/scmgit-docs/PLIST
--- a/devel/scmgit-docs/PLIST   Tue May 05 05:55:55 2009 +0000
+++ b/devel/scmgit-docs/PLIST   Tue May 05 06:21:16 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/06/24 08:21:04 bjs Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/05/05 06:21:17 minskim Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -108,6 +108,7 @@
 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/gitglossary.7
 man/man7/gittutorial-2.7
 man/man7/gittutorial.7
+man/man7/gitworkflows.7
diff -r 6060f6fbbe20 -r f9243c999177 devel/scmgit/Makefile
--- a/devel/scmgit/Makefile     Tue May 05 05:55:55 2009 +0000
+++ b/devel/scmgit/Makefile     Tue May 05 06:21:16 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/06/15 09:52:00 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2009/05/05 06:21:16 minskim Exp $
 
 .include "../../devel/scmgit/Makefile.version"
 
@@ -13,7 +13,7 @@
 
 META_PACKAGE=  yes
 
-DEPENDS+=      scmgit-base-[0-9]*:../../devel/scmgit-base
-DEPENDS+=      scmgit-docs-[0-9]*:../../devel/scmgit-docs
+DEPENDS+=      scmgit-base>=${GIT_VERSION}:../../devel/scmgit-base
+DEPENDS+=      scmgit-docs>=${GIT_VERSION}:../../devel/scmgit-docs
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6060f6fbbe20 -r f9243c999177 devel/scmgit/Makefile.version
--- a/devel/scmgit/Makefile.version     Tue May 05 05:55:55 2009 +0000
+++ b/devel/scmgit/Makefile.version     Tue May 05 06:21:16 2009 +0000
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.7 2009/01/09 13:42:15 tonnerre Exp $
+# $NetBSD: Makefile.version,v 1.8 2009/05/05 06:21:16 minskim Exp $
 #
-GIT_VERSION=   1.6.0.6
+GIT_VERSION=   1.6.2.5
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of scmgit packages.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated net/gtk-gnutella to 0.96.6
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of scmgit packages.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated net/gtk-gnutella to 0.96.6
Indexes:
Home | Main Index | Thread Index | Old Index