pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel Update to git-1.5.4. Remove stray Makefile.comm...

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e28a6f846e20
branches:  trunk
changeset: 538344:e28a6f846e20
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Wed Feb 06 07:53:31 2008 +0000

description:
Update to git-1.5.4.  Remove stray Makefile.common in scmgit-docs.
There are quite a few changes and (welcomed) fixes:  please see
the release notes in ${WRKSRC}/Documentation/RelNotes-1.5.4.
A small subset of the changes are included here.

Added
-----

 * i18n support for gitk.

Removal
-------

 * "git svnimport" was removed in favor of "git svn".  It is still there
   in the source tree (contrib/examples) but unsupported.

 * As git-commit and git-status have been rewritten, "git runstatus"
   helper script lost all its users and has been removed.


Fixes since v1.5.3 (unique to the 1.5.4 branch)
------------------

These fixes are only in v1.5.4 and not backported to v1.5.3 maintenance
series.

 * The way "git diff --check" behaves is much more consistent with the way
   "git apply --whitespace=warn" works.

 * "git svn" talking with the SVN over HTTP will correctly quote branch
   and project names.

 * "git config" did not work correctly on platforms that define
   REG_NOMATCH to an even number.

 * Recent versions of AsciiDoc 8 has a change to break our
   documentation; a workaround has been implemented.

 * "git diff --color-words" colored context lines in a wrong color.

diffstat:

 devel/scmgit-base/Makefile         |   5 +--
 devel/scmgit-base/PLIST            |  32 ++++++++++++++++++++++--------
 devel/scmgit-base/distinfo         |  23 +++++++++++----------
 devel/scmgit-base/patches/patch-aa |  39 ++++++++++++++++---------------------
 devel/scmgit-base/patches/patch-ab |  17 +++------------
 devel/scmgit-base/patches/patch-ac |  17 ++++++++++++++++
 devel/scmgit-base/patches/patch-ae |   4 +-
 devel/scmgit-base/patches/patch-af |  28 +++++++++++++-------------
 devel/scmgit-base/patches/patch-ag |   6 ++--
 devel/scmgit-base/patches/patch-ah |  36 +++++++++++++++++-----------------
 devel/scmgit-base/patches/patch-ai |   4 +-
 devel/scmgit-docs/Makefile         |   4 ++-
 devel/scmgit-docs/Makefile.common  |  27 --------------------------
 devel/scmgit-docs/PLIST            |  11 +++------
 devel/scmgit/Makefile.common       |   6 +++-
 15 files changed, 125 insertions(+), 134 deletions(-)

diffs (truncated from 608 to 300 lines):

diff -r 6216ab735844 -r e28a6f846e20 devel/scmgit-base/Makefile
--- a/devel/scmgit-base/Makefile        Wed Feb 06 07:17:31 2008 +0000
+++ b/devel/scmgit-base/Makefile        Wed Feb 06 07:53:31 2008 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/01/18 05:14:39 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/02/06 07:53:31 bjs Exp $
 #
 
 .include "${.CURDIR}/../scmgit/Makefile.common"
 
 PKGNAME=               scmgit-base-${GIT_VERSION}
-PKGREVISION=           1
 COMMENT=               GIT Tree History Storage Tool (base package)
 
 PKG_DESTDIR_SUPPORT=   user-destdir
@@ -12,7 +11,7 @@
 CONFLICTS+=            git-[0-9]*              # misc/git
 
 USE_LANGUAGES=         c99
-USE_TOOLS+=            perl:run sh:run wish:run
+USE_TOOLS+=            perl:run sh:run wish:run msgfmt
 
 MAKE_ENV+=             CURLDIR=${BUILDLINK_PREFIX.curl:Q}
 MAKE_ENV+=             PYTHON_PATH=${PYTHONBIN:Q}
