From 4285c59768bd4e3d7042f4a391d7b7f107409662 Mon Sep 17 00:00:00 2001 From: Adrian Panasiuk Date: Tue, 11 May 2010 18:44:50 +0000 Subject: [PATCH] fix script --- media-video/gnash/gnash-0.bep | 12 +++++++++--- media-video/gnash/install-gnash-deps | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/media-video/gnash/gnash-0.bep b/media-video/gnash/gnash-0.bep index ed599dabf..058aec237 100644 --- a/media-video/gnash/gnash-0.bep +++ b/media-video/gnash/gnash-0.bep @@ -2,6 +2,7 @@ DESCRIPTION="Gnash - GNU Flash player" HOMEPAGE="http://www.gnu.org/software/gnash/" # dummy SRC_URI="http://ports.haiku-files.org/export/682/haikuports/trunk/media-video/gnash/mime.zip" +CHECKSUM_MD5="1d22a6d67f69d0bfaf2f63e7e8e9d39f" REVISION="1" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." @@ -31,7 +32,7 @@ BUILD { setgcc gcc4 if test ! -e configure; then \ ./autogen.sh ; \ - rm config.status ; true ;\ + rm config.status || true ;\ fi if test ! -e config.status; then \ ./configure --prefix=/boot/apps/Gnash --exec-prefix=/boot/apps/Gnash --bindir=/boot/apps/Gnash --sysconfdir=/boot/preferences/Gnash --libdir=/boot/common/lib --with-renderer=agg --enable-fps-debug=yes --enable-plugins --enable-npapi --with-npapi-plugindir=/boot/apps/Gnash ; \ @@ -40,7 +41,12 @@ BUILD { pushd plugin ; \ mkdir -pv .libs ; \ - unzip -o ../../../mime.zip ; \ + MIMELOCATION=`pwd` ; \ + MIMELOCATION=`dirname "$MIMELOCATION"` ; \ + MIMELOCATION=`dirname "$MIMELOCATION"` ; \ + MIMELOCATION=`dirname "$MIMELOCATION"` ; \ + MIMELOCATION="$MIMELOCATION/download/mime.zip" ; \ + unzip -o "$MIMELOCATION" ; \ for GCC_VERSION in gcc2 gcc4 ; do \ ( echo "compiling libgnashplugin.$GCC_VERSION.so" && setgcc $GCC_VERSION && \ @@ -86,7 +92,7 @@ INSTALL { rm boot/apps/Gnash/gprocessor boot/apps/Gnash/rtmpget boot/apps/Gnash/gnash rm -r boot/apps/Gnash/include boot/apps/Gnash/share rm -r boot/common/lib/pkgconfig - rm -r boot/common/lib/gnash/libmoz* + rm -r boot/common/lib/gnash/libmoz* || true mkdir -pv boot/common/bin/ ln -sf /boot/apps/Gnash/haiku-gnash boot/common/bin/haiku-gnash ln -sf /boot/apps/Gnash/haiku-gnash boot/common/bin/gnash diff --git a/media-video/gnash/install-gnash-deps b/media-video/gnash/install-gnash-deps index 72c9f2cbf..36173b428 100755 --- a/media-video/gnash/install-gnash-deps +++ b/media-video/gnash/install-gnash-deps @@ -133,7 +133,8 @@ ask giflib http://www.fileden.com/files/2008/8/23/2062382/packages/giflib-4.1.6- if [ $COMPILE_TIME == yes ] then - ask Boost-all http://www.haiku-ports.de/packages/dev-libs/boost/boost-1.38.0-gcc4-haiku-2009-09-13.zip + #ask Boost-all http://www.haiku-ports.de/packages/dev-libs/boost/boost-1.38.0-gcc4-haiku-2009-09-13.zip + ask Boost-all http://students.mimuw.edu.pl/~ap262965/haiku-gnash/boost-1.38.0-gcc4-haiku-2009-09-13.zip ask agg-2.5-gcc4 http://students.mimuw.edu.pl/~ap262965/haiku-gnash/agg-2.5-gcc4-haiku-2009-09-13.zip ask_bzr else