From owner-svn-ports-head@freebsd.org  Sun Jan 10 18:16:43 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 68286A6A04D;
 Sun, 10 Jan 2016 18:16:43 +0000 (UTC)
 (envelope-from ohauer@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 mx1.freebsd.org (Postfix) with ESMTPS id 1FBE513D6;
 Sun, 10 Jan 2016 18:16:43 +0000 (UTC)
 (envelope-from ohauer@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0AIGgif006348;
 Sun, 10 Jan 2016 18:16:42 GMT (envelope-from ohauer@FreeBSD.org)
Received: (from ohauer@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0AIGgrU006346;
 Sun, 10 Jan 2016 18:16:42 GMT (envelope-from ohauer@FreeBSD.org)
Message-Id: <201601101816.u0AIGgrU006346@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ohauer set sender to
 ohauer@FreeBSD.org using -f
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Sun, 10 Jan 2016 18:16:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405734 - in head/devel/viewvc: . files
X-SVN-Group: ports-head
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Jan 2016 18:16:43 -0000

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
  =================================