- Update to 1.0.4

- Drop deprecated SILVERCITY option
- Pass maintainership to submitter

PR:		197771
Submitted by:	Anton Törnqvist <antont@inbox.lv>

6 files changed, 9 insertions, 77 deletions

diff --git a/www/trac/Makefile b/www/trac/Makefile
index 000d15e35ed0..aa378fea968a 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	trac
-PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTVERSION=	1.0.4
 CATEGORIES=	www devel python
 MASTER_SITES=	http://ftp.edgewall.com/pub/trac/ \
 		ftp://ftp.edgewall.com/pub/trac/
 DISTNAME=	Trac-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	antont@inbox.lv
 COMMENT=	Enhanced wiki and issue tracking system for software projects
 
 LICENSE=	BSD3CLAUSE
@@ -19,17 +18,15 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=0.9.5:${PORTSDIR}/devel/py-babel \
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=0.9.5:${PORTSDIR}/devel/py-babel \
 		${PYTHON_PKGNAMEPREFIX}Genshi>=0.6:${PORTSDIR}/textproc/py-genshi
 
-OPTIONS_DEFINE=		SILVERCITY DOCUTILS PYGMENTS TZ SVN
-OPTIONS_DEFAULT=	SILVERCITY DOCUTILS PYGMENTS TZ SVN SQLITE
+OPTIONS_DEFINE=		DOCUTILS PYGMENTS TZ SVN
+OPTIONS_DEFAULT=	DOCUTILS PYGMENTS TZ SVN SQLITE
 OPTIONS_RADIO=		DATABASE
 OPTIONS_RADIO_DATABASE=	PGSQL SQLITE
-SILVERCITY_DESC=	Silvercity for syntax highlighting
 DOCUTILS_DESC=		Allow additional text markup
 PYGMENTS_DESC=		Use generic syntax highlighter
 TZ_DESC=		Process Time Zones
 
-SILVERCITY_RUN_DEPENDS=	${LOCALBASE}/bin/source2html.py:${PORTSDIR}/textproc/silvercity
-DOCUTILS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>0:${PORTSDIR}/textproc/py-docutils
+DOCUTILS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.3.9:${PORTSDIR}/textproc/py-docutils
 PYGMENTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>0:${PORTSDIR}/textproc/py-pygments
 TZ_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
diff --git a/www/trac/distinfo b/www/trac/distinfo
index 1ab2a5e837da..0cb6186f10a6 100644
--- a/www/trac/distinfo
+++ b/www/trac/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Trac-1.0.1.tar.gz) = 9dd49065696a8d4dfcb1a1af81e51d6bd487f5a1e72b3325c1fe4ecb5c490adb
-SIZE (Trac-1.0.1.tar.gz) = 3479896
+SHA256 (Trac-1.0.4.tar.gz) = a1d564c5b612306856dd26851270b12fbba91bab1bc146b66d4cc248be1a172e
+SIZE (Trac-1.0.4.tar.gz) = 3579886
diff --git a/www/trac/files/patch-trac_util_translation.py b/www/trac/files/patch-trac_util_translation.py
deleted file mode 100644
index 4f68fe05e711..000000000000
--- a/www/trac/files/patch-trac_util_translation.py
+++ /dev/null
@@ -1,32 +0,0 @@
-Backported from fixes contained in http://trac.edgewall.org/ticket/11345
-
---- trac/util/translation.py.orig
-+++ trac/util/translation.py
-@@ -150,6 +150,6 @@
-                 t = self._null_translations
-             else:
--                t.add(Translations.load(locale_dir, locale or 'en_US',
--                                        'tracini'))
-+                self._add(t, Translations.load(locale_dir, locale or 'en_US',
-+                                               'tracini'))
-                 if env_path:
-                     with self._plugin_domains_lock:
-@@ -157,5 +157,6 @@
-                         domains = domains.items()
-                     for domain, dirname in domains:
--                        t.add(Translations.load(dirname, locale, domain))
-+                        self._add(t, Translations.load(dirname, locale,
-+                                                       domain))
-             self._current.translations = t
-             self._activate_failed = False
-@@ -184,4 +185,10 @@
-             return self._current.translations is not None \
-                    or self._activate_failed
-+
-+        # Internal methods
-+
-+        def _add(self, t, translations):
-+            if isinstance(translations, Translations):
-+                t.add(translations)
- 
-         # Delegated methods
diff --git a/www/trac/files/patch-trac_wiki_formatter.py b/www/trac/files/patch-trac_wiki_formatter.py
deleted file mode 100644
index f4c62953abfd..000000000000
--- a/www/trac/files/patch-trac_wiki_formatter.py
+++ /dev/null
@@ -1,14 +0,0 @@
-Backported from upstream repo: http://trac.edgewall.org/changeset/11683
-See PR 181419 for details.
-
---- trac/wiki/formatter.py.orig        2013-02-01 08:47:41.000000000 +0800
-+++ trac/wiki/formatter.py 2013-08-20 14:24:46.982232000 +0800
-@@ -575,7 +575,7 @@
-         ns = fullmatch.group('snsbr')
-         target = unquote_label(fullmatch.group('stgtbr'))
-         match = match[1:-1]
--        return '<%s>' % \
-+        return u'<%s>' % \
-                 self._make_link(ns, target, match, match, fullmatch)
-
-     def _shref_formatter(self, match, fullmatch):
diff --git a/www/trac/files/patch-trac_wiki_tests_wiki-tests.txt b/www/trac/files/patch-trac_wiki_tests_wiki-tests.txt
deleted file mode 100644
index bcd94e1761e1..000000000000
--- a/www/trac/files/patch-trac_wiki_tests_wiki-tests.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Backported from upstream repo: http://trac.edgewall.org/changeset/11683
-See PR 181419 for details.
-
---- trac/wiki/tests/wiki-tests.txt.orig        2013-08-20 14:02:43.308222000 +0800
-+++ trac/wiki/tests/wiki-tests.txt 2013-08-20 14:01:18.000000000 +0800
-@@ -314,6 +314,13 @@
- ------------------------------
- <p>
- nolink:&#34;&lt;blink&gt;&#34;
-+</p> 
-+------------------------------ 
-+============================== Bracketed links 
-+See <http://en.wikipedia.org/wiki/Mornington_Crescent_(game)> 
-+------------------------------ 
-+<p> 
-+See &lt;<a class="ext-link" href="http://en.wikipedia.org/wiki/Mornington_Crescent_(game)"><span class="icon"></span>http://en.wikipedia.org/wiki/Mornington_Crescent_(game)</a>&gt; 
- </p>
- ------------------------------
- ============================================================
diff --git a/www/trac/pkg-message b/www/trac/pkg-message
index 117b034ac451..0298f4551323 100644
--- a/www/trac/pkg-message
+++ b/www/trac/pkg-message
@@ -3,8 +3,8 @@
 From 0.12.x to 1.0.x
 ---------------------
 You should be careful to check that the plugins you depend on have
-been ported to 1.0.1, as they most probably won't work without adaptation
-due to the numerous internal changes that occurred during 1.0.1 development.
+been ported to 1.0.x, as they most probably won't work without adaptation
+due to the numerous internal changes that occurred during 1.0.x development.
 
 See: http://trac.edgewall.org/wiki/TracDev/ApiChanges/1.0