From 765716a4ce639f354e94df6f23f05ff43a7bde0e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 30 Oct 2010 21:56:59 +0000 Subject: [PATCH] Removed gcc4 libdir for several packages in the libpak. --- media-libs/flac/flac-1.2.1.bep | 6 +----- media-libs/guilib/guilib-1.2.1.bep | 6 +----- media-libs/lcms/lcms-2.0a.bep | 7 +------ media-libs/libao/libao-1.0.0.bep | 6 +----- media-libs/libart_lgpl/libart_lgpl-2.3.21.bep | 6 +----- media-libs/libmad/libmad-0.15.1.bep | 6 +----- media-libs/libmikmod/libmikmod-3.1.11.bep | 6 +----- media-libs/libmng/libmng-1.0.10.bep | 6 +----- media-libs/libmodplug/libmodplug-0.8.7.bep | 6 +----- media-libs/libsdl/libsdl-1.2-hg.bep | 6 +----- media-libs/libtheora/libtheora-1.1.1.bep | 6 +----- media-libs/sdl-gfx/sdl-gfx-2.0.20.bep | 6 +----- media-libs/sdl-image/sdl-image-1.2.10.bep | 6 +----- media-libs/sdl-mixer/sdl-mixer-1.2.11.bep | 6 +----- media-libs/sdl-net/sdl-net-1.2.7.bep | 6 +----- media-libs/sdl-rtf/sdl-rtf-0.1.0.bep | 6 +----- media-libs/sdl-sound/sdl-sound-1.0.3.bep | 6 +----- media-libs/sdl-ttf/sdl-ttf-2.0.10.bep | 6 +----- media-libs/smjpeg/smjpeg-0.2.1.bep | 6 +----- media-libs/smpeg/smpeg-0.4.5.bep | 6 +----- media-libs/speex/speex-1.2-git.bep | 6 +----- packs/libpak/libpak-0.9.4.bep | 14 +++++++------- 22 files changed, 28 insertions(+), 113 deletions(-) diff --git a/media-libs/flac/flac-1.2.1.bep b/media-libs/flac/flac-1.2.1.bep index 3072dcdea..21f69bcc4 100644 --- a/media-libs/flac/flac-1.2.1.bep +++ b/media-libs/flac/flac-1.2.1.bep @@ -9,11 +9,7 @@ BUILD { cd flac-1.2.1 libtoolize --force --copy --install MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./autogen.sh --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/guilib/guilib-1.2.1.bep b/media-libs/guilib/guilib-1.2.1.bep index 157ebeb7a..d4cef349f 100644 --- a/media-libs/guilib/guilib-1.2.1.bep +++ b/media-libs/guilib/guilib-1.2.1.bep @@ -18,11 +18,7 @@ BUILD { cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/lcms/lcms-2.0a.bep b/media-libs/lcms/lcms-2.0a.bep index 032afaa1d..44fc0404c 100644 --- a/media-libs/lcms/lcms-2.0a.bep +++ b/media-libs/lcms/lcms-2.0a.bep @@ -11,13 +11,8 @@ BUILD { aclocal automake autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR \ diff --git a/media-libs/libao/libao-1.0.0.bep b/media-libs/libao/libao-1.0.0.bep index a475e7634..2e52ba1e3 100644 --- a/media-libs/libao/libao-1.0.0.bep +++ b/media-libs/libao/libao-1.0.0.bep @@ -12,11 +12,7 @@ BUILD { autoconf automake MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.bep b/media-libs/libart_lgpl/libart_lgpl-2.3.21.bep index 4d84c074a..e5590ac61 100644 --- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.bep +++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.bep @@ -10,11 +10,7 @@ BUILD { libtoolize --force --copy --install autoreconf -i MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/libmad/libmad-0.15.1.bep b/media-libs/libmad/libmad-0.15.1.bep index 1d4a8bafc..37c6a0c5b 100644 --- a/media-libs/libmad/libmad-0.15.1.bep +++ b/media-libs/libmad/libmad-0.15.1.bep @@ -11,11 +11,7 @@ BUILD { aclocal autoconf MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/libmikmod/libmikmod-3.1.11.bep b/media-libs/libmikmod/libmikmod-3.1.11.bep index 2264549ac..75b125d28 100644 --- a/media-libs/libmikmod/libmikmod-3.1.11.bep +++ b/media-libs/libmikmod/libmikmod-3.1.11.bep @@ -19,11 +19,7 @@ BUILD { autoconf automake --add-missing MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/libmng/libmng-1.0.10.bep b/media-libs/libmng/libmng-1.0.10.bep index 8b8590357..2efcd067e 100644 --- a/media-libs/libmng/libmng-1.0.10.bep +++ b/media-libs/libmng/libmng-1.0.10.bep @@ -17,11 +17,7 @@ BUILD { # LDFLAGS=-L/boot/common/lib \ # CPPFLAGS=-I/boot/common/include MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/libmodplug/libmodplug-0.8.7.bep b/media-libs/libmodplug/libmodplug-0.8.7.bep index 095ecb5d6..e10ce86ed 100644 --- a/media-libs/libmodplug/libmodplug-0.8.7.bep +++ b/media-libs/libmodplug/libmodplug-0.8.7.bep @@ -12,11 +12,7 @@ BUILD { autoconf automake MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR \ diff --git a/media-libs/libsdl/libsdl-1.2-hg.bep b/media-libs/libsdl/libsdl-1.2-hg.bep index 3322c2dbb..7359e7ae6 100644 --- a/media-libs/libsdl/libsdl-1.2-hg.bep +++ b/media-libs/libsdl/libsdl-1.2-hg.bep @@ -14,11 +14,7 @@ BUILD { aclocal -I acinclude ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/libtheora/libtheora-1.1.1.bep b/media-libs/libtheora/libtheora-1.1.1.bep index 52315da5b..bd849b7f1 100644 --- a/media-libs/libtheora/libtheora-1.1.1.bep +++ b/media-libs/libtheora/libtheora-1.1.1.bep @@ -11,11 +11,7 @@ BUILD { aclocal -I m4 autoconf MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR \ diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep b/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep index b70b95a2b..f32b9e0ef 100644 --- a/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep +++ b/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep @@ -12,11 +12,7 @@ BUILD { autoconf automake MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/sdl-image/sdl-image-1.2.10.bep b/media-libs/sdl-image/sdl-image-1.2.10.bep index 2a39de186..99c66d09e 100644 --- a/media-libs/sdl-image/sdl-image-1.2.10.bep +++ b/media-libs/sdl-image/sdl-image-1.2.10.bep @@ -19,11 +19,7 @@ BUILD { aclocal -I acinclude ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --enable-bmp --enable-lbm --enable-pcx \ --enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \ diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep index 94bf7b638..4492666c7 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep @@ -22,11 +22,7 @@ BUILD { cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/sdl-net/sdl-net-1.2.7.bep b/media-libs/sdl-net/sdl-net-1.2.7.bep index 30fabc651..3e3f0e124 100644 --- a/media-libs/sdl-net/sdl-net-1.2.7.bep +++ b/media-libs/sdl-net/sdl-net-1.2.7.bep @@ -11,11 +11,7 @@ BUILD { libtoolize --copy --force --install ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep b/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep index 4969b8626..ce482c217 100644 --- a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep +++ b/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep @@ -20,11 +20,7 @@ BUILD { aclocal -I m4 ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3.bep b/media-libs/sdl-sound/sdl-sound-1.0.3.bep index 2d5728428..6432c7014 100644 --- a/media-libs/sdl-sound/sdl-sound-1.0.3.bep +++ b/media-libs/sdl-sound/sdl-sound-1.0.3.bep @@ -9,11 +9,7 @@ BUILD { libtoolize --copy --force --install ./bootstrap MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep index cc30da81f..004216101 100644 --- a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep +++ b/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep @@ -18,11 +18,7 @@ BUILD { echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/smjpeg/smjpeg-0.2.1.bep b/media-libs/smjpeg/smjpeg-0.2.1.bep index 01d5cc370..04d65bbaa 100644 --- a/media-libs/smjpeg/smjpeg-0.2.1.bep +++ b/media-libs/smjpeg/smjpeg-0.2.1.bep @@ -20,11 +20,7 @@ BUILD { automake --foreign --add-missing autoconf MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/smpeg/smpeg-0.4.5.bep b/media-libs/smpeg/smpeg-0.4.5.bep index 9ce002c3d..836d52a80 100644 --- a/media-libs/smpeg/smpeg-0.4.5.bep +++ b/media-libs/smpeg/smpeg-0.4.5.bep @@ -19,11 +19,7 @@ BUILD { automake --foreign --add-missing autoconf MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/speex/speex-1.2-git.bep b/media-libs/speex/speex-1.2-git.bep index 7ed43b115..2dc5e5938 100644 --- a/media-libs/speex/speex-1.2-git.bep +++ b/media-libs/speex/speex-1.2-git.bep @@ -11,11 +11,7 @@ BUILD { echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac autogen.sh --prefix=`finddir B_COMMON_DIRECTORY` MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/packs/libpak/libpak-0.9.4.bep b/packs/libpak/libpak-0.9.4.bep index aa11f8607..630bfa5f3 100644 --- a/packs/libpak/libpak-0.9.4.bep +++ b/packs/libpak/libpak-0.9.4.bep @@ -153,23 +153,23 @@ BUILD { haikuporter -y -z sdl-sound-1.0.3 mv ${HPLOC}/media-libs/sdl-sound/*.xz ${HPLOC}/packs/optionalpackages/sources -# haikuporter -y -d -i allegro-4.4.1.1 -# mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips + haikuporter -y -d -i allegro-4.4.1.1 + mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips haikuporter -y -d -i dumb-0.9.3 mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips -# haikuporter -y -d -i jgmod-0.99 -# mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips + haikuporter -y -d -i jgmod-0.99 + mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips setgcc gcc4 - haikuporter -y -d -i readline-6.0 + haikuporter -c -y -d -i readline-6.1 mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -d -i lua-5.1.4 + haikuporter -c -y -d -i lua-5.1.4 mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -d -i physfs-2.0.1 + haikuporter -c -y -d -i physfs-2.0.1 mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips haikuporter -c -y -d -i fribidi-0.19.2