View | Details | Raw Unified | Return to bug 188684 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-24 / +24 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/www/MT/Makefile 360588 2014-07-04 09:40:59Z tijl $
2
# $FreeBSD: head/www/MT/Makefile 360588 2014-07-04 09:40:59Z tijl $
3
3
4
PORTNAME=	MT
4
PORTNAME=	MT
5
PORTVERSION=	5.2.9
5
PORTVERSION=	5.2.10
6
PORTREVISION=	1
7
PORTEPOCH=	1
6
PORTEPOCH=	1
8
CATEGORIES?=	www
7
CATEGORIES?=	www
9
MASTER_SITES?=	http://www.movabletype.org/downloads/stable/\
8
MASTER_SITES?=	http://www.movabletype.org/downloads/stable/\
Lines 14-25 Link Here
14
MAINTAINER?=	takefu@airport.fm
13
MAINTAINER?=	takefu@airport.fm
15
COMMENT?=	Web-based personal publishing system for weblogs
14
COMMENT?=	Web-based personal publishing system for weblogs
16
15
16
LICENSE=	GPLv2
17
17
CONFLICTS?=	de-MT-[2-5].* fr-MT-[2-5].* ja-MT-[2-5].* ru-MT-[2-5].*
18
CONFLICTS?=	de-MT-[2-5].* fr-MT-[2-5].* ja-MT-[2-5].* ru-MT-[2-5].*
18
19
19
RUN_DEPENDS+=	p5-DBI>=1.21:${PORTSDIR}/databases/p5-DBI \
20
RUN_DEPENDS+=	p5-DBI>=1.21:${PORTSDIR}/databases/p5-DBI \
20
		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size
21
		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size
21
22
22
NO_OPTIONS_SORT=	yes
23
NO_OPTIONS_SORT=	yes
24
OPTIONS_SUB=		yes
23
OPTIONS_DEFINE=		APACHE SSL TLS PSGI\
25
OPTIONS_DEFINE=		APACHE SSL TLS PSGI\
24
			OPTIONAL_MODULES ADDITIONAL_MODULES
26
			OPTIONAL_MODULES ADDITIONAL_MODULES
25
OPTIONS_DEFAULT=	MYSQL OPTIONAL_MODULES
27
OPTIONS_DEFAULT=	MYSQL OPTIONAL_MODULES
Lines 37-50 Link Here
37
39
38
DATADIR=	www/data
40
DATADIR=	www/data
39
CGIDIR=		www/cgi-bin/mt
41
CGIDIR=		www/cgi-bin/mt
40
PLIST_SUB+=	DATADIR=${DATADIR} CGIDIR=${CGIDIR} DB_DIR=${DB_DIR}
41
SUB_FILES+=	pkg-install
42
SUB_LIST+=	DATADIR=${DATADIR} CGIDIR=${CGIDIR} DB_DIR=${DB_DIR}\
43
		PACKAGENAME=${PKGNAMEPREFIX}${PORTNAME}\
44
		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} STAGEDIR=${STAGEDIR}
45
42
46
USES=		perl5
43
SUB_LIST+=	CGIDIR=${CGIDIR}\
44
		PACKAGENAME=${PKGNAMEPREFIX}${PORTNAME}
45
PLIST_SUB+=	DATADIR=${DATADIR} CGIDIR=${CGIDIR} DB_DIR=${DB_DIR}\
46
		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
47
48
USES=		perl5 shebangfix
47
USE_PERL5=	run
49
USE_PERL5=	run
50
SHEBANG_FILES=	*.cgi
48
NO_BUILD=	yes
51
NO_BUILD=	yes
49
MT_DOCS_URL?=	http://www.movabletype.org/documentation/
52
MT_DOCS_URL?=	http://www.movabletype.org/documentation/
50
MT_UPGRADE_URL?=http://www.movabletype.org/documentation/installation/upgrade-movable-type.html
53
MT_UPGRADE_URL?=http://www.movabletype.org/documentation/installation/upgrade-movable-type.html
Lines 60-67 Link Here
60
RUN_DEPENDS+=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser\
63
RUN_DEPENDS+=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser\
61
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww\
64
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww\
62
		p5-SOAP-Lite>=0.5:${PORTSDIR}/net/p5-SOAP-Lite\
