Attachment 135391 Details for Bug 180252 – MT-5.2.7,1.patch

[patch] MT-5.2.7,1.patch

MT-5.2.7,1.patch (text/plain), 7.04 KB, created by takefu on 2013-07-04 09:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2013-07-04 09:40:00 UTC

Size: 7.04 KB

patch

obsolete

>diff -ruN /usr/ports/www/MT/Makefile www/MT/Makefile
>--- /usr/ports/www/MT/Makefile	2013-02-24 02:13:00.000000000 +0900
>+++ www/MT/Makefile	2013-07-04 17:20:18.000000000 +0900
>@@ -2,10 +2,11 @@
> # $FreeBSD: ports/www/MT/Makefile,v 1.61 2013/02/23 17:13:00 svnexp Exp $
>
> PORTNAME=	MT
>-PORTVERSION=	5.2.3
>+PORTVERSION=	5.2.7
> PORTEPOCH=	1
> CATEGORIES?=	www
>-MASTER_SITES?=	http://www.movabletype.org/downloads/stable/
>+MASTER_SITES?=	http://www.movabletype.org/downloads/stable/\
>+		http://www.movabletype.org/downloads/archives/5.x/
> DISTNAME?=	MTOS-${PORTVERSION}
>
> MAINTAINER?=	takefu@airport.fm
>@@ -19,13 +20,16 @@
> NO_OPTIONS_SORT=	yes
> OPTIONS_DEFINE=		APACHE MYSQL SSL TLS\
> 			OPTIONAL_MODULES ADDITIONAL_MODULES\
>-			PGSQL ORACLE ODBC SQLITE2 PSGI
>+			PGSQL ORACLE ODBC SQLITE2 SQLITE PSGI
> OPTIONS_DEFAULT=	MYSQL OPTIONAL_MODULES
> OPTIONAL_MODULES_DESC=	Optional Perl Modules
> ADDITIONAL_MODULES_DESC=Additional Perl modules
>-SQLITE2_DESC=		SQLite 2 database
> PSGI_DESC=		Perl Web Server Gateway Interface
>
>+PGSQL_DESC=		PostgreSQL database support[obsolete]
>+SQLITE_DESC=		SQLite3 database support[obsolete]
>+SQLITE2_DESC=		SQLite2 database support[obsolete]
>+
> .include <bsd.port.options.mk>
>
> DATADIR=	www/data
>@@ -41,7 +45,7 @@
> 		WWWOWN=${WWWOWN}\
> 		WWWGRP=${WWWGRP}
>
>-USE_PERL5_RUN=	5.8.1+
>+USE_PERL5_RUN=	yes
> NO_BUILD=	yes
> MT_DOCS_URL?=	http://www.movabletype.org/documentation/
> MT_UPGRADE_URL?=http://www.movabletype.org/documentation/installation/upgrade-movable-type.html
>@@ -100,8 +104,13 @@
> .endif
> .if empty${PORT_OPTIONS:MPGSQL} && empty(PORT_OPTIONS:MMYSQL)
> DB_DIR?=	${PREFIX}/${CGIDIR}/db
>-RUN_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite\
>-		sqlite3>=3:${PORTSDIR}/databases/sqlite3
>+. if ${PORT_OPTIONS:MSQLITE} && empty(PORT_OPTIONS:MSQLITE2)
>+USE_SQLITE=	yes
>+RUN_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
>+. elif ${PORT_OPTIONS:MSQLITE2} && empty(PORT_OPTIONS:MSQLITE)
>+USE_SQLITE=	2
>+RUN_DEPENDS+=	p5-DBD-SQLite2>=0:${PORTSDIR}/databases/p5-DBD-SQLite2
>+. endif
> WITH_DEFAULTDB=	yes
> .endif
> .if ${PORT_OPTIONS:MORACLE}
>@@ -110,9 +119,6 @@
> .if ${PORT_OPTIONS:MODBC}
> RUN_DEPENDS+=	p5-DBD-ODBC>=1.13:${PORTSDIR}/databases/p5-DBD-ODBC
> .endif
>-.if ${PORT_OPTIONS:MSQLITE2}
>-RUN_DEPENDS+=	p5-DBD-SQLite2>=0:${PORTSDIR}/databases/p5-DBD-SQLite2
>-.endif
> .if ${PORT_OPTIONS:MAPACHE}
> USE_APACHE_RUN=	22+
> SUB_FILES+=	MT.conf
>diff -ruN /usr/ports/www/MT/distinfo www/MT/distinfo
>--- /usr/ports/www/MT/distinfo	2013-02-24 02:13:00.000000000 +0900
>+++ www/MT/distinfo	2013-07-04 16:54:22.000000000 +0900
>@@ -1,4 +1,2 @@
>-SHA256 (MTOS-5.2.3.tar.gz) = b76dd45af1ca768ec32eecfe0513d421a8700ea98e74fbf062a1d76e57ff4366
>-SIZE (MTOS-5.2.3.tar.gz) = 7961636
>-SHA256 (MTOS-5.2.3-ru.tar.gz) = e75d505f866e1213afe1e37fd0ecd3931a2016b6bdee6aba552d7006573c1969
>-SIZE (MTOS-5.2.3-ru.tar.gz) = 8092081
>+SHA256 (MTOS-5.2.7.tar.gz) = 74078416b80aa5314fd6e85c7fa562d1f77a0e236a0137338c50c88b27185653
>+SIZE (MTOS-5.2.7.tar.gz) = 7965020
>diff -ruN /usr/ports/www/MT/pkg-plist www/MT/pkg-plist
>--- /usr/ports/www/MT/pkg-plist	2013-02-24 02:13:00.000000000 +0900
>+++ www/MT/pkg-plist	2013-06-11 13:24:59.000000000 +0900
>@@ -421,6 +421,7 @@
> %%CGIDIR%%/extlib/Data/ObjectDriver/ResultSet.pm
> %%CGIDIR%%/extlib/Data/ObjectDriver.pm
> %%CGIDIR%%/extlib/version.pod
>+%%CGIDIR%%/extlib/Locale/Maketext/Cookbook.pod
> %%CGIDIR%%/extlib/Locale/Maketext/GutsLoader.pm
> %%CGIDIR%%/extlib/Locale/Maketext/TPJ13.pod
> %%CGIDIR%%/extlib/Locale/Maketext/Guts.pm
>@@ -526,6 +527,7 @@
> %%CGIDIR%%/extlib/JSON.pm
> %%CGIDIR%%/extlib/Net/OAuth.pm
> %%CGIDIR%%/extlib/Net/HTTPS.pm
>+%%CGIDIR%%/extlib/Net/SMTP/TLS.pm
> %%CGIDIR%%/extlib/Net/OpenID/VerifiedIdentity.pm
> %%CGIDIR%%/extlib/Net/OpenID/Yadis.pm
> %%CGIDIR%%/extlib/Net/OpenID/Consumer.pm
>@@ -647,20 +649,6 @@
> %%CGIDIR%%/extlib/HTML/Form.pm
> %%CGIDIR%%/extlib/HTML/Template.pm
> %%CGIDIR%%/extlib/HTML/Diff.pm
>-%%CGIDIR%%/plugins/TypePadAntiSpam/lib/TypePadAntiSpam/L10N.pm
>-%%CGIDIR%%/plugins/TypePadAntiSpam/lib/TypePadAntiSpam/L10N/ja.pm
>-%%CGIDIR%%/plugins/TypePadAntiSpam/lib/TypePadAntiSpam/L10N/es.pm
>-%%CGIDIR%%/plugins/TypePadAntiSpam/lib/TypePadAntiSpam/L10N/de.pm
>-%%CGIDIR%%/plugins/TypePadAntiSpam/lib/TypePadAntiSpam/L10N/en_us.pm
>-%%CGIDIR%%/plugins/TypePadAntiSpam/lib/TypePadAntiSpam/L10N/fr.pm
>-%%CGIDIR%%/plugins/TypePadAntiSpam/lib/TypePadAntiSpam/L10N/nl.pm
>-%%CGIDIR%%/plugins/TypePadAntiSpam/lib/TypePadAntiSpam.pm
>-%%CGIDIR%%/plugins/TypePadAntiSpam/lib/MT/TypePadAntiSpam.pm
>-%%CGIDIR%%/plugins/TypePadAntiSpam/tmpl/config.tmpl
>-%%CGIDIR%%/plugins/TypePadAntiSpam/tmpl/stats_widget.tmpl
>-%%CGIDIR%%/plugins/TypePadAntiSpam/tmpl/system.tmpl
>-%%CGIDIR%%/plugins/TypePadAntiSpam/config.yaml
>-%%CGIDIR%%/plugins/TypePadAntiSpam/php/function.mttypepadantispamcounter.php
> %%LANG_RU%%%%CGIDIR%%/plugins/UpdatePingsRU/config.yaml
> %%CGIDIR%%/plugins/spamlookup/lib/spamlookup.pm
> %%CGIDIR%%/plugins/spamlookup/lib/spamlookup/L10N.pm
>@@ -684,6 +672,7 @@
> %%CGIDIR%%/plugins/StyleCatcher/lib/StyleCatcher/L10N.pm
> %%CGIDIR%%/plugins/StyleCatcher/lib/StyleCatcher/Library.pm
> %%CGIDIR%%/plugins/StyleCatcher/lib/StyleCatcher/Util.pm
>+%%CGIDIR%%/plugins/StyleCatcher/lib/StyleCatcher/Upgrade.pm
> %%CGIDIR%%/plugins/StyleCatcher/lib/StyleCatcher/L10N/ja.pm
> %%CGIDIR%%/plugins/StyleCatcher/lib/StyleCatcher/L10N/es.pm
> %%CGIDIR%%/plugins/StyleCatcher/lib/StyleCatcher/L10N/de.pm
>@@ -2095,6 +2084,10 @@
> %%CGIDIR%%/php/lib/block.mtsethashvar.php
> %%CGIDIR%%/php/lib/function.mtassettype.php
> %%CGIDIR%%/php/lib/block.mtifrequirecommentemails.php
>+%%CGIDIR%%/php/lib/function.mtwebsitedatelanguage.php
>+%%CGIDIR%%/php/lib/function.mtblogdatelanguage.php
>+%%CGIDIR%%/php/lib/function.mtcanonicalurl.php
>+%%CGIDIR%%/php/lib/function.mtcanonicallink.php
> %%CGIDIR%%/php/mt.php
> %%CGIDIR%%/php/tmpl/header-popup.tpl
> %%CGIDIR%%/php/tmpl/missing.tpl
>@@ -3404,6 +3397,7 @@
> @dirrm %%CGIDIR%%/extlib/Net/OAuth/SignatureMethod
> @dirrm %%CGIDIR%%/extlib/Net/OAuth
> @dirrm %%CGIDIR%%/extlib/Net/HTTP
>+@dirrm %%CGIDIR%%/extlib/Net/SMTP
> @dirrm %%CGIDIR%%/extlib/Net
> @dirrm %%CGIDIR%%/extlib/LWP/Protocol
> @dirrm %%CGIDIR%%/extlib/LWP/Authen
>@@ -3433,13 +3427,6 @@
> @dirrm %%CGIDIR%%/extlib/Apache
> @dirrm %%CGIDIR%%/extlib/HTML
> @dirrm %%CGIDIR%%/extlib
>-@dirrm %%CGIDIR%%/plugins/TypePadAntiSpam/lib/TypePadAntiSpam/L10N
>-@dirrm %%CGIDIR%%/plugins/TypePadAntiSpam/lib/TypePadAntiSpam
>-@dirrm %%CGIDIR%%/plugins/TypePadAntiSpam/lib/MT
>-@dirrm %%CGIDIR%%/plugins/TypePadAntiSpam/lib
>-@dirrm %%CGIDIR%%/plugins/TypePadAntiSpam/tmpl
>-@dirrm %%CGIDIR%%/plugins/TypePadAntiSpam/php
>-@dirrm %%CGIDIR%%/plugins/TypePadAntiSpam
> %%LANG_RU%%@dirrm %%CGIDIR%%/plugins/UpdatePingsRU
> @dirrm %%CGIDIR%%/plugins/spamlookup/lib/spamlookup/L10N
> @dirrm %%CGIDIR%%/plugins/spamlookup/lib/spamlookup
>diff -ruN /usr/ports/russian/MT/Makefile russian/MT/Makefile
>--- /usr/ports/russian/MT/Makefile	2013-02-24 02:12:59.000000000 +0900
>+++ russian/MT/Makefile	2013-06-11 16:44:24.000000000 +0900
>@@ -7,6 +7,8 @@
>
> COMMENT=	Russian localization of the MovableType publishing system
>
>+IGNORE=		source file not found
>+
> 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].*

Actions: View | Diff

Attachments on bug 180252: 135391