diff -r 6216ab735844 -r e28a6f846e20 devel/scmgit-base/PLIST
--- a/devel/scmgit-base/PLIST   Wed Feb 06 07:17:31 2008 +0000
+++ b/devel/scmgit-base/PLIST   Wed Feb 06 07:53:31 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/02/06 07:53:31 bjs Exp $
 bin/git
 bin/git-add
 bin/git-add--interactive
@@ -24,7 +24,6 @@
 bin/git-commit
 bin/git-commit-tree
 bin/git-config
-bin/git-convert-objects
 bin/git-count-objects
 bin/git-cvsexportcommit
 bin/git-cvsimport
@@ -35,6 +34,7 @@
 bin/git-diff-files
 bin/git-diff-index
 bin/git-diff-tree
+bin/git-fast-export
 bin/git-fast-import
 bin/git-fetch
 bin/git-fetch--tool
@@ -50,6 +50,7 @@
 bin/git-grep
 bin/git-gui
 bin/git-hash-object
+bin/git-help--browse
 bin/git-http-fetch
 bin/git-http-push
 bin/git-imap-send
@@ -57,7 +58,6 @@
 bin/git-init
 bin/git-init-db
 bin/git-instaweb
-bin/git-local-fetch
 bin/git-log
 bin/git-lost-found
 bin/git-ls-files
@@ -109,7 +109,6 @@
 bin/git-rev-parse
 bin/git-revert
 bin/git-rm
-bin/git-runstatus
 bin/git-send-email
 bin/git-send-pack
 bin/git-sh-setup
@@ -119,16 +118,11 @@
 bin/git-show-branch
 bin/git-show-index
 bin/git-show-ref
-bin/git-ssh-fetch
-bin/git-ssh-pull
-bin/git-ssh-push
-bin/git-ssh-upload
 bin/git-stash
 bin/git-status
 bin/git-stripspace
 bin/git-submodule
 bin/git-svn
-bin/git-svnimport
 bin/git-symbolic-ref
 bin/git-tag
 bin/git-tar-tree
@@ -156,6 +150,7 @@
 share/git-core/templates/hooks/pre-rebase
 share/git-core/templates/hooks/update
 share/git-core/templates/info/exclude
+share/git-gui/lib/about.tcl
 share/git-gui/lib/blame.tcl
 share/git-gui/lib/branch.tcl
 share/git-gui/lib/branch_checkout.tcl
@@ -165,16 +160,28 @@
 share/git-gui/lib/browser.tcl
 share/git-gui/lib/checkout_op.tcl
 share/git-gui/lib/choose_font.tcl
+share/git-gui/lib/choose_repository.tcl
 share/git-gui/lib/choose_rev.tcl
 share/git-gui/lib/class.tcl
 share/git-gui/lib/commit.tcl
 share/git-gui/lib/console.tcl
 share/git-gui/lib/database.tcl
+share/git-gui/lib/date.tcl
 share/git-gui/lib/diff.tcl
 share/git-gui/lib/encoding.tcl
 share/git-gui/lib/error.tcl
+share/git-gui/lib/git-gui.ico
 share/git-gui/lib/index.tcl
+share/git-gui/lib/logo.tcl
 share/git-gui/lib/merge.tcl
+share/git-gui/lib/msgs/de.msg
+share/git-gui/lib/msgs/fr.msg
+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/ru.msg
+share/git-gui/lib/msgs/sv.msg
+share/git-gui/lib/msgs/zh_cn.msg
 share/git-gui/lib/option.tcl
 share/git-gui/lib/remote.tcl
 share/git-gui/lib/remote_branch_delete.tcl
@@ -182,6 +189,13 @@
 share/git-gui/lib/status_bar.tcl
 share/git-gui/lib/tclIndex
 share/git-gui/lib/transport.tcl
+share/git-gui/lib/win32.tcl
+share/git-gui/lib/win32_shortcut.js
+share/gitk/lib/msgs/de.msg
+@dirrm share/gitk/lib/msgs
+@dirrm share/gitk/lib
+@dirrm share/gitk
+@dirrm share/git-gui/lib/msgs
 @dirrm share/git-gui/lib
 @dirrm share/git-gui
 @dirrm share/git-core/templates/info
