From fd4d6ee934698178c929a0ab44f77eb8d9e7bbcd Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sun, 27 Mar 2011 23:52:58 +0000 Subject: [PATCH] More cleanups relating to finddir invocations. No functional changes. --- app-arch/p7zip/p7zip-9.04.bep | 6 +++++- app-arch/p7zip/p7zip-9.13.bep | 5 +++-- dev-lang/yasm/yasm-1.1.0.bep | 7 ++++--- dev-libs/fribidi/fribidi-0.19.2.bep | 4 ++-- dev-libs/libevent/libevent-1.4.14b.bep | 4 ++-- dev-libs/libevent/libevent-2.0.10.bep | 4 ++-- dev-vcs/bzr/bzr-2.2.0.bep | 19 +++++++++++-------- 7 files changed, 29 insertions(+), 20 deletions(-) diff --git a/app-arch/p7zip/p7zip-9.04.bep b/app-arch/p7zip/p7zip-9.04.bep index e5fc8d1e6..26ae736bb 100644 --- a/app-arch/p7zip/p7zip-9.04.bep +++ b/app-arch/p7zip/p7zip-9.04.bep @@ -13,7 +13,11 @@ BUILD { INSTALL { cd p7zip_9.04 - make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` DEST_SHARE_DOC=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/p7zip DEST_MAN=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + make install DEST_DIR=${DESTDIR} \ + DEST_HOME=`finddir B_COMMON_DIRECTORY` \ + DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \ + DEST_MAN=$COMMON_DOCS/man } LICENSE="GNU LGPL v2.1" COPYRIGHT="1999-2009 7-Zip Igor Pavlov." diff --git a/app-arch/p7zip/p7zip-9.13.bep b/app-arch/p7zip/p7zip-9.13.bep index 0793c395e..a2b44e7f1 100644 --- a/app-arch/p7zip/p7zip-9.13.bep +++ b/app-arch/p7zip/p7zip-9.13.bep @@ -13,9 +13,10 @@ BUILD { INSTALL { cd p7zip_9.13 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \ - DEST_SHARE_DOC=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/p7zip \ - DEST_MAN=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \ + DEST_MAN=$COMMON_DOCS/man } LICENSE="GNU LGPL v2.1" COPYRIGHT="1999-2010 7-Zip Igor Pavlov." diff --git a/dev-lang/yasm/yasm-1.1.0.bep b/dev-lang/yasm/yasm-1.1.0.bep index c5c8352c8..9f243f965 100644 --- a/dev-lang/yasm/yasm-1.1.0.bep +++ b/dev-lang/yasm/yasm-1.1.0.bep @@ -1,5 +1,5 @@ -DESCRIPTION="Yasm assembler" -HOMEPAGE="http://www.tortall.net/projects/yasm/" +DESCRIPTION="Yasm assembler" +HOMEPAGE="http://www.tortall.net/projects/yasm/" SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz" CHECKSUM_MD5="8392e5f2235c2c2a981e1a633f2698cb" REVISION="1" @@ -8,8 +8,9 @@ DEPEND="" BUILD { cd yasm-1.1.0 libtoolize --force --copy --install + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + --mandir=$COMMON_DOCS/man make } diff --git a/dev-libs/fribidi/fribidi-0.19.2.bep b/dev-libs/fribidi/fribidi-0.19.2.bep index 48f0b233e..9786bac7f 100644 --- a/dev-libs/fribidi/fribidi-0.19.2.bep +++ b/dev-libs/fribidi/fribidi-0.19.2.bep @@ -18,11 +18,11 @@ BUILD { aclocal -I m4 automake autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ - --mandir=$MANDIR + --mandir=$COMMON_DOCS make } diff --git a/dev-libs/libevent/libevent-1.4.14b.bep b/dev-libs/libevent/libevent-1.4.14b.bep index 78aa9cb29..aff7ae9a7 100644 --- a/dev-libs/libevent/libevent-1.4.14b.bep +++ b/dev-libs/libevent/libevent-1.4.14b.bep @@ -9,11 +9,11 @@ DEPEND="" BUILD { cd libevent-1.4.14b-stable autoreconf -vfi - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ - --mandir=$MANDIR + --mandir=$COMMON_DOCS make } diff --git a/dev-libs/libevent/libevent-2.0.10.bep b/dev-libs/libevent/libevent-2.0.10.bep index 342d08396..87dc63adc 100644 --- a/dev-libs/libevent/libevent-2.0.10.bep +++ b/dev-libs/libevent/libevent-2.0.10.bep @@ -9,11 +9,11 @@ DEPEND="" BUILD { cd libevent-2.0.10-stable autoreconf -vfi - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ - --mandir=$MANDIR + --mandir=$COMMON_DOCS make } diff --git a/dev-vcs/bzr/bzr-2.2.0.bep b/dev-vcs/bzr/bzr-2.2.0.bep index c3999cdba..d2019e4ec 100644 --- a/dev-vcs/bzr/bzr-2.2.0.bep +++ b/dev-vcs/bzr/bzr-2.2.0.bep @@ -1,6 +1,6 @@ -DESCRIPTION="Bazaar" -HOMEPAGE="https://launchpad.net/bzr/" -SRC_URI="http://launchpad.net/bzr/2.2/2.2.0/+download/bzr-2.2.0.tar.gz" +DESCRIPTION="Bazaar" +HOMEPAGE="https://launchpad.net/bzr/" +SRC_URI="http://launchpad.net/bzr/2.2/2.2.0/+download/bzr-2.2.0.tar.gz" CHECKSUM_MD5="e47fa50e1fedc01c4761925e9d0d39ac" REVISION="1" STATUS_HAIKU="stable" @@ -17,16 +17,19 @@ BUILD { INSTALL { cd bzr-2.2.0 + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + if [ -n "$(setgcc | grep '2')" ]; then - python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} + python setup.py build_ext --allow-python-fallback install --prefix=$COMMON_DIR --root=${DESTDIR} else - python setup.py install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} + python setup.py install --prefix=$COMMON_DIR --root=${DESTDIR} fi ## Now put the man file(s) in the correct directory - mkdir -p ${DESTDIR}$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1 - mv ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man/man1/bzr* ${DESTDIR}/$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1/ + mkdir -p ${DESTDIR}$COMMON_DOCS/man/man1 + mv ${DESTDIR}/$COMMON_DIR/man/man1/bzr* ${DESTDIR}/$COMMON_DOCS/man/man1/ if [ -e "${DESTDIR}" ]; then - rm -rf ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man + rm -rf ${DESTDIR}/$COMMON_DIR/man fi }