editors/mp: Update to 5.45

Remove LLD_UNSAFE - seems to link fine now without it

3 files changed, 50 insertions, 59 deletions

diff --git a/editors/mp/Makefile b/editors/mp/Makefile
index 7e0153cee574..5561c4cf5fcd 100644
--- a/editors/mp/Makefile
+++ b/editors/mp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mp
-DISTVERSION=	5.44
+DISTVERSION=	5.45
 CATEGORIES=	editors
 
 MAINTAINER=	jhale@FreeBSD.org
@@ -29,7 +29,6 @@ CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}" \
 		NCURSESINC="${NCURSESINC}" \
 		NCURSESLIB="${NCURSESLIB}"
 LDFLAGS+=	-Wl,--as-needed
-LLD_UNSAFE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		DOCS MANPAGES NLS PCRE
diff --git a/editors/mp/distinfo b/editors/mp/distinfo
index fcd42cab213e..ed1b471e0d18 100644
--- a/editors/mp/distinfo
+++ b/editors/mp/distinfo
@@ -1,6 +1,6 @@
-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
diff --git a/editors/mp/files/patch-config.sh b/editors/mp/files/patch-config.sh
index c0b973f9b083..e98023f526c5 100644
--- a/editors/mp/files/patch-config.sh
+++ b/editors/mp/files/patch-config.sh
@@ -1,6 +1,6 @@
---- 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 ;;
@@ -8,7 +8,7 @@
      --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 ;;
@@ -18,7 +18,7 @@
      --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."
@@ -26,7 +26,7 @@
      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
  
@@ -36,61 +36,53 @@
  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 <ncursesw/ncurses.h>" > .tmp.c
-+    echo "#include <ncurses.h>" > .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"
+@@ -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
  
-     $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 <<EOF
+@@ -450,8 +452,8 @@ if [ "$WITHOUT_QT5" = "1" ] ; then
  else
-     if which pkg-config > /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`"
- 
-         echo "#include <QtWidgets>" > .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
+-        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)"
  
+         if USE_CXX=true chk_compiles "$(cat <<EOF
+ #include <QtWidgets>
+@@ -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 <<EOF
+ #include <gtk/gtk.h>
+@@ -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