--- xmascot/Makefile	2020-08-30 19:30:52.441042000 +0900
+++ xmascot/Makefile	2020-08-30 19:31:28.552850000 +0900
@@ -2,33 +2,37 @@ 
 # $FreeBSD: head/x11/xmascot/Makefile 547044 2020-08-30 09:47:49Z zeising $
 
 PORTNAME=	xmascot
-PORTVERSION=	2.6a
-PORTREVISION=	4
+PORTVERSION=	2.6a.20200830
+DISTVERSIONPREFIX=	v
 CATEGORIES=	x11
-MASTER_SITES=	http://cclub-flying.dsl.gr.jp/products/xmascot/
-DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nyan@FreeBSD.org
 COMMENT=	Moving mascot on your X11 screen
 
-# Fix build with -fno-common (llvm 11)
-CFLAGS+=	-fcommon
+LICENSE=	UNKNOWN
+LICENSE_NAME=	XMascot
+LICENSE_FILE=	${WRKSRC}/README.jp
+LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
-DEPRECATED=	Unmaintained and dead upstream, does not build with -fno-common (llvm 11).
-EXPIRATION_DATE=2021-04-01
-
-USES=		imake xorg
+USES=		iconv:build imake xorg
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
-MAKE_ARGS=	MAKE="${MAKE_CMD}"
+USE_GITHUB=	yes
+GH_ACCOUNT=	nyan-
 
-# Unbreak parallel (-jX) builds: do not use unsafe MakeSubdirs() macro
-post-patch:
-	@${REINPLACE_CMD} -e 's/MakeSubdirs(/Named&$$(IMAGELIB),/' \
-		${WRKSRC}/Imakefile
+OPTIONS_DEFINE=	DOCS
 
+X11_LIBDIR=	${STAGEDIR}${PREFIX}/lib/X11
+
 post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/ja_JP.EUC/app-defaults
-	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/XMascot \
-		${STAGEDIR}${PREFIX}/lib/X11/ja_JP.EUC/app-defaults
+	@${MKDIR} ${X11_LIBDIR}/ja_JP.EUC/app-defaults
+	${INSTALL_DATA} ${X11_LIBDIR}/ja_JP.eucJP/app-defaults/XMascot \
+		${X11_LIBDIR}/ja_JP.EUC/app-defaults
+	@${MKDIR} ${X11_LIBDIR}/ja_JP.UTF-8/app-defaults
+	${ICONV_CMD} -f euc-jp -t utf-8 ${X11_LIBDIR}/ja_JP.eucJP/app-defaults/XMascot > \
+		${X11_LIBDIR}/ja_JP.UTF-8/app-defaults/XMascot
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${LICENSE_FILE} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
--- xmascot/distinfo	2020-08-05 22:52:22.266944000 +0900
+++ xmascot/distinfo	2020-08-30 12:39:17.335038000 +0900
@@ -1,2 +1,3 @@ 
-SHA256 (xmascot2.6a.tar.gz) = 2eb66d97987217fbf7579b6bb96bdb19380e1389965758e8b4d022841c247773
-SIZE (xmascot2.6a.tar.gz) = 238536
+TIMESTAMP = 1598758757
+SHA256 (nyan--xmascot-v2.6a.20200830_GH0.tar.gz) = 8dd041f7b3befee147979a0251db53dd9fab26e866b436bc8b4aa8bdc16ca30d
+SIZE (nyan--xmascot-v2.6a.20200830_GH0.tar.gz) = 197945
--- xmascot/files/patch-config.tmpl	2020-08-05 22:52:22.265467000 +0900
+++ xmascot/files/patch-config.tmpl	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@ 
---- config.tmpl.orig	Fri Oct 24 01:41:01 1997
-+++ config.tmpl	Sat Jun  8 11:33:39 JST 2002
-@@ -97,6 +97,7 @@
- 
- #ifdef USE_I18N
- DEFINES_I18N = -DI18N
-+LANG = ja_JP.eucJP
- LOCALEDIR = $(LIBDIR)/$(LANG)/app-defaults
- #else
- DEFINES_I18N =
--- xmascot/pkg-plist	2020-08-05 22:52:22.265284000 +0900
+++ xmascot/pkg-plist	2020-08-30 12:30:44.293581000 +0900
@@ -2,6 +2,7 @@ 
 lib/X11/app-defaults/XMascot
 lib/X11/ja_JP.EUC/app-defaults/XMascot
 lib/X11/ja_JP.eucJP/app-defaults/XMascot
+lib/X11/ja_JP.UTF-8/app-defaults/XMascot
 lib/X11/xmascot/aquarius.gif
 lib/X11/xmascot/aries.gif
 lib/X11/xmascot/canser.gif
@@ -44,3 +45,4 @@ 
 lib/X11/xmascot/yubi.xbm
 lib/X11/xmascot/yubi.xbmmsk
 man/man1/xmascot.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/README.jp