opentyrian: fixed file permissions for data stuff, and tried to change the default...

diff --git a/opentyrian/.footprint b/opentyrian/.footprint
index 498158cc74a250ad281fa01214735d219ba539b0..8f013b70727c1dbd01a44892b7b5f798dd497dad 100644 (file)
--- a/opentyrian/.footprint
+++ b/opentyrian/.footprint
@@ -4,98 +4,98 @@ drwxr-xr-x    root/root       usr/bin/
 drwxr-xr-x     root/root       usr/share/
 drwxr-xr-x     root/root       usr/share/opentyrian/
 drwxr-xr-x     root/root       usr/share/opentyrian/data/
--rwxrwxrwx     root/root       usr/share/opentyrian/data/cubetxt1.dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/cubetxt2.dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/cubetxt3.dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/cubetxt4.dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/demo.1
--rwxrwxrwx     root/root       usr/share/opentyrian/data/demo.2
--rwxrwxrwx     root/root       usr/share/opentyrian/data/demo.3
--rwxrwxrwx     root/root       usr/share/opentyrian/data/demo.4
--rwxrwxrwx     root/root       usr/share/opentyrian/data/demo.5
--rwxrwxrwx     root/root       usr/share/opentyrian/data/dpmi16bi.ovl
--rwxrwxrwx     root/root       usr/share/opentyrian/data/estsc.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/exitmsg.bin
--rwxrwxrwx     root/root       usr/share/opentyrian/data/file_id.diz
--rwxrwxrwx     root/root       usr/share/opentyrian/data/helpme.doc
--rwxrwxrwx     root/root       usr/share/opentyrian/data/levels1.dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/levels2.dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/levels3.dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/levels4.dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/license.doc
--rwxrwxrwx     root/root       usr/share/opentyrian/data/loudness.awe
--rwxrwxrwx     root/root       usr/share/opentyrian/data/manual.doc
--rwxrwxrwx     root/root       usr/share/opentyrian/data/modems.txt
--rwxrwxrwx     root/root       usr/share/opentyrian/data/music.mus
--rwxrwxrwx     root/root       usr/share/opentyrian/data/netarena.pcx
--rwxrwxrwx     root/root       usr/share/opentyrian/data/netfont1.pcx
--rwxrwxrwx     root/root       usr/share/opentyrian/data/netfont2.pcx
--rwxrwxrwx     root/root       usr/share/opentyrian/data/netmega.pcx
--rwxrwxrwx     root/root       usr/share/opentyrian/data/netset.pcx
--rwxrwxrwx     root/root       usr/share/opentyrian/data/netterm.int
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsh#.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsh0.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsh1.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsh2.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsh3.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsh4.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsh5.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsh6.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsh7.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsh8.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsh9.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsh^.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsha.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshb.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshc.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshd.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshe.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshf.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshg.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshh.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshi.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshj.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshk.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshl.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshm.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshn.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsho.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshp.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshr.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshs.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsht.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshu.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newshv.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/newsh~.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/order.doc
--rwxrwxrwx     root/root       usr/share/opentyrian/data/order.tfp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/palette.dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/setup.box
--rwxrwxrwx     root/root       usr/share/opentyrian/data/setup.ini
--rwxrwxrwx     root/root       usr/share/opentyrian/data/setup.int
--rwxrwxrwx     root/root       usr/share/opentyrian/data/shapes).dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/shapesw.dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/shapesx.dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/shapesy.dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/shapesz.dat
--rwxrwxrwx     root/root       usr/share/opentyrian/data/shipedit.doc
--rwxrwxrwx     root/root       usr/share/opentyrian/data/shipedit.pcx
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tshp2.pcx
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tyrend.anm
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tyrian.cdt
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tyrian.hdt
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tyrian.ico
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tyrian.pic
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tyrian.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tyrian.snd
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tyrian1.lvl
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tyrian2.lvl
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tyrian3.lvl
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tyrian4.lvl
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tyrianc.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/tyrset.pcx
--rwxrwxrwx     root/root       usr/share/opentyrian/data/user1.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/user2.shp
--rwxrwxrwx     root/root       usr/share/opentyrian/data/voices.snd
--rwxrwxrwx     root/root       usr/share/opentyrian/data/voicesc.snd
+-rw-r--r--     root/root       usr/share/opentyrian/data/cubetxt1.dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/cubetxt2.dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/cubetxt3.dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/cubetxt4.dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/demo.1
+-rw-r--r--     root/root       usr/share/opentyrian/data/demo.2
+-rw-r--r--     root/root       usr/share/opentyrian/data/demo.3
+-rw-r--r--     root/root       usr/share/opentyrian/data/demo.4
+-rw-r--r--     root/root       usr/share/opentyrian/data/demo.5
+-rw-r--r--     root/root       usr/share/opentyrian/data/dpmi16bi.ovl
+-rw-r--r--     root/root       usr/share/opentyrian/data/estsc.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/exitmsg.bin
+-rw-r--r--     root/root       usr/share/opentyrian/data/file_id.diz
+-rw-r--r--     root/root       usr/share/opentyrian/data/helpme.doc
+-rw-r--r--     root/root       usr/share/opentyrian/data/levels1.dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/levels2.dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/levels3.dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/levels4.dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/license.doc
+-rw-r--r--     root/root       usr/share/opentyrian/data/loudness.awe
+-rw-r--r--     root/root       usr/share/opentyrian/data/manual.doc
+-rw-r--r--     root/root       usr/share/opentyrian/data/modems.txt
+-rw-r--r--     root/root       usr/share/opentyrian/data/music.mus
+-rw-r--r--     root/root       usr/share/opentyrian/data/netarena.pcx
+-rw-r--r--     root/root       usr/share/opentyrian/data/netfont1.pcx
+-rw-r--r--     root/root       usr/share/opentyrian/data/netfont2.pcx
+-rw-r--r--     root/root       usr/share/opentyrian/data/netmega.pcx
+-rw-r--r--     root/root       usr/share/opentyrian/data/netset.pcx
+-rw-r--r--     root/root       usr/share/opentyrian/data/netterm.int
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsh#.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsh0.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsh1.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsh2.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsh3.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsh4.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsh5.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsh6.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsh7.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsh8.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsh9.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsh^.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsha.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshb.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshc.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshd.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshe.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshf.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshg.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshh.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshi.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshj.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshk.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshl.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshm.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshn.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsho.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshp.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshr.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshs.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsht.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshu.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newshv.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/newsh~.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/order.doc
+-rw-r--r--     root/root       usr/share/opentyrian/data/order.tfp
+-rw-r--r--     root/root       usr/share/opentyrian/data/palette.dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/setup.box
+-rw-r--r--     root/root       usr/share/opentyrian/data/setup.ini
+-rw-r--r--     root/root       usr/share/opentyrian/data/setup.int
+-rw-r--r--     root/root       usr/share/opentyrian/data/shapes).dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/shapesw.dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/shapesx.dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/shapesy.dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/shapesz.dat
+-rw-r--r--     root/root       usr/share/opentyrian/data/shipedit.doc
+-rw-r--r--     root/root       usr/share/opentyrian/data/shipedit.pcx
+-rw-r--r--     root/root       usr/share/opentyrian/data/tshp2.pcx
+-rw-r--r--     root/root       usr/share/opentyrian/data/tyrend.anm
+-rw-r--r--     root/root       usr/share/opentyrian/data/tyrian.cdt
+-rw-r--r--     root/root       usr/share/opentyrian/data/tyrian.hdt
+-rw-r--r--     root/root       usr/share/opentyrian/data/tyrian.ico
+-rw-r--r--     root/root       usr/share/opentyrian/data/tyrian.pic
+-rw-r--r--     root/root       usr/share/opentyrian/data/tyrian.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/tyrian.snd
+-rw-r--r--     root/root       usr/share/opentyrian/data/tyrian1.lvl
+-rw-r--r--     root/root       usr/share/opentyrian/data/tyrian2.lvl
+-rw-r--r--     root/root       usr/share/opentyrian/data/tyrian3.lvl
+-rw-r--r--     root/root       usr/share/opentyrian/data/tyrian4.lvl
+-rw-r--r--     root/root       usr/share/opentyrian/data/tyrianc.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/tyrset.pcx
+-rw-r--r--     root/root       usr/share/opentyrian/data/user1.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/user2.shp
+-rw-r--r--     root/root       usr/share/opentyrian/data/voices.snd
+-rw-r--r--     root/root       usr/share/opentyrian/data/voicesc.snd
 -rwxr-xr-x     root/root       usr/share/opentyrian/opentyrian

