Merge branch '3.4' into 3.5

This commit is contained in:
Danny Rawlins 2019-05-09 23:15:56 +10:00
commit 2780229cfe
7 changed files with 4572 additions and 4589 deletions

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF366eGUXGvQ1NyksmoF+tdHjRk8J3wAWpzoQfV2qYxyzIwgg5deb6K9JB3acQLW42j1MS0BsxvPWGzC3racwAegQ=
SHA256 (Pkgfile) = 1c9417578eb5d99c41a9e09a1c46683c9cd49b47f484ab9859c1d9e59fcfbb93
RWSagIOpLGJF32MpzMWeeARCxu1BajtDMQhwvijGJmsTGv5qk/hPsSIfq+F/psi1es5XMe5O36b4wj5UIKvEr3nUbAHeNM7LBA8=
SHA256 (Pkgfile) = 9872a4d02fff6e9ab82274a2478c5e27901bbe5e3d96e3e259c12266c1b6e224
SHA256 (.footprint) = fd60992957bd0010460d49684c69464200651af797acdb98547f4847fc9f3f3c
SHA256 (cbindgen-v0.8.3.tar.gz) = 665904e4ef38a87108aaaba139ad1d7f8c94d43717bb0ec4d3514365927b88b6
SHA256 (cbindgen-v0.8.6.tar.gz) = 456a8ee9ab872cdb31f829fb06294c08b5e238f1390f9f4a5b7908a6346cbbf2

View File

