diff --git a/graphics/mtpaint/Portfile b/graphics/mtpaint/Portfile
index 9c4445b916fdb..821ce715bf373 100644
--- a/graphics/mtpaint/Portfile
+++ b/graphics/mtpaint/Portfile
@@ -1,8 +1,10 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+
 PortSystem              1.0
 
 name                    mtpaint
-version                 3.31
-revision                3
+version                 3.50
+revision                0
 categories              graphics
 license                 GPL-3+
 maintainers             nomaintainer
@@ -14,12 +16,14 @@ homepage                http://mtpaint.sourceforge.net/
 platforms               darwin
 master_sites            sourceforge:mtpaint
 use_bzip2               yes
-checksums               md5 fbe34eb25f96b6092403115f1f6ab387 \
-                        sha1 19396c905a227ab66b804dafd6fe76ecda519282 \
-                        rmd160 94243d246cef12e09c33b728ef37b16594d40813
+checksums               rmd160  1580a4843afea287d661eaa56499900b10403033 \
+                        sha256  695cea10c428a8f122ed59beee5ffa49dcdcba8d88a4790eaf3c64fd7c73d6ac \
+                        size    800134
 
 depends_build           port:pkgconfig
-depends_lib             port:libpng path:lib/pkgconfig/gtk+-2.0.pc:gtk2 port:freetype
+depends_lib             port:libpng \
+                        path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
+                        port:freetype
 
 patchfiles              patch-configure.diff \
                         patch-png.c.diff
diff --git a/graphics/mtpaint/files/patch-configure.diff b/graphics/mtpaint/files/patch-configure.diff
index ba1b6f26dd7af..d0e95b964076a 100644
--- a/graphics/mtpaint/files/patch-configure.diff
+++ b/graphics/mtpaint/files/patch-configure.diff
@@ -1,85 +1,18 @@
---- configure.orig	2009-04-15 13:46:26.000000000 -0500
-+++ configure	2011-10-02 08:54:54.000000000 -0500
-@@ -264,6 +264,7 @@
- 				MT_PO_DEST=$MT_LANG_DEST;;
- 		"--mandir="* )	MT_MAN_DEST="`echo "$A" | sed -e "s/--mandir=//"`";;
- 		"cflags" )	CFLAG=${CFLAGS};;
-+		"ldflags" )	LDFLAG=${LDFLAGS};;
- 		"--cpu="* )	MARCH='-march='"`echo "$A" | sed -e "s/--cpu=//"`";;
- 		"icons"* )	ICON_SET=$A;;
- 		"386" )		MARCH='-march=i386';;
-@@ -360,6 +361,7 @@
- noxft ........... Don't use Xft in MTK
+--- configure.orig	2020-12-31 10:02:20.000000000 -0500
++++ configure	2021-10-27 13:44:56.000000000 -0400
+@@ -96,6 +96,7 @@
+ 	"win" )		OS="MinGW/MSYS"
+ 			GTK=2;;
+ 	"cflags" )	OPTS=CFLAGS;;
++	"ldflags" )	LDFLAG=LDFLAGS;;
+ 	"386" )		MARCH='-march=i386';;
+ 	"486" )		MARCH='-march=i486';;
+ 	"586" )		MARCH='-march=i586';;
+@@ -179,6 +180,7 @@
+ nothread ......... Don't use multithreading
  
- cflags .......... Use CFLAGS environment variable
-+ldflags ......... Use LDFLAGS environment variable
- --cpu= .......... Target a specific CPU, e.g. athlon-xp, x86-64
- 686 ............. Target 686 machines
- 586 ............. Target 586 machines
-@@ -595,7 +597,7 @@
- 
- 	I_EX="$I_EX -DVERSION=\"\\\"$MT_VERSION\"\\\""
- 	GTK_INCLUDE="$GTK_INCLUDE $I_EX"
--	echo "LDFLAG = $L_EX $GTK_LIB" >> $GTK_FILE
-+	echo "LDFLAG = $LDFLAG $L_EX $GTK_LIB" >> $GTK_FILE
- 
- 	if [ "$CFLAG" ]
- 	then
-@@ -631,7 +633,7 @@
- 	echo
- 	echo "    Version             $MT_V"
- 	echo "    System              $OS"
--	echo -n "    Toolkit             "
-+	printf "    Toolkit             "
- if [ "$MTK_DIR" ]
- then
- 	echo "MTK - $MTK_DIR"
-@@ -660,6 +662,10 @@
- 	echo "Compiler"
- 	echo "--------"
- 	echo
-+if [ "$LDFLAG" ]
-+then
-+	echo "    LDFLAGS             $LDFLAG"
-+fi
- if [ "$CFLAG" ]
- then
- 	echo "    CFLAGS              $CFLAG"
-@@ -673,30 +679,30 @@
- 	echo "    Debug info          $DEBUG"
- if [ "$STATIC_PNG" ] || [ "$STATIC_GIF" ] || [ "$STATIC_JPEG" ] || [ "$STATIC_JP2" ] || [ "$STATIC_TIFF" ]
- then
--	echo -n "    Static libraries    "
-+	printf "    Static libraries    "
- 	if [ "$STATIC_PNG" ]
- 	then
--		echo -n "$STATIC_PNG "
-+		printf "$STATIC_PNG "
- 	fi
- 	if [ "$STATIC_GIF" ]
- 	then
--		echo -n "$STATIC_GIF "
-+		printf "$STATIC_GIF "
- 	fi
- 	if [ "$STATIC_JPEG" ]
- 	then
--		echo -n "$STATIC_JPEG "
-+		printf "$STATIC_JPEG "
- 	fi
- 	if [ "$STATIC_JP2" ]
- 	then
--		echo -n "$STATIC_JP2 "
-+		printf "$STATIC_JP2 "
- 	fi
- 	if [ "$STATIC_TIFF" ]
- 	then
--		echo -n "$STATIC_TIFF "
-+		printf "$STATIC_TIFF "
- 	fi
- 	if [ "$STATIC_FT" ]
- 	then
--		echo -n "$STATIC_FT "
-+		printf "$STATIC_FT "
- 	fi
- 	echo
- fi
+ cflags ........... Use CFLAGS environment variable
++ldflags .......... Use LDFLAGS environment variable
+ --cpu= ........... Target a specific CPU, e.g. athlon-xp, x86-64
+ 686 .............. Target 686 machines
+ 586 .............. Target 586 machines