summaryrefslogtreecommitdiff
path: root/misc/git
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2006-01-26 17:58:18 +0000
committerreed <reed@pkgsrc.org>2006-01-26 17:58:18 +0000
commitcf6b3e0678e1cdc2d8de2b2a4b3fba4d0aaac3c2 (patch)
tree2217a118ed76705427cfd9d8f1c80fbc57d9c035 /misc/git
parente05cca85cbf3538c13f3966f50f2e901ee856ee7 (diff)
downloadpkgsrc-cf6b3e0678e1cdc2d8de2b2a4b3fba4d0aaac3c2.tar.gz
Update git to git-4.3.20.
Remove BUILD_TARGET. Change pre-install target to post-extract and don't patch manually, just uses patches/ framework. This adds gitwhich command and removes gitregrep and gitrfgrep. Moves terminal files from lib/git/term/ to share/git. Update patch-ac -- for location of html document. (Now only installs one.) Update patch-ab -- to add .gitrc.cons25 Add patch-ad for the .gitrc.cons25 (this was in files, but recreated patch). (Note I only slightly tested git. I updated this because I saw old Makefile.in didn't honor the @mandir@ and @infodir@ as provided by configure. I patched this, but then saw this was an old version and new version already had this fixed.) Changes here: * Version 4.3.20 ================ ** Moving across filesystems now preserves file ownership. ** Copying no longer preserves file ownership. ** F7 (`make-directory') creates all the intermediate directories. ** Fixed a long standing bug in the xid code for long user names (I could finally reproduce it myself). ** Fixed a crash in the incremental search code. * Version 4.3.19 ================ ** Fixed 2 compilation problems on non-ANSI C compilers. ** Minor fixes in gitaction. * Version 4.3.18 ================ ** The build/installation procedure is now based on automake. ** `make prefix=some_path' no longer recompiles git. According to the new GNU coding standards this is the correct behaviour. ** The key sequence typed so far is displayed in the status bar, if not completed in one second. ** `select-extension'/`unselect-extension': new builtin commands, bound on `Alt-+'/`Alt--' (or `ESC +'/`ESC -'). These commands select/unselect all the files in the current directory that have the same extension as the current file. That is, if the current file is "git.c", `select-extension' will select all the "*.c" files in the current directory. If the current file does not have an extension (including the case where its name starts with a dot), no selections/unselections are made. ** The insertion of file/directory names in the command line (Alt-Enter) is a little bit smarter. Quotes are added only when necessary and when before the current possition there is a /, no space is added before the name, to allow for path building. ** The incremental forward/backwards search mechanism can recall the last searched string if the user types ^S/^R while the string is empty. This is similar to what Emacs does. ** F2 works on *.pgp files (will ask for a passphrase). ** `ESC m f' mounts the first floppy in /mnt/floppy. `ESC r f' unmounts it. ** A simple scroll-bar thumb (#) has been added on the right side of the panel's frame. ** The shell command currently being executed is displayed on the title of the xterm window. ** GIT_BROWSER: new environment variable. If set, git will use this to view html documents. If GIT_BROWSER is not set, lynx will be used instead. ** A more Unix like key sequence structure in gitps and gitview. You can scroll up and down with `Space' and `Backspace' and quit with `q'. ** Binary file split on `^C /' and (in background) on `^C b /'. ** The inconsistency between the keys and the signal names in gitps have been fixed. Signal selection is done with upper case letters only. ** Other bug fixes.
Diffstat (limited to 'misc/git')
-rw-r--r--misc/git/Makefile15
-rw-r--r--misc/git/PLIST96
-rw-r--r--misc/git/distinfo14
-rw-r--r--misc/git/patches/patch-aa13
-rw-r--r--misc/git/patches/patch-ad (renamed from misc/git/files/gitrc.cons25.patch)8
5 files changed, 58 insertions, 88 deletions
diff --git a/misc/git/Makefile b/misc/git/Makefile
index fa87fce433b..8d9d498e215 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2006/01/26 17:00:15 reed Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/26 17:58:18 reed Exp $
-DISTNAME= git-4.3.17
-PKGREVISION= 1
+DISTNAME= git-4.3.20
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU:=git/}
@@ -10,13 +9,9 @@ HOMEPAGE= http://hulubei.net/tudor/git/
COMMENT= GNU Interactive Tools - a file system browser for UNIX systems
GNU_CONFIGURE= YES
-INFO_FILES= git.info
+INFO_FILES= git.info git.info-1 git.info-2 git.info-3
-BUILD_TARGET= all info
-
-pre-install:
- ${CP} ${WRKSRC}/term/.gitrc.ansi \
- ${WRKSRC}/term/.gitrc.cons25
- (cd ${WRKSRC}/term ; ${PATCH} --quiet -p0 <${FILESDIR}/gitrc.cons25.patch )
+post-extract:
+ ${CP} ${WRKSRC}/term/.gitrc.ansi ${WRKSRC}/term/.gitrc.cons25
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/git/PLIST b/misc/git/PLIST
index f3ecbab06d4..b233256eb8d 100644
--- a/misc/git/PLIST
+++ b/misc/git/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/03/08 22:18:19 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/01/26 17:58:18 reed Exp $
bin/.gitaction
bin/git
bin/gitaction
@@ -6,67 +6,55 @@ bin/gitkeys
bin/gitmkdirs
bin/gitmount
bin/gitps
-bin/gitregrep
-bin/gitrfgrep
bin/gitrgrep
bin/gitunpack
bin/gitview
+bin/gitwhich
bin/gitwipe
bin/gitxgrep
-lib/git/term/.gitrc.aixterm
-lib/git/term/.gitrc.ansi
-lib/git/term/.gitrc.common
-lib/git/term/.gitrc.cons25
-lib/git/term/.gitrc.console
-lib/git/term/.gitrc.dtterm
-lib/git/term/.gitrc.eterm
-lib/git/term/.gitrc.generic
-lib/git/term/.gitrc.hft
-lib/git/term/.gitrc.hp
-lib/git/term/.gitrc.hpterm
-lib/git/term/.gitrc.iris-ansi
-lib/git/term/.gitrc.iris-ansi-net
-lib/git/term/.gitrc.linux
-lib/git/term/.gitrc.mach
-lib/git/term/.gitrc.minix
-lib/git/term/.gitrc.pc3
-lib/git/term/.gitrc.screen
-lib/git/term/.gitrc.sun
-lib/git/term/.gitrc.sun-cmd
-lib/git/term/.gitrc.thix
-lib/git/term/.gitrc.vt100
-lib/git/term/.gitrc.vt102
-lib/git/term/.gitrc.vt125
-lib/git/term/.gitrc.vt200
-lib/git/term/.gitrc.vt201
-lib/git/term/.gitrc.vt220
-lib/git/term/.gitrc.vt240
-lib/git/term/.gitrc.vt300
-lib/git/term/.gitrc.vt320
-lib/git/term/.gitrc.vt400
-lib/git/term/.gitrc.vt420
-lib/git/term/.gitrc.xterm
-lib/git/term/.gitrc.xterm-color
-lib/git/term/.gitrc.xterms
man/man1/git.1
man/man1/gitaction.1
man/man1/gitkeys.1
man/man1/gitmount.1
-man/man1/gitps.1
man/man1/gitrgrep.1
man/man1/gitunpack.1
-man/man1/gitview.1
-share/doc/html/git/git_1.html
-share/doc/html/git/git_10.html
-share/doc/html/git/git_2.html
-share/doc/html/git/git_3.html
-share/doc/html/git/git_4.html
-share/doc/html/git/git_5.html
-share/doc/html/git/git_6.html
-share/doc/html/git/git_7.html
-share/doc/html/git/git_8.html
-share/doc/html/git/git_9.html
-share/doc/html/git/git_toc.html
-@dirrm share/doc/html/git
-@dirrm lib/git/term
-@dirrm lib/git
+share/doc/git/git.html
+share/git/.gitrc.aixterm
+share/git/.gitrc.ansi
+share/git/.gitrc.common
+share/git/.gitrc.cons25
+share/git/.gitrc.console
+share/git/.gitrc.dtterm
+share/git/.gitrc.eterm
+share/git/.gitrc.generic
+share/git/.gitrc.hft
+share/git/.gitrc.hp
+share/git/.gitrc.hpterm
+share/git/.gitrc.iris-ansi
+share/git/.gitrc.iris-ansi-net
+share/git/.gitrc.linux
+share/git/.gitrc.mach
+share/git/.gitrc.minix
+share/git/.gitrc.pc3
+share/git/.gitrc.rxvt
+share/git/.gitrc.screen
+share/git/.gitrc.sun
+share/git/.gitrc.sun-cmd
+share/git/.gitrc.thix
+share/git/.gitrc.vt100
+share/git/.gitrc.vt102
+share/git/.gitrc.vt125
+share/git/.gitrc.vt200
+share/git/.gitrc.vt201
+share/git/.gitrc.vt220
+share/git/.gitrc.vt240
+share/git/.gitrc.vt300
+share/git/.gitrc.vt320
+share/git/.gitrc.vt400
+share/git/.gitrc.vt420
+share/git/.gitrc.xterm
+share/git/.gitrc.xterm-color
+share/git/.gitrc.xterm-debian
+share/git/.gitrc.xterms
+@dirrm share/git
+@dirrm share/doc/git
diff --git a/misc/git/distinfo b/misc/git/distinfo
index 766b657488a..752ff6cb5f6 100644
--- a/misc/git/distinfo
+++ b/misc/git/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 11:02:52 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/01/26 17:58:18 reed Exp $
-SHA1 (git-4.3.17.tar.gz) = f822365367508a2b6900092a2c36c9d82dcc250b
-RMD160 (git-4.3.17.tar.gz) = 79abefa501bac7670c6c2a7762daf162345ab91e
-Size (git-4.3.17.tar.gz) = 402888 bytes
-SHA1 (patch-aa) = f8c73bf43f75a7b58293cc16afa60f2d70125ae0
-SHA1 (patch-ab) = 53f4e2d24435db4aed7e61904dafe1d2e5de6463
-SHA1 (patch-ac) = 3c4a15ed06fb8c7e82aebf4933234e37cc378134
+SHA1 (git-4.3.20.tar.gz) = 2e761c033f3547d64f9deb72311146d683a4ad20
+RMD160 (git-4.3.20.tar.gz) = 1ca2ad64a8cbf0ef368e7fdbc7d65df395029ecd
+Size (git-4.3.20.tar.gz) = 426648 bytes
+SHA1 (patch-ab) = fae1f8bfb38f8187ff6d3d0116428f7563041912
+SHA1 (patch-ac) = e7143273cd3c7735688d03591dbba6ce0cf6df34
+SHA1 (patch-ad) = 5bb1addd7738b507e41bdb4670c029a3a79c6592
diff --git a/misc/git/patches/patch-aa b/misc/git/patches/patch-aa
deleted file mode 100644
index 3e2fdf19c63..00000000000
--- a/misc/git/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1998/08/07 11:10:20 agc Exp $
-
---- src/Makefile.in.orig Mon Mar 16 09:14:52 1998
-+++ src/Makefile.in Mon Mar 16 09:15:03 1998
-@@ -132,7 +132,7 @@
- for i in $(GIT_SCRIPTS);\
- do\
- rm -f $(bindir)/$$i;\
-- $(INSTALL_PROGRAM) $(srcdir)/$$i $(bindir)/$$i;\
-+ $(BSD_INSTALL_SCRIPT) $(srcdir)/$$i $(bindir)/$$i;\
- done
- for i in $(GIT_RGREPS);\
- do\
diff --git a/misc/git/files/gitrc.cons25.patch b/misc/git/patches/patch-ad
index 5ac98c4aa19..0db4504f59d 100644
--- a/misc/git/files/gitrc.cons25.patch
+++ b/misc/git/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: gitrc.cons25.patch,v 1.2 1998/08/07 11:10:20 agc Exp $
+$NetBSD: patch-ad,v 1.1 2006/01/26 17:58:18 reed Exp $
---- .gitrc.cons25.orig Sat Jun 15 17:00:30 1996
-+++ .gitrc.cons25 Sat Jun 15 17:05:28 1996
+--- term/.gitrc.cons25.orig 2006-01-26 09:32:11.000000000 -0800
++++ term/.gitrc.cons25 2006-01-26 09:33:17.000000000 -0800
@@ -24,7 +24,7 @@
+
[Setup]
- TempDirectory = /tmp
AnsiColors = ON # empty means OFF
-UseLastScreenChar = OFF # use the last character on the screen
+UseLastScreenChar = ON # use the last character on the screen