Upgrade to 3.2, since the old version is not available anymore.

Lots of changes since 2.661, e.g.
- the nofollow plugin is now included
- the configuration file has been renamed
- Support for Atom feeds
- a new Junk filter, comment and trackback moderation

www/MT/Makefile

@@ -6,14 +6,8 @@
 #
 
 PORTNAME=	MT
-PORTVERSION=	2.661
-PORTREVISION=	4
+PORTVERSION=	3.2
 CATEGORIES=	www
-MASTER_SITES=	http://www.movabletype.org/downloads/
-.if defined(WITH_OLD_DISTFILE)
-DISTNAME=	${PORTNAME}-${PORTVERSION}-full-lib
-.endif
-DISTFILES=	nofollow.tar.gz ${DISTNAME}.tar.gz
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	A web-based personal publishing system for weblogs
@@ -24,12 +18,13 @@ RUN_DEPENDS=	${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
 
 .if !defined(WITHOUT_OPTIONAL_MODULES)
 RUN_DEPENDS+=	${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
+	${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
 	${SITE_PERL}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick
 .endif
 
-DATADIR=		www/data/mt
-CGIDIR=			www/cgi-bin/mt
+WRKSRC=		${WRKDIR}/MT-${PORTVERSION}-en_US
+DATADIR=	www/data
+CGIDIR=		www/cgi-bin/mt
 
 .if defined(WITH_MYSQL)
 DB_DIR?=		/var/db/mysql/blog
@@ -53,21 +48,14 @@ USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 RESTRICTED=	License does not permit distribution
 
-.if defined(WITH_OLD_DISTFILE)
-PLIST_SUB+=	OLD=""
-.else
-WRKSRC=		${WRKDIR}/MT-${PORTVERSION}-full-lib
-PLIST_SUB+=	OLD="@comment "
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=	\
 : Because of licensing restrictions, you must fetch the source distribution\
-manually. Goto http://www.movabletype.org/ register as if you are going\
-to download 3.x, and then choosing 2.661 from the list after you log on.\
-Download the file into ${DISTDIR}/, and then run make again
+manually.\
+Goto http://www.movabletype.org/ and download the "Personal Free Edition"\
+Download the tar.gz file into ${DISTDIR}/, and then run make again
 ECHO_MSG=${ECHO_CMD}
 .endif
 
@@ -81,16 +69,16 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTo
 .endif
 
 pre-everything::
+	@${ECHO_CMD} "ATTENTION:"
+	@${ECHO_CMD} "If you are upgrading from an older version of MT"
+	@${ECHO_CMD} "please read http://www.sixapart.com/movabletype/docs/${PORTVERSION}/"
+	@${ECHO_CMD} "BEFORE installing this port"
+	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Available switches:"
 	@${ECHO_CMD} "-------------------"
 	@${ECHO_CMD} "DB_DIR"
 	@${ECHO_CMD} "		- Override the default database directory"
 	@${ECHO_CMD} "		  (${DB_DIR})"
-.if !defined(WITH_OLD_DISTFILE)
-	@${ECHO_CMD} "WITH_OLD_DISTFILE"
-	@${ECHO_CMD} "		- Use the pre 3.x distfile, which was available under"
-	@${ECHO_CMD} "		  a less restrictive license"
-.endif
 .if !defined(WITHOUT_OPTIONAL_MODULES)
 	@${ECHO_CMD} "WITHOUT_OPTIONAL_MODULES"
 	@${ECHO_CMD} "		- Don't install optional perl modules, needed for"
@@ -105,35 +93,21 @@ pre-everything::
 	@${ECHO_CMD} "		- Use PostgreSQL instead of Berkeley DB as database backend"
 .endif
 .if !defined(WITH_SQLITE)
-	@${ECHO_CMD} "WITH_POSTGRES"
+	@${ECHO_CMD} "WITH_SQLITE"
 	@${ECHO_CMD} "		- Use SQLite instead of Berkeley DB as database backend"
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${FIND} * -name "*.orig" -delete
-	@${ECHO_MSG} "Installing cgi under ${PREFIX}/${CGIDIR}"
+	@${ECHO_MSG} "Installing cgi under ${PREFIX}/${CGIDIR}/"
 	@${MKDIR} ${PREFIX}/${CGIDIR}
-	@cd ${WRKSRC} && ${CP} -R *.cgi lib extlib plugins search_templates \
-	  tmpl ${PREFIX}/${CGIDIR}
-	@${SED} -e 's#WWW.YOUR-SITE.COM/PATH/TO/MT/#${HOST}/cgi-bin/mt/#g' \
-	  -e 's/# StaticWebPath/StaticWebPath/g' \
-	  -e 's#path/to/static-files#mt#g' \
-	  -e 's/# NoHTMLEntities 1/NoHTMLEntities 1/g' \
-	  ${WRKSRC}/mt.cfg > ${PREFIX}/${CGIDIR}/mt.cfg.dist
-	[ -e ${PREFIX}/${CGIDIR}/mt.cfg ] || ${CP} ${PREFIX}/${CGIDIR}/mt.cfg.dist ${PREFIX}/${CGIDIR}/mt.cfg
-	${SED} -e 's#$$MT_DIR, .schemas.#"${PREFIX}/${DATADIR}/schemas"#' \
-	  ${WRKSRC}/mt-load.cgi > ${PREFIX}/${CGIDIR}/mt-load.cgi
-	@${ECHO_MSG} "Installing data under ${PREFIX}/${DATADIR}"
+	@cd ${WRKSRC} && ${CP} -R *.cgi mt-config.cgi-original \
+	  extlib default_templates  extlib extras import lib php plugins search_templates \
+	  tmpl tools ${PREFIX}/${CGIDIR}
+	@${ECHO_MSG} "Installing data under ${PREFIX}/${DATADIR}/"
 	@${MKDIR} ${PREFIX}/${DATADIR}
-	@cd ${WRKSRC} && ${CP} -R docs images \
-	  index.html schemas styles.css \
+	@cd ${WRKSRC} && ${CP} -R mt-static \
 	  ${PREFIX}/${DATADIR}
-.if defined(WITH_OLD_DISTFILE)
-	@cd ${WRKSRC}; ${INSTALL_DATA} LICENSE LICENSE-COMMERCIAL \
-		${PREFIX}/${DATADIR}
-.endif
-	${MKDIR} ${PREFIX}/${CGIDIR}/plugins
-	${INSTALL_DATA} ${WRKDIR}/nofollow/plugins/nofollow.pl ${PREFIX}/${CGIDIR}/plugins
 .if defined(WITH_DEFAULTDB)
 	@${MKDIR} -m 755 ${DB_DIR}
 	@${CHOWN} -R www:www ${DB_DIR}
@@ -141,6 +115,7 @@ do-install:
 	@${CHOWN} -R www:www ${PREFIX}/${CGIDIR} ${PREFIX}/${DATADIR}
 
 post-install:
-	@${ECHO_MSG} "Please read the documentation about initializing a blog DB in ${DB_DIR}"
+	@${ECHO_CMD} ""
+	@${ECHO_MSG} "Please read the documentation http://www.sixapart.com/movabletype/docs/${PORTVERSION}/"
 
 .include <bsd.port.post.mk>

www/MT/distinfo

@@ -1,6 +1,2 @@
-MD5 (MT-2.661.tar.gz) = 07733e1617d4c8af892665d8b4197ddb
-SIZE (MT-2.661.tar.gz) = 811477
-MD5 (MT-2.661-full-lib.tar.gz) = 9756572c9a7892cdecd12ac70be96a20
-SIZE (MT-2.661-full-lib.tar.gz) = 816641
-MD5 (nofollow.tar.gz) = bff57d4fa3550e062ac2df7e1b3aaf45
-SIZE (nofollow.tar.gz) = 3190
+MD5 (MT-3.2.tar.gz) = 3cdebc0c97fff7b6c1bb830d5d2f8a3e
+SIZE (MT-3.2.tar.gz) = 1377924

www/MT/files/patch-PluginData.pm

@@ -1,11 +0,0 @@
---- lib/MT/PluginData.pm.orig	Sun Nov  7 21:06:34 2004
-+++ lib/MT/PluginData.pm	Sun Nov  7 21:07:27 2004
-@@ -7,7 +7,7 @@
- use strict;
- 
- use Storable qw( freeze thaw );
--
-+$Storable::interwork_56_64bit = 1;
- use MT::Object;
- @MT::PluginData::ISA = qw( MT::Object );
- __PACKAGE__->install_properties ({