ports/162816: Update port: editors/mp to 5.2.1

[KATO Tsuguru]

>Number:         162816
>Category:       ports
>Synopsis:       Update port: editors/mp to 5.2.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 24 18:20:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 5.2.1

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/editors/mp/Makefile editors/mp/Makefile
--- /usr/ports/editors/mp/Makefile	2011-07-03 02:38:35.000000000 +0900
+++ editors/mp/Makefile	2011-11-16 00:11:09.000000000 +0900
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	mp
-PORTVERSION=	5.2.0
+PORTVERSION=	5.2.1
 CATEGORIES=	editors
 MASTER_SITES=	http://triptico.com/download/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A programming text editor
 
+LICENSE=	GPLv2 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 OPTIONS=	NLS	"Native language support"	on \
 		GTK2	"Build with GTK2 support"	off \
 		QT4	"Build with QT4 support"	off \
 		PCRE	"Build with PCRE support"	on
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
-
 WANT_GNOME=	yes
 USE_ICONV=	yes
 HAS_CONFIGURE=	yes
@@ -31,7 +31,7 @@
 
 DATADIR=	${PREFIX}/share/mp-5
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_GTK2) && defined(WITH_QT4)
 IGNORE=	GTK2 and QT4 GUIs are mutually exclusive. Please rerun 'make config' and disable one of these
@@ -56,7 +56,6 @@
 QT_COMPONENTS=	corelib gui moc_build
 QT_NONSTANDARD=	yes
 CONFIGURE_ENV+=	CPP="${CXX}" CCLINK="${CXX}"
-.include "${PORTSDIR}/Mk/bsd.qt.mk"
 .else
 CONFIGURE_ARGS+=	--without-qt4
 .endif
@@ -73,7 +72,9 @@
 		 s|-lX11||g' ${WRKSRC}/config.sh
 	@${REINPLACE_CMD} -e 's|<ncursesw/|<|g' ${WRKSRC}/mpv_curses.c
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/mpdm/config.sh
-	@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${WRKSRC}/mpsl/mpsl_d.c
+.for i in mpdm/mpdm.h mpdm/mpdm_s.c mpsl/mpsl_d.c
+	@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${WRKSRC}/${i}
+.endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mp-5 ${PREFIX}/bin
@@ -97,4 +98,4 @@
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/editors/mp/distinfo editors/mp/distinfo
--- /usr/ports/editors/mp/distinfo	2011-07-03 02:38:35.000000000 +0900
+++ editors/mp/distinfo	2011-11-16 00:05:50.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (mp-5.2.0.tar.gz) = 69cdc69969f70881c6eb1329d2f55a7a6ec63352c65f1a0a60a8bf24006c3ae6
-SIZE (mp-5.2.0.tar.gz) = 510970
+SHA256 (mp-5.2.1.tar.gz) = e91ff7b94427a5c49815f091c67c20f47f63fd473318dbd9dce52a68a6a6f9d4
+SIZE (mp-5.2.1.tar.gz) = 566513
>Release-Note:
>Audit-Trail:
>Unformatted: