From cb4520fe290879bef88db811f40bcaba1a9f891b Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Mon, 14 Mar 2011 00:19:36 +0000 Subject: [PATCH] Removed check for gcc4 and just set the libdir to B_COMMON_LIB_DIRECTORY. --- app-text/libpaper/libpaper-1.1.24.bep | 10 +++------- dev-games/physfs/physfs-2.0.1.bep | 16 ++++++---------- dev-libs/fribidi/fribidi-0.19.2.bep | 10 +++------- dev-libs/libevent/libevent-1.4.14b.bep | 6 +----- dev-libs/libpcre/libpcre-8.02.bep | 8 ++------ dev-libs/libpcre/libpcre-8.12.bep | 8 ++------ media-libs/faad2/faad2-2.7.bep | 10 +++------- media-libs/libsdl/libsdl-1.3-hg.bep | 10 +++------- sys-libs/readline/readline-6.0.bep | 10 +++------- sys-libs/readline/readline-6.1.bep | 10 +++------- 10 files changed, 29 insertions(+), 69 deletions(-) diff --git a/app-text/libpaper/libpaper-1.1.24.bep b/app-text/libpaper/libpaper-1.1.24.bep index fa65f83a9..48d77e6fd 100644 --- a/app-text/libpaper/libpaper-1.1.24.bep +++ b/app-text/libpaper/libpaper-1.1.24.bep @@ -1,5 +1,5 @@ -DESCRIPTION="Library for handling paper characteristics" -HOMEPAGE="http://packages.debian.org/unstable/source/libpaper" +DESCRIPTION="Library for handling paper characteristics" +HOMEPAGE="http://packages.debian.org/unstable/source/libpaper" SRC_URI="http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz" REVISION="1" STATUS_HAIKU="stable" @@ -14,11 +14,7 @@ BUILD { # 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/dev-games/physfs/physfs-2.0.1.bep b/dev-games/physfs/physfs-2.0.1.bep index 570b0cfb1..dfc030b5a 100644 --- a/dev-games/physfs/physfs-2.0.1.bep +++ b/dev-games/physfs/physfs-2.0.1.bep @@ -1,5 +1,5 @@ -DESCRIPTION="PhysicsFS is a library to provide abstract access to various archives" -HOMEPAGE="http://icculus.org/physfs" +DESCRIPTION="PhysicsFS is a library to provide abstract access to various archives" +HOMEPAGE="http://icculus.org/physfs" SRC_URI="hg+http://hg.icculus.org/icculus/physfs/#release-2.0.1" #SRC_URI="http://icculus.org/physfs/downloads/physfs-2.0.1.tar.gz" #CHECKSUM_MD5="df00465fcfa80e87f718961c6dd6b928" @@ -9,11 +9,7 @@ DEPEND="dev-util/cmake >= 2.8.0 dev-util/mercurial >= 1.4" BUILD { cd physfs-2.0.1 - if [ -n "$(setgcc | grep '2')" ]; then - cmake . -DLIBRARY_OUTPUT_PATH:=`finddir B_COMMON_LIB_DIRECTORY` - else - cmake . -DLIBRARY_OUTPUT_PATH:=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + cmake . -DLIBRARY_OUTPUT_PATH:=`finddir B_COMMON_LIB_DIRECTORY` make } @@ -24,10 +20,10 @@ INSTALL { if [ -e "${DESTDIR}" ]; then mkdir -p ${DESTDIR}/tmp-phy mv -v ${DESTDIR}/boot/common/lib ${DESTDIR}/tmp-phy - mkdir -p ${DESTDIR}/boot/common/lib/gcc4 - mv -v ${DESTDIR}/tmp-phy/lib/* ${DESTDIR}/boot/common/lib/gcc4 + mkdir -p ${DESTDIR}/boot/common/lib + mv -v ${DESTDIR}/tmp-phy/lib/* ${DESTDIR}/boot/common/lib else - mv -v /boot/common/lib/libphysfs.* /boot/common/lib/gcc4 + mv -v /boot/common/lib/libphysfs.* /boot/common/lib fi fi } diff --git a/dev-libs/fribidi/fribidi-0.19.2.bep b/dev-libs/fribidi/fribidi-0.19.2.bep index faed53582..48f0b233e 100644 --- a/dev-libs/fribidi/fribidi-0.19.2.bep +++ b/dev-libs/fribidi/fribidi-0.19.2.bep @@ -1,5 +1,5 @@ -DESCRIPTION="fribidi - A free implementation of the unicode bidirectional algorithm" -HOMEPAGE="http://fribidi.org/" +DESCRIPTION="fribidi - A free implementation of the unicode bidirectional algorithm" +HOMEPAGE="http://fribidi.org/" SRC_URI="http://fribidi.org/download/fribidi-0.19.2.tar.gz" CHECKSUM_MD5="626db17d2d99b43615ad9d12500f568a" REVISION="1" @@ -19,11 +19,7 @@ BUILD { 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/dev-libs/libevent/libevent-1.4.14b.bep b/dev-libs/libevent/libevent-1.4.14b.bep index 346703569..78aa9cb29 100644 --- a/dev-libs/libevent/libevent-1.4.14b.bep +++ b/dev-libs/libevent/libevent-1.4.14b.bep @@ -10,11 +10,7 @@ BUILD { cd libevent-1.4.14b-stable autoreconf -vfi 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/dev-libs/libpcre/libpcre-8.02.bep b/dev-libs/libpcre/libpcre-8.02.bep index 364d5096a..b7f1d8c3d 100644 --- a/dev-libs/libpcre/libpcre-8.02.bep +++ b/dev-libs/libpcre/libpcre-8.02.bep @@ -1,5 +1,5 @@ DESCRIPTION="libpcre - Perl Compatible Regular Expressions" -HOMEPAGE="http://www.xpcre.org/" +HOMEPAGE="http://www.xpcre.org/" SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.02.tar.bz2" CHECKSUM_MD5="27948c1b5f5c1eabc23cba1ebe4c316f" REVISION="1" @@ -7,11 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd pcre-8.02 - 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` libtoolize --force --copy aclocal autoconf diff --git a/dev-libs/libpcre/libpcre-8.12.bep b/dev-libs/libpcre/libpcre-8.12.bep index b074e1bc5..324e4999b 100644 --- a/dev-libs/libpcre/libpcre-8.12.bep +++ b/dev-libs/libpcre/libpcre-8.12.bep @@ -1,5 +1,5 @@ DESCRIPTION="libpcre - Perl Compatible Regular Expressions" -HOMEPAGE="http://www.xpcre.org/" +HOMEPAGE="http://www.xpcre.org/" SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.12.tar.bz2" CHECKSUM_MD5="f14a9fef3c92f3fc6c5ac92d7a2c7eb3" REVISION="1" @@ -7,11 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd pcre-8.12 -# 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` libtoolize --force --copy aclocal autoconf diff --git a/media-libs/faad2/faad2-2.7.bep b/media-libs/faad2/faad2-2.7.bep index d97c7acee..215d00dbb 100644 --- a/media-libs/faad2/faad2-2.7.bep +++ b/media-libs/faad2/faad2-2.7.bep @@ -1,5 +1,5 @@ -DESCRIPTION="FAAD2 is an open source MPEG-4 and MPEG-2 AAC decoder" -HOMEPAGE="http://www.audiocoding.com/" +DESCRIPTION="FAAD2 is an open source MPEG-4 and MPEG-2 AAC decoder" +HOMEPAGE="http://www.audiocoding.com/" SRC_URI="http://downloads.sourceforge.net/faac/faad2-2.7.tar.gz" REVISION="1" STATUS_HAIKU="stable" @@ -12,11 +12,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/libsdl/libsdl-1.3-hg.bep b/media-libs/libsdl/libsdl-1.3-hg.bep index 37763a8ee..5cfbea354 100644 --- a/media-libs/libsdl/libsdl-1.3-hg.bep +++ b/media-libs/libsdl/libsdl-1.3-hg.bep @@ -1,5 +1,5 @@ -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org/" +DESCRIPTION="Simple Direct Media Layer" +HOMEPAGE="http://www.libsdl.org/" SRC_URI="hg+http://hg.libsdl.org/SDL" #CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" REVISION="1" @@ -10,11 +10,7 @@ BUILD { cd libsdl-1.3-hg ./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/sys-libs/readline/readline-6.0.bep b/sys-libs/readline/readline-6.0.bep index 807a3a1bf..77b1ff870 100644 --- a/sys-libs/readline/readline-6.0.bep +++ b/sys-libs/readline/readline-6.0.bep @@ -1,5 +1,5 @@ -DESCRIPTION="readline" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +DESCRIPTION="readline" +HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.0.tar.gz" CHECKSUM_MD5="b7f65a48add447693be6e86f04a63019" REVISION="1" @@ -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/sys-libs/readline/readline-6.1.bep b/sys-libs/readline/readline-6.1.bep index 9392c2d6f..d4e92853f 100644 --- a/sys-libs/readline/readline-6.1.bep +++ b/sys-libs/readline/readline-6.1.bep @@ -1,5 +1,5 @@ -DESCRIPTION="readline" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +DESCRIPTION="readline" +HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.1.tar.gz" CHECKSUM_MD5="fc2f7e714fe792db1ce6ddc4c9fb4ef3" REVISION="1" @@ -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