diff --git a/editors/mp/Makefile b/editors/mp/Makefile index 0eec81128e35..bc1d66266b5d 100644 --- a/editors/mp/Makefile +++ b/editors/mp/Makefile @@ -1,125 +1,123 @@ # Created by: Mark Pulford PORTNAME= mp -DISTVERSION= 5.50 +DISTVERSION= 5.57 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.72:mpdm 2.62:mpsl -GH_SUBDIR= mpdm:mpdm mpsl:mpsl +GH_PROJECT= mp-5.x 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 diff --git a/editors/mp/distinfo b/editors/mp/distinfo index 0866ed030890..5fe6e459e6ca 100644 --- a/editors/mp/distinfo +++ b/editors/mp/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1619877757 -SHA256 (ttcdt-mp-5.x-5.50_GH0.tar.gz) = 581f3aa718ec7615d0029a01717cc6f3471244afb3017f1ed04fb99c67b3be66 -SIZE (ttcdt-mp-5.x-5.50_GH0.tar.gz) = 230814 -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 +TIMESTAMP = 1645632855 +SHA256 (ttcdt-mp-5.x-5.57_GH0.tar.gz) = 7d1cb0914c665c826a458ae2aac479204fca867abe98b9be1452d15e5ae2b69d +SIZE (ttcdt-mp-5.x-5.57_GH0.tar.gz) = 463070 diff --git a/editors/mp/files/patch-config.sh b/editors/mp/files/patch-config.sh index e98023f526c5..e4a222672b49 100644 --- a/editors/mp/files/patch-config.sh +++ b/editors/mp/files/patch-config.sh @@ -1,93 +1,93 @@ ---- config.sh.orig 2021-01-14 18:21:08 UTC +--- config.sh.orig 2022-02-03 09:30:31 UTC +++ config.sh @@ -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 ;; @@ -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 ;; @@ -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." @@ -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 -@@ -285,8 +287,8 @@ else +@@ -286,8 +288,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 if chk_compiles "$(cat < -@@ -540,8 +542,8 @@ if [ "$WITHOUT_GTK" = "1" ] ; then +@@ -541,8 +543,8 @@ if [ "$WITHOUT_GTK" = "1" ] ; then else # Try first GTK 3.0 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)" if chk_compiles "$(cat < -@@ -549,10 +551,10 @@ else +@@ -550,10 +552,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 +@@ -704,7 +706,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" +- MORE_TARGETS="$ARCH_FILE" ++ MORE_TARGETS="$ARCH_FILE $MORE_TARGETS" + MORE_INSTALL_TARGETS="install-arch $MORE_INSTALL_TARGETS" fi diff --git a/editors/mp/files/patch-makefile.in b/editors/mp/files/patch-makefile.in index be2c6b91518e..b31224da7c16 100644 --- a/editors/mp/files/patch-makefile.in +++ b/editors/mp/files/patch-makefile.in @@ -1,19 +1,19 @@ ---- makefile.in.orig 2020-10-11 16:57:43 UTC +--- makefile.in.orig 2022-02-03 09:30:31 UTC +++ makefile.in -@@ -52,13 +52,13 @@ mp.zip.o: mp.zip - $(LD) -r -b binary mp.zip -o $@ +@@ -56,13 +56,13 @@ $(MPSL)/libmpsl.a: $(MPSL)/VERSION $(MPSL)/config.h + $(MAKE) -C $(MPSL) libmpsl.a - $(APPNAME): $(OBJS) $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a -- $(CCLINK) $(CFLAGS) $(OBJS) `cat config.ldflags` -o $@ -+ $(CCLINK) $(LDFLAGS) $(OBJS) `cat config.ldflags` -o $@ + $(APPNAME): $(OBJS) $(DRV_OBJS) $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a +- $(CCLINK) $(CFLAGS) $(OBJS) $(DRV_OBJS) `cat config.ldflags` -o $@ ++ $(CCLINK) $(LDFLAGS) $(OBJS) $(DRV_OBJS) `cat config.ldflags` -o $@ mpv_kde4.o: mpv_kde4.cpp mpv_qk_common.moc - $(CPP) $(CFLAGS) -I. `cat config.cflags` -c $< + $(CPP) $(CXXFLAGS) -I. `cat config.cflags` -c $< mpv_qt4.o: mpv_qt4.cpp mpv_qk_common.moc - $(CPP) $(CFLAGS) -I. `cat config.cflags` -c $< + $(CPP) $(CXXFLAGS) -I. `cat config.cflags` -c $< mpv_qk_common.moc: mpv_qk_common.cpp $(MOC) -o $@ $< diff --git a/editors/mp/files/patch-mpv__qt4.cpp b/editors/mp/files/patch-mpv__qt4.cpp deleted file mode 100644 index e8ef3659ce85..000000000000 --- a/editors/mp/files/patch-mpv__qt4.cpp +++ /dev/null @@ -1,13 +0,0 @@ -Fix forgotten renamed variable. - ---- mpv_qt4.cpp.orig 2021-04-06 20:21:29 UTC -+++ mpv_qt4.cpp -@@ -518,7 +518,7 @@ static mpdm_t qt4_drv_idle(mpdm_t a, mpdm_t ctxt) - - window->area->timer->stop(); - -- if (msecs) -+ if (idle_msecs) - window->area->timer->start(idle_msecs); - - return NULL; diff --git a/editors/mp/pkg-plist b/editors/mp/pkg-plist index 13d99d3e4727..aceb3b5fbc47 100644 --- a/editors/mp/pkg-plist +++ b/editors/mp/pkg-plist @@ -1,52 +1,52 @@ bin/mp-5 %%MANPAGES%%man/man1/mp-5.1.gz %%GUI%%share/applications/minimum-profit.desktop %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/mp_actions.html +%%PORTDOCS%%%%DOCSDIR%%/mp_actions.gmi %%PORTDOCS%%%%DOCSDIR%%/mp_actions.txt %%PORTDOCS%%%%DOCSDIR%%/mp_api.html %%PORTDOCS%%%%DOCSDIR%%/mp_api.txt -%%PORTDOCS%%%%DOCSDIR%%/mp_configuration.html +%%PORTDOCS%%%%DOCSDIR%%/mp_configuration.gmi %%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_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_api.html %%PORTDOCS%%%%DOCSDIR%%/mpdm_api.txt %%PORTDOCS%%%%DOCSDIR%%/mpdm_overview.html %%PORTDOCS%%%%DOCSDIR%%/mpdm_overview.txt %%PORTDOCS%%%%DOCSDIR%%/mpsl_api.html %%PORTDOCS%%%%DOCSDIR%%/mpsl_api.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%%/mpsl_reference.html %%PORTDOCS%%%%DOCSDIR%%/mpsl_reference.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