From ea3f4cd92e1a0059847d42022e2cd8fb31214ab8 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sat, 22 Sep 2018 11:16:03 +0000 Subject: [PATCH] Drop some quotes to make the recipes consistent with the wiki. The quotes around $binDir and $prefix are not needed in the definitions of commandBinDir. There are over 120 recipes which define commandBinDir, and *most* of them don't have quotes in the lines defining commandBinDir and commandSuffix. 15 recipes were not consistent with the wiki. Now they are. --- app-admin/testdisk/testdisk-7.1~git.recipe | 6 +++--- app-arch/gcab/gcab-0.8.recipe | 4 ++-- app-arch/libarchive/libarchive-3.3.2.recipe | 6 +++--- app-arch/zopfli/zopfli-1.0.2.recipe | 4 ++-- app-arch/zstd/zstd-1.1.2.recipe | 4 ++-- app-cdr/uif2iso/uif2iso-0.1.7c.recipe | 4 ++-- app-editors/emacs/emacs-26.1.recipe | 4 ++-- dev-libs/xxhash/xxhash-0.6.4.recipe | 4 ++-- dev-libs/xxhash/xxhash-0.6.5.recipe | 4 ++-- media-libs/alembic/alembic-1.7.9.recipe | 2 +- media-libs/lcms/lcms-2.9.recipe | 4 ++-- media-libs/libbluray/libbluray-1.0.2.recipe | 4 ++-- media-libs/libpagemaker/libpagemaker-0.0.4.recipe | 4 ++-- media-libs/osl/osl-1.9.5.recipe | 4 ++-- media-libs/partio/partio-1.1.0.recipe | 4 ++-- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app-admin/testdisk/testdisk-7.1~git.recipe b/app-admin/testdisk/testdisk-7.1~git.recipe index 0176d1002..24782cb87 100644 --- a/app-admin/testdisk/testdisk-7.1~git.recipe +++ b/app-admin/testdisk/testdisk-7.1~git.recipe @@ -38,11 +38,11 @@ SOURCE_DIR="testdisk-$srcGitRev" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -commandSuffix="$secondaryArchSuffix" -commandBinDir="$binDir" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= - commandBinDir="$prefix/bin" + commandBinDir=$prefix/bin fi #TODO: add SVG icon to qphotorec diff --git a/app-arch/gcab/gcab-0.8.recipe b/app-arch/gcab/gcab-0.8.recipe index f3988f549..a350d0585 100644 --- a/app-arch/gcab/gcab-0.8.recipe +++ b/app-arch/gcab/gcab-0.8.recipe @@ -22,8 +22,8 @@ ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" # On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix="$secondaryArchSuffix" -commandBinDir="$binDir" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= commandBinDir=$prefix/bin diff --git a/app-arch/libarchive/libarchive-3.3.2.recipe b/app-arch/libarchive/libarchive-3.3.2.recipe index 43b6f628f..eaf2ca407 100644 --- a/app-arch/libarchive/libarchive-3.3.2.recipe +++ b/app-arch/libarchive/libarchive-3.3.2.recipe @@ -31,11 +31,11 @@ ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" # On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix="$secondaryArchSuffix" -commandBinDir="$binDir" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= - commandBinDir="$prefix/bin" + commandBinDir=$prefix/bin fi PROVIDES=" diff --git a/app-arch/zopfli/zopfli-1.0.2.recipe b/app-arch/zopfli/zopfli-1.0.2.recipe index 1e6b0ba03..869bee1c6 100644 --- a/app-arch/zopfli/zopfli-1.0.2.recipe +++ b/app-arch/zopfli/zopfli-1.0.2.recipe @@ -12,8 +12,8 @@ SOURCE_DIR="zopfli-zopfli-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc" SECONDARY_ARCHITECTURES="x86" -commandSuffix="$secondaryArchSuffix" -commandBinDir="$binDir" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= commandBinDir=$prefix/bin diff --git a/app-arch/zstd/zstd-1.1.2.recipe b/app-arch/zstd/zstd-1.1.2.recipe index 97f56936b..15bbbeb24 100644 --- a/app-arch/zstd/zstd-1.1.2.recipe +++ b/app-arch/zstd/zstd-1.1.2.recipe @@ -17,8 +17,8 @@ SOURCE_FILENAME="zstd-$portVersion.tar.gz" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" -commandSuffix="$secondaryArchSuffix" -commandBinDir="$binDir" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= commandBinDir=$prefix/bin diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c.recipe b/app-cdr/uif2iso/uif2iso-0.1.7c.recipe index b0f5e92ef..5b3a2096d 100644 --- a/app-cdr/uif2iso/uif2iso-0.1.7c.recipe +++ b/app-cdr/uif2iso/uif2iso-0.1.7c.recipe @@ -19,8 +19,8 @@ CHECKSUM_SHA256_2="60e91e4a3c7b64d18a144b0e2bc0499c1ab10db3676c099725aca820ff429 ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -commandSuffix="$secondaryArchSuffix" -commandBinDir="$binDir" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= commandBinDir=$prefix/bin diff --git a/app-editors/emacs/emacs-26.1.recipe b/app-editors/emacs/emacs-26.1.recipe index c8d60cfa9..090158b09 100644 --- a/app-editors/emacs/emacs-26.1.recipe +++ b/app-editors/emacs/emacs-26.1.recipe @@ -23,8 +23,8 @@ ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="?x86" # On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix="$secondaryArchSuffix" -commandBinDir="$binDir" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= commandBinDir=$prefix/bin diff --git a/dev-libs/xxhash/xxhash-0.6.4.recipe b/dev-libs/xxhash/xxhash-0.6.4.recipe index 882ec8924..57e3c5725 100644 --- a/dev-libs/xxhash/xxhash-0.6.4.recipe +++ b/dev-libs/xxhash/xxhash-0.6.4.recipe @@ -17,10 +17,10 @@ SECONDARY_ARCHITECTURES="?x86_gcc2 x86" # Provide cmd:xxhash on all primary architectures except x86_gcc2, # as well as on x86 secondary arch if the primary arch is x86_gcc2. -commandBinDir="$binDir" +commandBinDir=$binDir provideRuntime=yes if [ "$targetArchitecture" = x86_gcc2 ]; then - commandBinDir="$prefix"/bin + commandBinDir=$prefix/bin else if [ -n "$secondaryArchSuffix" ]; then provideRuntime=no diff --git a/dev-libs/xxhash/xxhash-0.6.5.recipe b/dev-libs/xxhash/xxhash-0.6.5.recipe index 287752876..528401c0c 100644 --- a/dev-libs/xxhash/xxhash-0.6.5.recipe +++ b/dev-libs/xxhash/xxhash-0.6.5.recipe @@ -18,11 +18,11 @@ SECONDARY_ARCHITECTURES="?x86_gcc2 x86" # Provide cmd:xxhash on all primary architectures except x86_gcc2, # as well as on x86 secondary arch if the primary arch is x86_gcc2. commandSuffix=$secondaryArchSuffix -commandBinDir="$binDir" +commandBinDir=$binDir provideRuntime=yes if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= - commandBinDir="$prefix"/bin + commandBinDir=$prefix/bin else if [ -n "$secondaryArchSuffix" ]; then provideRuntime=no diff --git a/media-libs/alembic/alembic-1.7.9.recipe b/media-libs/alembic/alembic-1.7.9.recipe index 3af1851b6..2f590084e 100644 --- a/media-libs/alembic/alembic-1.7.9.recipe +++ b/media-libs/alembic/alembic-1.7.9.recipe @@ -31,7 +31,7 @@ PATCHES="alembic-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86" -commandBinDir="$binDir" +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi diff --git a/media-libs/lcms/lcms-2.9.recipe b/media-libs/lcms/lcms-2.9.recipe index f0b93803c..1902bd7cb 100644 --- a/media-libs/lcms/lcms-2.9.recipe +++ b/media-libs/lcms/lcms-2.9.recipe @@ -16,8 +16,8 @@ SOURCE_DIR="lcms2-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -commandSuffix="$secondaryArchSuffix" -commandBinDir="$binDir" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= commandBinDir=$prefix/bin diff --git a/media-libs/libbluray/libbluray-1.0.2.recipe b/media-libs/libbluray/libbluray-1.0.2.recipe index 487589041..4f77b9f4c 100644 --- a/media-libs/libbluray/libbluray-1.0.2.recipe +++ b/media-libs/libbluray/libbluray-1.0.2.recipe @@ -12,10 +12,10 @@ ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" commandSuffix=$secondaryArchSuffix -commandBinDir="$binDir" +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= - commandBinDir="$prefix"/bin + commandBinDir=$prefix/bin fi libVersion="2.0.2" diff --git a/media-libs/libpagemaker/libpagemaker-0.0.4.recipe b/media-libs/libpagemaker/libpagemaker-0.0.4.recipe index f4bf482ca..9b25bba13 100644 --- a/media-libs/libpagemaker/libpagemaker-0.0.4.recipe +++ b/media-libs/libpagemaker/libpagemaker-0.0.4.recipe @@ -15,8 +15,8 @@ CHECKSUM_SHA256="66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519 ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -commandSuffix="$secondaryArchSuffix" -commandBinDir="$binDir" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= commandBinDir=$prefix/bin diff --git a/media-libs/osl/osl-1.9.5.recipe b/media-libs/osl/osl-1.9.5.recipe index d5d82edbc..02a0e8aa5 100644 --- a/media-libs/osl/osl-1.9.5.recipe +++ b/media-libs/osl/osl-1.9.5.recipe @@ -15,8 +15,8 @@ ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" # On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix="$secondaryArchSuffix" -commandBinDir="$binDir" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= commandBinDir=$prefix/bin diff --git a/media-libs/partio/partio-1.1.0.recipe b/media-libs/partio/partio-1.1.0.recipe index 452ad888d..fa70300b5 100644 --- a/media-libs/partio/partio-1.1.0.recipe +++ b/media-libs/partio/partio-1.1.0.recipe @@ -23,8 +23,8 @@ ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" # On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix="$secondaryArchSuffix" -commandBinDir="$binDir" +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then commandSuffix= commandBinDir=$prefix/bin