Explicitly reference all additional files.

Not referencing them caused them to be missing from the source packages.

This also moves all files that were in different dirs under the common
additional-files dir.
This commit is contained in:
Michael Lotz
2015-12-20 18:24:53 +01:00
parent 947c7b0ce2
commit a43c394c4d
47 changed files with 80 additions and 60 deletions

View File

@@ -60,6 +60,7 @@ BUILD_PREREQUIRES="
"
PATCHES="keepassx-2.0a5.patchset"
ADDITIONAL_FILES="keepassx.rdef"
BUILD()
{

View File

@@ -62,6 +62,7 @@ BUILD_PREREQUIRES="
"
PATCHES="keepassx-2.0a6.patchset"
ADDITIONAL_FILES="keepassx.rdef"
SOURCE_DIR="keepassx-2.0-alpha6"

View File

@@ -14,6 +14,7 @@ CHECKSUM_SHA256_2="e0227251c5aa23f8b88973c298cc80b03bd238c645f7f82a6ce888a06b295
SOURCE_DIR="texlive-20140525-source"
SOURCE_DIR_2="texlive-20140525-texmf"
PATCHES="texlive-2014.patchset"
ADDITIONAL_FILES="tlutils.pm.patch"
ARCHITECTURES="x86 !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -647,7 +648,7 @@ INSTALL()
export TEXLIVE_INSTALL_TEXMFCONFIG=/boot/home/config/settings/texmf/config
export TEXLIVE_INSTALL_TEXMFHOME=/boot/home/config/settings
if [ ! -e flag.patched ] ; then
patch -Np2 < $portDir/patches/tlutils.pm.patch
patch -Np2 < $portDir/additional-files/tlutils.pm.patch
touch flag.patched
fi
# hmm, need to work-around /boot/system/non-packaged not existing....

View File

@@ -111,6 +111,7 @@ BUILD_PREREQUIRES="
"
PATCHES="openjdk_x86-1.7.u80_b32-source9.patchset"
ADDITIONAL_FILES="jexec.rdef"
BUILD()
{
@@ -158,7 +159,8 @@ INSTALL()
mkdir -p $(dirname $jdkDir)
cp -a output/j2sdk-image $jdkDir
addResourcesToBinaries $portDir/sources/jexec.rdef $jdkDir/lib/jexec
addResourcesToBinaries $portDir/additional-files/jexec.rdef \
$jdkDir/lib/jexec
# set up the cacerts file
cacerts=$jdkDir/jre/lib/security/cacerts

View File

@@ -26,6 +26,11 @@ SOURCE_URI_7="hg+http://hg.openjdk.java.net/jdk7u/jdk7u/jaxws#jdk7u80-b02"
SOURCE_URI_8="hg+http://bitbucket.org/hamishm/haiku-jdk7u-hotspot#755ff2f"
SOURCE_URI_9="hg+http://bitbucket.org/hamishm/haiku-jdk7u-jdk#f39f6f6"
ADDITIONAL_FILES="
hjava.cpp
hjava.rdef
"
REVISION="2"
ARCHITECTURES="!x86_gcc2 ?x86"
SECONDARY_ARCHITECTURES="?x86"
@@ -109,8 +114,9 @@ BUILD_PREREQUIRES="
BUILD()
{
# Build "hjava" command.
g++ $portDir/sources/hjava.cpp -DJAVA_BINARY=\"$binDir/java\" -o hjava
addResourcesToBinaries $portDir/sources/hjava.rdef hjava
g++ $portDir/additional-files/hjava.cpp -DJAVA_BINARY=\"$binDir/java\" \
-o hjava
addResourcesToBinaries $portDir/additional-files/hjava.rdef hjava
OPENJDK_DIR=$(dirname $sourceDir)

View File

@@ -20,6 +20,11 @@ SOURCE_URI_7="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/jaxws#jdk8u40-b27"
SOURCE_URI_8="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn#jdk8u40-b27"
SOURCE_DIR="jdk"
ADDITIONAL_FILES="
elf.h
jexec.rdef
"
ARCHITECTURES="!x86_gcc2 ?x86"
SECONDARY_ARCHITECTURES="?x86" # circular dependency - needs fixing
@@ -120,7 +125,7 @@ BUILD()
ln -sfn $sourceDir7 jaxws
ln -sfn $sourceDir8 nashorn
cp $portDir/sources/elf.h hotspot/src/share/vm/utilities
cp $portDir/additional-files/elf.h hotspot/src/share/vm/utilities
# If ASLR is enabled, the JVM can fail to find a large enough area for
# the heap.
@@ -149,7 +154,8 @@ INSTALL()
mkdir -p $(dirname $jdkDir)
cp -a build/haiku-*/images/j2sdk-image $jdkDir
addResourcesToBinaries $portDir/sources/jexec.rdef $jdkDir/lib/jexec
addResourcesToBinaries $portDir/additional-files/jexec.rdef \
$jdkDir/lib/jexec
# set up the cacerts file
cacerts=$jdkDir/jre/lib/security/cacerts

View File

@@ -1,37 +0,0 @@
#!/bin/sh
javaHome="%JAVA_HOME%"
printUsage()
{
cat <<EOF
Usage: java-config <option>
Print java configuration values.
Options:
-h, --help - Print this help text.
-H - Print Java home path.
EOF
}
if [ $# -ne 1 ]; then
printUsage >&2
exit 1
fi
case "$1" in
-H)
echo $javaHome
;;
-h|--help)
printUsage
exit 0
;;
*)
printUsage >&2
exit 1
;;
esac

View File

@@ -9,6 +9,7 @@ HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
SOURCE_URI="https://github.com/downloads/lvc/abi-compliance-checker/abi-compliance-checker-1.98.3.tar.gz"
CHECKSUM_SHA256="d397530027ec781d53d80287a77f18a872b35720fbb1e559e0bda7e715607013"
SOURCE_DIR="abi-compliance-checker-1.98.3"
ADDITIONAL_FILES="example-descriptors"
LICENSE="GNU GPL v2"
COPYRIGHT="2009-2010 The Linux Foundation
2009-2011 Institute for System Programming, RAS
@@ -49,6 +50,7 @@ INSTALL()
# TODO: Need to figure out what goes where, as this isn't working
# mkdir -p $prefix
# perl Makefile.pl -install $PREFIX=$prefix
# cp -r $portDir/example-descriptors $dataDir/abi-compliance-checker
# cp -r $portDir/additional-files/example-descriptors \
# $dataDir/abi-compliance-checker
:
}

