From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 16 08:40:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0C86F65A for ; Wed, 16 Apr 2014 08:40:01 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C1A741E5A for ; Wed, 16 Apr 2014 08:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s3G8e0AT075137 for ; Wed, 16 Apr 2014 08:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s3G8e0RG075136; Wed, 16 Apr 2014 08:40:00 GMT (envelope-from gnats) Resent-Date: Wed, 16 Apr 2014 08:40:00 GMT Resent-Message-Id: <201404160840.s3G8e0RG075136@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, Takefu Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3B2DC629 for ; Wed, 16 Apr 2014 08:37:07 +0000 (UTC) Received: from ae-osaka.co.jp (mx.ae-osaka.co.jp [210.196.184.82]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D1B7D1E3C for ; Wed, 16 Apr 2014 08:37:05 +0000 (UTC) Received: from ae-osaka.co.jp (localhost.ae-osaka.co.jp [127.0.0.1]) by ae-osaka.co.jp (Postfix) with ESMTP id B15A5125F08 for ; Wed, 16 Apr 2014 17:36:26 +0900 (JST) Received: from [IPv6:2001:470:824b:a011:4570:787d:8adf:7f99] (unknown [IPv6:2001:470:824b:a011:4570:787d:8adf:7f99]) by ae-osaka.co.jp (Postfix) with ESMTPSA id 3CCAE125F06 for ; Wed, 16 Apr 2014 17:36:26 +0900 (JST) Message-Id: <534E410B.6010201@airport.fm> Date: Wed, 16 Apr 2014 17:36:27 +0900 From: Takefu To: freebsd-gnats-submit@freebsd.org Subject: ports/188684: [MAINTAINER] www/MT,russian/MT: update to 5.2.10 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Apr 2014 08:40:01 -0000 >Number: 188684 >Category: ports >Synopsis: [MAINTAINER] www/MT,russian/MT: update to 5.2.10,1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Apr 16 08:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Takefu >Release: FreeBSD 8.4-RELEASE-p8 i386 >Organization: FOX Amateur Radio Club >Environment: System: FreeBSD RELENG84-ix86.localIPv4.airport.fm 8.4-RELEASE-p8 FreeBSD 8.4-RELEASE-p8 #0: Tue Apr 15 11:05:17 JST 2014 >Description: www/MT,russian/MT - Update to 5.2.10 - add license Generated with FreeBSD Port Tools 1.01 (mode: update, diff: ports) >How-To-Repeat: >Fix: --- MT-5.2.10.patch begins here --- diff -ruN /usr/ports/www/MT/Makefile ./Makefile --- /usr/ports/www/MT/Makefile 2013-12-30 06:48:08.000000000 +0900 +++ ./Makefile 2014-04-16 17:20:36.000000000 +0900 @@ -2,7 +2,7 @@ # $FreeBSD: head/www/MT/Makefile 338047 2013-12-29 21:48:08Z rakuco $ PORTNAME= MT -PORTVERSION= 5.2.9 +PORTVERSION= 5.2.10 PORTEPOCH= 1 CATEGORIES?= www MASTER_SITES?= http://www.movabletype.org/downloads/stable/\ @@ -13,6 +13,8 @@ MAINTAINER?= takefu@airport.fm COMMENT?= Web-based personal publishing system for weblogs +LICENSE= GPLv2 + CONFLICTS?= de-MT-[2-5].* fr-MT-[2-5].* ja-MT-[2-5].* ru-MT-[2-5].* RUN_DEPENDS+= p5-DBI>=1.21:${PORTSDIR}/databases/p5-DBI \ @@ -59,8 +61,8 @@ RUN_DEPENDS+= p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser\ p5-libwww>=0:${PORTSDIR}/www/p5-libwww\ p5-SOAP-Lite>=0.5:${PORTSDIR}/net/p5-SOAP-Lite\ - convert:${PORTSDIR}/graphics/ImageMagick\ - p5-GD>=0:${PORTSDIR}/graphics/p5-GD \ + convert:${PORTSDIR}/graphics/ImageMagick-nox11\ + p5-GD>=0:${PORTSDIR}/graphics/p5-GD\ p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \ p5-Crypt-DSA>=0:${PORTSDIR}/security/p5-Crypt-DSA\ p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64\ diff -ruN /usr/ports//www/MT/distinfo ./distinfo --- /usr/ports//www/MT/distinfo 2013-12-30 06:48:08.000000000 +0900 +++ ./distinfo 2014-04-16 16:13:12.000000000 +0900 @@ -1,4 +1,4 @@ -SHA256 (MTOS-5.2.9.tar.gz) = 14d0dfeec17c28a77da101d9d69e17e45cb4f1fae322ac7529fb2378f5d76e52 -SIZE (MTOS-5.2.9.tar.gz) = 7965907 +SHA256 (MTOS-5.2.10.tar.gz) = 0ddd685e8ed131af51102713260b7b10bb9dcbd7f31de426d23f785c51e19815 +SIZE (MTOS-5.2.10.tar.gz) = 7965847 SHA256 (MTOS-5.2.9-ru.tar.gz) = cd088a6f330292ed37efa8b3f0c2d4d13b22e54f274bf0237932ad6b44533254 SIZE (MTOS-5.2.9-ru.tar.gz) = 8095257 --- MT-5.2.10.patch ends here --- --- ru-MT-5.2.10.patch begins here --- diff -ruN /usr/ports/russian/MT/Makefile ./Makefile --- /usr/ports/russian/MT/Makefile 2013-12-30 06:48:08.000000000 +0900 +++ ./Makefile 2014-04-16 17:00:21.000000000 +0900 @@ -3,10 +3,11 @@ CATEGORIES= russian www MASTER_SITES= http://movable-type.ru/downloads/ -DISTNAME= MTOS-${PORTVERSION}-${PKGNAMEPREFIX:S,-,,} +DISTNAME= MTOS-5.2.9-${PKGNAMEPREFIX:S,-,,} COMMENT= Russian localization of the MovableType publishing system +PATCHDIR= ${.CURDIR}/files MASTERDIR= ${.CURDIR}/../../www/MT MT_LANG= ${PKGNAMEPREFIX:S,-,,U} CONFLICTS= MT-[2-5].* de-MT-[2-5].* fr-MT-[2-5].* ja-MT-[2-5].* diff -ruN /usr/ports/russian/MT/files/patch-aa ./files/patch-aa --- /usr/ports/russian/MT/files/patch-aa 1970-01-01 09:00:00.000000000 +0900 +++ ./files/patch-aa 2014-04-16 16:14:16.000000000 +0900 @@ -0,0 +1,198 @@ +--- default_templates/comment_response.mtml.orig 2013-12-02 02:38:32.000000000 +0900 ++++ default_templates/comment_response.mtml 2014-04-16 15:17:26.000000000 +0900 +@@ -15,7 +15,7 @@ + + + <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$> +-

<__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>">

 ++

<__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>">

 + + + +--- lib/MT.pm.orig 2013-12-02 02:40:30.000000000 +0900 ++++ lib/MT.pm 2014-04-16 15:18:36.000000000 +0900 +@@ -39,8 +39,8 @@ + ) + = ( + 'Movable Type', 'MT', +- '5.2.9', '5.2.9-ru', +- '9', 'http://movable-type.ru/' ++ '5.2.10', '5.2.10-ru', ++ '10', 'http://movable-type.ru/' + ); + + # To allow MT to run straight from svn, if no build process (pre-processing) +@@ -56,7 +56,7 @@ + } + + if ( $RELEASE_NUMBER eq '__RELEASE' . '_NUMBER__' ) { +- $RELEASE_NUMBER = 9; ++ $RELEASE_NUMBER = 10; + } + + $DebugMode = 0; +@@ -124,7 +124,7 @@ + } + + sub build_id { +- my $build_id = '5.2.9-ru'; ++ my $build_id = '5.2.10-ru'; + $build_id = '' if $build_id eq '__BUILD_' . 'ID__'; + return $build_id; + } +--- mt-check.cgi.orig 2013-12-02 02:40:30.000000000 +0900 ++++ mt-check.cgi 2014-04-16 15:19:09.000000000 +0900 +@@ -97,9 +97,9 @@ + my $view = $cgi->param("view"); + my $version = $cgi->param("version"); + my $sess_id = $cgi->param('session_id'); +-$version ||= '5.2.9-ru'; ++$version ||= '5.2.10-ru'; + if ( $version eq '__PRODUCT_VERSION' . '_ID__' ) { +- $version = '5.2.9'; ++ $version = '5.2.10'; + } + + my ( $mt, $LH ); +--- mt-static/js/editor.js.orig 2013-12-02 02:40:32.000000000 +0900 ++++ mt-static/js/editor.js 2014-04-16 15:20:42.000000000 +0900 +@@ -1,4 +1,4 @@ +-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd. ++/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd. + * This file is combined from multiple sources. Consult the source files for their + * respective licenses and copyrights. + */;(function($){MT.EditorManager=function(){this.init.apply(this,arguments);};$.extend(MT.EditorManager,{editors:{},editorsForFormat:{},map:{},defaultWrapTag:'div',defaultWrapClass:'mt-editor-manager-wrap',register:function(id,editor){var thisConstructor=this;this.editors[id]=editor;$.each(editor.formatsForCurrentContext(),function(){if(!thisConstructor.editorsForFormat[this]){thisConstructor.editorsForFormat[this]=[];} +--- mt-static/js/mt_core_compact.js.orig 2013-12-02 02:40:32.000000000 +0900 ++++ mt-static/js/mt_core_compact.js 2014-04-16 15:21:04.000000000 +0900 +@@ -1,4 +1,4 @@ +-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd. ++/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd. + * This file is combined from multiple sources. Consult the source files for their + * respective licenses and copyrights. + */defined=function(x){return x!==undefined;};exists=function(x){return(x===undefined||x===null)?false:true;};truth=function(x){return(x&&x!="0")?true:false;};finite=function(x){return isFinite(x)?x:0;};finiteInt=function(x,b){return finite(parseInt(x,b));};finiteFloat=function(x){return finite(parseFloat(x));};max=function(){var a=arguments;var n=a[0];for(var i=1;i + + <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$> +-