diff -r 6216ab735844 -r e28a6f846e20 devel/scmgit-base/distinfo
--- a/devel/scmgit-base/distinfo        Wed Feb 06 07:17:31 2008 +0000
+++ b/devel/scmgit-base/distinfo        Wed Feb 06 07:53:31 2008 +0000
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+$NetBSD: distinfo,v 1.2 2008/02/06 07:53:31 bjs Exp $
 
-SHA1 (git-1.5.3.7.tar.gz) = 8a6b7f130f39765e8de8f32bb23d4799747ee190
-RMD160 (git-1.5.3.7.tar.gz) = 52ac1fb55341140abd18a226e8dd34654c79be61
-Size (git-1.5.3.7.tar.gz) = 1612748 bytes
-SHA1 (patch-aa) = 77ab1eaf9206534d2103e5481bcdc278ffb351d9
-SHA1 (patch-ab) = 6d9b08b20b3bbee931c8aa5842b03953e7cd2a7d
-SHA1 (patch-ae) = 44f30c796c922b028773668e80d71c0a48606f5c
-SHA1 (patch-af) = d2b6fff88913d89f37bf5453babc65027a6a5a54
-SHA1 (patch-ag) = feb17b439e0e4e89c25985f2e14e300d698c8dcf
-SHA1 (patch-ah) = 4cf802facbc3dd9f78e923427c4b5f455f954722
-SHA1 (patch-ai) = 569ca315a6ed73f8d06fa265945af3e2d920556a
+SHA1 (git-1.5.4.tar.gz) = e4114d06231a038e70bd3f3ff0abedd0c94c3e7f
+RMD160 (git-1.5.4.tar.gz) = 7211e87c82b56fc9a94baa83df232b27fbce11fa
+Size (git-1.5.4.tar.gz) = 1894329 bytes
+SHA1 (patch-aa) = 95952036a346a816cbf6d880f89db31b1113e312
+SHA1 (patch-ab) = 746bcea15853cd78b14dc2916f5f02bf67e59751
+SHA1 (patch-ac) = b8b70fabbd2857d5b4962b94d2c852f8d092ef27
+SHA1 (patch-ae) = 502cf80e047155a1302cbdafdd2a82e6077077e1
+SHA1 (patch-af) = 93b83ac35f3f48cbf9a8ee39db0709547bf9d6c3
+SHA1 (patch-ag) = 65e91df0ac4dfe977717b9c06cdf0511a7d12dca
+SHA1 (patch-ah) = 94947b3d79c43246388da9c434f9e71e6716c790
+SHA1 (patch-ai) = 95b2b0a41b8b6f0ee804b48a3f3686d2fdf164f5
diff -r 6216ab735844 -r e28a6f846e20 devel/scmgit-base/patches/patch-aa
--- a/devel/scmgit-base/patches/patch-aa        Wed Feb 06 07:17:31 2008 +0000
+++ b/devel/scmgit-base/patches/patch-aa        Wed Feb 06 07:53:31 2008 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+$NetBSD: patch-aa,v 1.2 2008/02/06 07:53:31 bjs Exp $
 
 NetBSD 3.0 needs -liconv, too.
 
 AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
 
---- Makefile.orig      2007-12-01 16:21:12.000000000 -0500
+--- Makefile.orig      2008-02-01 23:09:01.000000000 -0500
 +++ Makefile
-@@ -139,8 +139,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
+@@ -150,8 +150,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -15,9 +15,9 @@
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -177,12 +175,8 @@ GITWEB_SITE_FOOTER =
+@@ -192,12 +190,8 @@ GITWEB_SITE_FOOTER =
  
- export prefix bindir gitexecdir sharedir template_dir sysconfdir
+ export prefix bindir gitexecdir sharedir template_dir htmldir sysconfdir
  
 -CC = gcc
 -AR = ar