@ -5,17 +5,14 @@
# Optional: sccache
name=cbindgen
version=0.8.3
version=0.8.6
release=1
source=(https://github.com/eqrion/cbindgen/archive/v$version/$name-v$version.tar.gz)
build() {
cd $name-$version
if [ -n "$(pkginfo -i | grep '^sccache ')" ]; then
export RUSTC_WRAPPER=/usr/bin/sccache
fi
prt-get isinst sccache && export RUSTC_WRAPPER=/usr/bin/sccache
export CARGO_HOME="$PKGMK_SOURCE_DIR"
cargo build --release

View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF36PRRzg13NTUOpJ0N8iilvz24nME+7wIehsFqxrwEQZI8Y0I9ixL9YR1wfGmLIsazD+hB0/5ABy93ZWtqx0Tygw=
SHA256 (Pkgfile) = 9e059435f0a3d49072d24b3e8a45e6264bf459734cf77b086837353b60faa929
RWSagIOpLGJF30IhWXMHe07adPV0A0wyUgi6RshLTGPjW7G1oxSyZPwvy16wI5KTTyuY8uy/0cI5Qo5x8npgu2qPrlSjev5Z0gI=
SHA256 (Pkgfile) = 02d63cd7f911f09ba0a85de2ac9b9ad97233f6c67a3f9653956c7b1a7e9b8ea1
SHA256 (.footprint) = ba83ace6604f2c04a4e10eb00060ef7d98360e643f3674b29314fe9cec899189
SHA256 (firefox-66.0.4.source.tar.xz) = 7ac6fae17e402276483fbfbb6b320d61e6695a28f1112ba2c987127f105dc25d
SHA256 (firefox-66.0.5.source.tar.xz) = a2aeb4e036d1365a2d2550e24ba8b4dde061281300f2b11a204cc1e9eb1792b5
SHA256 (firefox.desktop) = 8ba3439f3dfc5cab883641969c93d8d15f8f20d7188d9568346b2edad52d6f91

View File

@ -5,7 +5,7 @@
# Optional: sccache
name=firefox
version=66.0.4
version=66.0.5
release=1
source=(https://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.xz
firefox.desktop)

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3zv7tFKGvDcismvwerawicGQzVCQzQBMgH5ak8Z0m2gPpDR/d5OXW87kDQaZX8z3bXRNl9tjq/kszE6gp7DCgw4=
SHA256 (Pkgfile) = 4b552b385e65ceba62bfb1e0c7dab577ab85ecee6df75943f58a048ee0fa16e3
RWSagIOpLGJF31mtRrxpYgHw12uC4webrr099sd/5NAQWrxX4jtphyqhWG7hgmbg6ujDH+3YQuH9Kzhv96YbpAYAc3Y08k6gwAk=
SHA256 (Pkgfile) = 4b11f1aee7df760e14d3f24bc506502c6877247bfa963ac03a96ad3c590cdaec
SHA256 (.footprint) = 31c6c85dfbd54b40bb611cecc030cf637e0165058643cdb413181ec7e4ae078c
SHA256 (ghc-8.4.3-src.tar.xz) = ae47afda985830de8811243255aa3744dfb9207cb980af74393298b2b62160d6
SHA256 (ghc-8.6.5-src.tar.xz) = 4d4aa1e96f4001b934ac6193ab09af5d6172f41f5a5d39d8e43393b9aafee361

View File

@ -4,11 +4,11 @@
# Depends on: docbook-xsl libedit libffi libgmp readline
name=ghc
version=8.4.3
_bversion=8.4.2
version=8.6.5
_bversion=8.6.3
release=1
_bootstrapsum=28c31489ed9a83af4400685ec8bc72a6d43d08958d75b2dc35d29a894a5c9d93
#curl -s http://downloads.haskell.org/~ghc/$version/SHA256SUMS | grep ./ghc-$version-x86_64-centos67-linux.tar.xz | cut -d' ' -f1
_bootstrapsum=355bd85c69933c31bbe99b4269ce719acfd0aad0b45e359ac39b9bb13996acc6
#curl -s http://downloads.haskell.org/~ghc/$version/SHA256SUMS | grep ./ghc-$version-x86_64-centos7-linux.tar.xz | cut -d' ' -f1
source=(https://downloads.haskell.org/~ghc/$version/$name-$version-src.tar.xz)
build() {
@ -16,21 +16,21 @@ build() {
if [ ! -e '/usr/bin/ghc' ]; then
# download binary bootstrap file if it does not exist
if [ ! -f "$PKGMK_SOURCE_DIR/$name-$_bversion-x86_64-centos67-linux.tar.xz" ]; then
if [ ! -f "$PKGMK_SOURCE_DIR/$name-$_bversion-x86_64-centos7-linux.tar.xz" ]; then
wget "http://downloads.haskell.org/~ghc/$_bversion/$name-$_bversion-x86_64-centos67-linux.tar.xz" \
--output-document="$PKGMK_SOURCE_DIR/$name-$_bversion-x86_64-centos67-linux.tar.xz"
wget "http://downloads.haskell.org/~ghc/$_bversion/$name-$_bversion-x86_64-centos7-linux.tar.xz" \
--output-document="$PKGMK_SOURCE_DIR/$name-$_bversion-x86_64-centos7-linux.tar.xz"
fi
if [ $_bootstrapsum != $(sha256sum "$PKGMK_SOURCE_DIR/$name-$_bversion-x86_64-centos67-linux.tar.xz" | cut -d' ' -f1) ]; then
echo "Error Bootstrap file $PKGMK_SOURCE_DIR/$name-$_bversion-x86_64-centos67-linux.tar.xz failed sha256sum"
if [ $_bootstrapsum != $(sha256sum "$PKGMK_SOURCE_DIR/$name-$_bversion-x86_64-centos7-linux.tar.xz" | cut -d' ' -f1) ]; then
echo "Error Bootstrap file $PKGMK_SOURCE_DIR/$name-$_bversion-x86_64-centos7-linux.tar.xz failed sha256sum"
exit $E_GENERAL
fi
mkdir tmp
cd tmp
bsdtar -xf "$PKGMK_SOURCE_DIR/$name-$_bversion-x86_64-centos67-linux.tar.xz"
bsdtar -xf "$PKGMK_SOURCE_DIR/$name-$_bversion-x86_64-centos7-linux.tar.xz"
mv $name-$_bversion ../$name-$_bversion-binary
cd -
rmdir tmp