www/MT, russian/MT: Upgrade version 5.2.9 => 5.2.10

PR: 188684 Submitted by: maintainer: takefu (airport.fm)
svn path=/head/; revision=363930
2024-11-21 00:25:50 +00:00 · 2014-08-03 19:29:14 +00:00 · 2014-08-03 19:29:14 +00:00 · c84c3d42ae · 2021-03-31 03:12:20 +00:00
commit c84c3d42ae
parent f0a393b1e7
22 changed files with 244 additions and 59 deletions
--- a/russian/MT/Makefile
+++ b/russian/MT/Makefile
@ -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].*
--- a/russian/MT/files/patch-default_templates__comment_response.mtml
+++ b/russian/MT/files/patch-default_templates__comment_response.mtml
@ -0,0 +1,11 @@
+--- 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:Else name="comment_error">
+     <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
+     <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
+-    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
+    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
+ </mt:If>
+ 
+ 
--- a/russian/MT/files/patch-lib__MT.pm
+++ b/russian/MT/files/patch-lib__MT.pm
@ -0,0 +1,31 @@
+--- 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;
+ }
--- a/russian/MT/files/patch-mt-check.cgi
+++ b/russian/MT/files/patch-mt-check.cgi
@ -0,0 +1,14 @@
+--- 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 );
--- a/russian/MT/files/patch-mt-staticcssmain.css
+++ b/russian/MT/files/patch-mt-staticcssmain.css
@ -0,0 +1,8 @@
+--- mt-static/css/main.css.orig	2013-12-02 02:40:33.000000000 +0900
+++ mt-static/css/main.css	2014-04-16 15:19:43.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.
+  */html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}body{margin:0;}h1,
--- a/russian/MT/files/patch-mt-staticcsssimple.css
+++ b/russian/MT/files/patch-mt-staticcsssimple.css
@ -0,0 +1,8 @@
+--- mt-static/css/simple.css.orig	2013-12-02 02:40:34.000000000 +0900
+++ mt-static/css/simple.css	2014-04-16 15:20:06.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.
+  */html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}body{margin:0;}h1,
--- a/russian/MT/files/patch-mt-staticjseditor.js
+++ b/russian/MT/files/patch-mt-staticjseditor.js
@ -0,0 +1,8 @@
+--- 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]=[];}
--- a/russian/MT/files/patch-mt-staticjsmt_core_compact.js
+++ b/russian/MT/files/patch-mt-staticjsmt_core_compact.js
@ -0,0 +1,8 @@
+--- 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<a.length;i++)
--- a/russian/MT/files/patch-php__mt.php
+++ b/russian/MT/files/patch-php__mt.php
@ -0,0 +1,22 @@
+--- php/mt.php.orig	2013-12-02 02:40:30.000000000 +0900
+++ php/mt.php	2014-04-16 15:21:49.000000000 +0900
+@@ -11,16 +11,16 @@
+ require_once('lib/class.exception.php');
+ 
+ define('VERSION', '5.2');
+-define('PRODUCT_VERSION', '5.2.9');
+define('PRODUCT_VERSION', '5.2.10');
+ 
+ $PRODUCT_NAME = 'Movable Type';
+ if($PRODUCT_NAME == '__PRODUCT' . '_NAME__')
+     $PRODUCT_NAME = 'Movable Type';
+ define('PRODUCT_NAME', $PRODUCT_NAME);
+ 
+-$RELEASE_NUMBER = '9';
+$RELEASE_NUMBER = '10';
+ if ( $RELEASE_NUMBER == '__RELEASE_' . 'NUMBER__' )
+-    $RELEASE_NUMBER = 9;
+    $RELEASE_NUMBER = 10;
+ define('RELEASE_NUMBER', $RELEASE_NUMBER);
+ 
+ $PRODUCT_VERSION_ID = '5.2.9-ru';
--- a/russian/MT/files/patch-themes__classic_blogtemplatescomment_response.mtml
+++ b/russian/MT/files/patch-themes__classic_blogtemplatescomment_response.mtml
@ -0,0 +1,11 @@
+--- themes/classic_blog/templates/comment_response.mtml.orig	2013-12-02 02:38:32.000000000 +0900
+++ themes/classic_blog/templates/comment_response.mtml	2014-04-16 15:22:52.000000000 +0900
+@@ -15,7 +15,7 @@
+ <mt:Else name="comment_error">
+     <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
+     <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
+-    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
+    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
+ </mt:If>
+ 
+ 
--- a/russian/MT/files/patch-themes__classic_blog__theme.yaml
+++ b/russian/MT/files/patch-themes__classic_blog__theme.yaml
@ -0,0 +1,11 @@
+--- 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.">
--- a/russian/MT/files/patch-themes__classic_websitetemplatescomment_response.mtml
+++ b/russian/MT/files/patch-themes__classic_websitetemplatescomment_response.mtml
@ -0,0 +1,11 @@
+--- 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:Else name="comment_error">
+     <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
+     <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
+-    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
+    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
+ </mt:If>
+ 
+ 
--- a/russian/MT/files/patch-themes__classic_website__theme.yaml
+++ b/russian/MT/files/patch-themes__classic_website__theme.yaml
@ -0,0 +1,11 @@
+--- 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.">
--- a/russian/MT/files/patch-themespicotemplates__comment_response.mtml
+++ b/russian/MT/files/patch-themespicotemplates__comment_response.mtml
@ -0,0 +1,12 @@
+--- 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:Else name="comment_error">
+     <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
+     <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
+-    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
+    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
+ </mt:If>
+ </mt:If>
+ 
+ 
--- a/russian/MT/files/patch-themespicotheme.yaml
+++ b/russian/MT/files/patch-themespicotheme.yaml
@ -0,0 +1,11 @@
+--- 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.">
--- a/russian/MT/files/patch-themesrainiertemplates__comment_response.mtml
+++ b/russian/MT/files/patch-themesrainiertemplates__comment_response.mtml
@ -0,0 +1,11 @@
+--- 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="<p class="message success"><__trans phrase="Your comment has been received and held for review by a blog administrator."></p>"$>
+ <mt:Else name="comment_error">
+   <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
+-  <mt:SetVarBlock name="message"><p class="message error"><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
+  <mt:SetVarBlock name="message"><p class="message error"><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
+ </mt:If>
+ <!DOCTYPE html>
+ <html>
--- a/russian/MT/files/patch-themesrainiertheme.yaml
+++ b/russian/MT/files/patch-themesrainiertheme.yaml
@ -0,0 +1,10 @@
+--- 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'
--- a/www/MT/Makefile
+++ b/www/MT/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	MT
-PORTVERSION=	5.2.9
-PORTREVISION=	1
+PORTVERSION=	5.2.10
 PORTEPOCH=	1
 CATEGORIES?=	www
 MASTER_SITES?=	http://www.movabletype.org/downloads/stable/\
