From owner-svn-ports-head@freebsd.org Thu Jan 14 11:54:27 2016 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 05A83A8242D; Thu, 14 Jan 2016 11:54:27 +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 D27F417FE; Thu, 14 Jan 2016 11:54:26 +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 u0EBsPsV072948; Thu, 14 Jan 2016 11:54:25 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0EBsP2D072944; Thu, 14 Jan 2016 11:54:25 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201601141154.u0EBsP2D072944@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 14 Jan 2016 11:54:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406109 - in head/games/trojka: . 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: Thu, 14 Jan 2016 11:54:27 -0000 Author: amdmi3 Date: Thu Jan 14 11:54:25 2016 New Revision: 406109 URL: https://svnweb.freebsd.org/changeset/ports/406109 Log: - Move scorefile to /var/games - Modernize plist - Remove useless pkg-message PR: 205626 Submitted by: amdmi3 Approved by: maintainer timeout (e@ik.nu, 2 weeks) Deleted: head/games/trojka/files/pkg-message.in Modified: head/games/trojka/Makefile head/games/trojka/files/patch-Makefile head/games/trojka/files/patch-trojka.6 head/games/trojka/pkg-plist Modified: head/games/trojka/Makefile ============================================================================== --- head/games/trojka/Makefile Thu Jan 14 11:47:39 2016 (r406108) +++ head/games/trojka/Makefile Thu Jan 14 11:54:25 2016 (r406109) @@ -3,6 +3,7 @@ PORTNAME= trojka PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ftp://ftp.funet.fi/pub/unix/games/ DISTNAME= ${PORTNAME} @@ -12,9 +13,7 @@ COMMENT= Game of skill LICENSE= TROJKA LICENSE_NAME= Trojka Copyright -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_FILE= ${WRKSRC}/COPYRIGHT - -SUB_FILES= pkg-message +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept .include Modified: head/games/trojka/files/patch-Makefile ============================================================================== --- head/games/trojka/files/patch-Makefile Thu Jan 14 11:47:39 2016 (r406108) +++ head/games/trojka/files/patch-Makefile Thu Jan 14 11:54:25 2016 (r406109) @@ -1,11 +1,11 @@ ---- Makefile.orig Sat Oct 21 05:17:43 1995 -+++ Makefile Tue Jul 18 11:39:08 2000 -@@ -6,14 +6,25 @@ +--- Makefile.orig 1995-10-20 21:17:43 UTC ++++ Makefile +@@ -6,14 +6,24 @@ # - -+SCOREDIR=$(PREFIX)/share/trojka ++SCOREDIR=/var/games +SCOREFILE=$(SCOREDIR)/trojka.scores +CFLAGS+= -DSCOREFILE=\"$(SCOREFILE)\" OBJS= trojka.o screen.o scan.o hiscore.o system.o @@ -17,18 +17,17 @@ install: - cp trojka /usr/games -+ install -c -d -m 0755 $(DESTDIR)$(SCOREDIR) -+ install -c -s trojka $(DESTDIR)$(PREFIX)/bin -+ install -c -m 0644 README $(DESTDIR)$(SCOREDIR) -+ install -c -m 0664 /dev/null $(DESTDIR)$(SCOREFILE) -+ install -c -m 0444 trojka.6.out $(DESTDIR)$(PREFIX)/man/man6/trojka.6 ++ ${BSD_INSTALL_PROGRAM} trojka $(DESTDIR)$(PREFIX)/bin ++ ${BSD_INSTALL_MAN} trojka.6.out $(DESTDIR)$(PREFIX)/man/man6/trojka.6 ++ mkdir -p $(DESTDIR)$(SCOREDIR) ++ touch $(DESTDIR)$(SCOREFILE).sample + +trojka.6.out: trojka.6 + sed "s|%%PREFIX%%|$(PREFIX)|" trojka.6 > trojka.6.out clean: rm -f $(PROGS) *.o core a.out trojka.scores -@@ -53,3 +64,5 @@ +@@ -53,3 +63,5 @@ hpux: linux: make trojka "CFLAGS=-DLINUX" Modified: head/games/trojka/files/patch-trojka.6 ============================================================================== --- head/games/trojka/files/patch-trojka.6 Thu Jan 14 11:47:39 2016 (r406108) +++ head/games/trojka/files/patch-trojka.6 Thu Jan 14 11:54:25 2016 (r406109) @@ -5,7 +5,7 @@ .SH FILES .nf -/usr/local/games/lib/trojka.scores The Trojka hiscore file -+%%PREFIX%%/share/trojka/trojka.scores The Trojka hiscore file ++/var/games/trojka.scores The Trojka hiscore file .SH HISTORY First version written in 1989 for MS-Dog. Not long thereafter (in 1990) Modified: head/games/trojka/pkg-plist ============================================================================== --- head/games/trojka/pkg-plist Thu Jan 14 11:47:39 2016 (r406108) +++ head/games/trojka/pkg-plist Thu Jan 14 11:54:25 2016 (r406109) @@ -1,11 +1,3 @@ -@mode 2755 -@group games -bin/trojka -@group -@mode +@(,games,2755) bin/trojka man/man6/trojka.6.gz -%%DATADIR%%/README -@group games -%%DATADIR%%/trojka.scores -@group -@dirrm %%DATADIR%% +@sample(,games,664) /var/games/trojka.scores.sample