ports/142532: [patch] games/jfk switch to using macros in plist & use $SUB_FILES t dynamically adjust pkg-message

Sevan Janiyan venture37 at geeklan.co.uk
Sat Jan 9 18:00:16 UTC 2010


>Number:         142532
>Category:       ports
>Synopsis:       [patch] games/jfk switch to using macros in plist &  use $SUB_FILES t dynamically adjust pkg-message
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 09 18:00:15 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sevan Janiyan
>Release:        
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/games/jfk/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	31 Jul 2009 13:51:29 -0000	1.16
+++ Makefile	9 Jan 2010 17:55:33 -0000
@@ -16,6 +16,7 @@
 
 GNU_CONFIGURE=	yes
 USE_SDL=	image sdl
+SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
@@ -33,6 +34,6 @@
 .endif
 
 post-install:
-	@${SED} s-\$${PREFIX}-${PREFIX}-g < ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	1 Nov 2002 20:58:48 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-Please create a file .jfkserverrc with a line 'level=<levelfile>' where
-<levelfile> is one from ${PREFIX}/share/jfk/levels/ or your own and a file
-.jfkclientrc with a line 'name=<yourname>' in your home directory. For more
-information about other variables read ${PREFIX}/share/doc/jfk/jfkserver.sample
-and ${PREFIX}/share/doc/jfk/jfkclient.sample.
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/games/jfk/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	21 Oct 2003 14:57:32 -0000	1.2
+++ pkg-plist	9 Jan 2010 17:55:33 -0000
@@ -3,152 +3,152 @@
 %%PORTDOCS%%%%DOCSDIR%%/controls.txt
 %%PORTDOCS%%%%DOCSDIR%%/jfkclient.sample
 %%PORTDOCS%%%%DOCSDIR%%/jfkserver.sample