View File

@@ -10,6 +10,7 @@ SOURCE_URI="http://sourceforge.net/projects/oarena/files/src/openarena-engine-so
SOURCE_DIR="openarena-engine-source-$portVersion"
CHECKSUM_SHA256="95aa500cb7e42e57fb1f6db7b97a254168f4fa2e3676d6cdc33180b69fde0e77"
PATCHES="openarena-$portVersion.patchset"
ADDITIONAL_FILES="openarena.rdef"
ARCHITECTURES="!x86_gcc2 ?x86_64 ?x86"
SECONDARY_ARCHITECTURES="x86"
@@ -56,6 +57,7 @@ INSTALL()
mkdir -p $appsDir/OpenArena
cp openarena* $appsDir/OpenArena/OpenArena
cp oa_ded* $appsDir/OpenArena/OpenArena_dedicated
addResourcesToBinaries $portDir/additional-files/openarena.rdef $appsDir/OpenArena/OpenArena
addResourcesToBinaries $portDir/additional-files/openarena.rdef \
$appsDir/OpenArena/OpenArena
addAppDeskbarSymlink $appsDir/OpenArena/OpenArena OpenArena
}

View File

@@ -12,6 +12,7 @@ SOURCE_FILENAME="slimevolley-$portVersion.tar.bz2"
CHECKSUM_SHA256="be8f461c6f1188ba709b1fbcbe64edffca4b8eb358bd2ed8825f8ebf30e660d3"
SOURCE_DIR="slimevolley"
PATCHES="slimevolley-2.4.2.patchset"
ADDITIONAL_FILES="slimevolley.rdef"
ARCHITECTURES="x86_gcc2"
@@ -52,7 +53,8 @@ BUILD()
-DDATA_DIR=$dataDir/games/slimevolley
make $jobArgs
addResourcesToBinaries $portDir/additional-files/slimevolley.rdef slimevolley
addResourcesToBinaries $portDir/additional-files/slimevolley.rdef \
slimevolley
}
INSTALL()