@ -14,12 +13,15 @@ DISTNAME?=	MTOS-${PORTVERSION}
 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 \
 		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size

 NO_OPTIONS_SORT=	yes
+OPTIONS_SUB=		yes
 OPTIONS_DEFINE=		APACHE SSL TLS PSGI\
 			OPTIONAL_MODULES ADDITIONAL_MODULES
 OPTIONS_DEFAULT=	MYSQL OPTIONAL_MODULES
@ -37,14 +39,15 @@ SQLITE2_DESC=		SQLite2 database support[obsolete]

 DATADIR=	www/data
 CGIDIR=		www/cgi-bin/mt
-PLIST_SUB+=	DATADIR=${DATADIR} CGIDIR=${CGIDIR} DB_DIR=${DB_DIR}
-SUB_FILES+=	pkg-install
-SUB_LIST+=	DATADIR=${DATADIR} CGIDIR=${CGIDIR} DB_DIR=${DB_DIR}\
-		PACKAGENAME=${PKGNAMEPREFIX}${PORTNAME}\
-		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} STAGEDIR=${STAGEDIR}

-USES=		perl5
+SUB_LIST+=	CGIDIR=${CGIDIR}\
+		PACKAGENAME=${PKGNAMEPREFIX}${PORTNAME}
+PLIST_SUB+=	DATADIR=${DATADIR} CGIDIR=${CGIDIR} DB_DIR=${DB_DIR}\
+		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+
+USES=		perl5 shebangfix
 USE_PERL5=	run
