svn commit: r373817 - in head/games/xmemory: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Wed Dec  3 13:37:16 2014
New Revision: 373817
URL: https://svnweb.freebsd.org/changeset/ports/373817
QAT: https://qat.redports.org/buildarchive/r373817/

Log:
  - Simplify MASTER_SITES
  - Place data files into ${DATADIR}
  - Fix default font name
  - Simplify installation and plist

Modified:
  head/games/xmemory/Makefile
  head/games/xmemory/files/patch-Imakefile
  head/games/xmemory/pkg-plist

Modified: head/games/xmemory/Makefile
==============================================================================
--- head/games/xmemory/Makefile	Wed Dec  3 13:36:55 2014	(r373816)
+++ head/games/xmemory/Makefile	Wed Dec  3 13:37:16 2014	(r373817)
@@ -5,19 +5,19 @@ PORTNAME=	xmemory
 PORTVERSION=	3.7
 PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	games/multiplayer
+MASTER_SITES=	XCONTRIB/games/multiplayer
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Multi-player memory game
 
 USES=		imake tar:tgz
 USE_XORG=	x11 xext
+MAKE_ENV=	DATADIR="${DATADIR}"
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xmemory
-	${INSTALL_DATA} ${WRKSRC}/home.mem ${WRKSRC}/sports.mem \
-			${STAGEDIR}${PREFIX}/lib/X11/xmemory
-	${LN} -sf home.mem ${STAGEDIR}${PREFIX}/lib/X11/xmemory/default.mem
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.mem ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>

Modified: head/games/xmemory/files/patch-Imakefile
==============================================================================
--- head/games/xmemory/files/patch-Imakefile	Wed Dec  3 13:36:55 2014	(r373816)
+++ head/games/xmemory/files/patch-Imakefile	Wed Dec  3 13:37:16 2014	(r373817)
@@ -1,11 +1,16 @@
---- Imakefile.orig	Thu Jul 18 08:02:56 1996
-+++ Imakefile	Sun Sep  8 03:41:59 2002
-@@ -8,12 +8,12 @@
+--- Imakefile.orig	1996-07-18 19:02:56.000000000 +0400
++++ Imakefile	2014-12-03 03:06:29.000000000 +0300
+@@ -4,16 +4,16 @@
+ 
+ XCOMM Default font pattern to be used when creating letter or smiley tiles
+ 
+-       FONT_DEFAULT = \"-bitstream-charter-bold-r-*\"
++       FONT_DEFAULT = \"-bitstream-bitstream\ charter-bold-r-*\"
  
  XCOMM where to search for data-files, when not found in current dir
  
 -         XMEMORYDIR = \"/usr/games/lib/xmemory\"
-+         XMEMORYDIR = \"${LIBDIR}/xmemory\"
++         XMEMORYDIR = \"${DATADIR}/xmemory\"
  
  XCOMM set the compiler that you like,
  XCOMM gcc should suit, since the libraries are not needed.

Modified: head/games/xmemory/pkg-plist
==============================================================================
--- head/games/xmemory/pkg-plist	Wed Dec  3 13:36:55 2014	(r373816)
+++ head/games/xmemory/pkg-plist	Wed Dec  3 13:37:16 2014	(r373817)
@@ -1,7 +1,5 @@
 bin/xmemory
 man/man1/xmemory.1.gz
-lib/X11/xmemory/sports.mem
-lib/X11/xmemory/home.mem
- at exec ln -sf %f %B/default.mem
- at unexec rm %B/default.mem
- at dirrm lib/X11/xmemory
+%%DATADIR%%/default.mem
+%%DATADIR%%/home.mem
+%%DATADIR%%/sports.mem