View File

@@ -53,9 +53,8 @@ BUILD_PREREQUIRES="
"
SOURCE_DIR="dosbox-0.74"
PATCHES="
powf.patch
"
PATCHES="powf.patch"
ADDITIONAL_FILES="dosbox.rdef"
BUILD()
{

View File

@@ -7,6 +7,7 @@ were never designed!"
HOMEPAGE="http://scummvm.org"
SOURCE_URI="http://sourceforge.net/projects/scummvm/files/scummvm/1.7.0/scummvm-1.7.0.tar.gz"
CHECKSUM_SHA256="aaee99d06b9c55e1359556908b5faeccfa017f2fdf5d1f3cf978dfb02b5bc301"
ADDITIONAL_FILES="scummvm.rdef"
REVISION="3"
LICENSE="GNU GPL v2"
COPYRIGHT="2001-2014 ScummVM Team"
@@ -85,7 +86,8 @@ INSTALL()
{
make install
mv $appsDir/scummvm $appsDir/ScummVM
addResourcesToBinaries $portDir/additional-files/scummvm.rdef $appsDir/ScummVM
addResourcesToBinaries $portDir/additional-files/scummvm.rdef \
$appsDir/ScummVM
addAppDeskbarSymlink $appsDir/ScummVM ScummVM
}

View File

@@ -10,6 +10,7 @@ HOMEPAGE="http://colorcode.laebisch.com/"
SOURCE_URI="http://colorcode.laebisch.com/download/ColorCode-0.7.2.tar.gz"
CHECKSUM_SHA256="d1c5bf4d65c81de16c4159c2c69c096fc7ff47cca587d7233985e078d63c79aa"
SOURCE_DIR="ColorCode-0.7.2"
ADDITIONAL_FILES="colorcode.rdef"
REVISION="1"
LICENSE="GNU GPL v3"
COPYRIGHT="2009-2011 Dirk Laebisch"

View File

@@ -14,6 +14,7 @@ LICENSE="GNU GPL v2"
COPYRIGHT="2000 Michael Speck"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
PATCHES="lmarbles-1.0.8.patchset"
ADDITIONAL_FILES="lmarbles.rdef"
PROVIDES="
lmarbles = $portVersion

View File

@@ -31,6 +31,7 @@ BUILD_PREREQUIRES="
SOURCE_DIR="BillardGL-$portVersion/src"
PATCHES="billardgl-$portVersion.patchset"
ADDITIONAL_FILES="haiku_icon.rdef"
BUILD()
{
@@ -43,5 +44,6 @@ INSTALL()
cp BillardGL $appsDir/BillardGL
cp -r lang $appsDir/BillardGL
cp -r Texturen $appsDir/BillardGL
addResourcesToBinaries $portDir/additional-files/haiku_icon.rdef $appsDir/BillardGL/BillardGL
addResourcesToBinaries $portDir/additional-files/haiku_icon.rdef \
$appsDir/BillardGL/BillardGL
}

View File

@@ -5,6 +5,7 @@ the like. It works with easy to write text files that include information \
about where the files to delete are."
HOMEPAGE="https://sites.google.com/site/appfilwip/home"
SOURCE_URI="git://github.com/HaikuArchives/FilWip.git#f89df458da79e172ccf243e994b2989d5837c362"
ADDITIONAL_FILES="install_plugins.sh"
REVISION="5"
LICENSE="SPL"

View File

@@ -31,6 +31,7 @@ REVISION="2"
SOURCE_URI="http://www.angryredplanet.com/~hackbod/beos/QuickRes-x86-20010126.zip"
CHECKSUM_SHA256="2ac84b361dfd7260564624f79ce7c7c52b768b89a98eaade322ad4a3ade194a7"
SOURCE_DIR="QuickRes"
ADDITIONAL_FILES="quickres.rdef"
DISABLE_SOURCE_PACKAGE=yes
ARCHITECTURES="x86_gcc2"

View File

@@ -17,6 +17,7 @@ COPYRIGHT="2002-2012 by Joachim Eibl"
LICENSE="GNU GPL v2"
REVISION="1"
PATCHES="kdiff3-0.9.97.patchset"
ADDITIONAL_FILES="kdiff3.rdef"
SOURCE_URI="http://sourceforge.net/projects/kdiff3/files/kdiff3/0.9.97/kdiff3-0.9.97.tar.gz"
CHECKSUM_SHA256="e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a"

View File

@@ -11,7 +11,7 @@ LICENSE="BSD (3-clause)"
SOURCE_URI="https://github.com/fontforge/fontforge/releases/download/$portVersion/fontforge-2014-11-26-Unix-Source.tar.gz"
SOURCE_FILENAME="fontforge-$portVersion.tar.gz"
CHECKSUM_SHA256="853d52c36d2da8a80c64def2483ddd9f79a028ec8fcea41ae46a7df2cc2cd38f"
#PATCHES="fontforge-$portVersion.patchset"
ADDITIONAL_FILES="fontforge-$portVersion.patchset"
REVISION="1"
ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
SECONDARY_ARCHITECTURES="!x86"
@@ -73,7 +73,8 @@ BUILD_PREREQUIRES="
BUILD()
{
patch -p1 -N < $portDir/patches/fontforge-$portVersion.patchset || true
patch -p1 -N < $portDir/additional-files/fontforge-$portVersion.patchset \
|| true
./bootstrap --skip-git
runConfigure ./configure
make $jobArgs

View File

@@ -27,6 +27,12 @@ REVISION="6"
SOURCE_URI="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-$portVersion.tar.gz"
CHECKSUM_SHA256="24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff"
PATCHES="lame-$portVersion.patch"
ADDITIONAL_FILES="
gtk.m4
lib-link.m4
lib-ld.m4
lib-prefix.m4
"
ARCHITECTURES="x86 x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"

View File

@@ -10,6 +10,7 @@ SOURCE_URI="https://github.com/LMMS/lmms/archive/07e422c66defdde88b3a8686ae1f0e6
CHECKSUM_SHA256="4a55299cf388c06d996e152353b1898cab457597d10cbbc77ce97777ae516d29"
SOURCE_DIR="lmms-07e422c66defdde88b3a8686ae1f0e6011fe387f"
PATCHES="lmms-1.2.0.patch"
ADDITIONAL_FILES="LMMS.rdef"
REVISION="1"
LICENSE="GNU GPL v2"
COPYRIGHT="2004-2014 Tobias Doerffel et al."

View File

@@ -37,6 +37,7 @@ BUILD_PREREQUIRES="
"
PATCHES="smplayer_x86-14.9.0.6966.patchset"
ADDITIONAL_FILES="smplayer.rdef"
BUILD()
{
@@ -54,6 +55,7 @@ INSTALL()
{
mkdir -p $appsDir/SMPlayer
cp src/smplayer $appsDir/SMPlayer/SMPlayer
addResourcesToBinaries $portDir/additional-files/smplayer.rdef $appsDir/SMPlayer/SMPlayer
addResourcesToBinaries $portDir/additional-files/smplayer.rdef \
$appsDir/SMPlayer/SMPlayer
addAppDeskbarSymlink $appsDir/SMPlayer/SMPlayer
}

View File

@@ -9,6 +9,7 @@ REVISION="1"
SOURCE_URI="http://download.videolan.org/pub/videolan/vlc/2.2.1/vlc-2.2.1.tar.xz"
CHECKSUM_SHA256="543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb"
PATCHES="vlc-2.2.1.patch"
ADDITIONAL_FILES="vlc.rdef"
ARCHITECTURES="!x86_gcc2 x86"
SECONDARY_ARCHITECTURES="x86"

View File

@@ -14,6 +14,7 @@ HOMEPAGE="http://www.wireshark.org"
SOURCE_URI="https://github.com/wireshark/wireshark/archive/wireshark-$portVersion.tar.gz"
SOURCE_DIR="wireshark-wireshark-$portVersion"
CHECKSUM_SHA256="5e01962638b7ecfce30d3970c909b9dcac4ef4299cdcd77a2bba0ebb85ef94e6"
ADDITIONAL_FILES="wireshark.rdef"
LICENSE="GNU GPL v2"
COPYRIGHT="1998-2015 Gerald Combs"
REVISION="1"
@@ -90,5 +91,6 @@ INSTALL()
make install-strip
find $libDir -name '*.la' -delete
addResourcesToBinaries $portDir/additional-files/wireshark.rdef $binDir/wireshark
addResourcesToBinaries $portDir/additional-files/wireshark.rdef \
$binDir/wireshark
}

View File

@@ -47,6 +47,7 @@ PATCH()
}
PATCHES="psi_plus_x86-0.16.475.patchset"
ADDITIONAL_FILES="psi-plus.rdef"
BUILD()
{
@@ -82,6 +83,7 @@ INSTALL()
rm -rf $appsDir/Psi-plus/psi-plus.debug
mv $appsDir/Psi-plus/psi-plus $appsDir/Psi-plus/Psi-plus
addResourcesToBinaries $portDir/additional-files/psi-plus.rdef $appsDir/Psi-plus/Psi-plus
addResourcesToBinaries $portDir/additional-files/psi-plus.rdef \
$appsDir/Psi-plus/Psi-plus
addAppDeskbarSymlink $appsDir/Psi-plus/Psi-plus
}

View File

@@ -19,6 +19,7 @@ SOURCE_URI_5="git+https://github.com/euroelessar/qutim-translations.git"
SOURCE_URI_6="git+https://github.com/gorthauer/artwork.git"
PATCHES="qutim_x86-0.3.3.patchset"
PATCHES_3="xdg.patchset"
ADDITIONAL_FILES="qutim.rdef"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86 !x86_gcc2"
@@ -104,6 +105,7 @@ INSTALL()
rm -rf $appsDir/qutIM/lib/{pkgconfig,qutim}
rm -rf $appsDir/qutIM/bin
addResourcesToBinaries $portDir/additional-files/qutim.rdef $appsDir/qutIM/qutIM
addResourcesToBinaries $portDir/additional-files/qutim.rdef \
$appsDir/qutIM/qutIM
addAppDeskbarSymlink $appsDir/qutIM/qutIM
}

