From owner-svn-ports-head@freebsd.org Fri Apr 20 12:01:07 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 99AB7F97C79; Fri, 20 Apr 2018 12:01:07 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CC3D7BCA1; Fri, 20 Apr 2018 12:01:07 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4616B18049; Fri, 20 Apr 2018 12:01:07 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3KC17Mg081016; Fri, 20 Apr 2018 12:01:07 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3KC16on081012; Fri, 20 Apr 2018 12:01:06 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201804201201.w3KC16on081012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Fri, 20 Apr 2018 12:01:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467821 - in head/devel/git: . files X-SVN-Group: ports-head X-SVN-Commit-Author: garga X-SVN-Commit-Paths: in head/devel/git: . files X-SVN-Commit-Revision: 467821 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Apr 2018 12:01:07 -0000 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 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 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 +@dir %%ETCDIR%%