65
		p5-SOAP-Lite>=0.5:${PORTSDIR}/net/p5-SOAP-Lite\
63
		convert:${PORTSDIR}/graphics/ImageMagick\
66
		convert:${PORTSDIR}/graphics/ImageMagick-nox11\
64
		p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
67
		p5-GD>=0:${PORTSDIR}/graphics/p5-GD\
65
		p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \
68
		p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \
66
		p5-Crypt-DSA>=0:${PORTSDIR}/security/p5-Crypt-DSA\
69
		p5-Crypt-DSA>=0:${PORTSDIR}/security/p5-Crypt-DSA\
67
		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64\
70
		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64\
Lines 118-138 Link Here
118
.if ${PORT_OPTIONS:MODBC}
121
.if ${PORT_OPTIONS:MODBC}
119
RUN_DEPENDS+=	p5-DBD-ODBC>=1.13:${PORTSDIR}/databases/p5-DBD-ODBC
122
RUN_DEPENDS+=	p5-DBD-ODBC>=1.13:${PORTSDIR}/databases/p5-DBD-ODBC
120
.endif
123
.endif
124
121
.if ${PORT_OPTIONS:MAPACHE}
125
.if ${PORT_OPTIONS:MAPACHE}
122
USE_APACHE_RUN=	22+
126
USE_APACHE_BUILD=	22+
123
SUB_FILES+=	MT.conf
127
SUB_FILES+=	MT.conf
124
SUB_LIST+=	APACHEETCDIR=${PREFIX}/${APACHEETCDIR}
128
SUB_LIST+=	APACHEETCDIR=${PREFIX}/${APACHEETCDIR}
129
.endif
130
125
.include <bsd.port.pre.mk>
131
.include <bsd.port.pre.mk>
126
. if ${APACHE_VERSION} == 24
132
127
PLIST_SUB+=	APACHE="" APACHE24=""
133
.if ${PORT_OPTIONS:MAPACHE} && (${APACHE_VERSION} <= 22)
128
SUB_LIST+=	APACHE24=""
134
SUB_LIST+=	APACHE22="" APACHE24="\#" MODULE=mod_alias.c
129
. else
135
.elif ${PORT_OPTIONS:MAPACHE} && (${APACHE_VERSION} >= 24)
130
PLIST_SUB+=	APACHE="" APACHE24="\#"
136
SUB_LIST+=	APACHE22="\#" APACHE24="" MODULE=alias_module
131
SUB_LIST+=	APACHE24="\#"
132
. endif
133
.else
134
PLIST_SUB+=	APACHE="@comment "
135
.endif
137
.endif
138
136
.if ${PORT_OPTIONS:MPSGI}
139
.if ${PORT_OPTIONS:MPSGI}
137
RUN_DEPENDS+=	p5-CGI-PSGI>0:${PORTSDIR}/www/p5-CGI-PSGI\
140
RUN_DEPENDS+=	p5-CGI-PSGI>0:${PORTSDIR}/www/p5-CGI-PSGI\
138
		p5-CGI-Emulate-PSGI>=0.06:${PORTSDIR}/www/p5-CGI-Emulate-PSGI\
141
		p5-CGI-Emulate-PSGI>=0.06:${PORTSDIR}/www/p5-CGI-Emulate-PSGI\
Lines 140-147 Link Here
140
		p5-SOAP-Transport-HTTP-Plack>=0:${PORTSDIR}/www/p5-SOAP-Transport-HTTP-Plack
143
		p5-SOAP-Transport-HTTP-Plack>=0:${PORTSDIR}/www/p5-SOAP-Transport-HTTP-Plack
141
.endif
144
.endif
142
145
143
.include <bsd.port.pre.mk>
144
145
pre-everything::
146
pre-everything::
146
	@${ECHO_CMD} "ATTENTION:"
147
	@${ECHO_CMD} "ATTENTION:"
147
	@${ECHO_CMD} "If you are upgrading from an older version of MT"
148
	@${ECHO_CMD} "If you are upgrading from an older version of MT"
Lines 171-180 Link Here
171
	@${ECHO_MSG} "Installing data under ${PREFIX}/${DATADIR}/"
