From sevan@newbie.thingamajig-systems.co.uk  Mon Jan 11 00:58:09 2010
Return-Path: <sevan@newbie.thingamajig-systems.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 05BBA1065693
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 11 Jan 2010 00:58:09 +0000 (UTC)
	(envelope-from sevan@newbie.thingamajig-systems.co.uk)
Received: from newbie.thingamajig-systems.co.uk (newbie.thingamajig-systems.co.uk [93.97.185.103])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F3338FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 11 Jan 2010 00:58:08 +0000 (UTC)
Received: from newbie.thingamajig-systems.co.uk (localhost [127.0.0.1])
	by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3) with ESMTP id o0B0sNRZ005552
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 11 Jan 2010 00:54:23 GMT
	(envelope-from sevan@newbie.thingamajig-systems.co.uk)
Received: (from root@localhost)
	by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3/Submit) id o0B0sNxl005551;
	Mon, 11 Jan 2010 00:54:23 GMT
	(envelope-from sevan)
Message-Id: <201001110054.o0B0sNxl005551@newbie.thingamajig-systems.co.uk>
Date: Mon, 11 Jan 2010 00:54:23 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] japanese/ja-zangband: use $SUB_FILES to dynamically adjust pkg-message
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         142622
>Category:       ports
>Synopsis:       [PATCH] japanese/ja-zangband: 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:   Mon Jan 11 01:00:11 UTC 2010
>Closed-Date:    Tue Jan 12 04:04:58 UTC 2010
>Last-Modified:  Tue Jan 12 04:10:07 UTC 2010
>Originator:     Sevan Janiyan
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan  5 21:11:58 UTC
>Description:
There's no need to invoke sed manually, use $SUB_FILES to take care of things automatically.

Added file(s):
- files/pkg-message.in

Removed file(s):
- files/MESSAGE.in

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- ja-zangband-2.4.0.j020104_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/zangband/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile	10 Jan 2010 01:08:57 -0000	1.12
+++ Makefile	11 Jan 2010 00:52:40 -0000
@@ -26,7 +26,8 @@
 NO_CDROM=	Possible copyright infringement
 
 WRKSRC=		${WRKDIR}/ZAngband
-PKGMESSAGE=	${WRKDIR}/MESSAGE
+SUB_FILES=	pkg-message
+SUB_LIST=	ANGBANDBIN=${ANGBANDBIN} ANGBANDLIB=${ANGBANDLIB}
 PLIST_SUB+=	ANGBANDBIN=${ANGBANDBIN} ANGBANDLIB=${ANGBANDLIB}
 
 SHAREOWN=	games
@@ -53,7 +54,6 @@
 pre-build:
 	${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
 	${CP} ${WRKSRC}/src/makefile.std ${WRKSRC}/src/Makefile
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g;s|%%ANGBANDBIN%%|${ANGBANDBIN}|g;s|%%ANGBANDLIB%%|${ANGBANDLIB}|g" ${FILESDIR}/MESSAGE.in > ${PKGMESSAGE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/testing ${PREFIX}/${ANGBANDBIN}
Index: files/MESSAGE.in
===================================================================
RCS file: files/MESSAGE.in
diff -N files/MESSAGE.in
--- files/MESSAGE.in	1 Sep 2001 06:04:55 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
- ============================================================================
- To reduce the number of term windows opened, use -n:
-   %%PREFIX%%/%%ANGBANDBIN%% -- -n2
-
- The binary will changed its owner to 'games:games' and added SETGID bit.
- Then players can record their score to public score files.
- You can set fonts by using environment variables such as ANGBAND_X11_FONT,
- ANGBAND_X11_FONT_1 (the number represents sub-window id),
- ANGBAND_X11_KFONT (for kanji support), etc.
-
- WARNING!
- You now have the following world-writable (mode 1777) directories:
-   %%PREFIX%%/%%ANGBANDLIB%%/save
-   %%PREFIX%%/%%ANGBANDLIB%%/user
- ============================================================================
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	11 Jan 2010 00:52:40 -0000
@@ -0,0 +1,15 @@
+ ============================================================================
+ To reduce the number of term windows opened, use -n:
+   %%PREFIX%%/%%ANGBANDBIN%% -- -n2
+
+ The binary will changed its owner to 'games:games' and added SETGID bit.
+ Then players can record their score to public score files.
+ You can set fonts by using environment variables such as ANGBAND_X11_FONT,
+ ANGBAND_X11_FONT_1 (the number represents sub-window id),
+ ANGBAND_X11_KFONT (for kanji support), etc.
+
+ WARNING!
+ You now have the following world-writable (mode 1777) directories:
+   %%PREFIX%%/%%ANGBANDLIB%%/save
+   %%PREFIX%%/%%ANGBANDLIB%%/user
+ ============================================================================
--- ja-zangband-2.4.0.j020104_2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Mon Jan 11 02:12:04 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142622 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Tue Jan 12 04:04:57 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142622: commit references a PR
Date: Tue, 12 Jan 2010 04:04:44 +0000 (UTC)

 pgollucci    2010-01-12 04:04:35 UTC
 
   FreeBSD ports repository
 
   Modified files:
     japanese/zangband    Makefile 
   Added files:
     japanese/zangband/files pkg-message.in 
   Removed files:
     japanese/zangband/files MESSAGE.in 
   Log:
   - SUB_FILES += pkg-message
   
   PR:             ports/142622
   Submitted by:   Sevan Janiyan <venture37@geeklan.co.uk>
   
   Revision  Changes    Path
   1.13      +2 -2      ports/japanese/zangband/Makefile
   1.2       +0 -15     ports/japanese/zangband/files/MESSAGE.in (dead)
   1.1       +15 -0     ports/japanese/zangband/files/pkg-message.in (new)
 _______________________________________________
 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:
