Scratch iniscratch script.

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

Scratch iniscratch script.

Barry Grumbine-2
Hi,

Scratch installs a script that is a bit messed up:

$ sysctl kern.version
kern.version=OpenBSD 5.1 (GENERIC.MP) #207: Sun Feb 12 09:42:14 MST 2012
    [hidden email]:/usr/src/sys/arch/amd64/compile/GENERIC.MP

$ pkg_info |grep scratch
scratch-1.3         visual programming environment and toolkit

$ cat /usr/local/share/scratch/iniscratch
SCRATCH_DIR=${HOME}/Scratch
mkdir ${SCRATCH_DIR}
gunzip < /usr/obj/ports/scratch-1.3/fake-amd64/usr/local/lib/scratch/Scratch.image.gz
> ${SCRATCH_DIR}/Scratch.image
for i in Help locale ; do ln -s
/usr/obj/ports/scratch-1.3/fake-amd64/usr/local/lib/scratch/$i
${SCRATCH_DIR}; done
for i in Media Projects ; do ln -s
/usr/obj/ports/scratch-1.3/fake-amd64/usr/local/share/scratch/$i
${SCRATCH_DIR}; done

$ locate Scratch.image.gz
/usr/local/lib/scratch/Scratch.image.gz


Sorry, I can't figure out how to fix it...


-Barry

Reply | Threaded
Open this post in threaded view
|

Re: Scratch iniscratch script.

Joachim Schipper-2
On Tue, Feb 14, 2012 at 12:59:06PM -0700, Barry Grumbine wrote:

> Hi,
>
> Scratch installs a script that is a bit messed up:
>
> $ sysctl kern.version
> kern.version=OpenBSD 5.1 (GENERIC.MP) #207: Sun Feb 12 09:42:14 MST 2012
>     [hidden email]:/usr/src/sys/arch/amd64/compile/GENERIC.MP
>
> $ pkg_info |grep scratch
> scratch-1.3         visual programming environment and toolkit
>
> $ cat /usr/local/share/scratch/iniscratch
> SCRATCH_DIR=${HOME}/Scratch
> mkdir ${SCRATCH_DIR}
> gunzip < /usr/obj/ports/scratch-1.3/fake-amd64/usr/local/lib/scratch/Scratch.image.gz
> > ${SCRATCH_DIR}/Scratch.image
> for i in Help locale ; do ln -s
> /usr/obj/ports/scratch-1.3/fake-amd64/usr/local/lib/scratch/$i
> ${SCRATCH_DIR}; done
> for i in Media Projects ; do ln -s
> /usr/obj/ports/scratch-1.3/fake-amd64/usr/local/share/scratch/$i
> ${SCRATCH_DIR}; done
>
> $ locate Scratch.image.gz
> /usr/local/lib/scratch/Scratch.image.gz
>
>
> Sorry, I can't figure out how to fix it...

The patch below fixes it. The port is still a bit strange, but it does
start now.

Next time, you may wish to talk to the maintainer first.

(To use it, install the ports tree for your system, and run
  # cd /usr/ports/*/scratch
  # patch -N < ~/this_mail
  # env FETCH_PACKAGES=yes make install
or
  # env FETCH_PACKAGES=yes make update
if you already have scratch installed.)

                Joachim

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/scratch/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 17 Nov 2010 08:05:16 -0000 1.3
+++ Makefile 14 Feb 2012 20:55:50 -0000
@@ -2,7 +2,7 @@
 
 COMMENT = visual programming environment and toolkit
 
-DISTNAME = scratch-1.3
+DISTNAME = scratch-1.3p0
 CATEGORIES = graphics
 HOMEPAGE = http://scratch.mit.edu/
 MASTER_SITES = ${HOMEPAGE:=files/}
Index: files/iniscratch
===================================================================
RCS file: /cvs/ports/graphics/scratch/files/iniscratch,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 iniscratch
--- files/iniscratch 3 Feb 2009 14:56:56 -0000 1.1.1.1
+++ files/iniscratch 14 Feb 2012 20:55:50 -0000
@@ -1,5 +1,5 @@
 SCRATCH_DIR=${HOME}/Scratch
 mkdir ${SCRATCH_DIR}
-gunzip < ${PREFIX}/lib/scratch/Scratch.image.gz > ${SCRATCH_DIR}/Scratch.image
-for i in Help locale ; do ln -s ${PREFIX}/lib/scratch/$i ${SCRATCH_DIR}; done
-for i in Media Projects ; do ln -s ${PREFIX}/share/scratch/$i ${SCRATCH_DIR}; done
+gunzip < ${TRUEPREFIX}/lib/scratch/Scratch.image.gz > ${SCRATCH_DIR}/Scratch.image
+for i in Help locale ; do ln -s ${TRUEPREFIX}/lib/scratch/$i ${SCRATCH_DIR}; done
+for i in Media Projects ; do ln -s ${TRUEPREFIX}/share/scratch/$i ${SCRATCH_DIR}; done

Reply | Threaded
Open this post in threaded view
|

Re: Scratch iniscratch script.

Stuart Henderson
On 2012/02/14 22:00, Joachim Schipper wrote:
> -DISTNAME = scratch-1.3
> +DISTNAME = scratch-1.3p0

not any more; keep DISTNAME the same and use REVISION=0

