diff --git a/app-text/libpaper/libpaper-1.1.24.bep b/app-text/libpaper/libpaper-1.1.24.bep index f7c0c747c..fa65f83a9 100644 --- a/app-text/libpaper/libpaper-1.1.24.bep +++ b/app-text/libpaper/libpaper-1.1.24.bep @@ -13,9 +13,16 @@ BUILD { aclocal -I m4 # 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 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + --libdir=$LIBDIR \ + --mandir=$MANDIR \ + --sbindir=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/libevent/libevent-1.4.14b.bep b/dev-libs/libevent/libevent-1.4.14b.bep index cd77f4c0f..346703569 100644 --- a/dev-libs/libevent/libevent-1.4.14b.bep +++ b/dev-libs/libevent/libevent-1.4.14b.bep @@ -9,7 +9,15 @@ DEPEND="" BUILD { cd libevent-1.4.14b-stable autoreconf -vfi - ./configure --prefix=/boot/common + 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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/guilib/guilib-1.2.1.bep b/media-libs/guilib/guilib-1.2.1.bep index 3a6aca904..157ebeb7a 100644 --- a/media-libs/guilib/guilib-1.2.1.bep +++ b/media-libs/guilib/guilib-1.2.1.bep @@ -17,7 +17,15 @@ BUILD { cp /boot/common/share/aclocal/ltsugar.m4 acinclude cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude ./autogen.sh - ./configure --prefix=/boot/common + 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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/lcms/lcms-2.0a.bep b/media-libs/lcms/lcms-2.0a.bep index 21aeb8cde..032afaa1d 100644 --- a/media-libs/lcms/lcms-2.0a.bep +++ b/media-libs/lcms/lcms-2.0a.bep @@ -11,7 +11,17 @@ BUILD { aclocal automake autoconf - ./configure --prefix=/boot/common CFLAGS=-O0 + + 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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR \ + CFLAGS=-O0 make } diff --git a/media-libs/libao/libao-1.0.0.bep b/media-libs/libao/libao-1.0.0.bep index ace0ecfeb..a475e7634 100644 --- a/media-libs/libao/libao-1.0.0.bep +++ b/media-libs/libao/libao-1.0.0.bep @@ -11,7 +11,15 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + 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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } 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 59bd18f88..4d84c074a 100644 --- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.bep +++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.bep @@ -9,7 +9,15 @@ BUILD { cd libart_lgpl-2.3.21 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + 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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/libmad/libmad-0.15.1.bep b/media-libs/libmad/libmad-0.15.1.bep index f56e8e3ee..ed16c7266 100644 --- a/media-libs/libmad/libmad-0.15.1.bep +++ b/media-libs/libmad/libmad-0.15.1.bep @@ -10,7 +10,15 @@ BUILD { libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=/boot/common + 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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/libmikmod/libmikmod-3.1.11.bep b/media-libs/libmikmod/libmikmod-3.1.11.bep index d0da8d1d7..2264549ac 100644 --- a/media-libs/libmikmod/libmikmod-3.1.11.bep +++ b/media-libs/libmikmod/libmikmod-3.1.11.bep @@ -18,7 +18,15 @@ BUILD { aclocal -I m4 autoconf automake --add-missing - ./configure --prefix=/boot/common + 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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/libmikmod/libmikmod.m4.diff b/media-libs/libmikmod/libmikmod.m4.diff deleted file mode 100644 index a69f39915..000000000 --- a/media-libs/libmikmod/libmikmod.m4.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- /boot/home/libmikmod-3.2.0-beta2-haiku/libmikmod.m4 2009-10-06 08:03:12.000000000 +0000 -+++ /boot/home/Desktop/libmikmod-3.2.0-beta2/libmikmod.m4 2004-01-21 01:36:34.000000000 +0000 -@@ -8,7 +8,7 @@ - dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and - dnl LIBMIKMOD_LDADD - dnl --AC_DEFUN([AM_PATH_LIBMIKMOD], -+AC_DEFUN(AM_PATH_LIBMIKMOD, - [dnl - dnl Get the cflags and libraries from the libmikmod-config script - dnl diff --git a/media-libs/libmng/libmng-1.0.10.bep b/media-libs/libmng/libmng-1.0.10.bep index f6c5df13d..8b8590357 100644 --- a/media-libs/libmng/libmng-1.0.10.bep +++ b/media-libs/libmng/libmng-1.0.10.bep @@ -13,9 +13,18 @@ BUILD { libtoolize --force --copy --install aclocal ./autogen.sh - ./configure --prefix=/boot/common \ - LDFLAGS=-L/boot/common/lib \ - CPPFLAGS=-I/boot/common/include +# ./configure --prefix=/boot/common \ +# 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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/libmodplug/libmodplug-0.8.7.bep b/media-libs/libmodplug/libmodplug-0.8.7.bep index 0d58cd230..095ecb5d6 100644 --- a/media-libs/libmodplug/libmodplug-0.8.7.bep +++ b/media-libs/libmodplug/libmodplug-0.8.7.bep @@ -11,7 +11,16 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common --enable-static + 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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR \ + --enable-static make } diff --git a/media-libs/libtheora/libtheora-1.1.1.bep b/media-libs/libtheora/libtheora-1.1.1.bep index 82878de4e..52315da5b 100644 --- a/media-libs/libtheora/libtheora-1.1.1.bep +++ b/media-libs/libtheora/libtheora-1.1.1.bep @@ -10,7 +10,16 @@ BUILD { libtoolize --force --copy --install aclocal -I m4 autoconf - ./configure --prefix=/boot/common --disable-asm + 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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR \ + --disable-asm make } diff --git a/media-libs/smjpeg/smjpeg-0.2.1.bep b/media-libs/smjpeg/smjpeg-0.2.1.bep index c5ba5cb35..01d5cc370 100644 --- a/media-libs/smjpeg/smjpeg-0.2.1.bep +++ b/media-libs/smjpeg/smjpeg-0.2.1.bep @@ -19,7 +19,15 @@ BUILD { aclocal -I m4 automake --foreign --add-missing autoconf - ./configure --prefix=/boot/common + 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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/smpeg/smpeg-0.4.5.bep b/media-libs/smpeg/smpeg-0.4.5.bep index d57168c6b..9ce002c3d 100644 --- a/media-libs/smpeg/smpeg-0.4.5.bep +++ b/media-libs/smpeg/smpeg-0.4.5.bep @@ -18,7 +18,15 @@ BUILD { aclocal -I acinclude automake --foreign --add-missing autoconf - ./configure --prefix=/boot/common + 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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/media-libs/speex/speex-1.2-git.bep b/media-libs/speex/speex-1.2-git.bep index ede179a72..7ed43b115 100644 --- a/media-libs/speex/speex-1.2-git.bep +++ b/media-libs/speex/speex-1.2-git.bep @@ -10,7 +10,15 @@ BUILD { libtoolize --copy --force --install echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac autogen.sh --prefix=`finddir B_COMMON_DIRECTORY` - ./configure --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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make } diff --git a/sys-libs/readline/readline-6.0.bep b/sys-libs/readline/readline-6.0.bep index e37815de9..b56ce26c9 100644 --- a/sys-libs/readline/readline-6.0.bep +++ b/sys-libs/readline/readline-6.0.bep @@ -10,7 +10,15 @@ BUILD { libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=/boot/common + 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 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR make }