Attachment 145144 Details for Bug 188684 – MT.patch

[patch] MT.patch

MT.patch (text/plain), 7.08 KB, created by takefu on 2014-07-30 07:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2014-07-30 07:50:01 UTC

Size: 7.08 KB

patch

obsolete

>diff -ruN /usr/ports/www/MT/Makefile ./Makefile
>--- /usr/ports/www/MT/Makefile	2014-07-04 18:40:59.000000000 +0900
>+++ ./Makefile	2014-07-29 15:42:31.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/www/MT/Makefile 360588 2014-07-04 09:40:59Z tijl $
> 
> 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 @@
> 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 @@
> 
> 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 @@
> 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 @@
> .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}
>+.endif
>+
> .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 "
>+
>+.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 @@
> 		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 @@
> 	@${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."
>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
>diff -ruN /usr/ports/www/MT/files/MT.conf.in ./files/MT.conf.in
>--- /usr/ports/www/MT/files/MT.conf.in	2014-01-24 09:14:07.000000000 +0900
>+++ ./files/MT.conf.in	2014-07-29 15:53:07.000000000 +0900
>@@ -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>
>diff -ruN /usr/ports/www/MT/files/pkg-install.in ./files/pkg-install.in
>--- /usr/ports/www/MT/files/pkg-install.in	2013-12-30 06:48:08.000000000 +0900
>+++ ./files/pkg-install.in	1970-01-01 09:00:00.000000000 +0900
>@@ -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
>diff -ruN /usr/ports/www/MT/pkg-plist ./pkg-plist
>--- /usr/ports/www/MT/pkg-plist	2013-12-30 06:48:08.000000000 +0900
>+++ ./pkg-plist	2014-07-29 13:07:50.000000000 +0900
>@@ -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%%

Actions: View | Diff

Attachments on bug 188684: 141786 | 141787 | 141788 | 145058 | 145059 | 145144 | 145145