Date: Tue, 31 Dec 2013 05:47:01 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185331: editors/mp: Update to version 5.2.7 Message-ID: <20131231054701.d63eb54f7922e18c1cd39182@yahoo.com> Resent-Message-ID: <201312302110.rBULA7mf098775@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185331 >Category: ports >Synopsis: editors/mp: Update to version 5.2.7 >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: Mon Dec 30 21:10:06 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p4 i386 >Organization: >Environment: >Description: - Update to version 5.2.7 >How-To-Repeat: >Fix: diff -urN /usr/ports/editors/mp/Makefile editors/mp/Makefile --- /usr/ports/editors/mp/Makefile 2013-11-06 22:06:06.000000000 +0900 +++ editors/mp/Makefile 2013-12-31 00:00:00.000000000 +0900 @@ -2,7 +2,7 @@ # $FreeBSD: head/editors/mp/Makefile 327720 2013-09-20 16:36:23Z bapt $ PORTNAME= mp -PORTVERSION= 5.2.6 +PORTVERSION= 5.2.7 CATEGORIES= editors MASTER_SITES= http://triptico.com/download/mp/ @@ -15,25 +15,21 @@ 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> .if ${PORT_OPTIONS:MNLS} USES+= gettext -PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+= --without-gettext -PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MGTK3} @@ -60,7 +56,7 @@ .endif .if ${PORT_OPTIONS:MPCRE} -LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+= --with-pcre .endif @@ -71,39 +67,43 @@ .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 -urN /usr/ports/editors/mp/distinfo editors/mp/distinfo --- /usr/ports/editors/mp/distinfo 2013-11-06 22:06:06.000000000 +0900 +++ editors/mp/distinfo 2013-12-31 00:00:00.000000000 +0900 @@ -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 -urN /usr/ports/editors/mp/files/patch-mpdn__config.sh editors/mp/files/patch-mpdn__config.sh --- /usr/ports/editors/mp/files/patch-mpdn__config.sh 2013-11-06 22:06:06.000000000 +0900 +++ editors/mp/files/patch-mpdn__config.sh 2013-12-31 00:00:00.000000000 +0900 @@ -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 -urN /usr/ports/editors/mp/pkg-plist editors/mp/pkg-plist --- /usr/ports/editors/mp/pkg-plist 2013-11-06 22:06:06.000000000 +0900 +++ editors/mp/pkg-plist 2013-12-31 00:00:00.000000000 +0900 @@ -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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131231054701.d63eb54f7922e18c1cd39182>