<__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>">

 ++

<__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>">

 + + + +--- themes/classic_blog/theme.yaml.orig 2013-12-02 02:38:32.000000000 +0900 ++++ themes/classic_blog/theme.yaml 2014-04-16 15:23:26.000000000 +0900 +@@ -2,7 +2,7 @@ + id: classic_blog + author_name: Six Apart, Ltd. + author_link: http://www.movabletype.org/ +-version: 1.11 ++version: 1.12 + class: blog + protected: 1 + description: <__trans phrase="A traditional blogging design that comes with plenty of styles and a selection of 2 column / 3 column layouts. Best for use in standard blog publishing applications."> +--- themes/pico/templates/comment_response.mtml.orig 2013-12-02 02:38:32.000000000 +0900 ++++ themes/pico/templates/comment_response.mtml 2014-04-16 15:26:22.000000000 +0900 +@@ -16,7 +16,8 @@ + + + <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$> +-

<__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>">

 ++

<__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>">

 ++ + + + +--- themes/pico/theme.yaml.orig 2013-12-02 02:38:33.000000000 +0900 ++++ themes/pico/theme.yaml 2014-04-16 15:26:41.000000000 +0900 +@@ -2,7 +2,7 @@ + id: pico + author_name: Six Apart, Ltd. + author_link: http://www.movabletype.org/ +-version: 1.11 ++version: 1.12 + class: blog + protected: 1 + description: <__trans phrase="Pico is a microblogging theme, designed for keeping things simple to handle frequent updates. To put the focus on content we've moved the sidebars below the list of posts."> +--- themes/rainier/templates/comment_response.mtml.orig 2013-12-02 02:38:33.000000000 +0900 ++++ themes/rainier/templates/comment_response.mtml 2014-04-16 15:27:29.000000000 +0900 +@@ -6,7 +6,7 @@ + <$mt:Var name="message" value="

