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

Collapse All | Expand All

(-)./Makefile (-109 / +75 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/www/MT/Makefile 378525 2015-02-06 10:41:17Z marino $
2
# $FreeBSD: head/www/MT/Makefile 378525 2015-02-06 10:41:17Z marino $
3
3
4
PORTNAME=	MT
4
PORTNAME=	MT
5
PORTVERSION=	5.2.11
5
PORTVERSION=	5.2.12
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 35-40 Link Here
35
PGSQL_DESC=		PostgreSQL database support[obsolete]
34
PGSQL_DESC=		PostgreSQL database support[obsolete]
36
SQLITE_DESC=		SQLite3 database support[obsolete]
35
SQLITE_DESC=		SQLite3 database support[obsolete]
37
SQLITE2_DESC=		SQLite2 database support[obsolete]
36
SQLITE2_DESC=		SQLite2 database support[obsolete]
37
APACHE_USE=		APACHE_BUILD=22+
38
39
OPTIONAL_MODULES_RUN_DEPENDS=\
40
	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser\
41
	p5-libwww>=0:${PORTSDIR}/www/p5-libwww\
42
	p5-SOAP-Lite>=0.5:${PORTSDIR}/net/p5-SOAP-Lite\
43
	convert:${PORTSDIR}/graphics/ImageMagick-nox11\
44
	p5-GD>=0:${PORTSDIR}/graphics/p5-GD\
45
	p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \
46
	p5-Crypt-DSA>=0:${PORTSDIR}/security/p5-Crypt-DSA\
47
	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64\
48
	p5-XML-Atom>=0:${PORTSDIR}/textproc/p5-XML-Atom\
49
	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip\
50
	p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced\
51
	p5-XML-LibXML>=1.7:${PORTSDIR}/textproc/p5-XML-LibXML
52
ADDITIONAL_MODULES_RUN_DEPENDS=\
53
	p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5\
54
	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1\
55
	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run\
56
	p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail\
57
	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap\
58
	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser\
59
	p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX\
60
	p5-Cache-Memcached>=0:${PORTSDIR}/databases/p5-Cache-Memcached\
61
	p5-Cache>=0:${PORTSDIR}/devel/p5-Cache
62
SSL_RUN_DEPENDS=p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL\
63
		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay\
64
		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL\
65
		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
66
TLS_RUN_DEPENDS=p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL\
67
		p5-Net-SMTP-TLS>=0:${PORTSDIR}/mail/p5-Net-SMTP-TLS
68
MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=2.9005:${PORTSDIR}/databases/p5-DBD-mysql
69
MYSQL_USE=		mysql=server
70
PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=1.32:${PORTSDIR}/databases/p5-DBD-Pg
71
SQLITE_USE=		SQLITE=yes
72
SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
73
SQLITE2_USE=		SQLITE=2
74
SQLITE2_RUN_DEPENDS=	p5-DBD-SQLite2>=0:${PORTSDIR}/databases/p5-DBD-SQLite2
75
ORACLE_RUN_DEPENDS=	p5-DBD-Oracle>=0.19:${PORTSDIR}/databases/p5-DBD-Oracle
76
ODBC_RUN_DEPENDS=	p5-DBD-ODBC>=1.13:${PORTSDIR}/databases/p5-DBD-ODBC
77
PSGI_RUN_DEPENDS=	p5-CGI-PSGI>0:${PORTSDIR}/www/p5-CGI-PSGI\
78
			p5-CGI-Emulate-PSGI>=0.06:${PORTSDIR}/www/p5-CGI-Emulate-PSGI\
79
			p5-Plack>=0:${PORTSDIR}/www/p5-Plack\
80
			p5-SOAP-Transport-HTTP-Plack>=0:${PORTSDIR}/www/p5-SOAP-Transport-HTTP-Plack
38
81
39
.include <bsd.port.options.mk>
82
.include <bsd.port.options.mk>
40
83
Lines 42-50 Link Here
42
CGIDIR=		www/cgi-bin/mt
85
CGIDIR=		www/cgi-bin/mt
43
86
44
SUB_LIST+=	CGIDIR=${CGIDIR}\
87
SUB_LIST+=	CGIDIR=${CGIDIR}\
45
		PACKAGENAME=${PKGNAMEPREFIX}${PORTNAME}
88
		PACKAGENAME=${PKGNAMEPREFIX}${PORTNAME}\
89
		MT_LANG=${MT_LANG:tl}
46
PLIST_SUB+=	DATADIR=${DATADIR} CGIDIR=${CGIDIR} DB_DIR=${DB_DIR}\
90
PLIST_SUB+=	DATADIR=${DATADIR} CGIDIR=${CGIDIR} DB_DIR=${DB_DIR}\
47
		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
91
		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
92
SUB_FILES=	pm.apache pm.default
93
PKGMESSAGE=	${WRKDIR}/pkg-message
48
94
49
USES=		perl5 shebangfix
95
USES=		perl5 shebangfix
50
USE_PERL5=	run
96
USE_PERL5=	run
Lines 58-149 Link Here
58
.if ${MT_LANG} == RU
104
.if ${MT_LANG} == RU
59
PLIST_SUB+=	LANG_RU=""
105
PLIST_SUB+=	LANG_RU=""
60
.else
106
.else
107
MT_LANG=
61
PLIST_SUB+=	LANG_RU="@comment "
108
PLIST_SUB+=	LANG_RU="@comment "
62
.endif
109
.endif
63
110
64
.if ${PORT_OPTIONS:MOPTIONAL_MODULES}
111
.include <bsd.port.options.mk>
65
RUN_DEPENDS+=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser\
112
66
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww\
67
		p5-SOAP-Lite>=0.5:${PORTSDIR}/net/p5-SOAP-Lite\
68
		convert:${PORTSDIR}/graphics/ImageMagick-nox11\
69
		p5-GD>=0:${PORTSDIR}/graphics/p5-GD\
70
		p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \
71
		p5-Crypt-DSA>=0:${PORTSDIR}/security/p5-Crypt-DSA\
72
		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64\
73
		p5-XML-Atom>=0:${PORTSDIR}/textproc/p5-XML-Atom\
74
		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip\
75
		p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced\
76
		p5-XML-LibXML>=1.7:${PORTSDIR}/textproc/p5-XML-LibXML
77
.endif
78
.if ${PORT_OPTIONS:MADDITIONAL_MODULES}
79
RUN_DEPENDS+=	p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5\
80
		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1\
81
		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run\
82
		p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail\
83
		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap\
84
		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser\
85
		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX\
86
		p5-Cache-Memcached>=0:${PORTSDIR}/databases/p5-Cache-Memcached\
87
		p5-Cache>=0:${PORTSDIR}/devel/p5-Cache
88
.endif
89
.if ${PORT_OPTIONS:MSSL} || ${PORT_OPTIONS:MTLS}
90
RUN_DEPENDS+=	p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL
91
. if ${PORT_OPTIONS:MSSL}
92
RUN_DEPENDS+=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay\
93
		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL\
94
		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
95
. endif
96
. if ${PORT_OPTIONS:MTLS}
97
RUN_DEPENDS+=	p5-Net-SMTP-TLS>=0:${PORTSDIR}/mail/p5-Net-SMTP-TLS
98
. endif
99
.endif
100
.if ${PORT_OPTIONS:MMYSQL}
113
.if ${PORT_OPTIONS:MMYSQL}
101
USE_MYSQL=	server
114
DB_DIR?=	/var/db/mysql/WEBLOG_DATABASEDIR
102
DB_DIR?=	${BASEDIR}/var/db/mysql/WEBLOG_DATABASEDIR
103
RUN_DEPENDS+=	p5-DBD-mysql>=2.9005:${PORTSDIR}/databases/p5-DBD-mysql
104
.endif
115
.endif
105
.if ${PORT_OPTIONS:MPGSQL}
116
.if ${PORT_OPTIONS:MPGSQL}
106
USES+=	pgsql
107
WANT_PGSQL=	server
117
WANT_PGSQL=	server
108
RUN_DEPENDS+=	p5-DBD-Pg>=1.32:${PORTSDIR}/databases/p5-DBD-Pg
109
.endif
118
.endif
110
.if empty(PORT_OPTIONS:MPGSQL) && empty(PORT_OPTIONS:MMYSQL)
119
.if empty(PORT_OPTIONS:MPGSQL) && empty(PORT_OPTIONS:MMYSQL)
111
DB_DIR?=	${PREFIX}/${CGIDIR}/db
120
DB_DIR?=	${PREFIX}/${CGIDIR}/db
112
. if ${PORT_OPTIONS:MSQLITE}
113
USE_SQLITE=	yes
114
RUN_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
115
. endif
116
. if ${PORT_OPTIONS:MSQLITE2}
117
USE_SQLITE=	2
118
RUN_DEPENDS+=	p5-DBD-SQLite2>=0:${PORTSDIR}/databases/p5-DBD-SQLite2
119
. endif
120
.endif
121
.if ${PORT_OPTIONS:MORACLE}
122
RUN_DEPENDS+=	p5-DBD-Oracle>=0.19:${PORTSDIR}/databases/p5-DBD-Oracle
123
.endif
124
.if ${PORT_OPTIONS:MODBC}
125
RUN_DEPENDS+=	p5-DBD-ODBC>=1.13:${PORTSDIR}/databases/p5-DBD-ODBC
126
.endif
127
128
.if ${PORT_OPTIONS:MAPACHE}
129
USE_APACHE_BUILD=	22+
130
SUB_FILES+=	MT.conf
131
SUB_LIST+=	APACHEETCDIR=${PREFIX}/${APACHEETCDIR}
132
.endif
133
134
.include <bsd.port.pre.mk>
135
136
.if ${PORT_OPTIONS:MAPACHE} && (${APACHE_VERSION} <= 22)
137
SUB_LIST+=	APACHE22="" APACHE24="\#" MODULE=mod_alias.c
138
.elif ${PORT_OPTIONS:MAPACHE} && (${APACHE_VERSION} >= 24)
139
SUB_LIST+=	APACHE22="\#" APACHE24="" MODULE=alias_module
140
.endif
141
142
.if ${PORT_OPTIONS:MPSGI}
143
RUN_DEPENDS+=	p5-CGI-PSGI>0:${PORTSDIR}/www/p5-CGI-PSGI\
144
		p5-CGI-Emulate-PSGI>=0.06:${PORTSDIR}/www/p5-CGI-Emulate-PSGI\
145
		p5-Plack>=0:${PORTSDIR}/www/p5-Plack\
146
		p5-SOAP-Transport-HTTP-Plack>=0:${PORTSDIR}/www/p5-SOAP-Transport-HTTP-Plack
147
.endif
121
.endif
148
122
149
pre-everything::
123
pre-everything::
Lines 165-204 Link Here
165
.endif
139
.endif
166
140
167
do-install:
141
do-install:
168
	@${FIND} ${WRKSRC}/* -name "*.orig" -delete
142
	${FIND} ${WRKSRC}/ -name "*.orig" -delete
169
	@${ECHO_MSG} "Installing cgi under ${PREFIX}/${CGIDIR}/"
143
	@${ECHO_MSG} "Installing cgi under ${PREFIX}/${CGIDIR}/"
170
	@${MKDIR} ${STAGEDIR}${PREFIX}/${CGIDIR}
144
	@${MKDIR} ${STAGEDIR}${PREFIX}/${CGIDIR}/alt-tmpl \
171
	@cd ${WRKSRC} && ${CP} -R *.cgi mt.psgi mt-config.cgi-original \
145
		${STAGEDIR}${PREFIX}/${CGIDIR}/import \
172
	  alt-tmpl default_templates extlib import lib php plugins \
146
		${STAGEDIR}${PREFIX}/${DATADIR}/
173
	  search_templates themes tmpl tools COPYING index.html readme.html \
174
	  ${STAGEDIR}${PREFIX}/${CGIDIR}
175
	@${ECHO_MSG} "Installing data under ${PREFIX}/${DATADIR}/"
176
	@${MKDIR} ${STAGEDIR}${PREFIX}/${DATADIR}
177
	@cd ${WRKSRC} && ${CP} -R mt-static ${STAGEDIR}${PREFIX}/${DATADIR}
178
	@${MKDIR} ${STAGEDIR}${DB_DIR}
147
	@${MKDIR} ${STAGEDIR}${DB_DIR}
148
.for tree in tools themes default_templates extlib plugins search_templates \
149
	lib tmpl php
150
	(cd ${WRKSRC} && \
151
		${COPYTREE_SHARE} ${tree} ${STAGEDIR}${PREFIX}/${CGIDIR}/)
152
.endfor
153
	(cd ${WRKSRC} && \
154
		${INSTALL_DATA} *.cgi mt-config.cgi-original mt.psgi COPYING \
155
		index.html readme.html ${STAGEDIR}${PREFIX}/${CGIDIR}/)
156
	@${ECHO_MSG} "Installing data under ${PREFIX}/${DATADIR}/"
157
	(cd ${WRKSRC} && \
158
		${COPYTREE_SHARE} mt-static ${STAGEDIR}${PREFIX}/${DATADIR})
179
159
180
post-install:
160
post-stage:
181
	@${ECHO_MSG} "*****************************************************************"
182
	@${ECHO_CMD} ""
183
	@${ECHO_MSG} "You have just installed the movabletype."
184
	@${ECHO_CMD} ""
185
.if ${PORT_OPTIONS:MAPACHE}
161
.if ${PORT_OPTIONS:MAPACHE}
186
	@${ECHO_MSG} "Note that you should restart your Apache web server to ensure that"
162
	# APACHE_VERSION hasn't been evaluated yet, so .if can't be used
187
	@${ECHO_MSG} "the "${PKGNAMEPREFIX}"MT configuration file is loaded."
163
	${REINPLACE_CMD} -e 's|%%APACHE${APACHE_VERSION}%%||' \
188
	@${ECHO_CMD} ""
164
		-e '/^%%APACHE/d' ${WRKDIR}/pm.apache
189
	@${ECHO_MSG} "Then browse to http://localhost/MTcgi/mt.cgi"
165
	${MV} ${WRKDIR}/pm.apache ${WRKDIR}/pkg-message
190
	@${ECHO_CMD} ""
191
	@${ECHO_MSG} "Please add the following to your apache config, and restart."
192
	@${ECHO_CMD} ""
193
	@${CAT} ${WRKDIR}/MT.conf
194
	@${ECHO_CMD} ""
195
	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes
196
	${INSTALL_DATA} ${WRKDIR}/MT.conf \
197
	  ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes/MT.conf
198
.else
166
.else
199
	@${ECHO_CMD} ""
167
	${MV} ${WRKDIR}/pm.default ${WRKDIR}/pkg-message
200
.endif
168
.endif
201
	@${ECHO_MSG} "Please read the documentation: ${MT_DOCS_URL}"
202
	@${ECHO_CMD} ""
203
169
204
.include <bsd.port.post.mk>
170
.include <bsd.port.mk>
(-)./distinfo (-4 / +4 lines)
Lines 1-4 Link Here
1
SHA256 (MTOS-5.2.11.tar.gz) = 561384c0793d0d47b3944ca83985771dc40afbe3111118bc61ba275ead5cc987
1
SHA256 (MTOS-5.2.12.tar.gz) = ee07575399ea42b4b7c05405738bba71e36eb1a5fc8aef37f2a4c8666c7f43a5
2
SIZE (MTOS-5.2.11.tar.gz) = 7957340
2
SIZE (MTOS-5.2.12.tar.gz) = 7957668
3
SHA256 (MTOS-5.2.11-ru.tar.gz) = 8747acb7799dc15bc201d6a2a39cf797c1597bf4520c954d74935d736c8e519a
3
SHA256 (MTOS-5.2.12-ru.tar.gz) = bca96d002aea57dc34a05e0ac8b4ad2bc97a79ad41f5cef4af991d0af54c06a0
4
SIZE (MTOS-5.2.11-ru.tar.gz) = 8095449
4
SIZE (MTOS-5.2.12-ru.tar.gz) = 8097317
(-)./files/MT.conf.in (-24 lines)
Lines 1-24 Link Here
1
#
2
# Directives to allow use of %%PACKAGENAME%% as a CGI
3
#
4
<IfModule %%MODULE%%>
5
	Alias /MT "%%PREFIX%%/%%DATADIR%%/mt-static"
6
	Alias /MTcgi "%%PREFIX%%/%%CGIDIR%%"
7
</IfModule>
8
9
#
10
# This is to permit URL access to scripts/files in %%PACKAGENAME%% directory.
11
#
12
<Directory "%%PREFIX%%/%%CGIDIR%%">
13
	Options ExecCGI
14
%%APACHE22%%	Order allow,deny
15
%%APACHE22%%	Allow from all
16
%%APACHE24%%	Require all granted
17
%%APACHE24%%	SetHandler cgi-script
18
</Directory>
19
<Directory "%%PREFIX%%/%%DATADIR%%/mt-static">
20
	Options None
21
%%APACHE22%%	Order allow,deny
22
%%APACHE22%%	Allow from all
23
%%APACHE24%%	Require all granted
24
</Directory>
(-)./files/pm.apache.in (+37 lines)
Line 0 Link Here
1
**************************************************************************
2
 You have just installed the movabletype.
3
 Please read the documentation: http://www.movabletype.org/documentation/
4
5
 Note that you should restart your Apache web server to ensure that
6
 the %%MT_LANG%%MT configuration file is loaded, and then set
7
 browser to http://localhost/MTcgi/mt.cgi
8
9
 Please add the following to your apache config, and restart:
10
11
#
12
# Directives to allow use of %%PACKAGENAME%% as a CGI
13
#
14
%%APACHE22%%<IfModule mod_alias.c>
15
%%APACHE24%%<IfModule alias_module>
16
	Alias /MT "%%PREFIX%%/%%DATADIR%%/mt-static"
17
	Alias /MTcgi "%%PREFIX%%/%%CGIDIR%%"
18
</IfModule>
19
20
#
21
# This is to permit URL access to scripts/files in %%PACKAGENAME%% directory.
22
#
23
<Directory "%%PREFIX%%/%%CGIDIR%%">
24
	Options ExecCGI
25
%%APACHE22%%	Order allow,deny
26
%%APACHE22%%	Allow from all
27
%%APACHE24%%	Require all granted
28
%%APACHE24%%	SetHandler cgi-script
29
</Directory>
30
<Directory "%%PREFIX%%/%%DATADIR%%/mt-static">
31
	Options None
32
%%APACHE22%%	Order allow,deny
33
%%APACHE22%%	Allow from all
34
%%APACHE24%%	Require all granted
35
</Directory>
36
37
**************************************************************************
(-)./files/pm.default.in (+4 lines)
Line 0 Link Here
1
**************************************************************************
2
 You have just installed the movabletype.
3
 Please read the documentation: http://www.movabletype.org/documentation/
4
**************************************************************************
(-)./pkg-plist (-2 lines)
Lines 3317-3323 Link Here
3317
%%LANG_RU%%%%DATADIR%%/mt-static/styles_ru.css
3317
%%LANG_RU%%%%DATADIR%%/mt-static/styles_ru.css
3318
@owner
3318
@owner
3319
@group
3319
@group
3320
%%APACHE%%%%APACHEETCDIR%%/Includes/MT.conf
3321
@dir %%CGIDIR%%/alt-tmpl
3320
@dir %%CGIDIR%%/alt-tmpl
3322
@dir %%CGIDIR%%/extlib/MT/L10N
3321
@dir %%CGIDIR%%/extlib/MT/L10N
3323
@dir %%CGIDIR%%/import
3322
@dir %%CGIDIR%%/import
Lines 3325-3328 Link Here
3325
@dir %%CGIDIR%%/php/plugins
3324
@dir %%CGIDIR%%/php/plugins
3326
@dir %%DATADIR%%/mt-static/support
3325
@dir %%DATADIR%%/mt-static/support
3327
%%MYSQL%%@dir(mysql,mysql,) %%DB_DIR%%
3326
%%MYSQL%%@dir(mysql,mysql,) %%DB_DIR%%
3328
%%MYSQL%%@dir(mysql,mysql,) /var/db/mysql

Return to bug 197588