From nobody@FreeBSD.org  Sat Jan  9 18:25:21 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5FC71065672
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  9 Jan 2010 18:25:21 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id BB96B8FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  9 Jan 2010 18:25:21 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o09IPL1X019993
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 9 Jan 2010 18:25:21 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o09IPLI9019992;
	Sat, 9 Jan 2010 18:25:21 GMT
	(envelope-from nobody)
Message-Id: <201001091825.o09IPLI9019992@www.freebsd.org>
Date: Sat, 9 Jan 2010 18:25:21 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] games/trojka switch to using macros in plist & use $SUB_FILES to dynamically adjust pkg-message
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: e@ik.nu

>Number:         142535
>Category:       ports
>Synopsis:       [patch] games/trojka switch to using macros in plist & use $SUB_FILES to dynamically adjust pkg-message
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 09 18:30:04 UTC 2010
>Closed-Date:    Sun Jan 10 00:37:02 UTC 2010
>Last-Modified:  Sun Jan 10 00:40:10 UTC 2010
>Originator:     Sevan Janiyan
>Release:        
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/games/trojka/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	21 Feb 2003 12:05:55 -0000	1.3
+++ Makefile	9 Jan 2010 18:18:58 -0000
@@ -15,8 +15,9 @@
 COMMENT=	A game of skill
 
 MAN6=		trojka.6
+SUB_FILES=	pkg-message
 
 post-install:
-	${SED} "s|%%PREFIX%%|${PREFIX}|" ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	18 Jul 2000 09:45:05 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-============================================================
-You now have suid binary (2755):
-
-   %%PREFIX%%/bin/trojka
-
-Scores will not be writed if you don't set suid.
-============================================================
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/games/trojka/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	18 Jul 2000 09:45:05 -0000	1.1
+++ pkg-plist	9 Jan 2010 18:18:58 -0000
@@ -1,5 +1,5 @@
 bin/trojka
-share/trojka/COPYRIGHT
-share/trojka/README
-share/trojka/trojka.scores
-@dirrm share/trojka
+%%DATADIR%%/COPYRIGHT
+%%DATADIR%%/README
+%%DATADIR%%/trojka.scores
+@dirrm %%DATADIR%%
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	9 Jan 2010 18:18:58 -0000
@@ -0,0 +1,7 @@
+============================================================
+You now have suid binary (2755):
+
+   %%PREFIX%%/bin/trojka
+
+Scores will not be writed if you don't set suid.
+============================================================


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Jan 9 18:30:18 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142535 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: e@ik.nu
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/142535: [patch] games/trojka switch to using macros in plist & use $SUB_FILES to dynamically adjust pkg-message
Date: Sat, 9 Jan 2010 18:30:14 UT

 Maintainer of games/trojka,
 
 Please note that PR ports/142535 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/142535
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Edwin Mons <e@ik.nu>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142535: [patch] games/trojka switch to using macros in plist & use $SUB_FILES to dynamically adjust pkg-message
Date: Sat, 9 Jan 2010 20:37:13 +0100

 Looks good, go ahead and commit it as far as I'm concerned.
 
 Kind regards,
 Edwin
 
 
 Op 9 jan 2010, om 19:30 heeft Edwin Groothuis het volgende geschreven:
 
 > Maintainer of games/trojka,
 > 
 > Please note that PR ports/142535 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 > 
 > The full text of the PR can be found at:
 >    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/142535
 > 
 > -- 
 > Edwin Groothuis via the GNATS Auto Assign Tool
 > edwin@FreeBSD.org
 
 Groetjes,
 Edwin
 
 
 
State-Changed-From-To: feedback->open 
State-Changed-By: edwin 
State-Changed-When: Sat Jan 9 20:42:05 UTC 2010 
State-Changed-Why:  
Maintainer approved 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142535 
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Sat Jan 9 22:05:30 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142535 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Sun Jan 10 00:37:01 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142535 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142535: commit references a PR
Date: Sun, 10 Jan 2010 00:36:44 +0000 (UTC)

 pgollucci    2010-01-10 00:36:24 UTC
 
   FreeBSD ports repository
 
   Modified files:
     games/trojka         Makefile pkg-plist 
   Added files:
     games/trojka/files   pkg-message.in 
   Removed files:
     games/trojka         pkg-message 
   Log:
   SUBFILES += pkg-message
   
   PR:             ports/142535
   Submitted by:   Sevan Janiyan <venture37@geeklan.co.uk>
   
   Revision  Changes    Path
   1.4       +2 -1      ports/games/trojka/Makefile
   1.1       +7 -0      ports/games/trojka/files/pkg-message.in (new)
   1.2       +0 -7      ports/games/trojka/pkg-message (dead)
   1.2       +4 -4      ports/games/trojka/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
