- use "SED" instead "REINPLACE_CMD -i"

- provide better config for apache24
- bump PORTREVISION
This commit is contained in:
Olli Hauer 2016-01-10 18:16:41 +00:00
parent bce020ca7b
commit f559f21d92
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=405734
2 changed files with 20 additions and 12 deletions

View file

@ -3,6 +3,7 @@
PORTNAME= viewvc PORTNAME= viewvc
PORTVERSION= 1.1.24 PORTVERSION= 1.1.24
PORTREVISION= 1
CATEGORIES= devel python CATEGORIES= devel python
MASTER_SITES= http://www.viewvc.org/ \ MASTER_SITES= http://www.viewvc.org/ \
LOCAL/ohauer LOCAL/ohauer
@ -63,7 +64,7 @@ post-patch:
${WRKSRC}/bin/standalone.py ${WRKSRC}/bin/standalone.py
# to much files, use own shebangfix # to much files, use own shebangfix
${FIND} ${WRKSRC} -type f | ${GREP} -v -e 'png' -e 'images' \ ${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/env python|\#!${PYTHON_CMD}|' \
-e '1s|^\#![[:space:]]*/usr/bin/python|\#!${PYTHON_CMD}|' -e '1s|^\#![[:space:]]*/usr/bin/python|\#!${PYTHON_CMD}|'

View file

@ -21,16 +21,23 @@
To use ViewVC with Apache or lighttpd as a CGI script, To use ViewVC with Apache or lighttpd as a CGI script,
see the following config examples. see the following config examples.
Example config lines for Apache Example config lines for Apache 2.4
=============================== ===================================
Alias /viewvc "%%PREFIX%%/viewvc/bin/cgi/" <IfModule wsgi_module>
<Directory "%%PREFIX%%/viewvc/bin/cgi"> WSGIRestrictSignal Off
AddHandler cgi-script .cgi </IfModule>
Options NONE +ExecCGI
DirectoryIndex viewvc.cgi
Require all granted
</Directory>
<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 Example config lines for lighttpd
================================= =================================