- Update from 5.2.6 to 5.2.7

- Add stage support

while here
- Convert some "if's" to options helpers

PR:		ports/185331
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

4 files changed, 40 insertions, 44 deletions

diff --git a/editors/mp/Makefile b/editors/mp/Makefile
index f9cd2d691fe4..060b2e2204d5 100644
--- a/editors/mp/Makefile
+++ b/editors/mp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mp
-PORTVERSION=	5.2.6
+PORTVERSION=	5.2.7
 CATEGORIES=	editors
 MASTER_SITES=	http://triptico.com/download/mp/
 
@@ -15,26 +15,26 @@ OPTIONS_DEFINE=	NLS PCRE DOCS
 OPTIONS_RADIO=	GUI
 OPTIONS_RADIO_GUI=	GTK3 GTK2 QT4
 OPTIONS_DEFAULT=	PCRE
+OPTIONS_SUB=	yes
 
 USES=		iconv ncurses
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config.sh
 CONFIGURE_ARGS=	--prefix=${PREFIX} --without-win32 --without-kde4
 
-MAN1=		mp-5.1
-
 DATADIR=	${PREFIX}/share/mp-5
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+NLS_USES=	gettext
+NLS_CONFIGURE_WITH=	gettext
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--without-gettext
-PLIST_SUB+=	NLS="@comment "
-.endif
+PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_CONFIGURE_WITH=	pcre
+
+QT4_USE=		QT4=corelib,gui,moc_build
+QT4_CONFIGURE_ENV=	CPP="${CXX}" CCLINK="${CXX}"
+QT4_CONFIGURE_WITH=	qt4
+
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK3}
 USE_GNOME+=	gtk30
@@ -52,16 +52,7 @@ CONFOPT_GTK=	0
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
-USE_QT4=	corelib gui moc_build
 QT_NONSTANDARD=	yes
-CONFIGURE_ENV+=	CPP="${CXX}" CCLINK="${CXX}"
-.else
-CONFIGURE_ARGS+=	--without-qt4
-.endif
-
-.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+=	--with-pcre
 .endif
 
 .include <bsd.port.pre.mk>
@@ -71,39 +62,43 @@ BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|<ncursesw/|<| ; \
+	@${REINPLACE_CMD} -e \
+		's|<ncursesw/|<| ; \
 		 s|-I/usr/local/include|| ; \
 		 s|-L/usr/local/lib|| ; \
 		 s|-lX11|| ; \
 		 /gtk+/s|3.0|${CONFOPT_GTK}.0| ; \
 		 /OK/s|3.0|${CONFOPT_GTK}.0| ; \
 		 /CONFOPT_GTK/s|3|${CONFOPT_GTK}|' ${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|<ncursesw/|<|g' ${WRKSRC}/mpv_curses.c
+	@${REINPLACE_CMD} -e \
+		's|%%LOCALBASE%%|${LOCALBASE}| ; \
+		 s|%%ICONV_PREFIX%%|${ICONV_PREFIX}| ; \
+		 s|%%ICONV_LIB%%|${ICONV_LIB}|g' ${WRKSRC}/mpdm/config.sh
 .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}
+	@${REINPLACE_CMD} -e \
+		's|<malloc\.h>|<stdlib.h>|g' ${WRKSRC}/${i}
 .endfor
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mp-5 ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/mpsl/mpsl2 ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mp-5.1 ${MANPREFIX}/man/man1
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/mp_*.mpsl ${DATADIR}
-	@${MKDIR} ${DATADIR}/lang
-	${INSTALL_DATA} ${WRKSRC}/lang/*.mpsl ${DATADIR}/lang
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} mp-5 ${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}/mpsl && ${INSTALL_PROGRAM} mpsl ${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} mp-5.1 ${STAGEDIR}${MANPREFIX}/man/man1)
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} mp_*.mpsl ${STAGEDIR}${DATADIR})
+	@${MKDIR} ${STAGEDIR}${DATADIR}/lang
+	(cd ${WRKSRC}/lang && ${INSTALL_DATA} *.mpsl ${STAGEDIR}${DATADIR}/lang)
 .if ${PORT_OPTIONS:MNLS}
 .for lang in de es it nl ru sv
-	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
-	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
-		${PREFIX}/share/locale/${lang}/LC_MESSAGES/minimum-profit.mo
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES
+	(cd ${WRKSRC}/po && ${INSTALL_DATA} ${lang}.mo \
+		${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/minimum-profit.mo)
 .endfor
 .endif
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in AUTHORS README RELEASE_NOTES mp_templates.sample doc/*.*
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR})
 .endfor
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/editors/mp/distinfo b/editors/mp/distinfo
index b20d0c012932..f7e981f1d1cc 100644
--- a/editors/mp/distinfo
+++ b/editors/mp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mp-5.2.6.tar.gz) = e516a02ae2539bb72c3fcf64a7cbc9e1f3108fbb526500d22da63a11afcd3d59
-SIZE (mp-5.2.6.tar.gz) = 546674
+SHA256 (mp-5.2.7.tar.gz) = 3721eaaf5c1fa327ea597d599cab14b728b73c62b56df14a42eca0c7908218f3
+SIZE (mp-5.2.7.tar.gz) = 552142
diff --git a/editors/mp/files/patch-mpdn__config.sh b/editors/mp/files/patch-mpdn__config.sh
index d5daa8cea74e..792476c57f87 100644
--- a/editors/mp/files/patch-mpdn__config.sh
+++ b/editors/mp/files/patch-mpdn__config.sh
@@ -23,8 +23,8 @@
  	else
  		# try now with -liconv
 -		TMP_LDFLAGS="-liconv"
-+		TMP_CFLAGS="-I%%LOCALBASE%%/include"
-+		TMP_LDFLAGS="-L%%LOCALBASE%%/lib -liconv"
++		TMP_CFLAGS="-I%%ICONV_PREFIX%%/include"
++		TMP_LDFLAGS="-L%%ICONV_PREFIX%%/lib %%ICONV_LIB%%"
  
 -		$CC .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log
 +		$CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log
diff --git a/editors/mp/pkg-plist b/editors/mp/pkg-plist
index 4f5c602592fc..ffb1003105a9 100644
--- a/editors/mp/pkg-plist
+++ b/editors/mp/pkg-plist
@@ -1,5 +1,6 @@
 bin/mp-5
-bin/mpsl2
+bin/mpsl
+man/man1/mp-5.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES