Index: head/editors/mp/Makefile =================================================================== --- head/editors/mp/Makefile (revision 399490) +++ head/editors/mp/Makefile (revision 399491) @@ -1,98 +1,109 @@ # Created by: Mark Pulford # $FreeBSD$ PORTNAME= mp -PORTVERSION= 5.2.9 +PORTVERSION= 5.2.10 CATEGORIES= editors MASTER_SITES= http://triptico.com/download/mp/ MAINTAINER= ports@FreeBSD.org COMMENT= Programming text editor LICENSE= GPLv2 # (or later) +LICENSE_FILE= ${WRKSRC}/COPYING USES= iconv ncurses HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config.sh CONFIGURE_ARGS= --prefix=${PREFIX} --without-win32 --without-kde4 DATADIR= ${PREFIX}/share/mp-5 -OPTIONS_DEFINE= NLS PCRE DOCS -OPTIONS_RADIO= GUI -OPTIONS_RADIO_GUI= GTK3 GTK2 QT4 +OPTIONS_DEFINE= DOCS NLS PCRE +OPTIONS_RADIO= GUI +OPTIONS_RADIO_GUI= GTK2 GTK3 QT4 OPTIONS_DEFAULT= PCRE -OPTIONS_SUB= yes +OPTIONS_SUB= yes -NLS_USES= gettext +NLS_USES= gettext NLS_CONFIGURE_WITH= gettext - +GTK2_USE= gnome=gtk20 +GTK3_USE= gnome=gtk30 PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre PCRE_CONFIGURE_WITH= pcre - -QT4_USE= QT4=corelib,gui,moc_build +QT4_USE= qt4=corelib,gui,moc_build QT4_CONFIGURE_ENV= CPP="${CXX}" CCLINK="${CXX}" QT4_CONFIGURE_WITH= qt4 .include -.if ${PORT_OPTIONS:MGTK3} -USE_GNOME+= gtk30 -CONFOPT_GTK= 3 +.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4} +USES+= pkgconfig +PLIST_SUB+= GUI="" +.else +PLIST_SUB+= GUI="@comment " .endif +.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} +DESKTOP_ENTRIES="Minimum Profit" "" "mp-5" "mp" "Develpment;TextEditor;GTK;" "" +.else +CONFIGURE_ARGS+= --without-gtk +CONFOPT_GTK= 0 +.endif + .if ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gtk20 CONFOPT_GTK= 2 .endif -.if empty(PORT_OPTIONS:MGTK3) && empty(PORT_OPTIONS:MGTK2) -CONFIGURE_ARGS+= --without-gtk -CONFOPT_GTK= 0 +.if ${PORT_OPTIONS:MGTK3} +CONFOPT_GTK= 3 .endif .if ${PORT_OPTIONS:MQT4} +DESKTOP_ENTRIES="Minimum Profit" "" "mp-5" "mp" "Development;TextEditor;Qt;" "" QT_NONSTANDARD= yes .endif post-patch: @${REINPLACE_CMD} -e \ 's|||g' ${WRKSRC}/${i} .endfor do-install: (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:MGTK2} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4} + (cd ${WRKSRC} && ${INSTALL_DATA} mp.png ${STAGEDIR}${PREFIX}/share/pixmaps) +.endif .if ${PORT_OPTIONS:MNLS} .for lang in de es it nl ru sv @${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 @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in AUTHORS README RELEASE_NOTES mp_templates.sample doc/*.* (cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR}) .endfor .include Index: head/editors/mp/distinfo =================================================================== --- head/editors/mp/distinfo (revision 399490) +++ head/editors/mp/distinfo (revision 399491) @@ -1,2 +1,2 @@ -SHA256 (mp-5.2.9.tar.gz) = a30403f4b0c07905733168e914d488f48fb449bb95f67a5254d9ca9ecb6b795d -SIZE (mp-5.2.9.tar.gz) = 557502 +SHA256 (mp-5.2.10.tar.gz) = f3ce1831d2cfb42a8540d197a9fdad163ecd17883a57cd798a2f30bfe791ddc1 +SIZE (mp-5.2.10.tar.gz) = 504306 Index: head/editors/mp/files/patch-mpdn__config.sh =================================================================== --- head/editors/mp/files/patch-mpdn__config.sh (revision 399490) +++ head/editors/mp/files/patch-mpdn__config.sh (revision 399491) @@ -1,38 +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 @@ +--- mpdm/config.sh.orig 2015-05-05 07:29:54 UTC ++++ mpdm/config.sh +@@ -370,13 +370,15 @@ else 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 @@ +@@ -403,13 +405,15 @@ else echo "#define CONFOPT_ICONV 1" >> config.h else # try now with -liconv - TMP_LDFLAGS="-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 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" Index: head/editors/mp/pkg-plist =================================================================== --- head/editors/mp/pkg-plist (revision 399490) +++ head/editors/mp/pkg-plist (revision 399491) @@ -1,64 +1,63 @@ bin/mp-5 bin/mpsl man/man1/mp-5.1.gz %%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/ru/LC_MESSAGES/minimum-profit.mo %%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_dir.mpsl %%DATADIR%%/mp_drv.mpsl %%DATADIR%%/mp_edit.mpsl %%DATADIR%%/mp_file.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_vcs.mpsl %%DATADIR%%/mp_writing.mpsl +%%GUI%%share/pixmaps/mp.png