Update to 3.04

* Update MESSAGE.

Changelog:
* Re-written from scratch, this is gilolite g3.

4 files changed, 131 insertions, 58 deletions

diff --git a/devel/gitolite/MESSAGE b/devel/gitolite/MESSAGE
index 5a40d3a9cd6..dddcafb2660 100644
--- a/devel/gitolite/MESSAGE
+++ b/devel/gitolite/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2011/11/20 19:11:49 ryoon Exp $
+$NetBSD: MESSAGE,v 1.2 2013/01/25 21:04:02 ryoon Exp $
 
 To use gitolite, you will need to perform the following steps.
 
@@ -9,17 +9,24 @@ To use gitolite, you will need to perform the following steps.
 	# groupadd git
 	# useradd -m -g git git
 
-2. login to new user git, create ssh public key, and copy public key
+2. login with new user git, create ssh public key, and copy public key
    file to user git's home directory on server.
 
-	$ ssh-keygen -t rsa -f git-admin
-	$ cp git-admin.pub ~/.ssh/
-	$ scp ~/git-admin.pub gitserver:~/.ssh/
+	On server
+	$ mkdir ~/.ssh
+	$ chmof 700 ~/.ssh
+
+	On client
+	$ ssh-keygen -t rsa -f git
+	$ scp ~/git.pub gitserver:~/
+
+	On server
+	$ chmod 600 ~/git.pub
 
 3. Setup gitolite.
 
    On server,
-	$ gl-setup ~/git-admin.pub
+	$ gitolite setup -pk git.pub
 
    And edit config file.
 
@@ -30,10 +37,10 @@ To use gitolite, you will need to perform the following steps.
 	    user git
 	    hostname RealGitServerName
 	    port 22
-	    identityfile ~/.ssh/git-admin
+	    identityfile ~/.ssh/git
 
-5. For testing, please clone testing repository.
+5. For administrative setting, please clone gitolite-admin repository.
 
 	On client,
-	$ git clone ssh://gitserver/testing
+	$ git clone gitserver:gitolite-admin
 ===========================================================================
diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile
index 5ddd433ca0e..b063c2bd99a 100644
--- a/devel/gitolite/Makefile
+++ b/devel/gitolite/Makefile
@@ -1,37 +1,66 @@
-# $NetBSD: Makefile,v 1.4 2012/10/31 11:17:00 asau Exp $
+# $NetBSD: Makefile,v 1.5 2013/01/25 21:04:02 ryoon Exp $
 #
 
