Index: head/editors/mp/Makefile =================================================================== --- head/editors/mp/Makefile (revision 540827) +++ head/editors/mp/Makefile (revision 540828) @@ -1,113 +1,113 @@ # Created by: Mark Pulford # $FreeBSD$ PORTNAME= mp -DISTVERSION= 5.36 +PORTVERSION= 5.41 CATEGORIES= editors MASTER_SITES= http://triptico.com/download/mp/ MAINTAINER= jhale@FreeBSD.org COMMENT= Programming text editor 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 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 ${INSTALL_MAN} ${WRKSRC}/mp-5.1 ${STAGEDIR}${MANPREFIX}/man/man1 .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 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 540827) +++ head/editors/mp/distinfo (revision 540828) @@ -1,3 +1,3 @@ -TIMESTAMP = 1576212317 -SHA256 (mp-5.36.tar.gz) = 3850838d16d3c6be7902cdd1b7d77c5b4282caa36373ff4a2a88c77cc25ecc96 -SIZE (mp-5.36.tar.gz) = 537723 +TIMESTAMP = 1593452440 +SHA256 (mp-5.41.tar.gz) = 51dc71d414d35fb0437b66d3b86e3a03de3811e5c60d86105d4662e30040513c +SIZE (mp-5.41.tar.gz) = 550542 Index: head/editors/mp/files/patch-config.sh =================================================================== --- head/editors/mp/files/patch-config.sh (revision 540827) +++ head/editors/mp/files/patch-config.sh (revision 540828) @@ -1,72 +1,82 @@ ---- config.sh.orig 2019-07-02 05:57:45 UTC +--- config.sh.orig 2020-05-16 07:31:22 UTC +++ config.sh -@@ -40,6 +40,7 @@ while [ $# -gt 0 ] ; do +@@ -37,6 +37,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 ;; -@@ -75,6 +76,7 @@ if [ "$CONFIG_HELP" = "1" ] ; then +@@ -71,6 +72,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... " +@@ -203,9 +205,6 @@ echo + (cd $MPSL && ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS) + echo + +-# import MPSL build configuration +-[ -f "$MPSL.build.sh" ] && . $MPSL.build.sh +- + cat $MPDM/config.ldflags >> config.ldflags + cat $MPSL/config.ldflags >> config.ldflags + +@@ -244,11 +243,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 + $CC $CFLAGS $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log if [ $? = 0 ] ; then -@@ -384,14 +386,14 @@ if [ "$WITHOUT_QT5" = "1" ] ; then +@@ -382,14 +381,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 +@@ -475,15 +474,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 + $CC $CFLAGS $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 + CFLAGS="$CFLAGS $TMP_CFLAGS" Index: head/editors/mp/files/patch-mpdm_config.sh =================================================================== --- head/editors/mp/files/patch-mpdm_config.sh (revision 540827) +++ head/editors/mp/files/patch-mpdm_config.sh (revision 540828) @@ -1,49 +1,49 @@ ---- mpdm/config.sh.orig 2019-02-11 11:53:55 UTC +--- mpdm/config.sh.orig 2020-05-10 08:05:32 UTC +++ mpdm/config.sh -@@ -194,8 +194,8 @@ echo -n "Testing for regular expressions... " +@@ -190,8 +190,8 @@ echo -n "Testing for regular expressions... " if [ "$WITH_PCRE" = 1 ] ; then # try first the pcre library - TMP_CFLAGS="-I/usr/local/include" - TMP_LDFLAGS="-L/usr/local/lib -lpcre -lpcreposix" + TMP_CFLAGS="-I$LOCALBASE/include" + TMP_LDFLAGS="-L$LOCALBASE/lib -lpcre -lpcreposix" echo "#include " > .tmp.c echo "int main(void) { regex_t r; regmatch_t m; regcomp(&r,\".*\",REG_EXTENDED|REG_ICASE); return 0; }" >> .tmp.c -@@ -373,13 +373,15 @@ else +@@ -371,13 +371,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 +- $CC $CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log ++ $CC $CFLAGS $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 + LDFLAGS="$LDFLAGS $TMP_LDFLAGS" else - echo "No" -@@ -406,13 +408,15 @@ else +@@ -405,13 +407,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 +- $CC $CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log ++ $CC $CFLAGS $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 + LDFLAGS="$LDFLAGS $TMP_LDFLAGS" else - echo "No"