>  CATEGORIES = graphics
>  HOMEPAGE = http://scratch.mit.edu/
>  MASTER_SITES = ${HOMEPAGE:=files/}
> Index: files/iniscratch
> ===================================================================
> RCS file: /cvs/ports/graphics/scratch/files/iniscratch,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 iniscratch
> --- files/iniscratch 3 Feb 2009 14:56:56 -0000 1.1.1.1
> +++ files/iniscratch 14 Feb 2012 20:55:50 -0000
> @@ -1,5 +1,5 @@
>  SCRATCH_DIR=${HOME}/Scratch
>  mkdir ${SCRATCH_DIR}
> -gunzip < ${PREFIX}/lib/scratch/Scratch.image.gz > ${SCRATCH_DIR}/Scratch.image
> -for i in Help locale ; do ln -s ${PREFIX}/lib/scratch/$i ${SCRATCH_DIR}; done
> -for i in Media Projects ; do ln -s ${PREFIX}/share/scratch/$i ${SCRATCH_DIR}; done
> +gunzip < ${TRUEPREFIX}/lib/scratch/Scratch.image.gz > ${SCRATCH_DIR}/Scratch.image
> +for i in Help locale ; do ln -s ${TRUEPREFIX}/lib/scratch/$i ${SCRATCH_DIR}; done
> +for i in Media Projects ; do ln -s ${TRUEPREFIX}/share/scratch/$i ${SCRATCH_DIR}; done
>

Reply | Threaded
Open this post in threaded view
|

Re: Scratch iniscratch script.

Stuart Cassoff-5
In reply to this post by Joachim Schipper-2
On 02/14/12 16:00, Joachim Schipper wrote:

> On Tue, Feb 14, 2012 at 12:59:06PM -0700, Barry Grumbine wrote:
>> Hi,
>>
>> Scratch installs a script that is a bit messed up:
>>
>> $ sysctl kern.version
>> kern.version=OpenBSD 5.1 (GENERIC.MP) #207: Sun Feb 12 09:42:14 MST 2012
>>     [hidden email]:/usr/src/sys/arch/amd64/compile/GENERIC.MP
>>
>> $ pkg_info |grep scratch
>> scratch-1.3         visual programming environment and toolkit
>>
>> $ cat /usr/local/share/scratch/iniscratch
>> SCRATCH_DIR=${HOME}/Scratch
>> mkdir ${SCRATCH_DIR}
>> gunzip < /usr/obj/ports/scratch-1.3/fake-amd64/usr/local/lib/scratch/Scratch.image.gz
>>> ${SCRATCH_DIR}/Scratch.image
>> for i in Help locale ; do ln -s
>> /usr/obj/ports/scratch-1.3/fake-amd64/usr/local/lib/scratch/$i
>> ${SCRATCH_DIR}; done
>> for i in Media Projects ; do ln -s
>> /usr/obj/ports/scratch-1.3/fake-amd64/usr/local/share/scratch/$i
>> ${SCRATCH_DIR}; done
>>
>> $ locate Scratch.image.gz
>> /usr/local/lib/scratch/Scratch.image.gz
>>
>>
>> Sorry, I can't figure out how to fix it...
>
> The patch below fixes it. The port is still a bit strange, but it does
> start now.
>
> Next time, you may wish to talk to the maintainer first.
>
> (To use it, install the ports tree for your system, and run
>   # cd /usr/ports/*/scratch
>   # patch -N < ~/this_mail
>   # env FETCH_PACKAGES=yes make install
> or
>   # env FETCH_PACKAGES=yes make update
> if you already have scratch installed.)
>
> Joachim
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/scratch/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile 17 Nov 2010 08:05:16 -0000 1.3
> +++ Makefile 14 Feb 2012 20:55:50 -0000
> @@ -2,7 +2,7 @@
>  
>  COMMENT = visual programming environment and toolkit
>  
> -DISTNAME = scratch-1.3
> +DISTNAME = scratch-1.3p0
>  CATEGORIES = graphics
>  HOMEPAGE = http://scratch.mit.edu/
>  MASTER_SITES = ${HOMEPAGE:=files/}
> Index: files/iniscratch
> ===================================================================
> RCS file: /cvs/ports/graphics/scratch/files/iniscratch,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 iniscratch
> --- files/iniscratch 3 Feb 2009 14:56:56 -0000 1.1.1.1
> +++ files/iniscratch 14 Feb 2012 20:55:50 -0000
> @@ -1,5 +1,5 @@
>  SCRATCH_DIR=${HOME}/Scratch
>  mkdir ${SCRATCH_DIR}
> -gunzip < ${PREFIX}/lib/scratch/Scratch.image.gz > ${SCRATCH_DIR}/Scratch.image
> -for i in Help locale ; do ln -s ${PREFIX}/lib/scratch/$i ${SCRATCH_DIR}; done
> -for i in Media Projects ; do ln -s ${PREFIX}/share/scratch/$i ${SCRATCH_DIR}; done
> +gunzip < ${TRUEPREFIX}/lib/scratch/Scratch.image.gz > ${SCRATCH_DIR}/Scratch.image
> +for i in Help locale ; do ln -s ${TRUEPREFIX}/lib/scratch/$i ${SCRATCH_DIR}; done
> +for i in Media Projects ; do ln -s ${TRUEPREFIX}/share/scratch/$i ${SCRATCH_DIR}; done
>
>
>

Oh, PREFIX, when will you be TRUE?

I've had weird experiences with PREFIX being different things at different times.

Stu

Reply | Threaded
Open this post in threaded view
|

Re: Scratch iniscratch script.

Stuart Henderson
On 2012/02/14 18:02, Stuart Cassoff wrote:
>
> Oh, PREFIX, when will you be TRUE?
>
> I've had weird experiences with PREFIX being different things at different times.
>
> Stu
>

 man bsd.port.mk | less +/^THE.FAKE.FRAMEWORK