svn commit: r369487 - in head/devel/viewvc: . files

[Olli Hauer]

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 <bsd.port.options.mk>
 
-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
  </Directory>
 
 

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
- at dirrm viewvc/bin/cgi
- at dirrm viewvc/bin/mod_python
- at dirrm viewvc/bin/wsgi
- at dirrm viewvc/bin
- at dirrm viewvc/lib/vcauth/forbidden
- at dirrm viewvc/lib/vcauth/forbiddenre
- at dirrm viewvc/lib/vcauth/svnauthz
- at dirrm viewvc/lib/vcauth
- at dirrm viewvc/lib/vclib/ccvs/rcsparse/test-data
- at dirrm viewvc/lib/vclib/ccvs/rcsparse
- at dirrm viewvc/lib/vclib/ccvs
- at dirrm viewvc/lib/vclib/svn
- at dirrm viewvc/lib/vclib
- at dirrm viewvc/lib
- at dirrm viewvc/templates/docroot/images
- at dirrm viewvc/templates/docroot
- at dirrm viewvc/templates/include
- at dirrm viewvc/templates
- at dirrm viewvc/templates-contrib/newvc/templates/docroot/images
- at dirrm viewvc/templates-contrib/newvc/templates/docroot
- at dirrm viewvc/templates-contrib/newvc/templates/include
- at dirrm viewvc/templates-contrib/newvc/templates
- at dirrm viewvc/templates-contrib/newvc
- at dirrm viewvc/templates-contrib/viewsvn/extras
- at dirrm viewvc/templates-contrib/viewsvn/screenshots
- at dirrm viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn
- at dirrm viewvc/templates-contrib/viewsvn/templates/docroot/images
- at dirrm viewvc/templates-contrib/viewsvn/templates/docroot
- at dirrm viewvc/templates-contrib/viewsvn/templates/include
- at dirrm viewvc/templates-contrib/viewsvn/templates
- at dirrm viewvc/templates-contrib/viewsvn
- at dirrm viewvc/templates-contrib
- at dirrmtry viewvc