diff --git a/opentyrian/Pkgfile b/opentyrian/Pkgfile
index 91c23b4fbe0cb68c026cd8847a8f8676a7ad9ed4..4f8897c3ff7128940f43de97591a7d7528e7109c 100644 (file)
--- a/opentyrian/Pkgfile
+++ b/opentyrian/Pkgfile
@@ -7,14 +7,18 @@
 
 name=opentyrian
 version=2.1
-release=1
+release=2
 source=(http://mikeux.dyndns.org/crux/files/$name-$version.tar.bz2 \
         http://camanis.net/tyrian/tyrian21.zip)
 
 build() {
   cd $name-$version
 
-  sed 's|:=|=|g' -i Makefile
+  # fix default screen scaler and resolution
+  sed -i src/video_scale.c -e 's|int scale, scaler = 2|int scale, scaler = 0|'
+  # fix var's assingement in Makefile
+  sed -i Makefile -e 's|:=|=|'
+
   make \
     CC="$CC" CFLAGS="$CFLAGS -fgnu89-inline" STRIP="$STRIP" \
     SDL_CFLAGS="-I$CLFS/usr/include -I$CLFS/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT" \
@@ -24,7 +28,7 @@ build() {
   install -D -m 0755 $name $PKG/usr/share/$name/$name
 
   rm -f $SRC/tyrian21/*.exe
-  mv $SRC/tyrian21/* $PKG/usr/share/$name/data/
+  install -m 0644 $SRC/tyrian21/* $PKG/usr/share/$name/data/
 
   cat > $PKG/usr/bin/$name << __EOF__
 #!/bin/sh