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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel Update scmgit{,-base,-docs} to 1.6.4.
From: minskim <minskim%pkgsrc.org@localhost>
Date: Mon, 16 Jan 2023 19:35:54 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a31b7c99f37
branches:  trunk
changeset: 396990:6a31b7c99f37
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Fri Aug 07 02:39:51 2009 +0000

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

Major changes:
     * git-svn updates, including a new --authors-prog option to map author
       names by invoking an external program, 'git svn reset' to unwind
       'git svn fetch', support for more than one branches, documenting
       of the useful --minimize-url feature, new "git svn gc" command, etc.
     * We feed iconv with "UTF-8" instead of "utf8"; the former is
       understood more widely.  Similarly updated test scripts to use
       encoding names more widely understood (e.g. use "ISO8859-1" instead
       of "ISO-8859-1").
     * Various portability fixes/workarounds for different vintages of
       SunOS, IRIX, and Windows.
     * Git-over-ssh transport on Windows supports PuTTY plink and TortoisePlink.
     * Many repeated use of lstat() are optimized out in "checkout" codepath.
     * git-status (and underlying git-diff-index --cached) are optimized
       to take advantage of cache-tree information in the index.

diffstat:

 devel/scmgit-base/PLIST            |   3 ++-
 devel/scmgit-base/distinfo         |  12 ++++++------
 devel/scmgit-base/patches/patch-aa |  31 ++++++++++++++++---------------
 devel/scmgit-base/patches/patch-ab |  18 +++++++++---------
 devel/scmgit/Makefile.version      |   4 ++--
 5 files changed, 35 insertions(+), 33 deletions(-)

diffs (152 lines):

diff -r e14ef1e4c309 -r 6a31b7c99f37 devel/scmgit-base/PLIST
--- a/devel/scmgit-base/PLIST   Thu Aug 06 23:21:31 2009 +0000
+++ b/devel/scmgit-base/PLIST   Fri Aug 07 02:39:51 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/07/19 01:29:33 minskim Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/08/07 02:39:51 minskim Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -6,6 +6,7 @@
 bin/git-upload-archive
 bin/git-upload-pack
 ${PLIST.gui}bin/gitk
+libexec/git-core/git
 libexec/git-core/git-add
 libexec/git-core/git-add--interactive
 libexec/git-core/git-am
diff -r e14ef1e4c309 -r 6a31b7c99f37 devel/scmgit-base/distinfo
--- a/devel/scmgit-base/distinfo        Thu Aug 06 23:21:31 2009 +0000
+++ b/devel/scmgit-base/distinfo        Fri Aug 07 02:39:51 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2009/07/20 03:43:07 hasso Exp $
+$NetBSD: distinfo,v 1.20 2009/08/07 02:39:51 minskim Exp $
 
-SHA1 (git-1.6.3.3.tar.gz) = 8eb22cafe085d3297872f817106fc00ad1c7ea0b
-RMD160 (git-1.6.3.3.tar.gz) = ac31ab58c2ab138ad3cb9c6044547b62ae4b3f31
-Size (git-1.6.3.3.tar.gz) = 2517144 bytes
-SHA1 (patch-aa) = 486cc9b322fc1f8f63ef5457ab49000d81f4707f
-SHA1 (patch-ab) = b8cbeacd7d44791a5151deaa97d1d283ac9296d1
+SHA1 (git-1.6.4.tar.gz) = 1c40571d4fd09b76f9ce3435e866fe3338df4bb3
+RMD160 (git-1.6.4.tar.gz) = b660e0db359146d51bf0ea8cae000c9688f3254e
+Size (git-1.6.4.tar.gz) = 2621645 bytes
+SHA1 (patch-aa) = 406ec1d5a5101b63982fdb3aaa64aed380f48918
+SHA1 (patch-ab) = 7d8bc92b7f36cf42368111334a6ec5b501d06f8d
 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
 SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
 SHA1 (patch-af) = ea0ac503103429f32d26bd42c37a9ed563ff17b8
diff -r e14ef1e4c309 -r 6a31b7c99f37 devel/scmgit-base/patches/patch-aa
--- a/devel/scmgit-base/patches/patch-aa        Thu Aug 06 23:21:31 2009 +0000
+++ b/devel/scmgit-base/patches/patch-aa        Fri Aug 07 02:39:51 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2009/07/20 03:43:07 hasso Exp $
+$NetBSD: patch-aa,v 1.10 2009/08/07 02:39:51 minskim Exp $
 
---- Makefile.orig      2009-06-22 09:24:25 +0300
-+++ Makefile   2009-07-20 06:07:34 +0300
-@@ -249,12 +249,8 @@ GITWEB_SITE_FOOTER =
+--- Makefile.orig      2009-07-29 01:18:18.000000000 -0700
++++ Makefile
+@@ -270,12 +270,8 @@ GITWEB_SITE_FOOTER =
  
  export prefix bindir sharedir sysconfdir
  
