* Fix typo in MESSAGE.

* Remove obsolete patches and regen distinfo.

4 files changed, 3 insertions, 79 deletions

diff --git a/devel/gitolite/MESSAGE b/devel/gitolite/MESSAGE
index dddcafb2660..f8c7b1e6204 100644
--- a/devel/gitolite/MESSAGE
+++ b/devel/gitolite/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2013/01/25 21:04:02 ryoon Exp $
+$NetBSD: MESSAGE,v 1.3 2013/01/31 11:12:51 ryoon Exp $
 
 To use gitolite, you will need to perform the following steps.
 
@@ -14,7 +14,7 @@ To use gitolite, you will need to perform the following steps.
 
 	On server
 	$ mkdir ~/.ssh
-	$ chmof 700 ~/.ssh
+	$ chmod 700 ~/.ssh
 
 	On client
 	$ ssh-keygen -t rsa -f git
diff --git a/devel/gitolite/distinfo b/devel/gitolite/distinfo
index ed00dfd3c7c..2e2ed5c0ca3 100644
--- a/devel/gitolite/distinfo
+++ b/devel/gitolite/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.2 2013/01/25 21:04:03 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2013/01/31 11:12:52 ryoon Exp $
 
 SHA1 (gitolite-3.04.tar.gz) = 6248e3afc0603104d9110148a49fff99538ee93c
 RMD160 (gitolite-3.04.tar.gz) = f7ee414c334ae6feed76c8da347280c5a5407943
 Size (gitolite-3.04.tar.gz) = 113916 bytes
-SHA1 (patch-src_gitolite) = e0b2103f5e62ed4c46f99e9d6dc1c498d9e78773
-SHA1 (patch-src_lib_Gitolite_Rc.pm) = a95c318597f90fb31c6fc792d403885458d2b78b
diff --git a/devel/gitolite/patches/patch-contrib_adc_watch b/devel/gitolite/patches/patch-contrib_adc_watch
deleted file mode 100644
index 78d86caee5f..00000000000
--- a/devel/gitolite/patches/patch-contrib_adc_watch
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-contrib_adc_watch,v 1.1.1.1 2011/11/20 19:11:49 ryoon Exp $
-
-* Improve portability
-
---- contrib/adc/watch.orig	2011-11-16 00:23:56.000000000 +0000
-+++ contrib/adc/watch
-@@ -75,11 +75,11 @@ cd $GL_REPO_BASE_ABS/$repo.git
- grep "^$GL_USER $identarg$" gl-watchers > /dev/null
- found=$?
- 
--[ $found -eq 0 -a $cmd == "add" ] && die "There is already a watch \"$identarg\" for user $GL_USER"
--[ $found -ne 0 -a $cmd == "remove" ] && die "No watch \"$identarg\" found for user $GL_USER"
-+[ $found -eq 0 -a $cmd = "add" ] && die "There is already a watch \"$identarg\" for user $GL_USER"
-+[ $found -ne 0 -a $cmd = "remove" ] && die "No watch \"$identarg\" found for user $GL_USER"
- 
--[ $cmd == "add" ] && echo "$GL_USER $identarg" >> gl-watchers && { echo "Added a watch \"$identarg\" for user $GL_USER"; exit 0; }
-+[ $cmd = "add" ] && echo "$GL_USER $identarg" >> gl-watchers && { echo "Added a watch \"$identarg\" for user $GL_USER"; exit 0; }
- 
--[ $cmd == "remove" ] && sed -i -e "/^$GL_USER $identarg$/d" gl-watchers && { echo "Removed a watch \"$identarg\" for user $GL_USER"; exit 0; }
-+[ $cmd = "remove" ] && sed -i -e "/^$GL_USER $identarg$/d" gl-watchers && { echo "Removed a watch \"$identarg\" for user $GL_USER"; exit 0; }
- 
- die "16 cores, 320GB of RAM, 4TB of disk, and you give me a command I am not programmed to do. Humans..."
diff --git a/devel/gitolite/patches/patch-src_gl-system-install b/devel/gitolite/patches/patch-src_gl-system-install
deleted file mode 100644
index d1a60e15bb3..00000000000
--- a/devel/gitolite/patches/patch-src_gl-system-install
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-src_gl-system-install,v 1.1.1.1 2011/11/20 19:11:49 ryoon Exp $
-
-* Do not check gl-setup in $PATH, it is useless with staged installation.
-
---- src/gl-system-install.orig	2011-11-20 12:03:57.000000000 +0000
-+++ src/gl-system-install
-@@ -92,24 +92,24 @@ cp -R hooks/* $buildroot$gl_hooks_dir ||
- # ----
- 
- # check if $gl_bin_dir is in $PATH and advise the user if needed
--which=`which gl-setup 2>/dev/null`
--
--path_advice="
--Since gl-setup MUST be run from the PATH (and not as src/gl-setup or such),
--you must fix this before running gl-setup.  The simplest way is to add
--
--    PATH=$gl_bin_dir:\$PATH
--
--to the end of your bashrc or similar file.  You can even simply run that
--command manually each time you log in and want to run a gitolite command."
--
--[ -z "$which" ] && die "                ***** WARNING *****
--gl-setup is not in your \$PATH.
--$path_advice"
--
--which=`dirname $which`
--[ "$which" != "$gl_bin_dir" ] && die "                ***** WARNING *****
--$which precedes $gl_bin_dir in your \$PATH,
--and it *also* contains gl-setup.  This is almost certainly going to confuse
--you or me later.
--$path_advice"
-+#which=`which gl-setup 2>/dev/null`
-+#
-+#path_advice="
-+#Since gl-setup MUST be run from the PATH (and not as src/gl-setup or such),
-+#you must fix this before running gl-setup.  The simplest way is to add
-+#
-+#    PATH=$gl_bin_dir:\$PATH
-+#
-+#to the end of your bashrc or similar file.  You can even simply run that
-+#command manually each time you log in and want to run a gitolite command."
-+#
-+#[ -z "$which" ] && die "                ***** WARNING *****
-+#gl-setup is not in your \$PATH.
-+#$path_advice"
-+#
-+#which=`dirname $which`
-+#[ "$which" != "$gl_bin_dir" ] && die "                ***** WARNING *****
-+#$which precedes $gl_bin_dir in your \$PATH,
-+#and it *also* contains gl-setup.  This is almost certainly going to confuse
-+#you or me later.
-+#$path_advice"