ports/79202: bugfix to games/childsplay

[bruno]

>Number:         79202
>Category:       ports
>Synopsis:       bugfix to games/childsplay
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 24 16:10:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     bruno
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
tinkerbox.org
>Environment:
System: FreeBSD duron.bschwand.net 4.11-STABLE FreeBSD 4.11-STABLE #0: Mon Dec 20 19:19:10 PST 2004 bruno at duron.bschwand.net:/usr/obj/usr/src/sys/MYKERNEL i386


	
>Description:
	bugfix in childsplay: wrong filepaths
>How-To-Repeat:
	install childsplay. code then looks for childsplayrc in wrong path
>Fix:

diff -U 4 -r -N childsplay-0.80.1.1/Makefile childsplay-0.80.1.1-2/Makefile
--- childsplay-0.80.1.1/Makefile	Tue Mar 22 21:12:12 2005
+++ childsplay-0.80.1.1-2/Makefile	Wed Mar 23 14:29:39 2005
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	childsplay
 PORTVERSION=	0.80.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	childsplay
 EXTRACT_SUFX=	.tgz
diff -U 4 -r -N childsplay-0.80.1.1/files/patch-childsplay.py childsplay-0.80.1.1-2/files/patch-childsplay.py
--- childsplay-0.80.1.1/files/patch-childsplay.py	Wed Dec 31 16:00:00 1969
+++ childsplay-0.80.1.1-2/files/patch-childsplay.py	Wed Mar 23 14:29:39 2005
@@ -0,0 +1,35 @@
+--- childsplay.py.orig	Wed Mar 23 14:24:48 2005
++++ childsplay.py	Wed Mar 23 14:19:08 2005
+@@ -113,9 +113,9 @@
+         except OSError,info:
+             print >> sys.stderr, "Message while creating directory tree in",os.environ["HOME"],"\n",info
+ # Put the childsplay rc file in the users home dir
+ HOME_RCDIR = os.path.join(HOMEDIR,'ConfigData')
+-src = os.path.join(LIBDIR,'ConfigData','childsplayrc')
++src = os.path.join(MODULESDATADIR,'ConfigData','childsplayrc')
+ dest = os.path.join(HOME_RCDIR,'childsplayrc')
+ #print "homerc,src,dest",HOME_RCDIR,src,dest
+ if not os.path.exists(dest):
+     try:
+@@ -149,9 +149,9 @@
+         rcobj.read(os.path.join(HOMEDIR,'ConfigData',file))
+     except (RcParser_module.ParsingError,Exception):
+         trace_error()
+         try:
+-            rcobj.read(os.path.join(LIBDIR,'ConfigData',file))
++            rcobj.read(os.path.join(MODULESDATADIR,'ConfigData',file))
+         except (RcParser_module.ParsingError,Exception):
+             trace_error()
+         return None
+     rcdic = {}
+@@ -885,9 +885,9 @@
+                         
+             try:
+                 if game_module.RCFILE:# can we use a rcfile?
+                     rcfile = plugin_name+'rc'
+-                    src = os.path.join(LIBDIR,'ConfigData',rcfile)
++                    src = os.path.join(MODULESDATADIR,'ConfigData',rcfile)
+                     dest = os.path.join(HOME_RCDIR,rcfile)
+                     if not os.path.exists(dest) and os.path.exists(src):
+                         shutil.copyfile(src,dest)
+                     plug_rcdic = get_rc(rcfile)
diff -U 4 -r -N childsplay-0.80.1.1/files/patch-utils.py childsplay-0.80.1.1-2/files/patch-utils.py
--- childsplay-0.80.1.1/files/patch-utils.py	Wed Dec 31 16:00:00 1969
+++ childsplay-0.80.1.1-2/files/patch-utils.py	Wed Mar 23 14:29:39 2005
@@ -0,0 +1,13 @@
+--- utils.py.orig	Wed Mar 23 14:26:35 2005
++++ utils.py	Wed Mar 23 14:27:19 2005
+@@ -75,9 +75,9 @@
+ 
+ def replace_rcfile():
+     """This is only used when we want to replace an existing configfile."""
+     #pass #enable this and comment out the rest when not replacing
+-    src = os.path.join(LIBDIR,'ConfigData',CHILDSPLAYRC)
++    src = os.path.join(MODULESDATADIR,'ConfigData',CHILDSPLAYRC)
+     dst = os.path.join(HOMEDIR,'ConfigData',CHILDSPLAYRC) 
+     if os.path.exists(src) and os.path.exists(dst):
+         print "Replace childsplayrc file\n",src,"->\n",dst
+         shutil.copyfile(src,dst)



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