172
	@${ECHO_MSG} "Installing data under ${PREFIX}/${DATADIR}/"
172
	@${MKDIR} ${STAGEDIR}${PREFIX}/${DATADIR}
173
	@${MKDIR} ${STAGEDIR}${PREFIX}/${DATADIR}
173
	@cd ${WRKSRC} && ${CP} -R mt-static ${STAGEDIR}${PREFIX}/${DATADIR}
174
	@cd ${WRKSRC} && ${CP} -R mt-static ${STAGEDIR}${PREFIX}/${DATADIR}
175
	@${MKDIR} ${STAGEDIR}${DB_DIR}
174
176
175
post-install:
177
post-install:
176
	@${SETENV} PKG_PREFIX=${PREFIX} STAGE=${STAGEDIR}\
177
		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${DB_DIR}
178
	@${ECHO_MSG} "*****************************************************************"
178
	@${ECHO_MSG} "*****************************************************************"
179
	@${ECHO_CMD} ""
179
	@${ECHO_CMD} ""
180
	@${ECHO_MSG} "You have just installed the movabletype."
180
	@${ECHO_MSG} "You have just installed the movabletype."
(-)./distinfo (-2 / +2 lines)
Lines 1-4 Link Here
1
SHA256 (MTOS-5.2.9.tar.gz) = 14d0dfeec17c28a77da101d9d69e17e45cb4f1fae322ac7529fb2378f5d76e52
1
SHA256 (MTOS-5.2.10.tar.gz) = 0ddd685e8ed131af51102713260b7b10bb9dcbd7f31de426d23f785c51e19815
2
SIZE (MTOS-5.2.9.tar.gz) = 7965907
2
SIZE (MTOS-5.2.10.tar.gz) = 7965847
3
SHA256 (MTOS-5.2.9-ru.tar.gz) = cd088a6f330292ed37efa8b3f0c2d4d13b22e54f274bf0237932ad6b44533254
3
SHA256 (MTOS-5.2.9-ru.tar.gz) = cd088a6f330292ed37efa8b3f0c2d4d13b22e54f274bf0237932ad6b44533254
4
SIZE (MTOS-5.2.9-ru.tar.gz) = 8095257
4
SIZE (MTOS-5.2.9-ru.tar.gz) = 8095257
(-)./files/MT.conf.in (-7 / +8 lines)
Lines 1-23 Link Here
1
#
1
#
2
# Directives to allow use of %%PACKAGENAME%% as a CGI
2
# Directives to allow use of %%PACKAGENAME%% as a CGI
3
#
3
#
4
<IfModule alias_module>
4
<IfModule %%MODULE%%>
5
	Alias /MT "%%PREFIX%%/%%DATADIR%%/mt-static"
5
	Alias /MT "%%PREFIX%%/%%DATADIR%%/mt-static"
6
	ScriptAlias /MTcgi "%%PREFIX%%/%%CGIDIR%%"
6
	Alias /MTcgi "%%PREFIX%%/%%CGIDIR%%"
7
</IfModule>
7
</IfModule>
8
8
9
#
9
#
10
# This is to permit URL access to scripts/files in %%PACKAGENAME%% directory.
10
# This is to permit URL access to scripts/files in %%PACKAGENAME%% directory.
11
#
11
#
12
<Directory "%%PREFIX%%/%%CGIDIR%%">
12
<Directory "%%PREFIX%%/%%CGIDIR%%">
13
	Options None
13
	Options EcexCGI
14
	Order allow,deny
14
%%APACHE22%%	Order allow,deny
15
	Allow from all
15
%%APACHE22%%	Allow from all
16
%%APACHE24%%	Require all granted
16
%%APACHE24%%	Require all granted
17
%%APACHE24%%	SetHandler cgi-script
17
%%APACHE24%%	SetHandler cgi-script
18
</Directory>
18
</Directory>
19
<Directory "%%PREFIX%%/%%DATADIR%%/mt-static">
19
<Directory "%%PREFIX%%/%%DATADIR%%/mt-static">
20
	Options None
20
	Options None
21
	Order allow,deny
21
%%APACHE22%%	Order allow,deny
22
	Allow from all
