Date: Wed, 23 Mar 2011 03:01:54 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/155809: Update port: editors/mp to 5.1.4 Message-ID: <20110323030154.efb088e7.tkato432@yahoo.com> Resent-Message-ID: <201103221820.p2MIK8vO036529@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155809 >Category: ports >Synopsis: Update port: editors/mp to 5.1.4 >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: Tue Mar 22 18:20:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.3-RELEASE-p3 i386 >Organization: >Environment: >Description: - Update to version 5.1.4 >How-To-Repeat: >Fix: diff -urN /usr/ports/editors/mp/Makefile editors/mp/Makefile --- /usr/ports/editors/mp/Makefile 2010-09-25 05:39:00.000000000 +0900 +++ editors/mp/Makefile 2011-03-19 08:44:50.000000000 +0900 @@ -6,64 +6,94 @@ # PORTNAME= mp -PORTVERSION= 3.3.18b -PORTREVISION= 2 +PORTVERSION= 5.1.4 CATEGORIES= editors MASTER_SITES= http://triptico.com/download/ MAINTAINER= ports@FreeBSD.org COMMENT= A programming text editor +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 CONFIGURE_SCRIPT= config.sh -CONFIGURE_ARGS= --prefix=${PREFIX} --without-win32 +CONFIGURE_ARGS= --prefix=${PREFIX} --without-win32 --without-kde4 -OPTIONS= CURSES "Build with ncurses support" on \ - NLS "Native language support" on \ - GTK1 "Build with GTK1 support" off \ - GTK2 "Build with GTK2 support" off \ - PCRE "Build with PCRE support" on +MAN1= mp-5.1 -MAN1= mp.1 +DATADIR= ${PREFIX}/share/mp-5 .include <bsd.port.pre.mk> -.if !defined(WITH_CURSES) -CONFIGURE_ARGS+= --without-curses +.if defined(WITH_GTK2) && defined(WITH_QT4) +IGNORE= GTK2 and QT4 GUIs are mutually exclusive. Please rerun 'make config' and disable one of these .endif -.if defined(WITH_GTK1) || defined(WITH_GTK2) -.include "${PORTSDIR}/Mk/bsd.gnome.mk" -.if defined(WITH_GTK1) && !defined(WITH_GTK2) -USE_GNOME+= gtk12 +.if defined(WITHOUT_NLS) +CONFIGURE_ARGS+= --without-gettext +PLIST_SUB+= NLS="@comment " .else -CONFIGURE_ARGS+= --without-gtk1 +USE_GETTEXT= yes +PLIST_SUB+= NLS="" .endif .if defined(WITH_GTK2) USE_GNOME+= gtk20 .else -CONFIGURE_ARGS+= --without-gtk2 -.endif -.else CONFIGURE_ARGS+= --without-gtk .endif -.if !defined(WITHOUT_NLS) -USE_GETTEXT= yes -PLIST_SUB+= NLS="" +.if defined(WITH_QT4) +USE_QT_VER+= 4 +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-gettext -PLIST_SUB+= NLS="@comment " +CONFIGURE_ARGS+= --without-qt4 .endif -.if defined(WITH_PCRE) +.if !defined(WITHOUT_PCRE) LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -.else -CONFIGURE_ARGS+= --without-pcre +CONFIGURE_ARGS+= --with-pcre .endif -pre-configure: - @${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/makefile.in +post-patch: + @${REINPLACE_CMD} -e 's|<ncursesw/|<|g ; \ + s|-I/usr/local/include||g ; \ + s|-L/usr/local/lib||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 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/mp-5 ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/mpsl/mpsl ${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 +.if !defined(WITHOUT_NLS) +.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 +.endfor +.endif +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for file in AUTHORS README RELEASE_NOTES mp_templates.sample doc/*.* + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.endfor +.endif .include <bsd.port.post.mk> diff -urN /usr/ports/editors/mp/distinfo editors/mp/distinfo --- /usr/ports/editors/mp/distinfo 2011-03-21 02:42:27.000000000 +0900 +++ editors/mp/distinfo 2011-03-19 05:54:23.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (mp-3.3.18b.tar.gz) = dabe00cbe8f0cb18a42c46242659265507b73c6862030dd63a22ed26738f9649 -SIZE (mp-3.3.18b.tar.gz) = 295661 +SHA256 (mp-5.1.4.tar.gz) = 7744ba8ead9e284aa548420e9a1bbfa6fc5cd7248d2fdfb309ded83f3f641d07 +SIZE (mp-5.1.4.tar.gz) = 485831 diff -urN /usr/ports/editors/mp/files/patch-config.sh editors/mp/files/patch-config.sh --- /usr/ports/editors/mp/files/patch-config.sh 2005-11-17 17:05:28.000000000 +0900 +++ editors/mp/files/patch-config.sh 1970-01-01 09:00:00.000000000 +0900 @@ -1,21 +0,0 @@ ---- config.sh.orig Wed Feb 23 21:23:18 2005 -+++ config.sh Thu Jul 21 18:18:59 2005 -@@ -320,14 +320,16 @@ - echo "#define CONFOPT_GETTEXT 1" >> config.h - else - # try now with -lintl -- TMP_LDFLAGS="-lintl" -+ TMP_LDFLAGS="-L/usr/local/lib -lintl" -+ TMP_CFLAGS="-I/usr/local/include" - -- $CC .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log -+ $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log - - if [ $? = 0 ] ; then - echo "OK (libintl needed)" - echo "#define CONFOPT_GETTEXT 1" >> config.h - echo "$TMP_LDFLAGS" >> config.ldflags -+ echo "$TMP_CFLAGS" >> config.cflags - else - echo "No" - WITHOUT_GETTEXT=1 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 1970-01-01 09:00:00.000000000 +0900 +++ editors/mp/files/patch-mpdn__config.sh 2011-03-19 08:42:03.000000000 +0900 @@ -0,0 +1,38 @@ +--- mpdm/config.sh.orig 2009-11-05 17:18:27.000000000 +0900 ++++ mpdm/config.sh 2011-03-19 08:40:21.000000000 +0900 +@@ -309,13 +309,15 @@ + echo "#define CONFOPT_GETTEXT 1" >> config.h + else + # try now with -lintl +- TMP_LDFLAGS="-lintl" ++ TMP_CFLAGS="-I%%LOCALBASE%%/include" ++ TMP_LDFLAGS="-L%%LOCALBASE%%/lib -lintl" + +- $CC .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log ++ $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log + + if [ $? = 0 ] ; then + echo "OK (libintl needed)" + echo "#define CONFOPT_GETTEXT 1" >> config.h ++ echo "$TMP_CFLAGS" >> config.cflags + echo "$TMP_LDFLAGS" >> config.ldflags + else + echo "No" +@@ -342,13 +344,15 @@ + echo "#define CONFOPT_ICONV 1" >> config.h + else + # try now with -liconv +- TMP_LDFLAGS="-liconv" ++ TMP_CFLAGS="-I%%LOCALBASE%%/include -liconv" ++ TMP_LDFLAGS="-L%%LOCALBASE%%/lib -liconv" + +- $CC .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log ++ $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log + + if [ $? = 0 ] ; then + echo "OK (libiconv needed)" + echo "#define CONFOPT_ICONV 1" >> config.h ++ echo "$TMP_CFLAGS" >> config.cflags + echo "$TMP_LDFLAGS" >> config.ldflags + else + echo "No" diff -urN /usr/ports/editors/mp/pkg-plist editors/mp/pkg-plist --- /usr/ports/editors/mp/pkg-plist 2006-11-27 16:07:18.000000000 +0900 +++ editors/mp/pkg-plist 2011-03-19 08:28:05.000000000 +0900 @@ -1,19 +1,65 @@ -bin/mp -%%DOCSDIR%%/AUTHORS -%%DOCSDIR%%/COPYING -%%DOCSDIR%%/Changelog -%%DOCSDIR%%/README -%%DOCSDIR%%/README.IRIX -%%DOCSDIR%%/README.mingw32 -%%DOCSDIR%%/README.solaris -%%DOCSDIR%%/README.zaurus -%%DOCSDIR%%/RELEASE_NOTES -%%DOCSDIR%%/mprc-win32.sample -%%DOCSDIR%%/mprc.sample +bin/mp-5 +bin/mpsl +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES +%%PORTDOCS%%%%DOCSDIR%%/mp_actions.html +%%PORTDOCS%%%%DOCSDIR%%/mp_actions.txt +%%PORTDOCS%%%%DOCSDIR%%/mp_api.html +%%PORTDOCS%%%%DOCSDIR%%/mp_api.txt +%%PORTDOCS%%%%DOCSDIR%%/mp_configuration.html +%%PORTDOCS%%%%DOCSDIR%%/mp_configuration.txt +%%PORTDOCS%%%%DOCSDIR%%/mp_cookbook.html +%%PORTDOCS%%%%DOCSDIR%%/mp_cookbook.txt +%%PORTDOCS%%%%DOCSDIR%%/mp_data_model.html +%%PORTDOCS%%%%DOCSDIR%%/mp_data_model.txt +%%PORTDOCS%%%%DOCSDIR%%/mp_encoding.html +%%PORTDOCS%%%%DOCSDIR%%/mp_encoding.txt +%%PORTDOCS%%%%DOCSDIR%%/mp_function_reference.html +%%PORTDOCS%%%%DOCSDIR%%/mp_function_reference.rhtml +%%PORTDOCS%%%%DOCSDIR%%/mp_index.html +%%PORTDOCS%%%%DOCSDIR%%/mp_index.txt +%%PORTDOCS%%%%DOCSDIR%%/mp_interactive_dialog_boxes.html +%%PORTDOCS%%%%DOCSDIR%%/mp_interactive_dialog_boxes.txt +%%PORTDOCS%%%%DOCSDIR%%/mp_internals.html +%%PORTDOCS%%%%DOCSDIR%%/mp_internals.txt +%%PORTDOCS%%%%DOCSDIR%%/mp_keycodes.html +%%PORTDOCS%%%%DOCSDIR%%/mp_keycodes.txt +%%PORTDOCS%%%%DOCSDIR%%/mp_man.html +%%PORTDOCS%%%%DOCSDIR%%/mp_man.txt +%%PORTDOCS%%%%DOCSDIR%%/mp_templates.sample %%NLS%%share/locale/de/LC_MESSAGES/minimum-profit.mo %%NLS%%share/locale/es/LC_MESSAGES/minimum-profit.mo %%NLS%%share/locale/it/LC_MESSAGES/minimum-profit.mo %%NLS%%share/locale/nl/LC_MESSAGES/minimum-profit.mo -%%NLS%%share/locale/sv/LC_MESSAGES/minimum-profit.mo %%NLS%%share/locale/ru/LC_MESSAGES/minimum-profit.mo -@dirrm %%DOCSDIR%% +%%NLS%%share/locale/sv/LC_MESSAGES/minimum-profit.mo +%%DATADIR%%/lang/de.mpsl +%%DATADIR%%/lang/es.mpsl +%%DATADIR%%/lang/it.mpsl +%%DATADIR%%/lang/nl.mpsl +%%DATADIR%%/lang/ru.mpsl +%%DATADIR%%/lang/sv.mpsl +%%DATADIR%%/mp_build.mpsl +%%DATADIR%%/mp_clipboard.mpsl +%%DATADIR%%/mp_core.mpsl +%%DATADIR%%/mp_crypt.mpsl +%%DATADIR%%/mp_drv.mpsl +%%DATADIR%%/mp_edit.mpsl +%%DATADIR%%/mp_file.mpsl +%%DATADIR%%/mp_keyseq.mpsl +%%DATADIR%%/mp_macro.mpsl +%%DATADIR%%/mp_misc.mpsl +%%DATADIR%%/mp_move.mpsl +%%DATADIR%%/mp_search.mpsl +%%DATADIR%%/mp_session.mpsl +%%DATADIR%%/mp_spell.mpsl +%%DATADIR%%/mp_syntax.mpsl +%%DATADIR%%/mp_tags.mpsl +%%DATADIR%%/mp_templates.mpsl +%%DATADIR%%/mp_toys.mpsl +%%DATADIR%%/mp_tui.mpsl +%%DATADIR%%/mp_writing.mpsl +@dirrm %%DATADIR%%/lang +@dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110323030154.efb088e7.tkato432>