git: ffce9c1d6dfc - main - x11/xmascot: clean up port

[Rene Ladan]

The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ffce9c1d6dfcfacb319eed3c02c2d2dc4f44bd46

commit ffce9c1d6dfcfacb319eed3c02c2d2dc4f44bd46
Author:     Yoshihiro Takahashi <nyan at FreeBSD.org>
AuthorDate: 2021-04-09 14:56:27 +0000
Commit:     Rene Ladan <rene at FreeBSD.org>
CommitDate: 2021-04-09 15:03:25 +0000

    x11/xmascot: clean up port
    
    - fix build with -fno-common and un-expire
    - set LICENSE
    - fix parallel build
    - move to MASTER_SITE of submitter
    
    Add entry to LEGAL
    
    Submitter becomes maintainer
    
    PR:             249011
    MFH:            2021Q2
---
 LEGAL                               |  1 +
 x11/xmascot/Makefile                | 42 ++++++++++++++++++++-----------------
 x11/xmascot/distinfo                |  5 +++--
 x11/xmascot/files/patch-config.tmpl | 10 ---------
 x11/xmascot/pkg-plist               |  2 ++
 5 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/LEGAL b/LEGAL
index d7815965d68a..2da0d189f14d 100644
--- a/LEGAL
+++ b/LEGAL
@@ -146,6 +146,7 @@ NetComponents-*		java/netcomponents	No redistribution except as part of a substa
 nntpcache-*		news/nntpcache		Free for individuals and non-military, non-profit organisations only
 nttcp-*			benchmarks/nttcp	No commercial use
 nwresources*.tar.gz	games/nwndata		Distribution not allowed
+nyan--xmascot-*		x11/xmascot		Commercial use is prohibited
 oneko-*.tar.gz		games/oneko-sakura	Including derivatives from CARDCAPTOR SAKURA
 OptimFROG*		audio/optimfrog		No commercial use
 oracle/*		databases/jdbc-oracle11g	This software is under license and export controls
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index 0d3b09ebfde2..3fdba7ad882c 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -1,33 +1,37 @@
 # Created by: Yukihiro Nakai <Nakai at Mlab.t.u-tokyo.ac.jp>
 
 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 at FreeBSD.org
+MAINTAINER=	nyan at 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-
+
+OPTIONS_DEFINE=	DOCS
 
-# Unbreak parallel (-jX) builds: do not use unsafe MakeSubdirs() macro
-post-patch:
-	@${REINPLACE_CMD} -e 's/MakeSubdirs(/Named&$$(IMAGELIB),/' \
-		${WRKSRC}/Imakefile
+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>
diff --git a/x11/xmascot/distinfo b/x11/xmascot/distinfo
index 70fe45b30815..6fee534aa7d6 100644
--- a/x11/xmascot/distinfo
+++ b/x11/xmascot/distinfo
@@ -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
diff --git a/x11/xmascot/files/patch-config.tmpl b/x11/xmascot/files/patch-config.tmpl
deleted file mode 100644
index eafaddf1910e..000000000000
--- a/x11/xmascot/files/patch-config.tmpl
+++ /dev/null
@@ -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 =
diff --git a/x11/xmascot/pkg-plist b/x11/xmascot/pkg-plist
index 8f53551c399a..026507ec24a6 100644
--- a/x11/xmascot/pkg-plist
+++ b/x11/xmascot/pkg-plist
@@ -2,6 +2,7 @@ bin/xmascot
 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/virgo.gif
 lib/X11/xmascot/yubi.xbm
 lib/X11/xmascot/yubi.xbmmsk
 man/man1/xmascot.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/README.jp