22
%%APACHE22%%	Allow from all
23
%%APACHE24%%	Require all granted
23
</Directory>
24
</Directory>
(-)./files/pkg-install.in (-24 lines)
Lines 1-24 Link Here
1
#!/bin/sh
2
case $2 in
3
	PRE-INSTALL)
4
		;;
5
	POST-INSTALL)
6
7
		if [ "X"$3 != "X" ]; then
8
			mkdir -p -m 755 ${STAGE}%%DB_DIR%%
9
			chown -R %%WWWOWN%%:%%WWWGRP%% ${STAGE}%%DB_DIR%%
10
		fi
11
			chown -R %%WWWOWN%%:%%WWWGRP%%\
12
				${STAGE}%%PREFIX%%/%%CGIDIR%%\
13
				${STAGE}%%PREFIX%%/%%DATADIR%%
14
		;;
15
	*)
16
	;;
17
esac
18
mkdir -p -m 755 ${STAGE}%%PREFIX%%/%%CGIDIR%%/import\
19
		${STAGE}%%PREFIX%%/%%CGIDIR%%/alt-tmpl\
20
		${STAGE}%%PREFIX%%/%%CGIDIR%%/extlib/MT/L10N\
21
		${STAGE}%%PREFIX%%/%%CGIDIR%%/php/extlib/smarty/demo/templates_c\
22
		${STAGE}%%PREFIX%%/%%CGIDIR%%/php/plugins\
23
		${STAGE}%%PREFIX%%/%%DATADIR%%/mt-static/support
24
exit
(-)./pkg-plist (+9 lines)
Lines 1-3 Link Here
1
@owner %%WWWOWN%%
2
@group %%WWWGRP%%
1
%%CGIDIR%%/tools/rebuild-benchmark
3
%%CGIDIR%%/tools/rebuild-benchmark
2
%%CGIDIR%%/tools/mt-tmpl-preview
4
%%CGIDIR%%/tools/mt-tmpl-preview
3
%%CGIDIR%%/tools/remove-object
5
%%CGIDIR%%/tools/remove-object
Lines 3571-3577 Link Here
3571
@dirrm %%CGIDIR%%/php/lib
3573
@dirrm %%CGIDIR%%/php/lib
3572
@dirrm %%CGIDIR%%/php/tmpl
3574
@dirrm %%CGIDIR%%/php/tmpl
3573
@dirrm %%CGIDIR%%/php
3575
@dirrm %%CGIDIR%%/php
3576
%%MYSQL%%@owner mysql
3577
%%MYSQL%%@group mysql
3574
@dirrmtry %%DB_DIR%%
3578
@dirrmtry %%DB_DIR%%
3579
%%MYSQL%%@dirrmtry /var/db/mysql
3580
%%MYSQL%%@owner %%WWWOWN%%
3581
%%MYSQL%%@group %%WWWGRP%%
3575
@dirrm %%CGIDIR%%
3582
@dirrm %%CGIDIR%%
3576
@dirrm %%DATADIR%%/mt-static/js/flash
3583
@dirrm %%DATADIR%%/mt-static/js/flash
3577
@dirrm %%DATADIR%%/mt-static/js/editor/editor
3584
@dirrm %%DATADIR%%/mt-static/js/editor/editor
Lines 3816-3821 Link Here
3816
@dirrm %%DATADIR%%/mt-static
3823
@dirrm %%DATADIR%%/mt-static
3817
@dirrmtry %%DATADIR%%
3824
@dirrmtry %%DATADIR%%
3818
@dirrmtry www/cgi-bin
3825
@dirrmtry www/cgi-bin
3826
@owner
3827
@group
3819
%%APACHE%%%%APACHEETCDIR%%/Includes/MT.conf
3828
%%APACHE%%%%APACHEETCDIR%%/Includes/MT.conf
3820
%%APACHE%%@dirrmtry %%APACHEETCDIR%%/Includes
3829
%%APACHE%%@dirrmtry %%APACHEETCDIR%%/Includes
3821
%%APACHE%%@dirrmtry %%APACHEETCDIR%%
3830
%%APACHE%%@dirrmtry %%APACHEETCDIR%%

Return to bug 188684