+SHEBANG_FILES=	*.cgi
 NO_BUILD=	yes
 MT_DOCS_URL?=	http://www.movabletype.org/documentation/
 MT_UPGRADE_URL?=http://www.movabletype.org/documentation/installation/upgrade-movable-type.html
@ -60,8 +63,8 @@ PLIST_SUB+=	LANG_RU="@comment "
 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\
@ -118,21 +121,21 @@ RUN_DEPENDS+=	p5-DBD-Oracle>=0.19:${PORTSDIR}/databases/p5-DBD-Oracle
 .if ${PORT_OPTIONS:MODBC}
 RUN_DEPENDS+=	p5-DBD-ODBC>=1.13:${PORTSDIR}/databases/p5-DBD-ODBC
 .endif
+
 .if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE_RUN=	22+
+USE_APACHE_BUILD=	22+
 SUB_FILES+=	MT.conf
 SUB_LIST+=	APACHEETCDIR=${PREFIX}/${APACHEETCDIR}
-.include <bsd.port.pre.mk>
-. if ${APACHE_VERSION} == 24
-PLIST_SUB+=	APACHE="" APACHE24=""
-SUB_LIST+=	APACHE24=""
-. else
-PLIST_SUB+=	APACHE="" APACHE24="\#"
-SUB_LIST+=	APACHE24="\#"
-. endif
-.else
-PLIST_SUB+=	APACHE="@comment "
 .endif
+
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MAPACHE} && (${APACHE_VERSION} <= 22)
+SUB_LIST+=	APACHE22="" APACHE24="\#" MODULE=mod_alias.c
+.elif ${PORT_OPTIONS:MAPACHE} && (${APACHE_VERSION} >= 24)
+SUB_LIST+=	APACHE22="\#" APACHE24="" MODULE=alias_module
+.endif
+
 .if ${PORT_OPTIONS:MPSGI}
 RUN_DEPENDS+=	p5-CGI-PSGI>0:${PORTSDIR}/www/p5-CGI-PSGI\
 		p5-CGI-Emulate-PSGI>=0.06:${PORTSDIR}/www/p5-CGI-Emulate-PSGI\
@ -140,8 +143,6 @@ RUN_DEPENDS+=	p5-CGI-PSGI>0:${PORTSDIR}/www/p5-CGI-PSGI\
 		p5-SOAP-Transport-HTTP-Plack>=0:${PORTSDIR}/www/p5-SOAP-Transport-HTTP-Plack
 .endif

-.include <bsd.port.pre.mk>
-
 pre-everything::
 	@${ECHO_CMD} "ATTENTION:"
 	@${ECHO_CMD} "If you are upgrading from an older version of MT"
@ -171,10 +172,9 @@ do-install:
 	@${ECHO_MSG} "Installing data under ${PREFIX}/${DATADIR}/"
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${DATADIR}
 	@cd ${WRKSRC} && ${CP} -R mt-static ${STAGEDIR}${PREFIX}/${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DB_DIR}

 post-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} STAGE=${STAGEDIR}\
-		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${DB_DIR}
 	@${ECHO_MSG} "*****************************************************************"
 	@${ECHO_CMD} ""
 	@${ECHO_MSG} "You have just installed the movabletype."
--- a/www/MT/distinfo
+++ b/www/MT/distinfo
@ -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
--- a/www/MT/files/MT.conf.in
+++ b/www/MT/files/MT.conf.in
@ -1,23 +1,24 @@
 #
 # Directives to allow use of %%PACKAGENAME%% as a CGI
 #
