From owner-svn-ports-all@FreeBSD.ORG Sun Sep 28 18:38:03 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7BA727F2; Sun, 28 Sep 2014 18:38:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 67DA8791; Sun, 28 Sep 2014 18:38:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8SIc3pC091824; Sun, 28 Sep 2014 18:38:03 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8SIc23r091818; Sun, 28 Sep 2014 18:38:02 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201409281838.s8SIc23r091818@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Sun, 28 Sep 2014 18:38:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369487 - 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Sep 2014 18:38:03 -0000 Author: ohauer Date: Sun Sep 28 18:38:02 2014 New Revision: 369487 URL: http://svnweb.freebsd.org/changeset/ports/369487 QAT: https://qat.redports.org/buildarchive/r369487/ Log: - remove unused CPE vars - use new python:2.7 notation - change apache sample to match apache24 - use own shebangfix, to many files (w.o file suffix) - use new pkg-plist (remove @dirrm..) - bump PORTREVISION Modified: head/devel/viewvc/Makefile head/devel/viewvc/files/pkg-message.in head/devel/viewvc/pkg-plist Modified: head/devel/viewvc/Makefile ============================================================================== --- head/devel/viewvc/Makefile Sun Sep 28 18:37:05 2014 (r369486) +++ head/devel/viewvc/Makefile Sun Sep 28 18:38:02 2014 (r369487) @@ -3,7 +3,7 @@ PORTNAME= viewvc PORTVERSION= 1.1.22 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= http://www.viewvc.org/ \ LOCAL/ohauer @@ -39,12 +39,9 @@ MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFI .include -USES= cpe -CPE_VENDOR= viewvc -CPE_PRODUCT= viewvc +USES= cpe python:2.7 NO_BUILD= yes USE_RC_SUBR= viewvc -USE_PYTHON= 2 SUB_FILES= pkg-message SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ ECHO=${ECHO} EGREP=${EGREP} TOUCH=${TOUCH} \ @@ -65,6 +62,11 @@ post-patch: ${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 '' \ + -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) Modified: head/devel/viewvc/files/pkg-message.in ============================================================================== --- head/devel/viewvc/files/pkg-message.in Sun Sep 28 18:37:05 2014 (r369486) +++ head/devel/viewvc/files/pkg-message.in Sun Sep 28 18:38:02 2014 (r369487) @@ -28,8 +28,7 @@ AddHandler cgi-script .cgi Options NONE +ExecCGI DirectoryIndex viewvc.cgi - Order allow,deny - Allow from all + Require all granted Modified: head/devel/viewvc/pkg-plist ============================================================================== --- head/devel/viewvc/pkg-plist Sun Sep 28 18:37:05 2014 (r369486) +++ head/devel/viewvc/pkg-plist Sun Sep 28 18:38:02 2014 (r369487) @@ -241,36 +241,3 @@ viewvc/templates/revision.ezt viewvc/templates/roots.ezt viewvc/templates/rss.ezt @sample viewvc/viewvc.conf.sample -@dirrm viewvc/bin/cgi -@dirrm viewvc/bin/mod_python -@dirrm viewvc/bin/wsgi -@dirrm viewvc/bin -@dirrm viewvc/lib/vcauth/forbidden -@dirrm viewvc/lib/vcauth/forbiddenre -@dirrm viewvc/lib/vcauth/svnauthz -@dirrm viewvc/lib/vcauth -@dirrm viewvc/lib/vclib/ccvs/rcsparse/test-data -@dirrm viewvc/lib/vclib/ccvs/rcsparse -@dirrm viewvc/lib/vclib/ccvs -@dirrm viewvc/lib/vclib/svn -@dirrm viewvc/lib/vclib -@dirrm viewvc/lib -@dirrm viewvc/templates/docroot/images -@dirrm viewvc/templates/docroot -@dirrm viewvc/templates/include -@dirrm viewvc/templates -@dirrm viewvc/templates-contrib/newvc/templates/docroot/images -@dirrm viewvc/templates-contrib/newvc/templates/docroot -@dirrm viewvc/templates-contrib/newvc/templates/include -@dirrm viewvc/templates-contrib/newvc/templates -@dirrm viewvc/templates-contrib/newvc -@dirrm viewvc/templates-contrib/viewsvn/extras -@dirrm viewvc/templates-contrib/viewsvn/screenshots -@dirrm viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn -@dirrm viewvc/templates-contrib/viewsvn/templates/docroot/images -@dirrm viewvc/templates-contrib/viewsvn/templates/docroot -@dirrm viewvc/templates-contrib/viewsvn/templates/include -@dirrm viewvc/templates-contrib/viewsvn/templates -@dirrm viewvc/templates-contrib/viewsvn -@dirrm viewvc/templates-contrib -@dirrmtry viewvc