3 files changed, 31 insertions, 113 deletions

diff --git a/devel/viewvc/Makefile b/devel/viewvc/Makefile
index f08946d7ac26..bb0617ba3762 100644
--- a/devel/viewvc/Makefile
+++ b/devel/viewvc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	viewvc
-PORTVERSION=	1.1.13
+PORTVERSION=	1.1.14
 #PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.viewvc.org/ \
@@ -17,15 +17,23 @@ COMMENT=	Web-based Version Control Repository Browsing
 
 LICENSE=	BSD
 
-OPTIONS=	SUBVERSION "use svn binding" on \
-		APACHE "Use apache as webserver" on \
-		LIGHTTPD "Use lighttpd as webserver" off \
-		MODPYTHON3 "Enable mod_python3 support (deprecated)" off \
-		MODWSGI3 "Enable mod_wsgi3 support" off \
-		MYSQL "Enable experimental MYSQL support" off
+NO_OPTIONS_SORT=	yes
+OPTIONS_DEFINE=		WEBSRV APMOD SVN MYSQL
+OPTIONS_DEFAULT=	WEBSRV APACHE SVN
+
+OPTIONS_SINGLE=		WEBSRV APMOD
+OPTIONS_SINGLE_WEBSRV=	APACHE LIGHTTPD
+OPTIONS_SINGLE_APMOD=	MODPYTHON3 MODWSGI3
+
+WEBSRV_DESC=	Enable web server support
+APMOD_DESC=	Enable Apache module OPTIONS
+APMOD_DESC=	depend on optional Apache module
+
+MODWSGI3_DESC=	Enable mod_wsgi3 support
+MODPYTHON3_DESC=Enable mod_python3 support
 
 NO_BUILD=	yes
-USE_PYTHON=	yes
+USE_PYTHON=	2.5-2.7
 SUB_FILES=	pkg-message
 SUB_LIST=	INSTDIR="${PREFIX}/${INSTDIR}" \
 		PYTHON_CMD=${PYTHON_CMD} \
@@ -42,54 +50,39 @@ USE_RC_SUBR=	viewvc
 
 RUN_DEPENDS+=	${LOCALBASE}/bin/pygmentize:${PORTSDIR}/textproc/py-pygments
 
-# viewvc can support CVS or SVN, controlled with the parameter
+# viewvc supports CVS and SVN, controlled with the parameter
 # cvs_roots (for CVS), svn_roots (for Subversion) in viewvc.conf
-.if defined (WITH_SUBVERSION)
+.if ${PORT_OPTIONS:MSVN}
 RUN_DEPENDS+=	${PYTHON_LIBDIR}/site-packages/svn/__init__.py:${PORTSDIR}/devel/py-subversion
 .endif
 
-.if defined (WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=	20+
 .endif
 
-.if defined(WITH_LIGHTTPD)
+.if ${PORT_OPTIONS:MLIGHTTPD}
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
 .endif
 
-.if defined(WITH_MODPYTHON3)
-RUN_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_python.so:${PORTSDIR}/www/mod_python3
+.if ${PORT_OPTIONS:MMODPYTHON3}
+RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_python>=3.3:${PORTSDIR}/www/mod_python3
 .endif
 
-.if defined(WITH_MODWSGI3)
-RUN_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_wsgi.so:${PORTSDIR}/www/mod_wsgi3
+.if ${PORT_OPTIONS:MMODWSGI3}
+RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_wsgi>=3.3:${PORTSDIR}/www/mod_wsgi3
 .endif
 
 # This feature is a clone of the Mozilla Project's Bonsai database.
-# It catalogs every commit in the CVS or Subversion repository into a SQL database.
+# It catalogs every commit in the CVS or Subversion repository into a MYSQL database.
 # In fact, the databases are 100% compatible.
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
 .endif
 
 pre-everything::
-.if defined(WITH_APACHE) && defined(WITH_LIGHTTPD)
-	@${ECHO_CMD} "It doesn't make sense to depend on Apache *and* lighttpd - choose only one."
-	@${FALSE}
-.endif
-
-.if defined(WITH_MODPYTHON3) && !defined(WITH_APACHE) && defined(WITH_LIGHTTPD)
-	@${ECHO_CMD} "mod_python3 needs Apache, please select Apache and deselect lighttpd"
-	@${FALSE}
-.elif defined(WITH_MODPYTHON3) && !defined(WITH_APACHE)
-	@${ECHO_CMD} "mod_python3 needs Apache, please select Apache"
-	@${FALSE}
-.elif defined(WITH_MODWSGI3) && !defined(WITH_APACHE) && defined(WITH_LIGHTTPD)
-	@${ECHO_CMD} "mod_wsgi3 needs Apache, please select Apache and deselect lighttpd"
-	@${FALSE}
-.elif defined(WITH_MODWSGI3) && !defined(WITH_APACHE)
-	@${ECHO_CMD} "mod_wsgi3 needs Apache, please select Apache"
-	@${FALSE}
-.endif
+.if ${PORT_OPTIONS:MAPMOD} && empty(PORT_OPTIONS:MAPACHE)
+IGNORE=	apache module needs Apache server, please re-run 'make config' then choose WEBSRV and APACHE
+. endif
 
 do-install:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${INSTDIR} --destdir="" --clean-mode=false)
