Index: head/editors/mp/Makefile =================================================================== --- head/editors/mp/Makefile (revision 561749) +++ head/editors/mp/Makefile (revision 561750) @@ -1,127 +1,126 @@ # Created by: Mark Pulford # $FreeBSD$ PORTNAME= mp -DISTVERSION= 5.44 +DISTVERSION= 5.45 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_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 -LLD_UNSAFE= yes 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 561749) +++ head/editors/mp/distinfo (revision 561750) @@ -1,7 +1,7 @@ -TIMESTAMP = 1609456446 -SHA256 (ttcdt-mp-5.x-5.44_GH0.tar.gz) = a799d7b188d221badfdf3e6ddd233d75c38fb82719b700f0e5475f7c61e7c512 -SIZE (ttcdt-mp-5.x-5.44_GH0.tar.gz) = 222903 +TIMESTAMP = 1610702987 +SHA256 (ttcdt-mp-5.x-5.45_GH0.tar.gz) = caa6844026245228b8186eb14b1e3fcaf65c105ccbdcab5cf9dccf6d53974132 +SIZE (ttcdt-mp-5.x-5.45_GH0.tar.gz) = 223933 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 Index: head/editors/mp/files/patch-config.sh =================================================================== --- head/editors/mp/files/patch-config.sh (revision 561749) +++ head/editors/mp/files/patch-config.sh (revision 561750) @@ -1,101 +1,93 @@ ---- config.sh.orig 2020-10-11 16:57:43 UTC +--- config.sh.orig 2021-01-14 18:21:08 UTC +++ config.sh -@@ -37,6 +37,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 ;; -@@ -46,6 +47,9 @@ while [ $# -gt 0 ] ; do +@@ -49,6 +50,9 @@ while [ $# -gt 0 ] ; do --without-ansi) WITHOUT_ANSI=1 ;; --with-external-arch) WITH_EXTERNAL_ARCH=1 ;; --with-external-tar) WITH_EXTERNAL_ARCH=1 ;; + --with-docs) MORE_TARGETS="docs $MORE_TARGETS" ;; + --with-gettext) WITHOUT_MSGFMT=0 ;; + --with-manpages) MORE_TARGETS="mp-5.1 $MORE_TARGETS" ;; --without-zip) WITHOUT_ZIP=1 ;; --help) CONFIG_HELP=1 ;; -@@ -73,6 +77,7 @@ if [ "$CONFIG_HELP" = "1" ] ; then +@@ -76,6 +80,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." -@@ -207,9 +212,6 @@ echo +@@ -225,9 +230,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 -@@ -248,11 +250,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 +@@ -285,8 +287,8 @@ else + TMP_CFLAGS="$(ncurses5-config --cflags)" + TMP_LDFLAGS="$(ncurses5-config --libs)" + else +- TMP_CFLAGS= +- TMP_LDFLAGS=-lncurses ++ TMP_CFLAGS="-I${NCURSESINC}" ++ TMP_LDFLAGS="${LDFLAGS} -L${NCURSESLIB} -lncursesw" + fi -- 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 $CFLAGS $TMP_CFLAGS .tmp.c $TMP_LDFLAGS -o .tmp.o 2>> .config.log - if [ $? = 0 ] ; then -@@ -386,14 +388,14 @@ if [ "$WITHOUT_QT5" = "1" ] ; then + if chk_compiles "$(cat < /dev/null 2>&1 + if chk_pkgconfig Qt5Widgets 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`" +- TMP_CFLAGS="$(${PKG_CONFIG} --cflags Qt5Widgets 2>/dev/null) -fPIC" +- TMP_LDFLAGS="$(${PKG_CONFIG} --libs Qt5Widgets 2>/dev/null)" ++ TMP_CFLAGS="$(${PKG_CONFIG} --cflags Qt5Widgets gl 2>/dev/null) -fPIC" ++ TMP_LDFLAGS="$(${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 -@@ -479,15 +481,15 @@ else - echo "int main(void) { gtk_main(); return 0; } " >> .tmp.c - + if USE_CXX=true chk_compiles "$(cat < +@@ -540,8 +542,8 @@ if [ "$WITHOUT_GTK" = "1" ] ; then + else # 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` + if chk_pkgconfig gtk+-3.0 ; then +- TMP_CFLAGS="$(${PKG_CONFIG} --cflags gtk+-3.0 2>/dev/null)" +- TMP_LDFLAGS="$(${PKG_CONFIG} --libs gtk+-3.0 2>/dev/null)" ++ TMP_CFLAGS="$(${PKG_CONFIG} --cflags gtk+-$GTKVER.0 2>/dev/null)" ++ TMP_LDFLAGS="$(${PKG_CONFIG} --libs gtk+-$GTKVER.0 2>/dev/null)" - $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" - CFLAGS="$CFLAGS $TMP_CFLAGS" -@@ -625,7 +627,7 @@ if [ "$WITH_EXTERNAL_ARCH" = "1" ] ; then + if chk_compiles "$(cat < +@@ -549,10 +551,10 @@ else + int main(void) { gtk_main(); return 0; } + EOF + )" ; 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" + CFLAGS="$CFLAGS $TMP_CFLAGS" +@@ -701,7 +703,7 @@ if [ "$WITH_EXTERNAL_ARCH" = "1" ] ; then echo "#define CONFOPT_EXTERNAL_ARCH 1" >> config.h echo "#define ARCH_START NULL" >> config.h echo "#define ARCH_END NULL" >> config.h - MORE_TARGETS="mp.tar" + MORE_TARGETS="mp.tar $MORE_TARGETS" MORE_INSTALL_TARGETS="install-tar $MORE_INSTALL_TARGETS" fi