svn commit: r405734 - in head/devel/viewvc: . files
Olli Hauer
ohauer at FreeBSD.org
Sun Jan 10 18:16:43 UTC 2016
Author: ohauer
Date: Sun Jan 10 18:16:41 2016
New Revision: 405734
URL: https://svnweb.freebsd.org/changeset/ports/405734
Log:
- use "SED" instead "REINPLACE_CMD -i"
- provide better config for apache24
- bump PORTREVISION
Modified:
head/devel/viewvc/Makefile
head/devel/viewvc/files/pkg-message.in
Modified: head/devel/viewvc/Makefile
==============================================================================
--- head/devel/viewvc/Makefile Sun Jan 10 18:15:19 2016 (r405733)
+++ head/devel/viewvc/Makefile Sun Jan 10 18:16:41 2016 (r405734)
@@ -3,6 +3,7 @@
PORTNAME= viewvc
PORTVERSION= 1.1.24
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://www.viewvc.org/ \
LOCAL/ohauer
@@ -63,7 +64,7 @@ post-patch:
${WRKSRC}/bin/standalone.py
# to much files, use own shebangfix
${FIND} ${WRKSRC} -type f | ${GREP} -v -e 'png' -e 'images' \
- | ${XARGS} ${REINPLACE_CMD} -i '' \
+ | ${XARGS} ${SED} -i '' \
-e '1s|^\#![[:space:]]*/usr/bin/env python|\#!${PYTHON_CMD}|' \
-e '1s|^\#![[:space:]]*/usr/bin/python|\#!${PYTHON_CMD}|'
Modified: head/devel/viewvc/files/pkg-message.in
==============================================================================
--- head/devel/viewvc/files/pkg-message.in Sun Jan 10 18:15:19 2016 (r405733)
+++ head/devel/viewvc/files/pkg-message.in Sun Jan 10 18:16:41 2016 (r405734)
@@ -8,10 +8,10 @@
To enable the standalone ViewVC server in rc.conf use
parameter viewvc_enable="YES".
- You can also adjust the user which runs the ViewVC standalone
+ You can also adjust the user which runs the ViewVC standalone
server with the parameter "viewvc_user".
- If you want to run the ViewVC standalone server with another
+ If you want to run the ViewVC standalone server with another
IP/PORT, use the parameter "viewvc_flags".
To see all available parameters, use the command
@@ -21,16 +21,23 @@
To use ViewVC with Apache or lighttpd as a CGI script,
see the following config examples.
- Example config lines for Apache
- ===============================
- Alias /viewvc "%%PREFIX%%/viewvc/bin/cgi/"
- <Directory "%%PREFIX%%/viewvc/bin/cgi">
- AddHandler cgi-script .cgi
- Options NONE +ExecCGI
- DirectoryIndex viewvc.cgi
- Require all granted
- </Directory>
-
+ Example config lines for Apache 2.4
+ ===================================
+ <IfModule wsgi_module>
+ WSGIRestrictSignal Off
+ </IfModule>
+
+ <IfModule !wsgi_module>
+ ScriptAlias "/viewvc" "%%PREFIX%%/viewvc/bin/cgi/viewvc.cgi"
+ </IfModule>
+
+ <IfModule wsgi_module>
+ WSGIScriptAlias "/viewvc" "%%PREFIX%%/viewvc/bin/wsgi/viewvc.wsgi"
+ </IfModule>
+
+ <Location /viewvc>
+ Options NONE +ExecCGI
+ </Location>
Example config lines for lighttpd
=================================
More information about the svn-ports-head
mailing list