Index: head/devel/viewvc/Makefile
===================================================================
--- head/devel/viewvc/Makefile	(revision 405733)
+++ head/devel/viewvc/Makefile	(revision 405734)
@@ -1,73 +1,74 @@
 # Created by: will
 # $FreeBSD$
 
 PORTNAME=	viewvc
 PORTVERSION=	1.1.24
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.viewvc.org/ \
 		LOCAL/ohauer
 
 MAINTAINER=	ohauer@FreeBSD.org
 COMMENT=	Web-based Version Control Repository Browsing
 
 LICENSE=	BSD2CLAUSE
 
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=		WEBSRV APMOD SVN MYSQL
 OPTIONS_DEFAULT=	WEBSRV APACHE SVN
 
 OPTIONS_SINGLE=		WEBSRV APMOD
 OPTIONS_SINGLE_WEBSRV=	APACHE LIGHTTPD
 OPTIONS_SINGLE_APMOD=	MODPYTHON33 MODPYTHON35 MODWSGI
 
 WEBSRV_DESC=		Enable web server support
 APMOD_DESC=		depend on optional Apache module
 
 MODWSGI_DESC=		Enable mod_wsgi support
 MODPYTHON33_DESC=	Enable mod_python33 support
 MODPYTHON35_DESC=	Enable mod_python35 support
 MYSQL_DESC=		Bonsai-like repository query facilities
 
 APACHE_USE=		APACHE_RUN=22+
 LIGHTTPD_RUN_DEPENDS=	lighttpd:${PORTSDIR}/www/lighttpd
 MODPYTHON33_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_python33>=3.3:${PORTSDIR}/www/mod_python33
 MODPYTHON35_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_python35>=3.5:${PORTSDIR}/www/mod_python35
 MODWSGI_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_wsgi4>=4.4.13:${PORTSDIR}/www/mod_wsgi4
 SVN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:${PORTSDIR}/devel/py-subversion
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
 
 .include <bsd.port.options.mk>
 
 USES=		cpe python:2.7
 NO_BUILD=	yes
 USE_RC_SUBR=	viewvc
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		ECHO=${ECHO} EGREP=${EGREP} TOUCH=${TOUCH} \
 		CHOWN=${CHOWN} RM=${RM:Q}
 
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:${PORTSDIR}/textproc/py-pygments
 
 pre-everything::
 .if ${PORT_OPTIONS:MAPMOD} && !${PORT_OPTIONS:MAPACHE}
 IGNORE=	apache module needs Apache server, please re-run 'make config' then choose WEBSRV and APACHE
 .endif
 
 post-patch:
 .for i in cvsgraph.conf mimetypes.conf viewvc.conf
 	${MV} ${WRKSRC}/conf/${i}.dist ${WRKSRC}/conf/${i}.sample
 	${REINPLACE_CMD} -e '/"${i}"/d' ${WRKSRC}/viewvc-install
 .endfor
 	${REINPLACE_CMD} -e 's/conf.dist/conf.sample/g' \
 		${WRKSRC}/viewvc-install \
 		${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}|'
 
 do-install:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${PORTNAME} --destdir="${STAGEDIR}" --clean-mode=false)
 
 .include <bsd.port.mk>
Index: head/devel/viewvc/files/pkg-message.in
===================================================================
--- head/devel/viewvc/files/pkg-message.in	(revision 405733)
+++ head/devel/viewvc/files/pkg-message.in	(revision 405734)
@@ -1,51 +1,58 @@
 *****************************************************************
 
  To use ViewVC, modify the configuration file located at
  %%PREFIX%%/viewvc/viewvc.conf.
 
  If no webserver was selected during installation, then
  a rc script for running ViewVC standalone is installed.
  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
  %%PREFIX%%/viewvc/bin/standalone.py --help
 
 
  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
  =================================
  server.modules = (
    "mod_alias",
    "mod_access"
  )
 
  alias.url += ( "/viewvc" => "%%PREFIX%%/viewvc/bin/cgi" )
 
  $HTTP["url"] =~ "^/viewvc/" {
    index-file.names  = ( "viewvc.cgi" )
      cgi.assign = (
        ".cgi" => "%%PYTHON_CMD%%",
      )
  }
 
 *****************************************************************