3 files changed, 26 insertions, 20 deletions

diff --git a/www/MT/Makefile b/www/MT/Makefile
index 9bd293ce7933..4c238537259a 100644
--- a/www/MT/Makefile
+++ b/www/MT/Makefile
@@ -5,24 +5,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=		MT
+PORTNAME=	MT
 PORTVERSION=	2.661
-PORTREVISION=	2
-CATEGORIES=		www
+PORTREVISION=	3
+CATEGORIES=	www
+MASTER_SITES=	http://www.movabletype.org/downloads/
 .if defined(WITH_OLD_DISTFILE)
-DISTNAME=		${PORTNAME}-${PORTVERSION}-full-lib
+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
+MAINTAINER=	arved@FreeBSD.org
+COMMENT=	A web-based personal publishing system for weblogs
 
 RUN_DEPENDS=	${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
-				${SITE_PERL}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size \
-				${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
+		${SITE_PERL}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size \
+		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
 
 .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
 
@@ -30,33 +32,33 @@ DATADIR=		www/data/mt
 CGIDIR=			www/cgi-bin/mt
 
 .if defined(WITH_MYSQL)
-DB_DIR?=			/var/db/mysql/blog
+DB_DIR?=		/var/db/mysql/blog
 USE_MYSQL=		yes
 .elif defined(WITH_POSTGRES)
-DB_DIR?=			${PREFIX}/pgsql/data/blog
+DB_DIR?=		${PREFIX}/pgsql/data/blog
 # Or somewhere defined in $PGDATA
 
 RUN_DEPENDS+=	postgres:${PORTSDIR}/databases/postgresql7
 .elif defined(WITH_SQLITE)
-DB_DIR?=			${PREFIX}/${CGIDIR}/db
+DB_DIR?=	${PREFIX}/${CGIDIR}/db
 RUN_DEPENDS+=\
 	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite
 .else
-DB_DIR?=			${PREFIX}/${CGIDIR}/db
+DB_DIR?=	${PREFIX}/${CGIDIR}/db
 WITH_DEFAULTDB=	yes
 .endif
 
-PLIST_SUB+=		DATADIR=${DATADIR} CGIDIR=${CGIDIR}
+PLIST_SUB+=	DATADIR=${DATADIR} CGIDIR=${CGIDIR}
 
 USE_PERL5_RUN=	yes
-NO_BUILD=		yes
-RESTRICTED=		License does not permit distribution
+NO_BUILD=	yes
+RESTRICTED=	License does not permit distribution
 
 .if defined(WITH_OLD_DISTFILE)
-PLIST_SUB+=		OLD=""
+PLIST_SUB+=	OLD=""
 .else
-WRKSRC=			${WRKDIR}/MT-${PORTVERSION}-full-lib
-PLIST_SUB+=		OLD="@comment "
+WRKSRC=		${WRKDIR}/MT-${PORTVERSION}-full-lib
+PLIST_SUB+=	OLD="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
@@ -131,6 +133,8 @@ do-install:
 	@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}
diff --git a/www/MT/distinfo b/www/MT/distinfo
index 864662ab0d70..7e227aabaa38 100644
--- a/www/MT/distinfo
+++ b/www/MT/distinfo
@@ -2,3 +2,5 @@ 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
diff --git a/www/MT/pkg-plist b/www/MT/pkg-plist
index a13e736dac36..0aea963021e2 100644
--- a/www/MT/pkg-plist
+++ b/www/MT/pkg-plist
@@ -243,6 +243,7 @@
 %%CGIDIR%%/tmpl/cms/upload_confirm.tmpl
 %%CGIDIR%%/tmpl/cms/view_log.tmpl
 %%CGIDIR%%/tmpl/error.tmpl
+%%CGIDIR%%/plugins/nofollow.pl
 %%OLD%%%%DATADIR%%/LICENSE
 %%OLD%%%%DATADIR%%/LICENSE-COMMERCIAL
 %%DATADIR%%/docs/755.gif
@@ -322,7 +323,6 @@
 %%DATADIR%%/schemas/postgres.dump
 %%DATADIR%%/schemas/sqlite.dump
 %%DATADIR%%/styles.css
-@exec mkdir %D/%%CGIDIR%%/plugins
 @exec chown -R www:www %D/%%CGIDIR%% %D/%%DATADIR%%
 @dirrm %%CGIDIR%%/extlib/Apache/XMLRPC
 @dirrm %%CGIDIR%%/extlib/Apache