From 897d7439b97da1d1542f13c249c9e7919de17719 Mon Sep 17 00:00:00 2001 From: pgollucci Date: Tue, 27 Apr 2010 03:26:25 +0000 Subject: - Update to 1.1.5 --- devel/viewvc/Makefile | 6 +++--- devel/viewvc/distinfo | 6 +++--- devel/viewvc/files/patch-lib-config.py | 31 ------------------------------- 3 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 devel/viewvc/files/patch-lib-config.py (limited to 'devel') diff --git a/devel/viewvc/Makefile b/devel/viewvc/Makefile index ff8b0b6ccef2..0117e556325c 100644 --- a/devel/viewvc/Makefile +++ b/devel/viewvc/Makefile @@ -6,10 +6,10 @@ # PORTNAME= viewvc -PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTVERSION= 1.1.5 CATEGORIES= devel python -MASTER_SITES= http://viewvc.tigris.org/files/documents/3330/47194/ +MASTER_SITES= http://viewvc.tigris.org/files/documents/3330/47458/ \ + LOCAL/pgollucci MAINTAINER= pgollucci@FreeBSD.org COMMENT= Web-based Version Control Repository Browsing diff --git a/devel/viewvc/distinfo b/devel/viewvc/distinfo index d09c69767868..cfc2bff2ea4b 100644 --- a/devel/viewvc/distinfo +++ b/devel/viewvc/distinfo @@ -1,3 +1,3 @@ -MD5 (viewvc-1.1.3.tar.gz) = e74127b9193e2bfc48f6242049701d91 -SHA256 (viewvc-1.1.3.tar.gz) = d1a1d0602198fd0f38379c7c0e647532e8f8a1d267236d293227c125f39a001f -SIZE (viewvc-1.1.3.tar.gz) = 593173 +MD5 (viewvc-1.1.5.tar.gz) = da7bbcf6800383ebb23405a064c6faf8 +SHA256 (viewvc-1.1.5.tar.gz) = 32ce717330fc780e9c2341cca800079078e9935581d4dfd526e4a15fc1d94919 +SIZE (viewvc-1.1.5.tar.gz) = 593630 diff --git a/devel/viewvc/files/patch-lib-config.py b/devel/viewvc/files/patch-lib-config.py deleted file mode 100644 index 6f17e200d234..000000000000 --- a/devel/viewvc/files/patch-lib-config.py +++ /dev/null @@ -1,31 +0,0 @@ ---- lib/config.py.orig 2010-01-07 10:44:45.000000000 -0800 -+++ lib/config.py 2010-01-07 10:44:50.000000000 -0800 -@@ -274,9 +274,7 @@ - """Overlay per-root options for ROOTNAME atop the existing option - set. This is a destructive change to the configuration.""" - -- # We can only deal with this happening once! -- assert(self.root_options_overlayed == 0) -- self.root_options_overlayed = 1 -+ did_overlay = 0 - - if not self.conf_path: - return -@@ -285,7 +283,17 @@ - base_section = self._is_allowed_override(self.parser, 'root', - rootname, section) - if base_section: -+ # We can currently only deal with root overlays happening -+ # once, so check that we've not yet done any overlaying of -+ # per-root options. -+ assert(self.root_options_overlayed == 0) - self._process_section(self.parser, section, base_section) -+ did_overlay = 1 -+ -+ # If we actually did any overlaying, remember this fact so we -+ # don't do it again later. -+ if did_overlay: -+ self.root_options_overlayed = 1 - - def _get_parser_items(self, parser, section): - """Basically implement ConfigParser.items() for pre-Python-2.3 versions.""" -- cgit