3 files changed, 7 insertions, 65 deletions

diff --git a/devel/viewvc/Makefile b/devel/viewvc/Makefile
index c587f170a5b6..8c60ba01e916 100644
--- a/devel/viewvc/Makefile
+++ b/devel/viewvc/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	viewvc
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	devel python
-MASTER_SITES=	http://viewvc.tigris.org/files/documents/3330/45933/
+MASTER_SITES=	http://viewvc.tigris.org/files/documents/3330/46029/
 
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	Web-based Version Control Repository Browsing
@@ -29,7 +29,7 @@ SUB_LIST=	INSTDIR="${PREFIX}/${INSTDIR}" \
 INSTDIR?=	${PORTNAME}
 PLIST_SUB=	INSTDIR=${INSTDIR}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITH_APACHE) && !defined(WITH_LIGHTTPD)
 USE_RC_SUBR=	viewvc
@@ -82,4 +82,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/viewvc/distinfo b/devel/viewvc/distinfo
index 8e233e87dcc9..5b35a179c828 100644
--- a/devel/viewvc/distinfo
+++ b/devel/viewvc/distinfo
@@ -1,3 +1,3 @@
-MD5 (viewvc-1.1.0.tar.gz) = fb2e97b7e902b030dc285d4ce3bd1862
-SHA256 (viewvc-1.1.0.tar.gz) = 7936b71b6d940765d0734ff76abda5d5d3aee9118f41bbb6c8d17d79455ee202
-SIZE (viewvc-1.1.0.tar.gz) = 621495
+MD5 (viewvc-1.1.1.tar.gz) = 73f8455e8ddd3d08201ab1533a408554
+SHA256 (viewvc-1.1.1.tar.gz) = 3a7f6fc897f34b148fd225071ddf2aa9c037ec89b0b5406d95f8a479e8254462
+SIZE (viewvc-1.1.1.tar.gz) = 585955
diff --git a/devel/viewvc/pkg-plist b/devel/viewvc/pkg-plist
index 9afeecce6d0e..6cf862cbcce7 100644
--- a/devel/viewvc/pkg-plist
+++ b/devel/viewvc/pkg-plist
@@ -187,59 +187,6 @@
 %%INSTDIR%%/templates-contrib/newvc/templates/revision.ezt
 %%INSTDIR%%/templates-contrib/newvc/templates/roots.ezt
 %%INSTDIR%%/templates-contrib/newvc/templates/rss.ezt
-%%INSTDIR%%/templates-contrib/tabbed/README
-%%INSTDIR%%/templates-contrib/tabbed/templates/annotate.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/diff.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/directory.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/help.css
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/help_dirview.html
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/help_log.html
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/help_query.html
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/help_rootview.html
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/annotate.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/back.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/back_small.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/broken.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/chalk.jpg
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/cvs-logo.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/cvsgraph_16x16.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/cvsgraph_32x32.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/diff.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/dir.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/down.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/download.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/feed-icon-16x16.jpg
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/forward.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/list.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/lock.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/log.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/svn-logo.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/text.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/up.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/view.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images/viewvc-logo.png
-%%INSTDIR%%/templates-contrib/tabbed/templates/docroot/styles.css
-%%INSTDIR%%/templates-contrib/tabbed/templates/error.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/graph.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/include/diff_form.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/include/dir_footer.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/include/dir_header.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/include/file_header.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/include/fileview.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/include/footer.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/include/header.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/include/log_footer.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/include/log_header.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/include/pathrev_form.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/include/props.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/log.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/markup.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/query.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/query_form.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/query_results.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/revision.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/roots.ezt
-%%INSTDIR%%/templates-contrib/tabbed/templates/rss.ezt
 %%INSTDIR%%/templates-contrib/viewsvn/INSTALL
 %%INSTDIR%%/templates-contrib/viewsvn/README
 %%INSTDIR%%/templates-contrib/viewsvn/extras/svnindex.css
@@ -307,11 +254,6 @@
 @dirrm %%INSTDIR%%/templates-contrib/viewsvn/screenshots
 @dirrm %%INSTDIR%%/templates-contrib/viewsvn/extras
 @dirrm %%INSTDIR%%/templates-contrib/viewsvn
-@dirrm %%INSTDIR%%/templates-contrib/tabbed/templates/include
-@dirrm %%INSTDIR%%/templates-contrib/tabbed/templates/docroot/images
-@dirrm %%INSTDIR%%/templates-contrib/tabbed/templates/docroot
-@dirrm %%INSTDIR%%/templates-contrib/tabbed/templates
-@dirrm %%INSTDIR%%/templates-contrib/tabbed
 @dirrm %%INSTDIR%%/templates-contrib/newvc/templates/include
 @dirrm %%INSTDIR%%/templates-contrib/newvc/templates/docroot/images
 @dirrm %%INSTDIR%%/templates-contrib/newvc/templates/docroot