-DISTNAME=	sitaramc-gitolite-v2.2-0-g15b17d7
-PKGNAME=	${DISTNAME:S/sitaramc-gitolite-v/gitolite-/:C/-0-.*//}
-PKGREVISION=	1
+DISTNAME=	gitolite-3.04
 CATEGORIES=	devel net
-MASTER_SITES=	-https://github.com/sitaramc/gitolite/tarball/v2.2
+MASTER_SITES=	-https://github.com/sitaramc/gitolite/archive/v3.04.tar.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/sitaramc/gitolite/wiki
 COMMENT=	Gitolite allows you to host Git repositories easily and securely
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	scmgit-base-[0-9]*:../../devel/scmgit-base
+DEPENDS+=	scmgit-base>=1.6.6:../../devel/scmgit-base
 
 USE_LANGUAGES=	# none
-USE_TOOLS+=	perl bash
+USE_TOOLS+=	pax perl:run
 
 # Force using "curl" for fetching the distribution file. It is only available
 # over HTTPS and "curl" is the only fetch program which always supports HTTPS.
 FETCH_USING=	curl
 
-WRKSRC=		${WRKDIR}/sitaramc-gitolite-0ffadc1
-
 NO_BUILD=	yes
 
-REPLACE_PERL=	src/gl-* src/sshkeys-lint hooks/common/update
-REPLACE_BASH=	src/gl-* hooks/common/*
+REPLACE_PERL=	src/lib/* src/VREF/* src/triggers/* src/triggers/*/* \
+		src/commands/* src/gitolite*
+REPLACE_SH=	src/VREF/* src/triggers/*
+
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	pre-configure
+SUBST_MESSAGE.prefix=	Set PREFIX
+SUBST_FILES.prefix=	src/gitolite
+SUBST_FILES.prefix+=	src/lib/Gitolite/Rc.pm
+SUBST_VARS.prefix=	PREFIX
+
+INSTALLATION_DIRS+=	bin lib \
+			share/doc/gitolite \
+			libexec/gitolite
+
+pre-install:
+	${FIND} ${WRKSRC} -type f \
+		-name "*.orig" -exec ${RM} -f {} \;
 
 do-install:
-	${RM} ${WRKSRC}/src/gl-system-install.orig
-	${WRKSRC}/src/gl-system-install ${PREFIX}/bin \
-		${PREFIX}/share/gitolite/conf ${PREFIX}/share/gitolite/hooks \
-		${DESTDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/src/gitolite ${DESTDIR}${PREFIX}/libexec/gitolite
+	${INSTALL_SCRIPT} ${WRKSRC}/src/gitolite-shell ${DESTDIR}${PREFIX}/libexec/gitolite
+
+	cd ${DESTDIR}${PREFIX}/bin && ${LN} -s ../libexec/gitolite/gitolite gitolite
+
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DESTDIR}${PREFIX}/share/gitolite
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/gitolite
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/share/gitolite
+
+	cd ${WRKSRC}/src/lib && pax -rw -pmp Gitolite \
+		${DESTDIR}${PERL5_INSTALLVENDORARCH}
+
+	cd ${WRKSRC}/src && pax -rw -pmp triggers \
+		${DESTDIR}${PREFIX}/libexec/gitolite
+	cd ${WRKSRC}/src && pax -rw -pmp syntactic-sugar \
+		${DESTDIR}${PREFIX}/libexec/gitolite
+	cd ${WRKSRC}/src && pax -rw -pmp VREF \
+		${DESTDIR}${PREFIX}/libexec/gitolite
+	cd ${WRKSRC}/src && pax -rw -pmp commands \
+		${DESTDIR}${PREFIX}/libexec/gitolite
 
+.include "../../lang/perl5/dirs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gitolite/PLIST b/devel/gitolite/PLIST
index f15be11d82d..a5e5d742190 100644
--- a/devel/gitolite/PLIST
+++ b/devel/gitolite/PLIST
@@ -1,28 +1,65 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/11/20 19:11:49 ryoon Exp $
-bin/gitolite.pm
-bin/gitolite_env.pm
-bin/gitolite_rc.pm
-bin/gl-admin-push
-bin/gl-auth-command
-bin/gl-compile-conf
-bin/gl-conf-convert
-bin/gl-dryrun
-bin/gl-install
-bin/gl-mirror-push
-bin/gl-mirror-shell
-bin/gl-query-rc
-bin/gl-setup
-bin/gl-setup-authkeys
-bin/gl-system-install
-bin/gl-time
-bin/gl-tool
-bin/sshkeys-lint
-share/gitolite/conf/VERSION
-share/gitolite/conf/example.conf
-share/gitolite/conf/example.gitolite.rc
-share/gitolite/hooks/common/gitolite-hooked
-share/gitolite/hooks/common/gl-pre-git.hub-sample
-share/gitolite/hooks/common/post-receive.mirrorpush
-share/gitolite/hooks/common/update
-share/gitolite/hooks/common/update.secondary.sample
-share/gitolite/hooks/gitolite-admin/post-update
+@comment $NetBSD: PLIST,v 1.2 2013/01/25 21:04:02 ryoon Exp $
+bin/gitolite
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Common.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Conf.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Conf/Explode.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Conf/Load.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Conf/Store.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Conf/Sugar.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Easy.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Hooks/PostUpdate.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Hooks/Update.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Rc.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Setup.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Test.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Test/Tsh.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers/Alias.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers/CpuTime.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers/Mirroring.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers/RepoUmask.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers/Shell.pm
+${PERL5_SUB_INSTALLVENDORARCH}/Gitolite/Triggers/Writable.pm
+libexec/gitolite/VREF/COUNT
+libexec/gitolite/VREF/EMAIL-CHECK
+libexec/gitolite/VREF/FILETYPE
+libexec/gitolite/VREF/MAX_NEWBIN_SIZE
+libexec/gitolite/VREF/MERGE-CHECK
+libexec/gitolite/VREF/VOTES
+libexec/gitolite/VREF/lock
+libexec/gitolite/VREF/partial-copy
+libexec/gitolite/commands/D
+libexec/gitolite/commands/access
+libexec/gitolite/commands/creator
+libexec/gitolite/commands/desc
+libexec/gitolite/commands/fork
+libexec/gitolite/commands/git-config
+libexec/gitolite/commands/help
+libexec/gitolite/commands/htpasswd
+libexec/gitolite/commands/info
+libexec/gitolite/commands/list-dangling-repos
+libexec/gitolite/commands/lock
+libexec/gitolite/commands/mirror
+libexec/gitolite/commands/perms
+libexec/gitolite/commands/print-default-rc
+libexec/gitolite/commands/push
+libexec/gitolite/commands/sshkeys-lint
+libexec/gitolite/commands/sskm
+libexec/gitolite/commands/sudo
+libexec/gitolite/commands/svnserve
+libexec/gitolite/commands/symbolic-ref
+libexec/gitolite/commands/writable
+libexec/gitolite/gitolite
+libexec/gitolite/gitolite-shell
+libexec/gitolite/syntactic-sugar/continuation-lines
+libexec/gitolite/syntactic-sugar/keysubdirs-as-groups
+libexec/gitolite/triggers/partial-copy
+libexec/gitolite/triggers/post-compile/ssh-authkeys
+libexec/gitolite/triggers/post-compile/ssh-authkeys-shell-users
+libexec/gitolite/triggers/post-compile/update-git-configs
+libexec/gitolite/triggers/post-compile/update-git-daemon-access-list
+libexec/gitolite/triggers/post-compile/update-gitweb-access-list
+libexec/gitolite/triggers/renice
+libexec/gitolite/triggers/upstream
+share/gitolite
+@pkgdir share/doc/gitolite
diff --git a/devel/gitolite/distinfo b/devel/gitolite/distinfo
index dd518f2e349..ed00dfd3c7c 100644
--- a/devel/gitolite/distinfo
+++ b/devel/gitolite/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/11/20 19:11:49 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2013/01/25 21:04:03 ryoon Exp $
 
-SHA1 (sitaramc-gitolite-v2.2-0-g15b17d7.tar.gz) = 395f66b984073af9de43598e25ff9f828bd65f7c
-RMD160 (sitaramc-gitolite-v2.2-0-g15b17d7.tar.gz) = 7b8963cdb309e99d9ddffacc8877286a736ab16c
-Size (sitaramc-gitolite-v2.2-0-g15b17d7.tar.gz) = 240960 bytes
-SHA1 (patch-contrib_adc_watch) = bab42eb263900466aaa106a09d2bf3180be204ea
-SHA1 (patch-src_gl-system-install) = 849d8a7b350f5e6ef4e35b35cdfd1cbcf05c964d
+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