@@ -28,8 +28,8 @@
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -402,9 +396,10 @@ ifeq ($(uname_S),Darwin)
-       NO_STRLCPY = YesPlease
+@@ -421,9 +415,10 @@ ifeq ($(uname_S),Darwin)
+       NO_MEMMEM = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
 +      NEEDS_LIBICONV = YesPlease
@@ -38,9 +38,9 @@
 -      SHELL_PATH = /bin/bash
 +      SHELL_PATH = ${BASH}
        NO_STRCASESTR = YesPlease
+       NO_MEMMEM = YesPlease
        NO_HSTRERROR = YesPlease
-       ifeq ($(uname_R),5.8)
-@@ -420,8 +415,6 @@ ifeq ($(uname_S),SunOS)
+@@ -441,8 +436,6 @@ ifeq ($(uname_S),SunOS)
                NO_C99_FORMAT = YesPlease
                NO_STRTOUMAX = YesPlease
        endif
@@ -49,7 +49,7 @@
        BASIC_CFLAGS += -D__EXTENSIONS__
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -451,9 +444,7 @@ ifeq ($(uname_S),OpenBSD)
+@@ -476,9 +469,7 @@ ifeq ($(uname_S),OpenBSD)
        BASIC_LDFLAGS += -L/usr/local/lib
  endif
  ifeq ($(uname_S),NetBSD)
@@ -60,7 +60,7 @@
        BASIC_CFLAGS += -I/usr/pkg/include
        BASIC_LDFLAGS += -L/usr/pkg/lib
        ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
-@@ -718,7 +709,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
+@@ -779,7 +770,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
  PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
  TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  
@@ -68,24 +68,19 @@
 +LIBS += $(GITLIBS) $(EXTLIBS)
  
  BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
-       -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS)
-@@ -991,14 +982,14 @@ remove-dashes:
+       $(COMPAT_CFLAGS)
+@@ -1047,10 +1038,10 @@ remove-dashes:
  ### Installation rules
  
  install: all
--      $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(bindir_SQ)'
--      $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
+-      $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
+-      $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 -      $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 -      $(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
 +      $(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(bindir_SQ)'
-+      $(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
++      $(BSD_INSTALL_SCRIPT_DIR) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +      $(BSD_INSTALL_SCRIPT) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +      $(BSD_INSTALL_SCRIPT) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
        $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
-       $(MAKE) -C perl prefix='$(prefix_SQ)' install
+       $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
  ifndef NO_TCLTK
--      $(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
-+      $(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
-       $(MAKE) -C git-gui install
- endif
-       if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
diff -r 6216ab735844 -r e28a6f846e20 devel/scmgit-base/patches/patch-ab
--- a/devel/scmgit-base/patches/patch-ab        Wed Feb 06 07:17:31 2008 +0000
+++ b/devel/scmgit-base/patches/patch-ab        Wed Feb 06 07:53:31 2008 +0000
@@ -1,17 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+$NetBSD: patch-ab,v 1.2 2008/02/06 07:53:32 bjs Exp $
 
---- git-compat-util.h.orig     2007-10-31 21:04:37.000000000 +0100
-+++ git-compat-util.h  2007-11-29 16:24:57.810134000 +0100
-@@ -6,6 +6,8 @@
- #ifndef FLEX_ARRAY
- #if defined(__GNUC__) && (__GNUC__ < 3)
- #define FLEX_ARRAY 0
-+#elif defined(__SUNPRO_C)
-+#define FLEX_ARRAY 1
- #else
- #define FLEX_ARRAY /* empty */
- #endif
-@@ -24,7 +26,7 @@
+--- git-compat-util.h.orig     2008-02-01 23:09:01.000000000 -0500
++++ 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)
  
diff -r 6216ab735844 -r e28a6f846e20 devel/scmgit-base/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/scmgit-base/patches/patch-ac        Wed Feb 06 07:53:31 2008 +0000
Home | Main Index | Thread Index | Old Index