Index: head/editors/mp/Makefile =================================================================== --- head/editors/mp/Makefile (revision 521242) +++ head/editors/mp/Makefile (revision 521243) @@ -1,114 +1,113 @@ # Created by: Mark Pulford # $FreeBSD$ PORTNAME= mp -DISTVERSION= 5.31 -PORTREVISION= 1 +DISTVERSION= 5.36 CATEGORIES= editors MASTER_SITES= http://triptico.com/download/mp/ MAINTAINER= jhale@FreeBSD.org COMMENT= Programming text editor -BROKEN= unfetchable - LICENSE= PD LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake iconv HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config.sh CONFIGURE_ARGS= --prefix=${PREFIX} --docdir=${DOCSDIR} \ --without-win32 --without-kde4 --without-qt4 CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" \ ICONV_LIB="${ICONV_LIB}" \ ICONV_PREFIX="${ICONV_PREFIX}" \ NCURSESINC="${NCURSESINC}" \ NCURSESLIB="${NCURSESLIB}" LDFLAGS+= -Wl,--as-needed LLD_UNSAFE= yes MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DOCS NLS PCRE OPTIONS_RADIO= GUI OPTIONS_RADIO_GUI= GTK2 GTK3 QT5 CONSOLE_DESC= ${NCURSES_DESC} OPTIONS_SINGLE= CONSOLE OPTIONS_SINGLE_CONSOLE= ANSI NCURSES OPTIONS_DEFAULT= NCURSES PCRE OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_WITH= gettext PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_CONFIGURE_WITH= pcre ANSI_DESC= ANSI terminal support ANSI_CONFIGURE_WITH= ansi GTK2_USES= gnome pkgconfig GTK2_USE= gnome=cairo,gdkpixbuf2,gtk20 GTK2_CONFIGURE_ON= --with-gtk=2 -GTK2_DESKTOP_ENTRIES= "Minimum Profit" "" "mp" "mp-5" "Utility;TextEditor;GTK;" "" GTK3_USES= gnome pkgconfig GTK3_USE= gnome=cairo,gdkpixbuf2,gtk30 GTK3_CONFIGURE_ON= --with-gtk=3 -GTK3_DESKTOP_ENTRIES= "Minimum Profit" "" "mp" "mp-5" "Utility;TextEditor;GTK;" "" NCURSES_USES= ncurses NCURSES_CONFIGURE_WITH= curses NCURSES_CFLAGS= -I${NCURSESBASE}/include QT5_USES= compiler:c++11-lang gl pkgconfig qmake:no_env qt:5 QT5_USE= cxxstd=-std=c++11 \ gl=gl \ qt=buildtools_build,core,gui,widgets QT5_CONFIGURE_ENV= CCLINK="${CXX}" QT5_CONFIGURE_ON= --with-qt5 --with-moc="${MOC}" -QT5_DESKTOP_ENTRIES= "Minimum Profit" "" "mp" "mp-5" "Utility;TextEditor;Qt;" "" +QT5_CONFIGURE_OFF= --without-qt .include .if ${PORT_OPTIONS:MGTK*} || ${PORT_OPTIONS:MQT5} +USES+= desktop-file-utils PLIST_SUB+= GUI="" .else PLIST_SUB+= GUI="@comment " .endif .if !${PORT_OPTIONS:MGTK*} CONFIGURE_ARGS+= --without-gtk .endif do-configure: @(for CONFIGURE_WRKSRC in ${WRKSRC}/mpdm ${WRKSRC}/mpsl ${WRKSRC}; \ do \ cd $${CONFIGURE_WRKSRC} && \ ${SETENV} CC="${CC}" CPP="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}; \ done;) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mp-5 ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/mp-5.1 ${STAGEDIR}${MANPREFIX}/man/man1 .if ${PORT_OPTIONS:MGTK*} || ${PORT_OPTIONS:MQT5} - ${INSTALL_DATA} ${WRKSRC}/mp.png ${STAGEDIR}${PREFIX}/share/pixmaps + ${MKDIR} ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/minimum-profit.desktop ${STAGEDIR}${PREFIX}/share/applications + ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps + ${INSTALL_DATA} ${WRKSRC}/minimum-profit.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps .endif do-install-NLS-on: .for lang in de es it nl ru sv ${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \ ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/minimum-profit.mo .endfor do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in AUTHORS README RELEASE_NOTES mp_templates.sample doc/* mpdm/doc/* mpsl/doc/* ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/editors/mp/distinfo =================================================================== --- head/editors/mp/distinfo (revision 521242) +++ head/editors/mp/distinfo (revision 521243) @@ -1,3 +1,3 @@ -TIMESTAMP = 1552964726 -SHA256 (mp-5.31.tar.gz) = 77126949191800eac7618ecb5664896715c9437061cc4f73b3939cb4f5e20f1e -SIZE (mp-5.31.tar.gz) = 509436 +TIMESTAMP = 1576212317 +SHA256 (mp-5.36.tar.gz) = 3850838d16d3c6be7902cdd1b7d77c5b4282caa36373ff4a2a88c77cc25ecc96 +SIZE (mp-5.36.tar.gz) = 537723 Index: head/editors/mp/files/patch-config.sh =================================================================== --- head/editors/mp/files/patch-config.sh (revision 521242) +++ head/editors/mp/files/patch-config.sh (revision 521243) @@ -1,72 +1,72 @@ ---- config.sh.orig 2019-02-15 07:23:10 UTC +--- config.sh.orig 2019-07-02 05:57:45 UTC +++ config.sh -@@ -38,6 +38,7 @@ while [ $# -gt 0 ] ; do +@@ -40,6 +40,7 @@ while [ $# -gt 0 ] ; do case $1 in --without-curses) WITHOUT_CURSES=1 ;; --without-gtk) WITHOUT_GTK=1 ;; + --with-gtk=*) GTKVER=`echo $1 | sed -e 's/--with-gtk=//'` ;; --without-win32) WITHOUT_WIN32=1 ;; --with-kde4) WITHOUT_KDE4=0 ;; --without-qt) WITHOUT_QT5=1 && WITHOUT_QT4=1 ;; -@@ -73,6 +74,7 @@ if [ "$CONFIG_HELP" = "1" ] ; then - echo "--prefix=PREFIX Installation prefix ($PREFIX)." - echo "--without-curses Disable curses (text) interface detection." - echo "--without-gtk Disable GTK interface detection." -+ echo "--with-gtk=GTKVER Enable GTK where GTKVER=(2|3)." - echo "--without-win32 Disable win32 interface detection." - echo "--with-kde4 Enable KDE4 interface detection." - echo "--without-qt Disable Qt interface detection." +@@ -75,6 +76,7 @@ if [ "$CONFIG_HELP" = "1" ] ; then + echo "--prefix=PREFIX Installation prefix ($PREFIX)." + echo "--without-curses Disable curses (text) interface detection." + echo "--without-gtk Disable GTK interface detection." ++ echo "--with-gtk=GTKVER Enable GTK where GTKVER=(2|3)." + echo "--without-win32 Disable win32 interface detection." + echo "--with-kde4 Enable KDE4 interface detection." + echo "--without-qt Disable Qt interface detection." @@ -250,11 +252,11 @@ echo -n "Testing for ncursesw... " if [ "$WITHOUT_CURSES" = "1" ] ; then echo "Disabled" else - echo "#include " > .tmp.c + echo "#include " > .tmp.c echo "int main(void) { initscr(); endwin(); return 0; }" >> .tmp.c - TMP_CFLAGS="-I/usr/local/include -I/usr/include/ncurses -I/usr/include/ncursesw" - TMP_LDFLAGS="-L/usr/local/lib -lncursesw" + TMP_CFLAGS="-I${NCURSESINC}" + TMP_LDFLAGS="${LDFLAGS} -L${NCURSESLIB} -lncursesw" $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log if [ $? = 0 ] ; then @@ -384,14 +386,14 @@ if [ "$WITHOUT_QT5" = "1" ] ; then else if which pkg-config > /dev/null 2>&1 then - TMP_CFLAGS="`sh -c 'pkg-config --cflags Qt5Widgets' 2>/dev/null` -fPIC" - TMP_LDFLAGS="`sh -c 'pkg-config --libs Qt5Widgets' 2>/dev/null`" + TMP_CFLAGS="`sh -c 'pkg-config --cflags Qt5Widgets gl' 2>/dev/null` -fPIC" + TMP_LDFLAGS="`sh -c 'pkg-config --libs Qt5Widgets gl' 2>/dev/null`" echo "#include " > .tmp.cpp echo "int main(int argc, char *argv[]) { new QApplication(argc, argv) ; return 0; } " >> .tmp.cpp - echo "$CPP $TMP_CFLAGS .tmp.cpp $TMP_LDFLAGS -o .tmp.o" >> .config.log - $CPP $TMP_CFLAGS .tmp.cpp $TMP_LDFLAGS -o .tmp.o 2>> .config.log + echo "$CPP $CXXFLAGS $TMP_CFLAGS .tmp.cpp $TMP_LDFLAGS -o .tmp.o" >> .config.log + $CPP $CXXFLAGS $TMP_CFLAGS .tmp.cpp $TMP_LDFLAGS -o .tmp.o 2>> .config.log if [ $? = 0 ] ; then echo $TMP_CFLAGS >> config.cflags @@ -475,15 +477,15 @@ else echo "int main(void) { gtk_main(); return 0; } " >> .tmp.c # Try first GTK 3.0 - TMP_CFLAGS=`sh -c 'pkg-config --cflags gtk+-3.0' 2>/dev/null` - TMP_LDFLAGS=`sh -c 'pkg-config --libs gtk+-3.0' 2>/dev/null` + TMP_CFLAGS=`sh -c "pkg-config --cflags gtk+-$GTKVER.0" 2>/dev/null` + TMP_LDFLAGS=`sh -c "pkg-config --libs gtk+-$GTKVER.0" 2>/dev/null` $CC $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log if [ $? = 0 ] ; then - echo "#define CONFOPT_GTK 3" >> config.h + echo "#define CONFOPT_GTK $GTKVER" >> config.h echo "$TMP_CFLAGS " >> config.cflags echo "$TMP_LDFLAGS " >> config.ldflags - echo "OK (3.0)" + echo "OK ($GTKVER.0)" DRIVERS="gtk $DRIVERS" DRV_OBJS="mpv_gtk.o $DRV_OBJS" else Index: head/editors/mp/files/patch-mpdm_mpdm__f.c =================================================================== --- head/editors/mp/files/patch-mpdm_mpdm__f.c (nonexistent) +++ head/editors/mp/files/patch-mpdm_mpdm__f.c (revision 521243) @@ -0,0 +1,13 @@ +mpdm_f.c:1947:9: error: use of undeclared identifier 'environ' + environ = (char **) calloc(sizeof(char *), mpdm_size(v) + 1); + +--- mpdm/mpdm_f.c.orig 2019-11-27 07:37:22 UTC ++++ mpdm/mpdm_f.c +@@ -1944,6 +1944,7 @@ static int sysdep_popen(mpdm_t v, char *prg, int rw) + + /* build the environment for the subprocess */ + v = mpdm_join(mpdm_get_wcs(mpdm_root(), L"ENV"), MPDM_S(L"=")); ++ extern char **environ; + environ = (char **) calloc(sizeof(char *), mpdm_size(v) + 1); + + mpdm_ref(v); Property changes on: head/editors/mp/files/patch-mpdm_mpdm__f.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/editors/mp/files/patch-mpv__gtk.c =================================================================== --- head/editors/mp/files/patch-mpv__gtk.c (revision 521242) +++ head/editors/mp/files/patch-mpv__gtk.c (revision 521243) @@ -1,14 +1,52 @@ Fix build with GTK 2.x -https://github.com/angelortega/mp-5.x/pull/40 +mpv_gtk.c:2386:5: error: use of undeclared identifier 'GdkMonitor' + GdkMonitor *monitor; ---- mpv_gtk.c.orig 2019-02-26 08:10:09 UTC +--- mpv_gtk.c.orig 2019-10-24 17:18:37 UTC +++ mpv_gtk.c -@@ -2533,7 +2533,7 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt) - gtk_box_pack_start(GTK_BOX(vbox), status, FALSE, FALSE, 0); - +@@ -2378,13 +2378,14 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt) #if CONFOPT_GTK == 2 -- gtk_misc_set_alignment(GTK_MISC(label), 0, .5); -+ gtk_misc_set_alignment(GTK_MISC(status), 0, .5); + GdkPixmap *pixmap; + GdkPixmap *mask; ++ GdkScreen *screen; #endif #if CONFOPT_GTK == 3 - gtk_label_set_xalign(GTK_LABEL(status), 0.0); + GdkPixbuf *pixmap; +-#endif + GdkDisplay *display; + GdkMonitor *monitor; + GdkRectangle monitor_one_size; ++#endif + mpdm_t v; + int w, h; + GtkTargetEntry targets[] = { +@@ -2399,6 +2400,21 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt) + gtk_window_set_title(GTK_WINDOW(window), "mp " VERSION); + + /* get real screen and pick a usable size for the main area */ ++#if CONFOPT_GTK == 2 ++ screen = gtk_window_get_screen(GTK_WINDOW(window)); ++ if (gdk_screen_get_n_monitors(screen) > 1) { ++ GdkRectangle monitor_one_size; ++ gdk_screen_get_monitor_geometry(screen, 0, &monitor_one_size); ++ ++ w = (monitor_one_size.width * 3) / 4; ++ h = (monitor_one_size.height * 2) / 3; ++ } ++ else { ++ w = (gdk_screen_get_width(screen) * 3) / 4; ++ h = (gdk_screen_get_height(screen) * 2) / 3; ++ } ++#endif ++#if CONFOPT_GTK == 3 + display = gdk_display_get_default(); + + monitor = gdk_display_get_monitor(display, 0); +@@ -2407,6 +2423,7 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt) + + w = (monitor_one_size.width * 3) / 4; + h = (monitor_one_size.height * 2) / 3; ++#endif + + v = mpdm_get_wcs(MP, L"state"); + if ((v = mpdm_get_wcs(v, L"window")) == NULL) { Index: head/editors/mp/pkg-plist =================================================================== --- head/editors/mp/pkg-plist (revision 521242) +++ head/editors/mp/pkg-plist (revision 521243) @@ -1,44 +1,46 @@ bin/mp-5 man/man1/mp-5.1.gz +%%GUI%%share/applications/minimum-profit.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES %%PORTDOCS%%%%DOCSDIR%%/mp_actions.html %%PORTDOCS%%%%DOCSDIR%%/mp_actions.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_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 %%PORTDOCS%%%%DOCSDIR%%/mpdm_overview.html %%PORTDOCS%%%%DOCSDIR%%/mpdm_overview.txt %%PORTDOCS%%%%DOCSDIR%%/mpsl_index.html %%PORTDOCS%%%%DOCSDIR%%/mpsl_index.txt %%PORTDOCS%%%%DOCSDIR%%/mpsl_internals.html %%PORTDOCS%%%%DOCSDIR%%/mpsl_internals.txt %%PORTDOCS%%%%DOCSDIR%%/mpsl_overview.html %%PORTDOCS%%%%DOCSDIR%%/mpsl_overview.txt %%PORTDOCS%%%%DOCSDIR%%/mpsl_quickref.ps %%PORTDOCS%%%%DOCSDIR%%/mpsl_quickref.txt +%%PORTDOCS%%%%DOCSDIR%%/mptxt_format.txt +%%GUI%%share/icons/hicolor/48x48/apps/minimum-profit.png %%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 -%%GUI%%share/pixmaps/mp.png