View File

@@ -5,6 +5,7 @@ SOURCE_URI="https://github.com/Vacuum-IM/vacuum-im/archive/$portVersion.tar.gz"
SOURCE_FILENAME="vacuum-im-$portVersion.tar.gz"
SOURCE_DIR="vacuum-im-$portVersion"
CHECKSUM_SHA256="3237933f68884fb5b3422ad0fc97083b40a7aae9d8c105a23720c09599ffe5da"
ADDITIONAL_FILES="vacuum.rdef"
REVISION="1"
LICENSE="GNU GPL v3"
COPYRIGHT="2008-2015 Vacuum Team"
@@ -59,7 +60,8 @@ INSTALL()
cp -r src/translations $appsDir/Vacuum-IM
rm -rf $appsDir/Vacuum-IM/translations/{ts*,.tx}
addResourcesToBinaries $portDir/additional-files/vacuum.rdef $appsDir/Vacuum-IM/Vacuum
addResourcesToBinaries $portDir/additional-files/vacuum.rdef \
$appsDir/Vacuum-IM/Vacuum
# For some reason attributes are missing without mimeset
mimeset -f $appsDir/Vacuum-IM/Vacuum
addAppDeskbarSymlink $appsDir/Vacuum-IM/Vacuum

View File

@@ -10,6 +10,7 @@ COPYRIGHT="2006-2015 The qBittorrent project"
LICENSE="MIT"
SOURCE_URI="http://sourceforge.net/projects/qbittorrent/files/qbittorrent/qbittorrent-$portVersion/qbittorrent-$portVersion.tar.gz"
CHECKSUM_SHA256="d4ebaab27fdebd37aa3c7f221c8c3d12a40d22d9e5423d1eec235d4085cc7358"
ADDITIONAL_FILES="qbittorrent.rdef"
REVISION="2"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
@@ -61,7 +62,8 @@ INSTALL()
make install
mv $prefix/bin/qbittorrent $appsDir/qBittorrent
strip $appsDir/qBittorrent
addResourcesToBinaries $portDir/additional-files/qbittorrent.rdef $appsDir/qBittorrent
addResourcesToBinaries $portDir/additional-files/qbittorrent.rdef \
$appsDir/qBittorrent
rm -r $prefix/{bin,data,documentation}
# TODO: install locale files from dist/qt-translations