@@ -15,28 +15,28 @@
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -694,9 +690,10 @@ ifeq ($(uname_S),Darwin)
+@@ -719,9 +715,10 @@ ifeq ($(uname_S),Darwin)
        USE_ST_TIMESPEC = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
-+      NEEDS_LIBICONV = YesPlease
++      NEED_LIBICONV = YesPlease
        NEEDS_SOCKET = YesPlease
        NEEDS_NSL = YesPlease
 -      SHELL_PATH = /bin/bash
 +      SHELL_PATH = ${BASH}
+       SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
        NO_STRCASESTR = YesPlease
        NO_MEMMEM = YesPlease
-       NO_HSTRERROR = YesPlease
-@@ -714,8 +711,6 @@ ifeq ($(uname_S),SunOS)
-               NO_C99_FORMAT = YesPlease
-               NO_STRTOUMAX = YesPlease
+@@ -754,8 +751,6 @@ ifeq ($(uname_S),SunOS)
+       ifdef NO_IPV6
+               NEEDS_RESOLV = YesPlease
        endif
--      INSTALL = ginstall
+-      INSTALL = /usr/ucb/install
 -      TAR = gtar
-       BASIC_CFLAGS += -D__EXTENSIONS__
+       BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -759,14 +754,19 @@ ifeq ($(uname_S),OpenBSD)
+@@ -800,15 +795,20 @@ ifeq ($(uname_S),OpenBSD)
        THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),NetBSD)
@@ -48,6 +48,7 @@
        BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
        THREADED_DELTA_SEARCH = YesPlease
        USE_ST_TIMESPEC = YesPlease
+       NO_MKSTEMPS = YesPlease
  endif
 +ifeq ($(uname_S),DragonFly)
 +      NEEDS_LIBICONV = YesPlease
@@ -59,7 +60,7 @@
  ifeq ($(uname_S),AIX)
        NO_STRCASESTR=YesPlease
        NO_MEMMEM = YesPlease
-@@ -1183,7 +1183,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
+@@ -1289,7 +1289,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
  PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
  TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  
@@ -68,7 +69,7 @@
  
  BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
        $(COMPAT_CFLAGS)
-@@ -1535,10 +1535,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
+@@ -1643,10 +1643,10 @@ gitexec_instdir_SQ = $(subst ','\'',$(gi
  export gitexec_instdir
  
  install: all
diff -r e14ef1e4c309 -r 6a31b7c99f37 devel/scmgit-base/patches/patch-ab
--- a/devel/scmgit-base/patches/patch-ab        Thu Aug 06 23:21:31 2009 +0000
+++ b/devel/scmgit-base/patches/patch-ab        Fri Aug 07 02:39:51 2009 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2008/08/20 03:04:20 bjs Exp $
+$NetBSD: patch-ab,v 1.5 2009/08/07 02:39:51 minskim Exp $
 
---- git-compat-util.h.orig     2008-08-17 16:43:06.000000000 -0400
+--- git-compat-util.h.orig     2009-07-29 01:18:18.000000000 -0700
 +++ git-compat-util.h
-@@ -39,7 +39,7 @@
- /* Approximation of the length of the decimal representation of this type. */
- #define decimal_length(x)     ((int)(sizeof(x) * 2.56 + 0.5) + 1)
- 
--#if !defined(__APPLE__) && !defined(__FreeBSD__)  && !defined(__USLC__) && !defined(_M_UNIX)
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)  && !defined(__USLC__) && !defined(_M_UNIX) && !defined(__sun)
+@@ -55,7 +55,7 @@
+ # else
+ # define _XOPEN_SOURCE 500
+ # endif
+-#elif !defined(__APPLE__) && !defined(__FreeBSD__)  && !defined(__USLC__) && !defined(_M_UNIX) && !defined(sgi)
++#elif !defined(__APPLE__) && !defined(__FreeBSD__)  && !defined(__USLC__) && !defined(_M_UNIX) && !defined(sgi) && !defined(__sun)
  #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
+ #ifndef __sun__
  #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
- #endif
diff -r e14ef1e4c309 -r 6a31b7c99f37 devel/scmgit/Makefile.version
--- a/devel/scmgit/Makefile.version     Thu Aug 06 23:21:31 2009 +0000
+++ b/devel/scmgit/Makefile.version     Fri Aug 07 02:39:51 2009 +0000
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.9 2009/07/19 01:29:32 minskim Exp $
+# $NetBSD: Makefile.version,v 1.10 2009/08/07 02:39:51 minskim Exp $
 #
-GIT_VERSION=   1.6.3.3
+GIT_VERSION=   1.6.4
Prev by Date: [pkgsrc/trunk]: pkgsrc/misc/gaupol Allow python26.
Next by Date: [pkgsrc/trunk]: pkgsrc/x11/py-wxWidgets Update to py-wxWidgets-2.8.10.1. The ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/misc/gaupol Allow python26.
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11/py-wxWidgets Update to py-wxWidgets-2.8.10.1. The ...
Indexes:
Home | Main Index | Thread Index | Old Index