diff --git a/graphics/azpainter/Makefile b/graphics/azpainter/Makefile
index 4d436be5d76c..072f1a2e8e74 100644
--- a/graphics/azpainter/Makefile
+++ b/graphics/azpainter/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	azpainter
 PORTVERSION=	2.1.7
 PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://azsky2.html.xdomain.jp/arc/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	16-bit RGB full color painting application
-WWW=		http://azsky2.html.xdomain.jp/soft/azpainter.html
+WWW=		http://azelpg.gitlab.io/azsky2/soft/azpainter.html
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 
 USES=		compiler:c11 desktop-file-utils gmake jpeg pkgconfig \
 		shared-mime-info tar:xz xorg
 USE_XORG=	x11 xext xi
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--docdir="${DOCSDIR}" CC="${CC}" LIBS="-lz"
 
 PORTDOCS=	AUTHORS ChangeLog ReadMe_en ReadMe_ja manual_ja.html
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--debug
 .endif
 
 pre-build-NLS-on:
 	cd ${WRKSRC}/translation && ${CC} ${CFLAGS} -o mtrconv mtrconv.c
 .for lang in en ru uk
 	cd ${WRKSRC}/translation && ./mtrconv ${lang} ../data/tr/${lang}.mtr
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/azpainter/files/patch-Makefile.in b/graphics/azpainter/files/patch-Makefile.in
index 7ae62ef963f1..0e18ef894410 100644
--- a/graphics/azpainter/files/patch-Makefile.in
+++ b/graphics/azpainter/files/patch-Makefile.in
@@ -1,11 +1,20 @@
 --- Makefile.in.orig	2020-12-04 15:00:00 UTC
 +++ Makefile.in