View File

@@ -12,6 +12,7 @@ LICENSE="
SOURCE_URI="https://github.com/RetroShare/RetroShare/archive/v0.6.0-RC2-SVN.zip"
SOURCE_DIR="RetroShare-0.6.0-RC2-SVN"
CHECKSUM_SHA256="a5c75a274cd2f2028a2f96d3b0188fd9297505d4b47fb5e338bd6bada618baab"
ADDITIONAL_FILES="retroshare.rdef"
REVISION="1"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
@@ -100,6 +101,7 @@ INSTALL()
# cp -r plugins/VOIP $appsDir/RetroShare/plugins
strip -s $appsDir/RetroShare/RetroShare
addResourcesToBinaries $portDir/additional-files/retroshare.rdef $appsDir/RetroShare/RetroShare
addResourcesToBinaries $portDir/additional-files/retroshare.rdef \
$appsDir/RetroShare/RetroShare
addAppDeskbarSymlink $appsDir/RetroShare/RetroShare
}

View File

@@ -9,6 +9,7 @@ HOMEPAGE="http://www.gnu.org/software/less/"
SOURCE_URI="http://ftp.gnu.org/gnu/less/less-$portVersion.tar.gz"
CHECKSUM_SHA256="9fe8287c647afeafb4149c5dedaeacfd20971ed7c26c7553794bb750536b5f57"
PATCHES="less-451.patch"
ADDITIONAL_FILES="sysless.in"
LICENSE="GNU GPL v3"
COPYRIGHT="1984-2012 Mark Nudelman"
REVISION="4"

View File

@@ -9,6 +9,7 @@ HOMEPAGE="http://www.greenwoodsoftware.com/less/"
SOURCE_URI="http://www.greenwoodsoftware.com/less/less-$portVersion.tar.gz"
CHECKSUM_SHA256="e536c7819ede54b3d487f0ffc4c14b3620bed83734d92a81e89f62346db0fcac"
PATCHES="less-$portVersion.patchset"
ADDITIONAL_FILES="sysless.in"
LICENSE="GNU GPL v3"
COPYRIGHT="1984-2014 Mark Nudelman"
REVISION="2"

View File

@@ -12,6 +12,7 @@ REVISION="1"
SOURCE_URI="http://www.greenwoodsoftware.com/less/less-$portVersion.tar.gz"
CHECKSUM_SHA256="8305f5a06764ff094ed3428f94f29059541e2483eae201991f90823da6557212"
PATCHES="less-$portVersion.patchset"
ADDITIONAL_FILES="sysless.in"
ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"