Index: head/editors/mp/Makefile =================================================================== --- head/editors/mp/Makefile (revision 568461) +++ head/editors/mp/Makefile (revision 568462) @@ -1,126 +1,126 @@ # Created by: Mark Pulford # $FreeBSD$ PORTNAME= mp -DISTVERSION= 5.46 +DISTVERSION= 5.47 CATEGORIES= editors MAINTAINER= jhale@FreeBSD.org COMMENT= Programming text editor LICENSE= PD LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake iconv USE_GITHUB= yes GH_ACCOUNT= ttcdt GH_PROJECT= mp-5.x mpdm:mpdm mpsl:mpsl -GH_TAGNAME= 2.70:mpdm 2.61:mpsl +GH_TAGNAME= 2.72:mpdm 2.62:mpsl GH_SUBDIR= mpdm:mpdm mpsl:mpsl 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 MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DOCS MANPAGES 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= MANPAGES NCURSES PCRE OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= p5-Grutatxt>=0:textproc/p5-Grutatxt \ mp_doccer:textproc/mp_doccer DOCS_CONFIGURE_WITH= docs MANPAGES_BUILD_DEPENDS= p5-Grutatxt>=0:textproc/p5-Grutatxt MANPAGES_CONFIGURE_WITH=manpages 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 GTK3_USES= gnome pkgconfig GTK3_USE= gnome=cairo,gdkpixbuf2,gtk30 GTK3_CONFIGURE_ON= --with-gtk=3 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_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 .if ${PORT_OPTIONS:MGTK*} || ${PORT_OPTIONS:MQT5} ${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 README RELEASE_NOTES mp_templates.sample doc/* mpdm/doc/* mpsl/doc/* ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor do-install-MANPAGES-on: ${INSTALL_MAN} ${WRKSRC}/mp-5.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include Index: head/editors/mp/distinfo =================================================================== --- head/editors/mp/distinfo (revision 568461) +++ head/editors/mp/distinfo (revision 568462) @@ -1,7 +1,7 @@ -TIMESTAMP = 1612381167 -SHA256 (ttcdt-mp-5.x-5.46_GH0.tar.gz) = 492cbba7108d00ff41fc88429912fd5489d1afd97a3fdcd4be90968cca0ab1bc -SIZE (ttcdt-mp-5.x-5.46_GH0.tar.gz) = 225040 -SHA256 (ttcdt-mpdm-2.70_GH0.tar.gz) = d3c6269ef2151071d60a736b328ac33040a8afe2a808ccbe56cfa5686198c48a -SIZE (ttcdt-mpdm-2.70_GH0.tar.gz) = 142016 -SHA256 (ttcdt-mpsl-2.61_GH0.tar.gz) = 1d360ca31bdc04dee7338442fc3a0996eab87ceb22d5f76f6843f9469d4be45b -SIZE (ttcdt-mpsl-2.61_GH0.tar.gz) = 70207 +TIMESTAMP = 1615814934 +SHA256 (ttcdt-mp-5.x-5.47_GH0.tar.gz) = cb2d209141ed30801b273bf49310863a9f5c546ba75a6a4320a98f5bad88b215 +SIZE (ttcdt-mp-5.x-5.47_GH0.tar.gz) = 235276 +SHA256 (ttcdt-mpdm-2.72_GH0.tar.gz) = eca91ca7549cab93931a806c7434fff9efa122f29ba787c670ab25fec24ecfbf +SIZE (ttcdt-mpdm-2.72_GH0.tar.gz) = 144909 +SHA256 (ttcdt-mpsl-2.62_GH0.tar.gz) = 3e12bbbb8504bc9ebba31a5753c60e5280a1d7d9f3f0d5199ff0f1f3f241879a +SIZE (ttcdt-mpsl-2.62_GH0.tar.gz) = 69393 Index: head/editors/mp/files/patch-mpdm_mpdm__f.c =================================================================== --- head/editors/mp/files/patch-mpdm_mpdm__f.c (revision 568461) +++ head/editors/mp/files/patch-mpdm_mpdm__f.c (revision 568462) @@ -1,22 +1,21 @@ -mpdm_f.c:1947:9: error: use of undeclared identifier 'environ' - environ = (char **) calloc(sizeof(char *), mpdm_size(v) + 1); +mpdm_f.c:2395:24: error: variable has incomplete type 'struct sockaddr_in' + struct sockaddr_in host; + ^ +mpdm_f.c:2395:12: note: forward declaration of 'struct sockaddr_in' + struct sockaddr_in host; + ^ +mpdm_f.c:2417:23: warning: implicit declaration of function 'htons' is invalid in C99 [-Wimplicit-function-declaration] + host.sin_port = htons(p); + ^ --- mpdm/mpdm_f.c.orig 2020-11-22 08:58:48 UTC +++ mpdm/mpdm_f.c @@ -78,6 +78,8 @@ #include #endif +#include + #include "mpdm.h" #ifdef CONFOPT_ICONV -@@ -1974,6 +1976,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);