-share/jfk/art/bar/weapon_5.png
-share/jfk/art/bar/arrow.png
-share/jfk/art/bar/bar.png
-share/jfk/art/bar/number_0.png
-share/jfk/art/bar/number_1.png
-share/jfk/art/bar/number_2.png
-share/jfk/art/bar/number_3.png
-share/jfk/art/bar/number_4.png
-share/jfk/art/bar/number_5.png
-share/jfk/art/bar/number_6.png
-share/jfk/art/bar/number_7.png
-share/jfk/art/bar/number_8.png
-share/jfk/art/bar/number_9.png
-share/jfk/art/bar/weapon_0.png
-share/jfk/art/bar/weapon_1.png
-share/jfk/art/bar/weapon_2.png
-share/jfk/art/bar/weapon_3.png
-share/jfk/art/bar/weapon_4.png
-share/jfk/art/bar/player_0.png
-share/jfk/art/bar/player_1.png
-share/jfk/art/bar/player_2.png
-share/jfk/art/bar/player_3.png
-share/jfk/art/bar/player_4.png
-share/jfk/art/bar/player_X.png
-share/jfk/art/font/console.png
-share/jfk/art/font/consoler.png
-share/jfk/art/font/consoley.png
-share/jfk/art/font/highscore.png
-share/jfk/art/ground/waste.png
-share/jfk/art/ground/grass.png
-share/jfk/art/splash/screen.png
-share/jfk/art/object/weapon/weapon_0.png
-share/jfk/art/object/weapon/weapon_1.png
-share/jfk/art/object/weapon/weapon_2.png
-share/jfk/art/object/weapon/weapon_3.png
-share/jfk/art/object/weapon/weapon_4.png
-share/jfk/art/object/weapon/weapon_5.png
-share/jfk/art/object/item/ammo.png
-share/jfk/art/object/item/ammo_s.png
-share/jfk/art/object/item/medikit.png
-share/jfk/art/object/item/medikit_s.png
-share/jfk/art/object/item/beer.png
-share/jfk/art/object/item/grave_0.png
-share/jfk/art/object/item/grave_1.png
-share/jfk/art/object/item/grave_2.png
-share/jfk/art/object/item/grave_3.png
-share/jfk/art/object/item/grave_4.png
-share/jfk/art/object/item/grave_5.png
-share/jfk/art/object/item/grave_6.png
-share/jfk/art/object/person/player_0.png
-share/jfk/art/object/person/player_1.png
-share/jfk/art/object/person/player_2.png
-share/jfk/art/object/person/player_3.png
-share/jfk/art/object/person/player_4.png
-share/jfk/art/object/person/player_5.png
-share/jfk/art/object/person/player_6.png
-share/jfk/art/object/person/player_7.png
-share/jfk/art/object/person/player_8.png
-share/jfk/art/object/person/player_9.png
-share/jfk/art/object/person/player_10.png
-share/jfk/art/object/person/player_11.png
-share/jfk/art/object/person/player_12.png
-share/jfk/art/object/person/player_13.png
-share/jfk/art/object/person/player_14.png
-share/jfk/art/object/person/player_15.png
-share/jfk/art/object/person/player_16.png
-share/jfk/art/object/person/player_17.png
-share/jfk/art/object/person/player_18.png
-share/jfk/art/object/person/player_19.png
-share/jfk/art/object/person/player_20.png
-share/jfk/art/object/person/player_21.png
-share/jfk/art/object/person/player_22.png
-share/jfk/art/object/person/player_23.png
-share/jfk/art/object/person/player_24.png
-share/jfk/art/object/person/player_25.png
-share/jfk/art/object/person/player_26.png
-share/jfk/art/object/person/player_27.png
-share/jfk/art/object/person/player_28.png
-share/jfk/art/object/person/player_29.png
-share/jfk/art/object/person/player_30.png
-share/jfk/art/object/person/player_31.png
-share/jfk/art/object/person/player_32.png
-share/jfk/art/object/person/player_33.png
-share/jfk/art/object/person/player_34.png
-share/jfk/art/object/person/player_35.png
-share/jfk/art/object/explosion/explode_0.png
-share/jfk/art/object/explosion/explode_1.png
-share/jfk/art/object/explosion/explode_2.png
-share/jfk/art/object/explosion/explode_3.png
-share/jfk/art/object/explosion/explode_4.png
-share/jfk/art/object/explosion/explode_5.png
-share/jfk/art/object/explosion/explode_6.png
-share/jfk/art/object/explosion/explode_7.png
-share/jfk/art/object/explosion/explode_8.png
-share/jfk/art/object/explosion/explode_9.png
-share/jfk/art/object/explosion/explode_10.png
-share/jfk/art/object/explosion/explode_11.png
-share/jfk/art/object/explosion/explode_12.png
-share/jfk/art/object/explosion/explode_13.png
-share/jfk/art/object/explosion/explode_14.png
-share/jfk/art/object/explosion/explode_15.png
-share/jfk/art/object/explosion/explode_16.png
-share/jfk/art/object/explosion/explode_17.png
-share/jfk/art/object/explosion/explode_18.png
-share/jfk/art/object/bullet/weapon_0_bullet_0.png
-share/jfk/art/object/bullet/weapon_0_bullet_1.png
-share/jfk/art/object/bullet/weapon_0_bullet_2.png
-share/jfk/art/object/bullet/weapon_0_bullet_3.png
-share/jfk/art/object/bullet/weapon_0_bullet_4.png
-share/jfk/art/object/bullet/weapon_0_bullet_5.png
-share/jfk/art/object/bullet/weapon_0_bullet_6.png
-share/jfk/art/object/bullet/weapon_0_bullet_7.png
-share/jfk/art/object/bullet/weapon_0_bullet_8.png
-share/jfk/art/object/bullet/weapon_0_bullet_9.png
-share/jfk/art/object/bullet/weapon_0_bullet_10.png
-share/jfk/art/object/bullet/weapon_0_bullet_11.png
-share/jfk/art/object/bullet/weapon_0_bullet_12.png
-share/jfk/art/object/bullet/weapon_0_bullet_13.png
-share/jfk/art/object/bullet/weapon_0_bullet_14.png
-share/jfk/art/object/bullet/weapon_0_bullet_15.png
-share/jfk/art/object/bullet/weapon_0_bullet_16.png
-share/jfk/art/object/bullet/weapon_0_bullet_17.png
-share/jfk/art/object/bullet/weapon_0_bullet_18.png
-share/jfk/art/object/bullet/weapon_0_bullet_19.png
-share/jfk/art/object/bullet/weapon_0_bullet_20.png
-share/jfk/art/object/bullet/weapon_0_bullet_21.png
-share/jfk/art/object/bullet/weapon_0_bullet_22.png
-share/jfk/art/object/bullet/weapon_0_bullet_23.png
-share/jfk/art/object/obstacle/bush_0.png
-share/jfk/art/object/obstacle/lake_0.png
-share/jfk/art/object/obstacle/stone_0.png
-share/jfk/art/object/obstacle/tree_0.png
-share/jfk/levels/demolevel
-share/jfk/levels/level1
+%%DATADIR%%/art/bar/weapon_5.png
+%%DATADIR%%/art/bar/arrow.png
+%%DATADIR%%/art/bar/bar.png
+%%DATADIR%%/art/bar/number_0.png
+%%DATADIR%%/art/bar/number_1.png
+%%DATADIR%%/art/bar/number_2.png
+%%DATADIR%%/art/bar/number_3.png
+%%DATADIR%%/art/bar/number_4.png
+%%DATADIR%%/art/bar/number_5.png
+%%DATADIR%%/art/bar/number_6.png
+%%DATADIR%%/art/bar/number_7.png
+%%DATADIR%%/art/bar/number_8.png
+%%DATADIR%%/art/bar/number_9.png
+%%DATADIR%%/art/bar/weapon_0.png
+%%DATADIR%%/art/bar/weapon_1.png
+%%DATADIR%%/art/bar/weapon_2.png
+%%DATADIR%%/art/bar/weapon_3.png
+%%DATADIR%%/art/bar/weapon_4.png
+%%DATADIR%%/art/bar/player_0.png
+%%DATADIR%%/art/bar/player_1.png
+%%DATADIR%%/art/bar/player_2.png
+%%DATADIR%%/art/bar/player_3.png
+%%DATADIR%%/art/bar/player_4.png
+%%DATADIR%%/art/bar/player_X.png
+%%DATADIR%%/art/font/console.png
+%%DATADIR%%/art/font/consoler.png
+%%DATADIR%%/art/font/consoley.png
+%%DATADIR%%/art/font/highscore.png
+%%DATADIR%%/art/ground/waste.png
+%%DATADIR%%/art/ground/grass.png
+%%DATADIR%%/art/splash/screen.png
+%%DATADIR%%/art/object/weapon/weapon_0.png
+%%DATADIR%%/art/object/weapon/weapon_1.png
+%%DATADIR%%/art/object/weapon/weapon_2.png
+%%DATADIR%%/art/object/weapon/weapon_3.png
+%%DATADIR%%/art/object/weapon/weapon_4.png
+%%DATADIR%%/art/object/weapon/weapon_5.png
+%%DATADIR%%/art/object/item/ammo.png
+%%DATADIR%%/art/object/item/ammo_s.png
+%%DATADIR%%/art/object/item/medikit.png
+%%DATADIR%%/art/object/item/medikit_s.png
+%%DATADIR%%/art/object/item/beer.png
+%%DATADIR%%/art/object/item/grave_0.png
+%%DATADIR%%/art/object/item/grave_1.png
+%%DATADIR%%/art/object/item/grave_2.png
+%%DATADIR%%/art/object/item/grave_3.png
+%%DATADIR%%/art/object/item/grave_4.png
+%%DATADIR%%/art/object/item/grave_5.png
+%%DATADIR%%/art/object/item/grave_6.png
+%%DATADIR%%/art/object/person/player_0.png
+%%DATADIR%%/art/object/person/player_1.png
+%%DATADIR%%/art/object/person/player_2.png
+%%DATADIR%%/art/object/person/player_3.png
+%%DATADIR%%/art/object/person/player_4.png
+%%DATADIR%%/art/object/person/player_5.png
+%%DATADIR%%/art/object/person/player_6.png
+%%DATADIR%%/art/object/person/player_7.png
+%%DATADIR%%/art/object/person/player_8.png
+%%DATADIR%%/art/object/person/player_9.png
+%%DATADIR%%/art/object/person/player_10.png
+%%DATADIR%%/art/object/person/player_11.png
+%%DATADIR%%/art/object/person/player_12.png
+%%DATADIR%%/art/object/person/player_13.png
+%%DATADIR%%/art/object/person/player_14.png
+%%DATADIR%%/art/object/person/player_15.png
+%%DATADIR%%/art/object/person/player_16.png
+%%DATADIR%%/art/object/person/player_17.png
+%%DATADIR%%/art/object/person/player_18.png
+%%DATADIR%%/art/object/person/player_19.png
+%%DATADIR%%/art/object/person/player_20.png
+%%DATADIR%%/art/object/person/player_21.png
+%%DATADIR%%/art/object/person/player_22.png
+%%DATADIR%%/art/object/person/player_23.png
+%%DATADIR%%/art/object/person/player_24.png
+%%DATADIR%%/art/object/person/player_25.png
+%%DATADIR%%/art/object/person/player_26.png
+%%DATADIR%%/art/object/person/player_27.png
+%%DATADIR%%/art/object/person/player_28.png
+%%DATADIR%%/art/object/person/player_29.png
+%%DATADIR%%/art/object/person/player_30.png
+%%DATADIR%%/art/object/person/player_31.png
+%%DATADIR%%/art/object/person/player_32.png
+%%DATADIR%%/art/object/person/player_33.png
+%%DATADIR%%/art/object/person/player_34.png
+%%DATADIR%%/art/object/person/player_35.png
+%%DATADIR%%/art/object/explosion/explode_0.png
+%%DATADIR%%/art/object/explosion/explode_1.png
+%%DATADIR%%/art/object/explosion/explode_2.png
+%%DATADIR%%/art/object/explosion/explode_3.png
+%%DATADIR%%/art/object/explosion/explode_4.png
+%%DATADIR%%/art/object/explosion/explode_5.png
+%%DATADIR%%/art/object/explosion/explode_6.png
+%%DATADIR%%/art/object/explosion/explode_7.png
+%%DATADIR%%/art/object/explosion/explode_8.png
+%%DATADIR%%/art/object/explosion/explode_9.png
+%%DATADIR%%/art/object/explosion/explode_10.png
+%%DATADIR%%/art/object/explosion/explode_11.png
+%%DATADIR%%/art/object/explosion/explode_12.png
+%%DATADIR%%/art/object/explosion/explode_13.png
+%%DATADIR%%/art/object/explosion/explode_14.png
+%%DATADIR%%/art/object/explosion/explode_15.png
+%%DATADIR%%/art/object/explosion/explode_16.png
+%%DATADIR%%/art/object/explosion/explode_17.png
+%%DATADIR%%/art/object/explosion/explode_18.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_0.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_1.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_2.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_3.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_4.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_5.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_6.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_7.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_8.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_9.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_10.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_11.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_12.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_13.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_14.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_15.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_16.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_17.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_18.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_19.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_20.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_21.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_22.png
+%%DATADIR%%/art/object/bullet/weapon_0_bullet_23.png
+%%DATADIR%%/art/object/obstacle/bush_0.png
+%%DATADIR%%/art/object/obstacle/lake_0.png
+%%DATADIR%%/art/object/obstacle/stone_0.png
+%%DATADIR%%/art/object/obstacle/tree_0.png
+%%DATADIR%%/levels/demolevel
+%%DATADIR%%/levels/level1
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm share/jfk/art/bar
- at dirrm share/jfk/art/font
- at dirrm share/jfk/art/ground
- at dirrm share/jfk/art/splash
- at dirrm share/jfk/art/object/weapon
- at dirrm share/jfk/art/object/item
- at dirrm share/jfk/art/object/person
- at dirrm share/jfk/art/object/explosion
- at dirrm share/jfk/art/object/bullet
- at dirrm share/jfk/art/object/obstacle
- at dirrm share/jfk/art/object
- at dirrm share/jfk/art
- at dirrm share/jfk/levels
- at dirrm share/jfk
+ at dirrm %%DATADIR%%/art/bar
+ at dirrm %%DATADIR%%/art/font
+ at dirrm %%DATADIR%%/art/ground
+ at dirrm %%DATADIR%%/art/splash
+ at dirrm %%DATADIR%%/art/object/weapon
+ at dirrm %%DATADIR%%/art/object/item
+ at dirrm %%DATADIR%%/art/object/person
+ at dirrm %%DATADIR%%/art/object/explosion
+ at dirrm %%DATADIR%%/art/object/bullet
+ at dirrm %%DATADIR%%/art/object/obstacle
+ at dirrm %%DATADIR%%/art/object
+ at dirrm %%DATADIR%%/art
+ at dirrm %%DATADIR%%/levels
+ at 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 17:55:33 -0000
@@ -0,0 +1,5 @@
+Please create a file .jfkserverrc with a line 'level=<levelfile>' where
+<levelfile> is one from %%DATADIR%%/levels/ or your own and a file
+.jfkclientrc with a line 'name=<yourname>' in your home directory. For more
+information about other variables read %%DOCSDIR%%/jfkserver.sample
+and %%DOCSDIR%%/jfkclient.sample.


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list