From owner-svn-ports-head@freebsd.org Tue Dec 29 10:21:20 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E1CE3A55ADE; Tue, 29 Dec 2015 10:21:19 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 B9811162A; Tue, 29 Dec 2015 10:21:19 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBTALIK0079705; Tue, 29 Dec 2015 10:21:18 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBTALIFP079702; Tue, 29 Dec 2015 10:21:18 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201512291021.tBTALIFP079702@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 29 Dec 2015 10:21:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404729 - in head/games/xbat: . 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.20 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: Tue, 29 Dec 2015 10:21:20 -0000 Author: amdmi3 Date: Tue Dec 29 10:21:18 2015 New Revision: 404729 URL: https://svnweb.freebsd.org/changeset/ports/404729 Log: - Use gcc, as the game segfaults being compiled with clang - Move highscores to /var/games - Modernize plist PR: 205630 Submitted by: amdmi3 Approved by: turutani@scphys.kyoto-u.ac.jp Modified: head/games/xbat/Makefile head/games/xbat/files/patch-Imakefile head/games/xbat/pkg-plist Modified: head/games/xbat/Makefile ============================================================================== --- head/games/xbat/Makefile Tue Dec 29 10:19:55 2015 (r404728) +++ head/games/xbat/Makefile Tue Dec 29 10:21:18 2015 (r404729) @@ -3,7 +3,7 @@ PORTNAME= xbat PORTVERSION= 1.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= LOCAL/hrs DISTNAME= xev111 @@ -19,5 +19,6 @@ USES= imake USE_XORG= x11 xext WRKSRC= ${WRKDIR}/Xev111 ALL_TARGET= xbat +USE_GCC= yes # segfaults when compiled with clang .include Modified: head/games/xbat/files/patch-Imakefile ============================================================================== --- head/games/xbat/files/patch-Imakefile Tue Dec 29 10:19:55 2015 (r404728) +++ head/games/xbat/files/patch-Imakefile Tue Dec 29 10:21:18 2015 (r404729) @@ -1,10 +1,10 @@ ---- Imakefile.orig Mon Mar 17 12:32:22 1997 -+++ Imakefile Tue Jul 1 18:37:39 1997 +--- Imakefile.orig 1997-03-17 12:32:22 UTC ++++ Imakefile @@ -1,24 +1,24 @@ # TOP10 DIR : directory for socre files # -SCORE_DIR = /usr/local/games/Xbat/Score -+SCORE_DIR = ${PREFIX}/lib/X11/Xbat/Score ++SCORE_DIR = /var/games/xbat/Score # IMAGE DIR : directory for image files -IMAGE_DIR = /usr/local/games/Xbat/Image @@ -32,3 +32,15 @@ ####################################################################### +@@ -48,9 +48,8 @@ DependTarget() + CleanTarget() + + install:: +- MakeDir($(DESTDIR)$(SCORE_DIR)) +- chmod 777 $(DESTDIR)$(SCORE_DIR); +- @case '${MFLAGS}' in *[i]*) set +e;; esac; for i in Score/?* ; do set -x; $(INSTALL) -c -m 0666 $$i $(DESTDIR)$(SCORE_DIR) ; \ ++ MakeDir($(DESTDIR)$(SCORE_DIR)) ++ @case '${MFLAGS}' in *[i]*) set +e;; esac; cd Score; for i in ?* ; do set -x; $(INSTALL) -c -m 0666 $$i $(DESTDIR)$(SCORE_DIR)/$$i.sample ; \ + done; + + MakeDir($(DESTDIR)$(IMAGE_DIR)) Modified: head/games/xbat/pkg-plist ============================================================================== --- head/games/xbat/pkg-plist Tue Dec 29 10:19:55 2015 (r404728) +++ head/games/xbat/pkg-plist Tue Dec 29 10:21:18 2015 (r404729) @@ -1,8 +1,4 @@ -@owner root -@group games -@mode 2755 -bin/xbat -@mode 0664 +@(,games,2755) bin/xbat lib/X11/Xbat/Domo/domoX0201.dat lib/X11/Xbat/Domo/domoX0202.dat lib/X11/Xbat/Domo/domoX0203.dat @@ -694,14 +690,10 @@ lib/X11/Xbat/Map/kuuchuu_map6.dat lib/X11/Xbat/Map/kuuchuu_map7.dat lib/X11/Xbat/Map/kuuchuu_map8.dat lib/X11/Xbat/Map/kuuchuu_map9.dat -@mode 0755 -lib/X11/Xbat/Score/top10-0.txt -lib/X11/Xbat/Score/top10-1.txt -lib/X11/Xbat/Score/top10-2.txt -lib/X11/Xbat/Score/top10-3.txt -lib/X11/Xbat/Score/top10-4.txt -@dirrm lib/X11/Xbat/Domo -@dirrm lib/X11/Xbat/Image -@dirrm lib/X11/Xbat/Map -@dirrm lib/X11/Xbat/Score -@dirrm lib/X11/Xbat +@sample(,games,664) /var/games/xbat/Score/top10-0.txt.sample +@sample(,games,664) /var/games/xbat/Score/top10-1.txt.sample +@sample(,games,664) /var/games/xbat/Score/top10-2.txt.sample +@sample(,games,664) /var/games/xbat/Score/top10-3.txt.sample +@sample(,games,664) /var/games/xbat/Score/top10-4.txt.sample +@dir(,games,775) /var/games/xbat/Score +@dir /var/games/xbat