4 files changed, 30 insertions, 7 deletions

diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile
index c0a47b661b42..40d6f6582e5a 100644
--- a/devel/gitolite/Makefile
+++ b/devel/gitolite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gitolite
-PORTVERSION=	3.03
+PORTVERSION=	3.04
 CATEGORIES=	devel
 MASTER_SITES=	http://milki.github.com/${PORTNAME}/ \
 		LOCAL/tdb
@@ -24,11 +24,13 @@ USE_PERL5=	yes
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	GITUSER	"Create git user as gitolite provider" On
+OPTIONS_DEFINE=	GITUSER
+
+GITUSER_DESC=	Create git user as gitolite provider
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_GITUSER)
+.if ${PORT_OPTIONS:MGITUSER}
 USERS=		git
 GROUPS=		${USERS}
 PLIST_SUB+=	GITUSER=""
@@ -57,6 +59,16 @@ do-install:
 	@${LN} -s ${PREFIX}/libexec/gitolite/gitolite ${PREFIX}/bin/gitolite
 
 post-install:
+.if !defined(NOPORTDOCS)
+	-@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DOCSDIR}
+.endif
+
 	@${CAT} ${PKGMESSAGE}
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	README.txt CHANGELOG
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/gitolite/distinfo b/devel/gitolite/distinfo
index ff841a96ca72..5d3488c1bb21 100644
--- a/devel/gitolite/distinfo
+++ b/devel/gitolite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gitolite-3.03.tar.gz) = b3487fd99cc46a7be32a58f8a86a520fc0943814794cc56b5f83d803591737ca
-SIZE (gitolite-3.03.tar.gz) = 199433
+SHA256 (gitolite-3.04.tar.gz) = 900dd144ddfa88cc21fadfef7652799ead78c1be52304506994307c448e6b618
+SIZE (gitolite-3.04.tar.gz) = 114010
diff --git a/devel/gitolite/files/pkg-message.in b/devel/gitolite/files/pkg-message.in
index 95a42771d0d7..b2fa60cf7b12 100644
--- a/devel/gitolite/files/pkg-message.in
+++ b/devel/gitolite/files/pkg-message.in
@@ -34,4 +34,9 @@ additional users and repositories can be configured.
 
 By default, the git user is created for use by gitolite.
 
+
+A quick-install guide can be found in:
+
+%%DOCSDIR%%/README.txt
+
 ==============================================================================
diff --git a/devel/gitolite/pkg-plist b/devel/gitolite/pkg-plist
index e60eb7d9248e..d94ae2756836 100644
--- a/devel/gitolite/pkg-plist
+++ b/devel/gitolite/pkg-plist
@@ -16,6 +16,7 @@ bin/gitolite
 %%SITE_PERL%%/Gitolite/Triggers/Alias.pm
 %%SITE_PERL%%/Gitolite/Triggers/CpuTime.pm
 %%SITE_PERL%%/Gitolite/Triggers/Mirroring.pm
+%%SITE_PERL%%/Gitolite/Triggers/RepoUmask.pm
 %%SITE_PERL%%/Gitolite/Triggers/Shell.pm
 %%SITE_PERL%%/Gitolite/Triggers/Writable.pm
 libexec/gitolite/VERSION
@@ -24,8 +25,9 @@ libexec/gitolite/VREF/EMAIL-CHECK
 libexec/gitolite/VREF/FILETYPE
 libexec/gitolite/VREF/MAX_NEWBIN_SIZE
 libexec/gitolite/VREF/MERGE-CHECK
-libexec/gitolite/VREF/partial-copy
 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
@@ -35,13 +37,17 @@ 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/check-g2-compat
 libexec/gitolite/convert-gitosis-conf
@@ -50,7 +56,7 @@ 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/new-normal-repos
+libexec/gitolite/triggers/upstream
 libexec/gitolite/triggers/post-compile/ssh-authkeys
 libexec/gitolite/triggers/post-compile/ssh-authkeys-shell-users
 libexec/gitolite/triggers/post-compile/update-git-configs