11 files changed, 13 insertions, 65 deletions
diff --git a/MOVED b/MOVED
index 2e12a4c1dfff..fddb29905e34 100644
--- a/MOVED
+++ b/MOVED
@@ -7649,3 +7649,4 @@ textproc/apache-solr9|textproc/apache-solr|2023-06-18|New stable release
 games/poker-eval||2023-06-20|Upstream vanished
 graphics/3d-ascii-viewer-c|graphics/3d-ascii-viewer|2023-06-21|Project was renamed
 archivers/libunrar6|archivers/libunrar|2023-06-21|Moved to unversioned origin. Use archivers/libunrar instead
+japanese/font-plemoljp-nfj||2023-06-22|Removed by upsteam
diff --git a/japanese/Makefile b/japanese/Makefile
index ebcb4373b36a..611ad704281c 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -100,7 +100,6 @@
     SUBDIR += font-plemoljp
     SUBDIR += font-plemoljp-hs
     SUBDIR += font-plemoljp-nf
-    SUBDIR += font-plemoljp-nfj
     SUBDIR += font-ricty
     SUBDIR += font-ricty-discord
     SUBDIR += font-rounded-mgenplus
diff --git a/japanese/font-plemoljp-hs/Makefile b/japanese/font-plemoljp-hs/Makefile
index 0ef6c759d902..b3ed181c9669 100644
--- a/japanese/font-plemoljp-hs/Makefile
+++ b/japanese/font-plemoljp-hs/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	plemoljp-hs
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.0
 PORTREVISION=	0
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	https://github.com/yuru7/PlemolJP/releases/download/v${PORTVERSION}/
diff --git a/japanese/font-plemoljp-hs/distinfo b/japanese/font-plemoljp-hs/distinfo
index 5af0142fc255..7b4529fae009 100644
--- a/japanese/font-plemoljp-hs/distinfo
+++ b/japanese/font-plemoljp-hs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679663643
-SHA256 (PlemolJP_HS_v1.5.0.zip) = 93fbc2629c18577c56ff01e9bc59ffdf9fe02d1327e0d8ad4a0c0744c3a28a47
-SIZE (PlemolJP_HS_v1.5.0.zip) = 98997500
+TIMESTAMP = 1687435290
+SHA256 (PlemolJP_HS_v1.6.0.zip) = dade882a9140daacb42fb1c736779041487be830249228ae8d8c85474eada4ee
+SIZE (PlemolJP_HS_v1.6.0.zip) = 98998199
diff --git a/japanese/font-plemoljp-nf/Makefile b/japanese/font-plemoljp-nf/Makefile
index 0c01f50365bd..f09675e5923f 100644
--- a/japanese/font-plemoljp-nf/Makefile
+++ b/japanese/font-plemoljp-nf/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	plemoljp-nf
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.0
 PORTREVISION=	0
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	https://github.com/yuru7/PlemolJP/releases/download/v${PORTVERSION}/
diff --git a/japanese/font-plemoljp-nf/distinfo b/japanese/font-plemoljp-nf/distinfo
index 929494744bf6..dc81b35d2e24 100644
--- a/japanese/font-plemoljp-nf/distinfo
+++ b/japanese/font-plemoljp-nf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679663796
-SHA256 (PlemolJP_NF_v1.5.0.zip) = 2fce63cf12f6175a1202aad95ab3d0c10208f72d5695bda2ec6ff7e076290441
-SIZE (PlemolJP_NF_v1.5.0.zip) = 65107281
+TIMESTAMP = 1687435944
+SHA256 (PlemolJP_NF_v1.6.0.zip) = ea63ed7eb6fa255f7bd2bb1066158077d41b8668e32a86ffa9322501d6fc18dc
+SIZE (PlemolJP_NF_v1.6.0.zip) = 80116833
diff --git a/japanese/font-plemoljp-nfj/Makefile b/japanese/font-plemoljp-nfj/Makefile
deleted file mode 100644
index 04cfd928858b..000000000000
--- a/japanese/font-plemoljp-nfj/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-PORTNAME=	plemoljp-nfj
-PORTVERSION=	1.5.0
-PORTREVISION=	0
-CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	https://github.com/yuru7/PlemolJP/releases/download/v${PORTVERSION}/
-PKGNAMEPREFIX=	ja-font-
-DISTNAME=	PlemolJP_NFJ_v${DISTVERSION}
-
-MAINTAINER=	ume@FreeBSD.org
-COMMENT=	Plex Mono Language JP (Nerd Fonts / Japanese character priority)
-WWW=		https://github.com/yuru7/PlemolJP
-
-LICENSE=	OFL11
-
-USES=		fonts:fc zip
-NO_ARCH=	yes
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
-OPTIONS_MULTI=			FONT_FAMILY
-OPTIONS_MULTI_FONT_FAMILY=	PLEMOLJP_CONS_NFJ PLEMOLJP35_CONS_NFJ
-OPTIONS_DEFAULT=		PLEMOLJP_CONS_NFJ PLEMOLJP35_CONS_NFJ
-PLEMOLJP_CONS_NFJ_DESC=		PlemolJP Console NFJ
-PLEMOLJP35_CONS_NFJ_DESC=	PlemolJP35 Console NFJ
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPLEMOLJP_CONS_NFJ}
-FONT_FAMILY+=	PlemolJPConsole_NFJ
-.endif
-.if ${PORT_OPTIONS:MPLEMOLJP35_CONS_NFJ}
-FONT_FAMILY+=	PlemolJP35Console_NFJ
-.endif
-
-do-install:
-	${MKDIR} ${STAGEDIR}${FONTSDIR}
-.for FAMILY in ${FONT_FAMILY}
-.  for STYLE in Bold BoldItalic ExtraLight ExtraLightItalic Italic \
-		Light LightItalic Medium MediumItalic Regular \
-		SemiBold SemiBoldItalic Text TextItalic Thin ThinItalic
-	${INSTALL_DATA} ${WRKSRC}/${FAMILY}/${FAMILY:S/_//}-${STYLE}.ttf \
-		${STAGEDIR}${FONTSDIR}
-	@${ECHO_CMD} ${FONTSDIR}/${FAMILY:S/_//}-${STYLE}.ttf >> ${TMPPLIST}
-.  endfor
-.endfor
-
-.include <bsd.port.mk>
diff --git a/japanese/font-plemoljp-nfj/distinfo b/japanese/font-plemoljp-nfj/distinfo
deleted file mode 100644
index 4d929b6779e0..000000000000
--- a/japanese/font-plemoljp-nfj/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1679663919
-SHA256 (PlemolJP_NFJ_v1.5.0.zip) = 18ca6e80979e28638d24ca3bb3084635e939cf1881c70c20941e9fc280b4bef6
-SIZE (PlemolJP_NFJ_v1.5.0.zip) = 65113361
diff --git a/japanese/font-plemoljp-nfj/pkg-descr b/japanese/font-plemoljp-nfj/pkg-descr
deleted file mode 100644
index b45a20a28033..000000000000
--- a/japanese/font-plemoljp-nfj/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-Plex Mono Language JP is a composite font of IBM Plex Mono and
-IBM Plex Sans JP (Nerd Fonts / Japanese character priority).
diff --git a/japanese/font-plemoljp/Makefile b/japanese/font-plemoljp/Makefile
index ca0423795ba6..0f9232280468 100644
--- a/japanese/font-plemoljp/Makefile
+++ b/japanese/font-plemoljp/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	plemoljp
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.0
 PORTREVISION=	0
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	https://github.com/yuru7/PlemolJP/releases/download/v${PORTVERSION}/
diff --git a/japanese/font-plemoljp/distinfo b/japanese/font-plemoljp/distinfo
index 07a1e20c371d..7e797d2f024a 100644
--- a/japanese/font-plemoljp/distinfo
+++ b/japanese/font-plemoljp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679663477
-SHA256 (PlemolJP_v1.5.0.zip) = 6a39148e888036f74143ea340c938abae9d514e197a4625a87517e600bb68276
-SIZE (PlemolJP_v1.5.0.zip) = 99003872
+TIMESTAMP = 1687435250
+SHA256 (PlemolJP_v1.6.0.zip) = 890075d6a22d05685aa0bd3e85390fba0151c2220a1e2649976c5af41692c3cc
+SIZE (PlemolJP_v1.6.0.zip) = 99003805