From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Feb 28 09:50:03 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6BB4D391 for ; Fri, 28 Feb 2014 09:50:03 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 41CE416D0 for ; Fri, 28 Feb 2014 09:50:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s1S9o3pw079205 for ; Fri, 28 Feb 2014 09:50:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s1S9o3P4079204; Fri, 28 Feb 2014 09:50:03 GMT (envelope-from gnats) Resent-Date: Fri, 28 Feb 2014 09:50:03 GMT Resent-Message-Id: <201402280950.s1S9o3P4079204@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andrew Childs Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1FFE8288 for ; Fri, 28 Feb 2014 09:42:05 +0000 (UTC) Received: from smtp3.clear.net.nz (smtp3.clear.net.nz [203.97.33.64]) by mx1.freebsd.org (Postfix) with ESMTP id D6B8A1639 for ; Fri, 28 Feb 2014 09:42:04 +0000 (UTC) Received: from mxin1-orange.clear.net.nz (lb2-srcnat.clear.net.nz [203.97.32.237]) by smtp3.clear.net.nz (CLEAR Net Mail) with ESMTP id <0N1P00KS18UI1E30@smtp3.clear.net.nz> for FreeBSD-gnats-submit@freebsd.org; Fri, 28 Feb 2014 22:25:32 +1300 (NZDT) Received: from 202-78-141-194.cable.telstraclear.net (HELO mail.cons.org.nz) ([202.78.141.194]) by smtpin1.clear.net.nz with ESMTP; Fri, 28 Feb 2014 22:25:31 +1300 Received: from northind.cons.org.nz (northind.cons.org.nz [IPv6:2001:4428:27c:1::25]) by mail.cons.org.nz (Postfix) with ESMTP id D7EC427F190 for ; Fri, 28 Feb 2014 22:25:30 +1300 (NZDT) Received: by northind.cons.org.nz (Postfix, from userid 1001) id 6D22F84; Fri, 28 Feb 2014 22:25:30 +1300 (NZDT) Message-Id: <20140228092530.6D22F84@northind.cons.org.nz> Date: Fri, 28 Feb 2014 22:25:30 +1300 (NZDT) From: Andrew Childs To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/187133: www/trac: fix rc script; backport fix for upstream #11345 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Andrew Childs List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2014 09:50:03 -0000 >Number: 187133 >Category: ports >Synopsis: www/trac: fix rc script; backport fix for upstream #11345 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Feb 28 09:50:02 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Andrew Childs >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD northind.cons.org.nz 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: 1. Add PYTHON_CMD to SUB_LIST to fix the following in the rc script: command="%%PYTHON_CMD%%" 2. Backport a fix from upstream #11345 [1]. Not a FreeBSD or ports specific problem, but prevents some functionality from working by default. If this is an inappropriate change for ports please cherry-pick the SUB_LIST fix. [1] http://trac.edgewall.org/ticket/11345 >How-To-Repeat: >Fix: --- trac.patch begins here --- diff --git a/www/trac/Makefile b/www/trac/Makefile index 24527ee..289fbd6 100644 --- a/www/trac/Makefile +++ b/www/trac/Makefile @@ -51,6 +51,7 @@ USE_PYTHON= 2 USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes USE_RC_SUBR= tracd +SUB_LIST= PYTHON_CMD=${PYTHON_CMD} post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample-plugins diff --git a/www/trac/files/patch-trac_util_translation.py b/www/trac/files/patch-trac_util_translation.py new file mode 100644 index 0000000..4f68fe0 --- /dev/null +++ b/www/trac/files/patch-trac_util_translation.py @@ -0,0 +1,32 @@ +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 --- trac.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: