Bug 80743 - port update/fix: french/alphabet_sounds_fr
Summary: port update/fix: french/alphabet_sounds_fr
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Thierry Thomas
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-05-08 03:00 UTC by bruno schwander
Modified: 2005-05-09 21:14 UTC (History)
0 users

See Also:


Attachments
file.diff (1.38 KB, patch)
2005-05-08 03:00 UTC, bruno schwander
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description bruno schwander 2005-05-08 03:00:19 UTC
	fix and update to alphabet_sounds_fr v 0.3

How-To-Repeat: 	N/A
Comment 1 Thierry Thomas freebsd_committer freebsd_triage 2005-05-08 16:19:01 UTC
State Changed
From-To: open->feedback


I suggest the following patch, to fix the dependency and 
the installation directory; could you please revie it? 

--- alphabet_sounds_fr.diff begins here --- 
diff -urN french/alphabet_sounds_fr.orig/Makefile french/alphabet_sounds_fr/Makefile 
--- french/alphabet_sounds_fr.orig/Makefile	Sun May  8 17:15:40 2005 
+++ french/alphabet_sounds_fr/Makefile	Sun May  8 17:06:47 2005 
@@ -5,7 +5,6 @@ 

PORTNAME=	alphabet_sounds_fr 
PORTVERSION=	0.3 
-PORTREVISION=	1 
CATEGORIES=	french games 
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} 
MASTER_SITE_SUBDIR=	childsplay 
@@ -14,7 +13,7 @@ 
MAINTAINER=	bruno@tinkerbox.org 
COMMENT=	Educative games for children. Alphabet sounds package (french) 

-BUILD_DEPENDS=	${LOCALBASE}/bin/childsplay:${PORTSDIR}/games/childsplay 
+BUILD_DEPENDS=	${X11BASE}/bin/childsplay:${PORTSDIR}/games/childsplay 
RUN_DEPENDS=	${BUILD_DEPENDS} 

USE_REINPLACE=	yes 
diff -urN french/alphabet_sounds_fr.orig/files/patch-install.sh french/alphabet_sounds_fr/files/patch-install.sh 
--- french/alphabet_sounds_fr.orig/files/patch-install.sh	Sun May  8 17:15:40 2005 
+++ french/alphabet_sounds_fr/files/patch-install.sh	Sun May  8 17:06:39 2005 
@@ -1,5 +1,5 @@ 
--- install.sh.orig	Mon Jun 28 13:44:23 2004 
-+++ install.sh	Sun Aug 22 17:16:36 2004 
++++ install.sh	Sun May  8 17:06:06 2005 
@@ -1,8 +1,8 @@ 
-#!/bin/bash  
-# install plugin in the standard childsplay path   
@@ -8,7 +8,7 @@ 

PREFIX=/usr/local 
-DESTDIR=$PREFIX/games/childsplay 
-+DESTDIR=$PREFIX/share/childsplay 
++DESTDIR=$PREFIX/childsplay 

########################################################### 
#    DO NOT EDIT BEHIND THIS POINT 
--- alphabet_sounds_fr.diff ends here --- 



Comment 2 Thierry Thomas freebsd_committer freebsd_triage 2005-05-08 16:19:01 UTC
Responsible Changed
From-To: freebsd-ports-bugs->thierry


Take it.
Comment 3 Thierry Thomas freebsd_committer freebsd_triage 2005-05-09 06:29:40 UTC
Le Lun  9 mai 05 à  1:18:37 +0200, bruno schwander <bruno@tinkerbox.org>
 écrivait :
> Hi Thierry,

Hello,

> You are right for the BUILD_DEPEND, thanks for catching that. However the
> install dir should stay in $PREFIX/share/childsplay.
> 
> That is where similar data is installed by ports/games/childsplay and
> ports/games/childsplay_plugins. It won't work if installed somewhere else.
> 
> It's a bunch of resources that are shared among childsplay and its
> plugins, so it makes sense to put it there I think.

OK, then you have to update pkg-plist too.

Regards,
-- 
Th. Thomas.
Comment 4 bruno 2005-05-09 17:25:09 UTC
forgot that, here is the patch to pkg-plist

--- alphabet_sounds_fr.orig/pkg-plist    Mon Jul 12 21:54:34 2004
+++ alphabet_sounds_fr/pkg-plist    Wed Mar 23 08:57:08 2005
@@ -1,38 +1,38 @@
-childsplay/Data/AlphabetSounds/fr/0.ogg
-childsplay/Data/AlphabetSounds/fr/1.ogg
-childsplay/Data/AlphabetSounds/fr/2.ogg
-childsplay/Data/AlphabetSounds/fr/3.ogg
-childsplay/Data/AlphabetSounds/fr/4.ogg
-childsplay/Data/AlphabetSounds/fr/5.ogg
-childsplay/Data/AlphabetSounds/fr/6.ogg
-childsplay/Data/AlphabetSounds/fr/7.ogg
-childsplay/Data/AlphabetSounds/fr/8.ogg
-childsplay/Data/AlphabetSounds/fr/9.ogg
-childsplay/Data/AlphabetSounds/fr/a.ogg
-childsplay/Data/AlphabetSounds/fr/b.ogg
-childsplay/Data/AlphabetSounds/fr/c.ogg
-childsplay/Data/AlphabetSounds/fr/d.ogg
-childsplay/Data/AlphabetSounds/fr/e.ogg
-childsplay/Data/AlphabetSounds/fr/f.ogg
-childsplay/Data/AlphabetSounds/fr/g.ogg
-childsplay/Data/AlphabetSounds/fr/h.ogg
-childsplay/Data/AlphabetSounds/fr/i.ogg
-childsplay/Data/AlphabetSounds/fr/j.ogg
-childsplay/Data/AlphabetSounds/fr/k.ogg
-childsplay/Data/AlphabetSounds/fr/l.ogg
-childsplay/Data/AlphabetSounds/fr/m.ogg
-childsplay/Data/AlphabetSounds/fr/n.ogg
-childsplay/Data/AlphabetSounds/fr/o.ogg
-childsplay/Data/AlphabetSounds/fr/p.ogg
-childsplay/Data/AlphabetSounds/fr/q.ogg
-childsplay/Data/AlphabetSounds/fr/r.ogg
-childsplay/Data/AlphabetSounds/fr/s.ogg
-childsplay/Data/AlphabetSounds/fr/t.ogg
-childsplay/Data/AlphabetSounds/fr/u.ogg
-childsplay/Data/AlphabetSounds/fr/v.ogg
-childsplay/Data/AlphabetSounds/fr/w.ogg
-childsplay/Data/AlphabetSounds/fr/x.ogg
-childsplay/Data/AlphabetSounds/fr/y.ogg
-childsplay/Data/AlphabetSounds/fr/z.ogg
-childsplay/Data/AlphabetSounds/fr/10.ogg
-@dirrm childsplay/Data/AlphabetSounds/fr
+share/childsplay/Data/AlphabetSounds/fr/0.ogg
+share/childsplay/Data/AlphabetSounds/fr/1.ogg
+share/childsplay/Data/AlphabetSounds/fr/2.ogg
+share/childsplay/Data/AlphabetSounds/fr/3.ogg
+share/childsplay/Data/AlphabetSounds/fr/4.ogg
+share/childsplay/Data/AlphabetSounds/fr/5.ogg
+share/childsplay/Data/AlphabetSounds/fr/6.ogg
+share/childsplay/Data/AlphabetSounds/fr/7.ogg
+share/childsplay/Data/AlphabetSounds/fr/8.ogg
+share/childsplay/Data/AlphabetSounds/fr/9.ogg
+share/childsplay/Data/AlphabetSounds/fr/a.ogg
+share/childsplay/Data/AlphabetSounds/fr/b.ogg
+share/childsplay/Data/AlphabetSounds/fr/c.ogg
+share/childsplay/Data/AlphabetSounds/fr/d.ogg
+share/childsplay/Data/AlphabetSounds/fr/e.ogg
+share/childsplay/Data/AlphabetSounds/fr/f.ogg
+share/childsplay/Data/AlphabetSounds/fr/g.ogg
+share/childsplay/Data/AlphabetSounds/fr/h.ogg
+share/childsplay/Data/AlphabetSounds/fr/i.ogg
+share/childsplay/Data/AlphabetSounds/fr/j.ogg
+share/childsplay/Data/AlphabetSounds/fr/k.ogg
+share/childsplay/Data/AlphabetSounds/fr/l.ogg
+share/childsplay/Data/AlphabetSounds/fr/m.ogg
+share/childsplay/Data/AlphabetSounds/fr/n.ogg
+share/childsplay/Data/AlphabetSounds/fr/o.ogg
+share/childsplay/Data/AlphabetSounds/fr/p.ogg
+share/childsplay/Data/AlphabetSounds/fr/q.ogg
+share/childsplay/Data/AlphabetSounds/fr/r.ogg
+share/childsplay/Data/AlphabetSounds/fr/s.ogg
+share/childsplay/Data/AlphabetSounds/fr/t.ogg
+share/childsplay/Data/AlphabetSounds/fr/u.ogg
+share/childsplay/Data/AlphabetSounds/fr/v.ogg
+share/childsplay/Data/AlphabetSounds/fr/w.ogg
+share/childsplay/Data/AlphabetSounds/fr/x.ogg
+share/childsplay/Data/AlphabetSounds/fr/y.ogg
+share/childsplay/Data/AlphabetSounds/fr/z.ogg
+share/childsplay/Data/AlphabetSounds/fr/10.ogg
+@dirrm share/childsplay/Data/AlphabetSounds/fr


On Mon, 9 May 2005, Thierry Thomas wrote:

> Le Lun  9 mai 05 =E0  1:18:37 +0200, bruno schwander <bruno@tinkerbox.org=
>
>  =E9crivait=A0:
> > Hi Thierry,
>
> Hello,
>
> > You are right for the BUILD_DEPEND, thanks for catching that. However t=
he
> > install dir should stay in $PREFIX/share/childsplay.
> >
> > That is where similar data is installed by ports/games/childsplay and
> > ports/games/childsplay_plugins. It won't work if installed somewhere el=
se.
> >
> > It's a bunch of resources that are shared among childsplay and its
> > plugins, so it makes sense to put it there I think.
>
> OK, then you have to update pkg-plist too.
>
> Regards,
> --
> Th. Thomas.
>
Comment 5 Thierry Thomas freebsd_committer freebsd_triage 2005-05-09 21:13:25 UTC
State Changed
From-To: feedback->closed


Committed, thanks!