+@@ -9,7 +9,7 @@ package_name := @PACKAGE_NAME@
+ package_version := @PACKAGE_VERSION@
+ package_full := $(package_name)-$(package_version)
+ 
+-inst_exe := install -m 755
++inst_exe := $(BSD_INSTALL_PROGRAM)
+ inst_dir := install -m 755 -d
+ inst_file := install -m 644
+ 
 @@ -229,7 +229,7 @@ install:
  	$(inst_file) desktop/*.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps
  	$(inst_file) desktop/azpainter.xml $(DESTDIR)$(datarootdir)/mime/packages
  
 -	$(inst_file) GPL3 AUTHORS ChangeLog ReadMe_en ReadMe_ja manual_ja.html $(DESTDIR)$(docdir)
 +	$(inst_file) AUTHORS ChangeLog ReadMe_en ReadMe_ja manual_ja.html $(DESTDIR)$(docdir)
  
  	$(inst_file) data/*.dat data/*.png data/sckey-2.conf $(DESTDIR)$(datadir)
  
diff --git a/graphics/azpainter/files/patch-configure b/graphics/azpainter/files/patch-configure
new file mode 100644
index 000000000000..658db25ba6dc
--- /dev/null
+++ b/graphics/azpainter/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	2020-12-04 15:00:00 UTC
++++ configure
+@@ -339,8 +339,8 @@ fc_check_lib libjpeg "libjpeg" "" "-ljpeg" "stdio.h jp
+ fc_check_lib x11 "x11" "" "-lX11" "X11/Xlib.h" "" "libx11-dev or libX11-devel or libx11"
+ fc_check_lib xext "xext" "" "-lXext" "X11/Xlib.h X11/extensions/XShm.h" "" "libxext-dev or libXext-devel or libxext"
+ fc_check_lib xinput "xi" "" "-lXi" "X11/Xlib.h X11/extensions/XInput2.h" "" "libxi-dev or libXi-devel or libxi"
+-fc_check_lib fontconfig "fontconfig" "" "-lfontconfig -lfreetype" "fontconfig/fontconfig.h" "/usr/include/freetype2 /usr/local/include/freetype2 /opt/X11/include/freetype2" "libfontconfig1-dev or libfontconfig-devel or fontconfig"
+-fc_check_lib freetype2 "freetype2" "" "" "ft2build.h" "" "libfreetype6-dev or libfreetype6-devel or freetype2"
++fc_check_lib fontconfig "fontconfig" "" "-lfontconfig" "fontconfig/fontconfig.h" "/usr/include/freetype2 /usr/local/include/freetype2 /opt/X11/include/freetype2" "libfontconfig1-dev or libfontconfig-devel or fontconfig"
++fc_check_lib freetype2 "freetype2" "" "-lfreetype" "ft2build.h" "" "libfreetype6-dev or libfreetype6-devel or freetype2"
+ 
+ #------------------
+ # Makefile
diff --git a/graphics/azpainterb/Makefile b/graphics/azpainterb/Makefile
index 53c805aa0313..7cef407fbeb6 100644
--- a/graphics/azpainterb/Makefile
+++ b/graphics/azpainterb/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	azpainterb
 PORTVERSION=	1.1.3
 PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://azsky2.html.xdomain.jp/arc/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	8-bit RGB color dot editing program
-WWW=		http://azsky2.html.xdomain.jp/soft/azpainterb.html
+WWW=		http://azelpg.gitlab.io/azsky2/soft/azpainterb.html
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 
 USES=		compiler:c11 desktop-file-utils gmake jpeg pkgconfig \
 		tar:xz xorg
 USE_XORG=	x11 xext xi
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--docdir="${DOCSDIR}" CC="${CC}" LIBS="-lz"
 
 PORTDOCS=	AUTHORS ChangeLog ReadMe_en ReadMe_ja manual_ja.html
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--debug
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/azpainterb/files/patch-Makefile.in b/graphics/azpainterb/files/patch-Makefile.in
index 209f02d8ea02..22f3d9e190fe 100644
--- a/graphics/azpainterb/files/patch-Makefile.in
+++ b/graphics/azpainterb/files/patch-Makefile.in
@@ -1,11 +1,20 @@
 --- Makefile.in.orig	2020-12-04 15:00:00 UTC
 +++ Makefile.in
+@@ -9,7 +9,7 @@ package_name := @PACKAGE_NAME@
+ package_version := @PACKAGE_VERSION@
+ package_full := $(package_name)-$(package_version)
+ 
+-inst_exe := install -m 755
++inst_exe := $(BSD_INSTALL_PROGRAM)
+ inst_dir := install -m 755 -d
+ inst_file := install -m 644
+ 
 @@ -209,7 +209,7 @@ install:
  	$(inst_file) desktop/azpainterb.png $(DESTDIR)$(datarootdir)/icons/hicolor/48x48/apps
  	$(inst_file) desktop/azpainterb.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps
  
 -	$(inst_file) GPL3 AUTHORS ChangeLog ReadMe_en ReadMe_ja manual_ja.html $(DESTDIR)$(docdir)
 +	$(inst_file) AUTHORS ChangeLog ReadMe_en ReadMe_ja manual_ja.html $(DESTDIR)$(docdir)
  
  	$(inst_file) data/brushlist.dat data/grad.dat data/sckey.conf \
  	 data/coltype.png data/icon.png data/texlib.dat \
diff --git a/graphics/azpainterb/files/patch-configure b/graphics/azpainterb/files/patch-configure
new file mode 100644
index 000000000000..658db25ba6dc
--- /dev/null
+++ b/graphics/azpainterb/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	2020-12-04 15:00:00 UTC
++++ configure
+@@ -339,8 +339,8 @@ fc_check_lib libjpeg "libjpeg" "" "-ljpeg" "stdio.h jp
+ fc_check_lib x11 "x11" "" "-lX11" "X11/Xlib.h" "" "libx11-dev or libX11-devel or libx11"
+ fc_check_lib xext "xext" "" "-lXext" "X11/Xlib.h X11/extensions/XShm.h" "" "libxext-dev or libXext-devel or libxext"
+ fc_check_lib xinput "xi" "" "-lXi" "X11/Xlib.h X11/extensions/XInput2.h" "" "libxi-dev or libXi-devel or libxi"
+-fc_check_lib fontconfig "fontconfig" "" "-lfontconfig -lfreetype" "fontconfig/fontconfig.h" "/usr/include/freetype2 /usr/local/include/freetype2 /opt/X11/include/freetype2" "libfontconfig1-dev or libfontconfig-devel or fontconfig"
+-fc_check_lib freetype2 "freetype2" "" "" "ft2build.h" "" "libfreetype6-dev or libfreetype6-devel or freetype2"
++fc_check_lib fontconfig "fontconfig" "" "-lfontconfig" "fontconfig/fontconfig.h" "/usr/include/freetype2 /usr/local/include/freetype2 /opt/X11/include/freetype2" "libfontconfig1-dev or libfontconfig-devel or fontconfig"
++fc_check_lib freetype2 "freetype2" "" "-lfreetype" "ft2build.h" "" "libfreetype6-dev or libfreetype6-devel or freetype2"
+ 
+ #------------------
+ # Makefile