diff --git a/games-rpg/freedroidrpg/additional-files/freedroidrpg.rdef.in b/games-rpg/freedroidrpg/additional-files/freedroidrpg.rdef.in index 45bc6dc63..2189f1ba8 100644 --- a/games-rpg/freedroidrpg/additional-files/freedroidrpg.rdef.in +++ b/games-rpg/freedroidrpg/additional-files/freedroidrpg.rdef.in @@ -15,21 +15,26 @@ resource app_version { resource app_signature "@APP_SIGNATURE@"; resource vector_icon array { - $"6E636966080500020006023CEBF13B809ABE0E713F6E504BD5FF4837B8004947" + $"6E6369660A0500020006023CEBF13B809ABE0E713F6E504BD5FF4837B8004947" $"47931A1A1A020106033DC0000000000000003DC00049600048400000F8F8F841" $"F7E59BFFEABD0605FF020006033ABDF0B06C7F31F9F33C3FC74A3C824A82B120" $"F3812569BE5805AAF38125020116023B40000000000000003B800048E0004A00" $"0000FF3500020116023B40000000000000003B80004A90004A000000FF340005" - $"FF0A0614B6BFD7ECEE2E473E2C3A2A3E2E3630393A323634BDDDB9EB4031BF7D" - $"31C005314532C13CB9EB4B354E385239503654BE273D484F4BC69BC3D6C4D0C4" - $"6F49464AC2CCC42CC19EC36343474046C06E463E463D473B49BE2BC301BD32C3" - $"C8384B304BBA7FC494B88DC3CD0606FE0E364B3A49BCE2C3CFBE0BC2A74045BE" - $"AB45C0AC454649C174C2B6C2C3C3E74A4B4051485138510604EE3441383C343C" - $"3B3C3B413746BDE4C29233450604EE463F493C473C4D3C4D404B454E44454706" - $"082EB027602E542A58B9EEC65D324C37494E5254C5C1C607C816C96858600802" - $"533A5C3408022D3A24340604EE2433253425332535243523342335233308023D" - $"4A3E4D0802434A424D0C0A000200041001178300040A010104000A020100000A" - $"040101000A050102000A060103000A000206051001178200040A000107100117" - $"8300040A070107000A00010730582001178300040A0701072058200A01020809" - $"100117820004" + $"FF020106023CB7163DD8A1BD0B973C2657495AB348112500FFFFFFFF286F8204" + $"015D0A0614B6BFD7ECEE2E473E2D3A2B3E2F3630393C323633BEB6BA1440303B" + $"3045304432C0D0B9F94C354E385239503654BE273D484F4BC69BC3D6C4D0C46F" + $"49464AC2CCC42CC19EC36343474046C06E463E463D473B49BE2BC301BD32C3C8" + $"384B304BBA7FC494B88DC3CD0606FE0E364B3A49BCE2C3CFBE0BC2A74045BEAB" + $"45C0AC454649C174C2B6C2C3C3E74A4B405243523D520604EE3441383C343C3B" + $"3C3B413746BDE4C29233450604EE463F493C473C4D3C4D404B454E4445470802" + $"52395A3408022D3A24340604EE2433253425332535243523342335233308023D" + $"4A3E4D0802434A424D02044030C34530BC3A30304030BC3A30C3454050BC3A50" + $"C34550504050C34550BC3A0E0A090109024120000000000000003F4000C70000" + $"4880000A0001091240FAF9000000000000410999C805F2C7E66701178300040A" + $"0801090240FAF9000000000000410999C805F2C7E6670A000200011001178300" + $"040A020100000A040101000A050102000A060103000A00020504100117820004" + $"0A0001061240CC4B000000000000413333BE625BC6E00001178300040A070106" + $"0240CC4B000000000000413333BE625BC6E0000A0001061240CC4B0000000000" + $"004133334B4676C6DFFF01178300040A0701060240CC4B000000000000413333" + $"4B4676C6DFFF0A01020708100117820004" }; diff --git a/games-rpg/freedroidrpg/freedroidrpg-1.0~rc2.recipe b/games-rpg/freedroidrpg/freedroidrpg-1.0~rc2.recipe index d4c76290f..0e2c3cf54 100644 --- a/games-rpg/freedroidrpg/freedroidrpg-1.0~rc2.recipe +++ b/games-rpg/freedroidrpg/freedroidrpg-1.0~rc2.recipe @@ -20,7 +20,7 @@ they can fully express their creativity." HOMEPAGE="http://freedroid.org" COPYRIGHT="2002-2019 The Freedroid team" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${portVersion%\~*}/freedroidRPG-${portVersion//\~}.tar.gz" CHECKSUM_SHA256="feb3e8118422ce4a1c4a5b2b0b3095bee08ca8bdbb4ba25791095ed194b25382" SOURCE_DIR="freedroidrpg-1.0RC2" @@ -119,8 +119,17 @@ BUILD() autoconf echo "=== automake" automake - runConfigure ./configure \ - --bindir=$appsDir \ + + local APPDIR="$appsDir/FreedroidRPG/" + + ./configure \ + --prefix=$APPDIR \ + --bindir=$APPDIR \ + --sbindir=$APPDIR \ + --datarootdir=$APPDIR \ + --datadir=$APPDIR \ + --mandir=$manDir \ + --docdir=$docDir \ --disable-sdltest \ --with-embedded-lua make $jobArgs @@ -130,9 +139,10 @@ INSTALL() { make install - mv $appsDir/freedroidRPG $appsDir/FreedroidRPG + mv $appsDir/FreedroidRPG/freedroidRPG $appsDir/FreedroidRPG/FreedroidRPG + rm -rf $appsDir/FreedroidRPG/{applications,icons,metainfo} - packageEntries data $dataDir + packageEntries data $appsDir/FreedroidRPG/freedroidrpg local APP_SIGNATURE="application/x-vnd.freedroidrpg" local MAJOR="`echo "$portVersion" | cut -d. -f1`" @@ -146,7 +156,7 @@ INSTALL() -e "s|@LONG_INFO@|$LONG_INFO|" \ $portDir/additional-files/freedroidrpg.rdef.in > $sourceDir/freedroidrpg.rdef - addResourcesToBinaries $sourceDir/freedroidrpg.rdef $appsDir/FreedroidRPG + addResourcesToBinaries $sourceDir/freedroidrpg.rdef $appsDir/FreedroidRPG/FreedroidRPG - addAppDeskbarSymlink $appsDir/FreedroidRPG + addAppDeskbarSymlink $appsDir/FreedroidRPG/FreedroidRPG }