diff --git a/devel/viewvc/distinfo b/devel/viewvc/distinfo
index 6b4924355fd6..5c4c6f60b541 100644
--- a/devel/viewvc/distinfo
+++ b/devel/viewvc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (viewvc-1.1.13.tar.gz) = 29b946a296bf59f685d892460fa0da639884dd5911ab5bce8c2afc7b2aea47a8
-SIZE (viewvc-1.1.13.tar.gz) = 607965
+SHA256 (viewvc-1.1.14.tar.gz) = a8ee93fb321b98ca31ffa8c98dad0013e682922acfcafbddb5ef733605c91c9c
+SIZE (viewvc-1.1.14.tar.gz) = 609716
diff --git a/devel/viewvc/files/patch-viewvc-issue-504.diff b/devel/viewvc/files/patch-viewvc-issue-504.diff
deleted file mode 100644
index 3ba12ab7be9d..000000000000
--- a/devel/viewvc/files/patch-viewvc-issue-504.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-Fix issue #504
-("annotate view fails on filenames with colon (:) characters in their names").
-
-
-Index: lib/vclib/svn/svn_ra.py
-===================================================================
---- lib/vclib/svn/svn_ra.py
-+++ lib/vclib/svn/svn_ra.py
-@@ -20,7 +20,10 @@
- import tempfile
- import time
- import urllib
--from svn_repos import Revision, SVNChangedPath, _datestr_to_date, _compare_paths, _path_parts, _cleanup_path, _rev2optrev, _fix_subversion_exception, _split_revprops
-+from svn_repos import Revision, SVNChangedPath, _datestr_to_date, \
-+                      _compare_paths, _path_parts, _cleanup_path, \
-+                      _rev2optrev, _fix_subversion_exception, \
-+                      _split_revprops, _canonicalize_path
- from svn import core, delta, client, wc, ra
- 
- 
-@@ -421,7 +424,8 @@
-   def _geturl(self, path=None):
-     if not path:
-       return self.rootpath
--    return self.rootpath + '/' + urllib.quote(path, "/*~")
-+    path = self.rootpath + '/' + urllib.quote(path)
-+    return _canonicalize_path(path)
- 
-   def _get_dirents(self, path, rev):
-     """Return a 2-type of dirents and locks, possibly reading/writing
-Index: lib/vclib/svn/svn_repos.py
-===================================================================
---- lib/vclib/svn/svn_repos.py
-+++ lib/vclib/svn/svn_repos.py
-@@ -43,7 +43,14 @@
-     e.apr_err = e[1]
-   if not hasattr(e, 'message'):
-     e.message = e[0]
--  
-+
-+### Pre-1.4 Subversion doesn't have svn_path_canonicalize()
-+def _canonicalize_path(path):
-+  try:
-+    return core.svn_path_canonicalize(path)
-+  except AttributeError:
-+    return path
-+
- def _allow_all(root, path, pool):
-   """Generic authz_read_func that permits access to all paths"""
-   return 1
-@@ -115,9 +122,10 @@
-   rootpath = urllib.quote(rootpath)
-   path = urllib.quote(path)
-   if drive:
--    return 'file:///' + drive + rootpath + '/' + path
-+    url = 'file:///' + drive + rootpath + '/' + path
-   else:
--    return 'file://' + rootpath + '/' + path
-+    url = 'file://' + rootpath + '/' + path
-+  return _canonicalize_path(url)
- 
- 
- # Given a dictionary REVPROPS of revision properties, pull special
-Index: CHANGES
-===================================================================
---- CHANGES
-+++ CHANGES
-@@ -1,3 +1,7 @@
-+Version 1.1.14 (released ??-???-????)
-+
-+  * fix annotation of svn files with non-URI-safe paths (issue #504)
-+
- Version 1.1.13 (released 23-Jan-2012)
- 
-   * fix svndbadmin failure on deleted paths under Subversion 1.7 (issue #499)