From owner-svn-ports-head@FreeBSD.ORG Wed Dec 3 13:37:17 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D0DAC1E9; Wed, 3 Dec 2014 13:37:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B1BAF8B1; Wed, 3 Dec 2014 13:37:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB3DbH2Y098941; Wed, 3 Dec 2014 13:37:17 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB3DbHF1098938; Wed, 3 Dec 2014 13:37:17 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412031337.sB3DbHF1098938@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 3 Dec 2014 13:37:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373817 - in head/games/xmemory: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Dec 2014 13:37:18 -0000 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@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 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 -@exec ln -sf %f %B/default.mem -@unexec rm %B/default.mem -@dirrm lib/X11/xmemory +%%DATADIR%%/default.mem +%%DATADIR%%/home.mem +%%DATADIR%%/sports.mem