Skip to content

Commit

Permalink
x11/xmascot: clean up port
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
nyan- authored and rene0 committed Apr 9, 2021
1 parent 98bc55d commit ffce9c1
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 31 deletions.
1 change: 1 addition & 0 deletions LEGAL
Expand Up @@ -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
Expand Down
42 changes: 23 additions & 19 deletions x11/xmascot/Makefile
@@ -1,33 +1,37 @@
# Created by: Yukihiro Nakai <Nakai@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@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-

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>
5 changes: 3 additions & 2 deletions 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
10 changes: 0 additions & 10 deletions x11/xmascot/files/patch-config.tmpl

This file was deleted.

2 changes: 2 additions & 0 deletions x11/xmascot/pkg-plist
Expand Up @@ -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
Expand Down Expand Up @@ -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

0 comments on commit ffce9c1

Please sign in to comment.