-<IfModule alias_module>
+<IfModule %%MODULE%%>
 	Alias /MT "%%PREFIX%%/%%DATADIR%%/mt-static"
-	ScriptAlias /MTcgi "%%PREFIX%%/%%CGIDIR%%"
+	Alias /MTcgi "%%PREFIX%%/%%CGIDIR%%"
 </IfModule>

 #
 # This is to permit URL access to scripts/files in %%PACKAGENAME%% directory.
 #
 <Directory "%%PREFIX%%/%%CGIDIR%%">
-	Options None
-	Order allow,deny
-	Allow from all
+	Options EcexCGI
+%%APACHE22%%	Order allow,deny
+%%APACHE22%%	Allow from all
 %%APACHE24%%	Require all granted
 %%APACHE24%%	SetHandler cgi-script
 </Directory>
 <Directory "%%PREFIX%%/%%DATADIR%%/mt-static">
 	Options None
-	Order allow,deny
-	Allow from all
+%%APACHE22%%	Order allow,deny
+%%APACHE22%%	Allow from all
+%%APACHE24%%	Require all granted
 </Directory>
--- a/www/MT/files/pkg-install.in
+++ b/www/MT/files/pkg-install.in
@ -1,24 +0,0 @@
-#!/bin/sh
-case $2 in
-	PRE-INSTALL)
-		;;
-	POST-INSTALL)
-
-		if [ "X"$3 != "X" ]; then
-			mkdir -p -m 755 ${STAGE}%%DB_DIR%%
-			chown -R %%WWWOWN%%:%%WWWGRP%% ${STAGE}%%DB_DIR%%
-		fi
-			chown -R %%WWWOWN%%:%%WWWGRP%%\
-				${STAGE}%%PREFIX%%/%%CGIDIR%%\
-				${STAGE}%%PREFIX%%/%%DATADIR%%
-		;;
-	*)
-	;;
-esac
-mkdir -p -m 755 ${STAGE}%%PREFIX%%/%%CGIDIR%%/import\
-		${STAGE}%%PREFIX%%/%%CGIDIR%%/alt-tmpl\
-		${STAGE}%%PREFIX%%/%%CGIDIR%%/extlib/MT/L10N\
-		${STAGE}%%PREFIX%%/%%CGIDIR%%/php/extlib/smarty/demo/templates_c\
-		${STAGE}%%PREFIX%%/%%CGIDIR%%/php/plugins\
-		${STAGE}%%PREFIX%%/%%DATADIR%%/mt-static/support
-exit
--- a/www/MT/pkg-plist
+++ b/www/MT/pkg-plist
@ -1,3 +1,5 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%CGIDIR%%/tools/rebuild-benchmark
 %%CGIDIR%%/tools/mt-tmpl-preview
 %%CGIDIR%%/tools/remove-object
@ -3571,7 +3573,12 @@
@dirrm %%CGIDIR%%/php/lib
@dirrm %%CGIDIR%%/php/tmpl
@dirrm %%CGIDIR%%/php
+%%MYSQL%%@owner mysql
+%%MYSQL%%@group mysql
@dirrmtry %%DB_DIR%%
+%%MYSQL%%@dirrmtry /var/db/mysql
+%%MYSQL%%@owner %%WWWOWN%%
+%%MYSQL%%@group %%WWWGRP%%
@dirrm %%CGIDIR%%
@dirrm %%DATADIR%%/mt-static/js/flash
@dirrm %%DATADIR%%/mt-static/js/editor/editor
@ -3816,6 +3823,8 @@
@dirrm %%DATADIR%%/mt-static
@dirrmtry %%DATADIR%%
@dirrmtry www/cgi-bin
+@owner
+@group
 %%APACHE%%%%APACHEETCDIR%%/Includes/MT.conf
 %%APACHE%%@dirrmtry %%APACHEETCDIR%%/Includes
 %%APACHE%%@dirrmtry %%APACHEETCDIR%%