<__trans phrase="Your comment has been received and held for review by a blog administrator.">

"$> + + <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$> +-

<__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>">

 ++

<__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>">

 + + + +--- themes/rainier/theme.yaml.orig 2013-12-02 02:38:33.000000000 +0900 ++++ themes/rainier/theme.yaml 2014-04-16 15:27:46.000000000 +0900 +@@ -1,6 +1,6 @@ + label: 'Rainier' + id: 'rainier' +-version: 1.03 ++version: 1.04 + author_link: 'http://www.sixapart.com/' + author_name: 'Six Apart, Ltd.' + class: 'blog' +--- themes/classic_website/templates/comment_response.mtml.orig 2013-12-02 02:38:32.000000000 +0900 ++++ themes/classic_website/templates/comment_response.mtml 2014-04-16 15:25:24.000000000 +0900 +@@ -15,7 +15,7 @@ + + + <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$> +-

<__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>">

 ++

<__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>">

 + + + +--- themes/classic_website/theme.yaml.orig 2013-12-02 02:38:32.000000000 +0900 ++++ themes/classic_website/theme.yaml 2014-04-16 15:25:48.000000000 +0900 +@@ -2,7 +2,7 @@ + id: classic_website + author_name: Six Apart, Ltd. + author_link: http://www.movabletype.org/ +-version: 1.11 ++version: 1.12 + class: website + protected: 1 + description: <__trans phrase="Create a blog portal that aggregates contents from several blogs in one website."> --- ru-MT-5.2.10.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: