- Update to 1.05. [2]

- Pass maintainership to submitter. [1]
- Add knob MODPYTHON3. [1]

PR:		ports/121160 [1], ports/121883 [2]
Submitted by:	Philip M. Gollucci <pgollucci@p6m7g8.com>

3 files changed, 81 insertions, 8 deletions

diff --git a/devel/viewvc/Makefile b/devel/viewvc/Makefile
index 18c4215ec52b..e82626cf6d4a 100644
--- a/devel/viewvc/Makefile
+++ b/devel/viewvc/Makefile
@@ -6,16 +6,23 @@
 #
 
 PORTNAME=	viewvc
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	devel python
-MASTER_SITES=	http://viewvc.tigris.org/files/documents/3330/37319/
+MASTER_SITES=	http://viewvc.tigris.org/files/documents/3330/41694/
 
-MAINTAINER=	jbq@caraldi.com
+MAINTAINER=	pgollucci@p6m7g8.com
 COMMENT=	Web-based Version Control Repository Browsing
 
-RUN_DEPENDS=	${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/subversion-python
+RUN_DEPENDS=	${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/subversion-python \
+		${PYTHON_LIBDIR}/site-packages/_mysql.so:${PORTSDIR}/databases/py-MySQLdb
 
 USE_PYTHON=	yes
+.if defined (WITH_APACHE)
+USE_APACHE=	2.0+
+.endif
+.if defined(WITH_MODPYTHON3)
+RUN_DEPENDS+=	${APACHEMODDIR}/mod_python.so:${PORTSDIR}/www/mod_python3
+.endif
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
@@ -25,7 +32,7 @@ INSTDIR?=	${PORTNAME}
 PLIST_SUB=	INSTDIR=${INSTDIR}
 
 do-install:
-	(cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${INSTDIR} --destdir="" --clean-mode=false)
+	@(cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${INSTDIR} --destdir="" --clean-mode=false)
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/devel/viewvc/distinfo b/devel/viewvc/distinfo
index e086b5a8ffe9..3be8b7a87d67 100644
--- a/devel/viewvc/distinfo
+++ b/devel/viewvc/distinfo
@@ -1,3 +1,3 @@
-MD5 (viewvc-1.0.4.tar.gz) = e55ba2864a23b0597f80ccf726966b96
-SHA256 (viewvc-1.0.4.tar.gz) = 555ee9fffa4f883bf56b077e856ea313d994e59c0267b41c558dbc0d1950cd1f
-SIZE (viewvc-1.0.4.tar.gz) = 383491
+MD5 (viewvc-1.0.5.tar.gz) = 8fc8107f937b9da481b14333a7fdb29d
+SHA256 (viewvc-1.0.5.tar.gz) = 0caf17fa0137231c0a78a5c57e758da73475212516d4758fe521def007a8fddd
+SIZE (viewvc-1.0.5.tar.gz) = 522323
diff --git a/devel/viewvc/pkg-plist b/devel/viewvc/pkg-plist
index ad94a7bdb2d8..36c9e4a5574d 100644
--- a/devel/viewvc/pkg-plist
+++ b/devel/viewvc/pkg-plist
@@ -122,8 +122,74 @@
 %%INSTDIR%%/templates/revision.ezt
 %%INSTDIR%%/templates/roots.ezt
 %%INSTDIR%%/templates/rss.ezt
+%%INSTDIR%%/templates-contrib/README
+%%INSTDIR%%/templates-contrib/viewsvn/INSTALL
+%%INSTDIR%%/templates-contrib/viewsvn/README
+%%INSTDIR%%/templates-contrib/viewsvn/extras/fix-blame-output.diff
+%%INSTDIR%%/templates-contrib/viewsvn/extras/svnindex.css
+%%INSTDIR%%/templates-contrib/viewsvn/extras/svnindex.xsl
+%%INSTDIR%%/templates-contrib/viewsvn/screenshots/diff.png
+%%INSTDIR%%/templates-contrib/viewsvn/screenshots/dir.png
+%%INSTDIR%%/templates-contrib/viewsvn/screenshots/log.png
+%%INSTDIR%%/templates-contrib/viewsvn/screenshots/markup.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/annotate.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/diff.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/directory.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/broken.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/dir.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/down.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/download.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/favicon-svn.ico
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/feed-icon-16x16.jpg
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/logo-svn.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/logo-viewvc.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/svn.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/text.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/back.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/back_small.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/blame.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/checkout.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/diff.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/forward.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/license.txt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/log.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/patch.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/repos.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/tsvn.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/up.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/viewvc.png
+%%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/styles.css
+%%INSTDIR%%/templates-contrib/viewsvn/templates/error.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/graph.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/include/diff_form.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/include/dir_footer.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/include/dir_header.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/include/file_header.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/include/footer.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/include/header.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/include/log_footer.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/include/log_header.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/include/paging.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/include/pathrev_form.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/log.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/markup.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/query.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/query_form.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/query_results.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/revision.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/roots.ezt
+%%INSTDIR%%/templates-contrib/viewsvn/templates/rss.ezt
 %%INSTDIR%%/viewvc.conf.dist
 @exec [ -f %B/viewvc.conf ] || cp %B/%f %B/viewvc.conf
+@dirrm %%INSTDIR%%/templates-contrib/viewsvn/extras
+@dirrm %%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn
+@dirrm %%INSTDIR%%/templates-contrib/viewsvn/templates/docroot/images
+@dirrm %%INSTDIR%%/templates-contrib/viewsvn/templates/docroot
+@dirrm %%INSTDIR%%/templates-contrib/viewsvn/templates/include
+@dirrm %%INSTDIR%%/templates-contrib/viewsvn/templates
+@dirrm %%INSTDIR%%/templates-contrib/viewsvn/screenshots
+@dirrm %%INSTDIR%%/templates-contrib/viewsvn
+@dirrm %%INSTDIR%%/templates-contrib
 @dirrm %%INSTDIR%%/templates/include
 @dirrm %%INSTDIR%%/templates/docroot/images
 @dirrm %%INSTDIR%%/templates/docroot