svn commit: r467821 - in head/devel/git: . files

[Adam Weinberger]

> On 20 Apr, 2018, at 6:01, Renato Botelho <garga at FreeBSD.org> wrote:
>
> Author: garga
> Date: Fri Apr 20 12:01:06 2018
> New Revision: 467821
> URL: https://svnweb.freebsd.org/changeset/ports/467821
>
> Log:
>   Install a gitweb.conf initial file and update pkg-message to make it easier
>   to configure it
>
>   PR:		218229
>   Submitted by:	Zsolt Udvari <uzsolt at uzsolt.hu>
>   Sponsored by:	Rubicon Communications, LLC (Netgate)
>
> Added:
>   head/devel/git/files/gitweb.conf.in   (contents, props changed)
> Modified:
>   head/devel/git/Makefile
>   head/devel/git/files/pkg-message.in
>   head/devel/git/pkg-plist
>
> Modified: head/devel/git/Makefile
> ==============================================================================
> --- head/devel/git/Makefile	Fri Apr 20 11:53:21 2018	(r467820)
> +++ head/devel/git/Makefile	Fri Apr 20 12:01:06 2018	(r467821)
> @@ -3,7 +3,7 @@
>
>  PORTNAME=	git
>  DISTVERSION=	2.17.0
> -PORTREVISION=	1
> +PORTREVISION=	2
>  CATEGORIES=	devel
>  MASTER_SITES=	KERNEL_ORG/software/scm/git
>  DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
> @@ -23,7 +23,7 @@ CONFLICTS_INSTALL?=	git-gui-[0-9]* git-subversion-[0-9
>  USERS=		git_daemon
>  GROUPS=		git_daemon
>
> -SUB_FILES=	pkg-message
> +SUB_FILES=	pkg-message gitweb.conf
>
>  GNU_CONFIGURE=	yes
>  USES=		autoreconf gmake iconv shebangfix ssl tar:xz
> @@ -233,5 +233,10 @@ post-install-CONTRIB-off:
>
>  post-install-P4-on:
>  	${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${STAGEDIR}${PREFIX}/bin/
> +
> +post-install-GITWEB-on:
> +	${MKDIR} ${STAGEDIR}${ETCDIR}
> +	${INSTALL_DATA} ${WRKDIR}/gitweb.conf \
> +		${STAGEDIR}${ETCDIR}/gitweb.conf.sample
>
>  .include <bsd.port.mk>
>
> Added: head/devel/git/files/gitweb.conf.in
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/devel/git/files/gitweb.conf.in	Fri Apr 20 12:01:06 2018	(r467821)
> @@ -0,0 +1 @@
> +our $projectroot="%%PREFIX%%/git/pub";
>
> Modified: head/devel/git/files/pkg-message.in
> ==============================================================================
> --- head/devel/git/files/pkg-message.in	Fri Apr 20 11:53:21 2018	(r467820)
> +++ head/devel/git/files/pkg-message.in	Fri Apr 20 12:01:06 2018	(r467821)
> @@ -7,12 +7,11 @@ In the directory %%EXAMPLESDIR%%/gitweb you can find a
>  make gitweb work as a public repository on the web.
>
>  All you have to do to make gitweb work is:
> -1) Copy the files %%EXAMPLESDIR%%/gitweb/* to a directory on
> -   your web server (e.g. Apache2) in which you are able to execute
> -   CGI-scripts.
> -2) In gitweb.cgi, adjust the variable $projectroot to point to
> -   your git repository (that is where you have your *.git project
> -   directories).
> +1) Please be sure you're able to execute CGI scripts in
> +   %%EXAMPLESDIR%%/gitweb.
> +2) Set the GITWEB_CONFIG variable in your webserver's config to
> +   %%ETCDIR%%/gitweb.conf. This variable is passed to gitweb.cgi.
> +3) Restart server.
>  *************************** GITWEB *************************************
>
>  *************************** CONTRIB ************************************
>
> Modified: head/devel/git/pkg-plist
> ==============================================================================
> --- head/devel/git/pkg-plist	Fri Apr 20 11:53:21 2018	(r467820)
> +++ head/devel/git/pkg-plist	Fri Apr 20 12:01:06 2018	(r467821)
> @@ -1228,6 +1228,7 @@ man/man7/gitworkflows.7.gz
>  %%HTMLDOCS%%%%DOCSDIR%%/user-manual.txt
>  share/emacs/site-lisp/git/git-blame.el
>  share/emacs/site-lisp/git/git.el
> +%%GITWEB%%@sample %%ETCDIR%%/gitweb.conf.sample
>  %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
>  %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-favicon.png
>  %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-logo.png
> @@ -1496,3 +1497,4 @@ share/git-core/templates/info/exclude
>  %%NLS%%share/locale/vi/LC_MESSAGES/git.mo
>  %%NLS%%share/locale/zh_CN/LC_MESSAGES/git.mo
>  @dir share/git-core/templates/branches
> + at dir %%ETCDIR%%

This fails to package with GITWEB off now. You probably need to protect  
that “@dir %%ETCDIR%%” with %%GITWEB%%.

===>  Building package for git-2.17.0_2
pkg-static:  
lstat(/wrkdirs/usr/ports/devel/git/work/stage/usr/local/etc/git/): No such  
file or directory
*** Error code 1

# Adam


--
Adam Weinberger
adamw at adamw.org
http://www.adamw.org