From 51ee6bc94444151a7baad1c7ec909fcd8337b1b4 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 14 Aug 2018 09:17:46 +0200 Subject: [PATCH] code style. remove old patches. --- app-editors/retext/retext-7.0.1.recipe | 6 +- .../tagainijisho-1.2~20180610.recipe | 2 +- dev-lang/ghc/ghc-7.8.3.recipe | 42 +++---- dev-libs/boost/boost-1.57.0.recipe | 3 +- dev-libs/boost/boost163-1.63.0.recipe | 27 +++-- dev-libs/boost/boost164-1.64.0.recipe | 27 +++-- dev-libs/boost/boost165-1.65.1.recipe | 23 ++-- dev-libs/boost/boost166-1.66.0.recipe | 3 +- dev-libs/hyphen/hyphen-2.8.8.recipe | 2 - dev-libs/libidl/libidl-0.8.14.recipe | 41 +++---- .../libidl/patches/libidl-0.8.14.patchset | 51 -------- .../libsolv-0.3.0_haiku_2013_05_30.recipe | 31 +++-- .../libsolv-0.3.0_haiku_2013_06_16.recipe | 2 - .../libsolv-0.3.0_haiku_2013_10_01.recipe | 33 +++--- dev-libs/libtommath/libtommath-1.0.1.recipe | 1 - dev-libs/libyajl/libyajl-2.1.0.recipe | 5 +- dev-libs/nspr/nspr-4.11.recipe | 41 ++++--- dev-libs/nspr/nspr-4.12.recipe | 41 ++++--- dev-libs/nspr/nspr-4.19.recipe | 41 ++++--- .../opencl_headers-1.2~20180318.recipe | 6 +- .../opencl_headers-2.2~20180318.recipe | 6 +- dev-qt/qml-box2d/qml_box2d-20160102.recipe | 14 +-- dev-vcs/fossil/fossil-1.37.recipe | 11 +- games-action/swars/swars-0.3.recipe | 14 +-- games-arcade/nxengine/nxengine-1.0.0.4.recipe | 4 +- .../sdlscavenger/sdlscavenger-145.1.recipe | 22 ++-- .../opencity/opencity-0.0.6.3.recipe | 34 +++--- .../openttd_gfx/openttd_gfx-0.5.4.recipe | 4 +- haiku-apps/album/album-0.9.4.recipe | 14 +-- haiku-apps/archiver/archiver-1.0.0.recipe | 6 +- .../beindexed/beindexed-0.2.0_alpha.recipe | 35 +++--- haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe | 6 +- haiku-apps/pe/patches/pe-2.4.5.patchset | 22 ---- haiku-apps/pe/pe-2.4.5.recipe | 9 +- .../sane_backends/sane_backends-1.0.24.recipe | 36 +++--- media-libs/flickcurl/flickcurl-1.26.recipe | 37 +++--- media-libs/freetype/freetype-2.9.recipe | 16 +-- media-libs/guilib/guilib-1.2.1.recipe | 38 +++--- media-libs/ilmbase/ilmbase-2.1.0.recipe | 55 +++++---- media-libs/leptonica/leptonica-1.69.recipe | 110 +++++++++--------- .../libart_lgpl/libart_lgpl-2.3.21.recipe | 31 +++-- media-libs/libdvdnav/libdvdnav-4.2.1.recipe | 46 ++++---- media-libs/libdvdread/libdvdread-4.2.1.recipe | 40 +++---- media-libs/libebur128/libebur128-1.2.3.recipe | 2 +- media-libs/libfpx/libfpx-1.3.1.10.recipe | 5 +- media-libs/libharu/libharu-2.3.0.recipe | 32 +++-- .../libtimidity/libtimidity-0.1.0.recipe | 24 ++-- .../opencollada/opencollada-1.6.63.recipe | 2 +- .../opencolorio/opencolorio-1.0.9.recipe | 36 +++--- media-libs/openexr/openexr-2.1.0.recipe | 46 ++++---- media-libs/opensubdiv/opensubdiv-3.3.3.recipe | 7 +- media-libs/sbc/sbc-1.3.recipe | 53 ++++----- media-libs/x264/x264-20160712.recipe | 3 +- media-sound/csound/csound-6.06.0.recipe | 2 +- media-sound/dcadec/dcadec-0.2.0.recipe | 32 ++--- media-sound/fluidlite/fluidlite-1.0.0.recipe | 6 +- media-sound/lmms/lmms-1.2.0~rc4.recipe | 23 ++-- media-sound/ocp/ocp-0.1.22~git.recipe | 6 +- net-im/icq/icq-10~git.recipe | 14 +-- net-libs/libnatpmp/libnatpmp-20140401.recipe | 31 +++-- net-libs/neon/neon-0.29.6.recipe | 35 +++--- net-print/gutenprint/gutenprint-5.2.10.recipe | 26 ++--- net-print/gutenprint/gutenprint-5.2.9.recipe | 27 +++-- net-voip/yate/yate-6.0.0.recipe | 3 +- sci-libs/libgeotiff/libgeotiff-1.4.2.recipe | 1 - .../patches/libgeotiff-1.4.2.patchset | 72 ------------ .../man_pages_posix-2013.a.recipe | 3 +- sys-devel/autoconf/autoconf-2.68.recipe | 23 ++-- sys-devel/gettext/gettext-0.18.1.1.recipe | 55 +++++---- .../libedit/libedit-2015_03_21_3.1.recipe | 35 +++--- sys-libs/mesa/mesa-10.1.1.recipe | 5 - x11-libs/cairo/cairo-1.12.16.recipe | 37 +++--- 72 files changed, 719 insertions(+), 965 deletions(-) delete mode 100644 dev-libs/libidl/patches/libidl-0.8.14.patchset delete mode 100644 haiku-apps/pe/patches/pe-2.4.5.patchset delete mode 100644 sci-libs/libgeotiff/patches/libgeotiff-1.4.2.patchset diff --git a/app-editors/retext/retext-7.0.1.recipe b/app-editors/retext/retext-7.0.1.recipe index f90cbcecf..69605205e 100644 --- a/app-editors/retext/retext-7.0.1.recipe +++ b/app-editors/retext/retext-7.0.1.recipe @@ -18,10 +18,10 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - cmd:python3 markdown_python3 markups_python3 pyqt_python3 + cmd:python3 lib:libxcb$secondaryArchSuffix " @@ -34,8 +34,8 @@ BUILD_PREREQUIRES=" cmd:lrelease cmd:python3 " -# For TEST() -BUILD_PREREQUIRES+=" + +TEST_REQUIRES=" markups_python3 qthaikuplugins$secondaryArchSuffix " diff --git a/app-i18n/tagainijisho/tagainijisho-1.2~20180610.recipe b/app-i18n/tagainijisho/tagainijisho-1.2~20180610.recipe index 71e592e5a..4374fe3f2 100644 --- a/app-i18n/tagainijisho/tagainijisho-1.2~20180610.recipe +++ b/app-i18n/tagainijisho/tagainijisho-1.2~20180610.recipe @@ -46,8 +46,8 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:cmake - cmd:gunzip cmd:g++$secondaryArchSuffix + cmd:gunzip cmd:make cmd:pkg_config$secondaryArchSuffix " diff --git a/dev-lang/ghc/ghc-7.8.3.recipe b/dev-lang/ghc/ghc-7.8.3.recipe index a668c80de..1f2a0b696 100644 --- a/dev-lang/ghc/ghc-7.8.3.recipe +++ b/dev-lang/ghc/ghc-7.8.3.recipe @@ -8,22 +8,16 @@ HOMEPAGE="https://www.haskell.org/ghc/" COPYRIGHT="The Glasgow Haskell Team" LICENSE="BSD (3-clause) GNU LGPL v2.1" - -VENDOR="jessicah.org" - -SOURCE_URI_1="https://www.haskell.org/ghc/dist/7.8.3/ghc-7.8.3-src.tar.bz2" -SOURCE_URI_2="https://pulkomandy.tk/drop/ghc-7.8.3-i386-unknown-haiku.tar.gz" - -CHECKSUM_SHA256_1="2358826f8424bf571dcc313bd882422fe108a340d6e37db4339ff6d5d6ac3f37" -CHECKSUM_SHA256_2="23b1a7a13b7ec07b7768d35e8ce9334131e57b7ab652b0ad3aa0faa559630d15" - REVISION="11" +SOURCE_URI_1="https://www.haskell.org/ghc/dist/7.8.3/ghc-7.8.3-src.tar.bz2" +CHECKSUM_SHA256_1="2358826f8424bf571dcc313bd882422fe108a340d6e37db4339ff6d5d6ac3f37" +SOURCE_URI_2="https://pulkomandy.tk/drop/ghc-7.8.3-i386-unknown-haiku.tar.gz" +CHECKSUM_SHA256_2="23b1a7a13b7ec07b7768d35e8ce9334131e57b7ab652b0ad3aa0faa559630d15" +PATCHES="ghc-$portVersion.patchset" ARCHITECTURES="x86" SECONDARY_ARCHITECTURES="x86" -PATCHES="ghc-$portVersion.patchset" - GLOBAL_WRITABLE_FILES=" settings/ghc directory keep-old " @@ -31,48 +25,46 @@ GLOBAL_WRITABLE_FILES=" PROVIDES=" ghc$secondaryArchSuffix = $portVersion cmd:ghc - cmd:ghci + cmd:ghc_$portVersion cmd:ghc_pkg + cmd:ghc_pkg_$portVersion + cmd:ghci + cmd:ghci_$portVersion cmd:haddock + cmd:haddock_ghc_$portVersion cmd:hp2ps cmd:hpc cmd:hsc2hs cmd:runghc cmd:runghc_$portVersion cmd:runhaskell - cmd:ghc_$portVersion - cmd:ghc_pkg_$portVersion - cmd:ghci_$portVersion - cmd:haddock_ghc_$portVersion " - REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libz$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libncursesw$secondaryArchSuffix >= 5 + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion haiku_devel >= $haikuVersion - devel:libz$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libncursesw$secondaryArchSuffix >= 5 + devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" + cmd:autoconf + cmd:awk + cmd:find cmd:gcc$secondaryArchSuffix + cmd:grep cmd:ld$secondaryArchSuffix cmd:make - cmd:tar cmd:perl cmd:sed - cmd:find cmd:sort - cmd:awk - cmd:grep - cmd:autoconf + cmd:tar " BUILD() diff --git a/dev-libs/boost/boost-1.57.0.recipe b/dev-libs/boost/boost-1.57.0.recipe index fca1e2737..c8e9f7a8d 100644 --- a/dev-libs/boost/boost-1.57.0.recipe +++ b/dev-libs/boost/boost-1.57.0.recipe @@ -139,7 +139,8 @@ INSTALL() packageEntries wave $libDir/libboost_wave* } -TEST() { +TEST() +{ cd status ../bjam $jobArgs } diff --git a/dev-libs/boost/boost163-1.63.0.recipe b/dev-libs/boost/boost163-1.63.0.recipe index 1601b533b..8a8ff0878 100644 --- a/dev-libs/boost/boost163-1.63.0.recipe +++ b/dev-libs/boost/boost163-1.63.0.recipe @@ -6,11 +6,11 @@ generation, multithreading, image processing, regular expressions, and unit \ testing. It contains over eighty individual libraries. " HOMEPAGE="https://www.boost.org/" +COPYRIGHT="1998-2014 Beman Dawes, David Abrahams, Rene Rivera, et al." +LICENSE="Boost v1.0" +REVISION="4" SOURCE_URI="https://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.tar.bz2" CHECKSUM_SHA256="beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0" -REVISION="4" -LICENSE="Boost v1.0" -COPYRIGHT="1998-2014 Beman Dawes, David Abrahams, Rene Rivera, et al." SOURCE_DIR="boost_1_63_0" PATCHES="boost-$portVersion.patchset" @@ -37,26 +37,26 @@ PROVIDES=" lib:libboost_math_c99f$secondaryArchSuffix = $libVersion lib:libboost_math_tr1$secondaryArchSuffix = $libVersion lib:libboost_math_tr1f$secondaryArchSuffix = $libVersion + lib:libboost_prg_exec_monitor$secondaryArchSuffix = $libVersion lib:libboost_program_options$secondaryArchSuffix = $libVersion lib:libboost_random$secondaryArchSuffix = $libVersion lib:libboost_regex$secondaryArchSuffix = $libVersion lib:libboost_serialization$secondaryArchSuffix = $libVersion - lib:libboost_wserialization$secondaryArchSuffix = $libVersion lib:libboost_signals$secondaryArchSuffix = $libVersion lib:libboost_system$secondaryArchSuffix = $libVersion - lib:libboost_prg_exec_monitor$secondaryArchSuffix = $libVersion lib:libboost_thread$secondaryArchSuffix = $libVersion lib:libboost_timer$secondaryArchSuffix = $libVersion lib:libboost_type_erasure$secondaryArchSuffix = $libVersion lib:libboost_unit_test_framework$secondaryArchSuffix = $libVersion lib:libboost_wave$secondaryArchSuffix = $libVersion + lib:libboost_wserialization$secondaryArchSuffix = $libVersion " REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix - lib:libicuuc$secondaryArchSuffix - lib:libicui18n$secondaryArchSuffix lib:libicudata$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -94,21 +94,19 @@ PROVIDES_devel=" devel:libboost_wave$secondaryArchSuffix = $portVersion devel:libboost_wserialization$secondaryArchSuffix = $portVersion " - REQUIRES_devel=" - haiku$secondaryArchSuffix boost163$secondaryArchSuffix == $portVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix - devel:libz$secondaryArchSuffix - devel:libicuuc$secondaryArchSuffix - devel:libicui18n$secondaryArchSuffix devel:libicudata$secondaryArchSuffix + devel:libicui18n$secondaryArchSuffix + devel:libicuuc$secondaryArchSuffix + devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -169,7 +167,8 @@ INSTALL() packageEntries devel $developDir } -TEST() { +TEST() +{ cd status ../bjam $jobArgs } diff --git a/dev-libs/boost/boost164-1.64.0.recipe b/dev-libs/boost/boost164-1.64.0.recipe index 591613a4d..0c5cf931c 100644 --- a/dev-libs/boost/boost164-1.64.0.recipe +++ b/dev-libs/boost/boost164-1.64.0.recipe @@ -6,11 +6,11 @@ generation, multithreading, image processing, regular expressions, and unit \ testing. It contains over eighty individual libraries. " HOMEPAGE="https://www.boost.org/" +COPYRIGHT="1998-2017 Beman Dawes, David Abrahams, Rene Rivera, et al." +LICENSE="Boost v1.0" +REVISION="3" SOURCE_URI="https://sourceforge.net/projects/boost/files/boost/1.64.0/boost_1_64_0.tar.bz2" CHECKSUM_SHA256="7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332" -REVISION="3" -LICENSE="Boost v1.0" -COPYRIGHT="1998-2017 Beman Dawes, David Abrahams, Rene Rivera, et al." SOURCE_DIR="boost_1_64_0" PATCHES="boost-$portVersion.patchset" @@ -37,26 +37,26 @@ PROVIDES=" lib:libboost_math_c99f$secondaryArchSuffix = $libVersion lib:libboost_math_tr1$secondaryArchSuffix = $libVersion lib:libboost_math_tr1f$secondaryArchSuffix = $libVersion + lib:libboost_prg_exec_monitor$secondaryArchSuffix = $libVersion lib:libboost_program_options$secondaryArchSuffix = $libVersion lib:libboost_random$secondaryArchSuffix = $libVersion lib:libboost_regex$secondaryArchSuffix = $libVersion lib:libboost_serialization$secondaryArchSuffix = $libVersion - lib:libboost_wserialization$secondaryArchSuffix = $libVersion lib:libboost_signals$secondaryArchSuffix = $libVersion lib:libboost_system$secondaryArchSuffix = $libVersion - lib:libboost_prg_exec_monitor$secondaryArchSuffix = $libVersion lib:libboost_thread$secondaryArchSuffix = $libVersion lib:libboost_timer$secondaryArchSuffix = $libVersion lib:libboost_type_erasure$secondaryArchSuffix = $libVersion lib:libboost_unit_test_framework$secondaryArchSuffix = $libVersion lib:libboost_wave$secondaryArchSuffix = $libVersion + lib:libboost_wserialization$secondaryArchSuffix = $libVersion " REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix - lib:libicuuc$secondaryArchSuffix - lib:libicui18n$secondaryArchSuffix lib:libicudata$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -94,21 +94,19 @@ PROVIDES_devel=" devel:libboost_wave$secondaryArchSuffix = $portVersion devel:libboost_wserialization$secondaryArchSuffix = $portVersion " - REQUIRES_devel=" - haiku$secondaryArchSuffix boost164$secondaryArchSuffix == $portVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix - devel:libz$secondaryArchSuffix - devel:libicuuc$secondaryArchSuffix - devel:libicui18n$secondaryArchSuffix devel:libicudata$secondaryArchSuffix + devel:libicui18n$secondaryArchSuffix + devel:libicuuc$secondaryArchSuffix + devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -169,7 +167,8 @@ INSTALL() packageEntries devel $developDir } -TEST() { +TEST() +{ cd status ../bjam $jobArgs } diff --git a/dev-libs/boost/boost165-1.65.1.recipe b/dev-libs/boost/boost165-1.65.1.recipe index a6f9e0a05..f444e1405 100644 --- a/dev-libs/boost/boost165-1.65.1.recipe +++ b/dev-libs/boost/boost165-1.65.1.recipe @@ -6,11 +6,11 @@ generation, multithreading, image processing, regular expressions, and unit \ testing. It contains over eighty individual libraries. " HOMEPAGE="https://www.boost.org/" +COPYRIGHT="1998-2017 Beman Dawes, David Abrahams, Rene Rivera, et al." +LICENSE="Boost v1.0" +REVISION="4" SOURCE_URI="https://dl.bintray.com/boostorg/release/$portVersion/source/boost_${portVersion//./_}.tar.bz2" CHECKSUM_SHA256="9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81" -REVISION="4" -LICENSE="Boost v1.0" -COPYRIGHT="1998-2017 Beman Dawes, David Abrahams, Rene Rivera, et al." SOURCE_DIR="boost_${portVersion//./_}" PATCHES="boost-$portVersion.patchset" @@ -56,9 +56,9 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix - lib:libicuuc$secondaryArchSuffix - lib:libicui18n$secondaryArchSuffix lib:libicudata$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -98,21 +98,19 @@ PROVIDES_devel=" devel:libboost_wave$secondaryArchSuffix = $portVersion devel:libboost_wserialization$secondaryArchSuffix = $portVersion " - REQUIRES_devel=" - haiku$secondaryArchSuffix >= r1~alpha4_pm_hrev51470 boost165$secondaryArchSuffix == $portVersion + haiku$secondaryArchSuffix >= r1~alpha4_pm_hrev51470 " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix - devel:libz$secondaryArchSuffix - devel:libicuuc$secondaryArchSuffix - devel:libicui18n$secondaryArchSuffix devel:libicudata$secondaryArchSuffix + devel:libicui18n$secondaryArchSuffix + devel:libicuuc$secondaryArchSuffix + devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -174,7 +172,8 @@ INSTALL() packageEntries devel $developDir } -TEST() { +TEST() +{ cd status ../bjam $jobArgs } diff --git a/dev-libs/boost/boost166-1.66.0.recipe b/dev-libs/boost/boost166-1.66.0.recipe index 45565e6b5..a4b503abb 100644 --- a/dev-libs/boost/boost166-1.66.0.recipe +++ b/dev-libs/boost/boost166-1.66.0.recipe @@ -169,7 +169,8 @@ INSTALL() packageEntries devel $developDir } -TEST() { +TEST() +{ cd status ../bjam $jobArgs } diff --git a/dev-libs/hyphen/hyphen-2.8.8.recipe b/dev-libs/hyphen/hyphen-2.8.8.recipe index c0d00c219..2c70f951b 100644 --- a/dev-libs/hyphen/hyphen-2.8.8.recipe +++ b/dev-libs/hyphen/hyphen-2.8.8.recipe @@ -16,8 +16,6 @@ REVISION="3" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="?x86_gcc2 x86" -#PATCHES="hyphen-$portVersion.patchset" - PROVIDES=" hyphen$secondaryArchSuffix = $portVersion compat >= 2.8 lib:libhyphen$secondaryArchSuffix = 0.3.0 compat >= 0 diff --git a/dev-libs/libidl/libidl-0.8.14.recipe b/dev-libs/libidl/libidl-0.8.14.recipe index f5cf43427..2ee166d97 100644 --- a/dev-libs/libidl/libidl-0.8.14.recipe +++ b/dev-libs/libidl/libidl-0.8.14.recipe @@ -7,11 +7,13 @@ primary means of libIDL distribution). However, the functionality was designed \ to be as reusable and portable as possible. " HOMEPAGE="http://github.com/GNOME/libIDL/" -SOURCE_URI="http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-$portVersion.tar.gz" -CHECKSUM_SHA256="bca99570f1ab453e11ae627b209561019cde5aaa98f71f43cc6da048d3bc7e72" COPYRIGHT="1998-1999 Andrew T. Veliath" LICENSE="GNU LGPL v2" REVISION="3" +SOURCE_URI="http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-$portVersion.tar.gz" +CHECKSUM_SHA256="bca99570f1ab453e11ae627b209561019cde5aaa98f71f43cc6da048d3bc7e72" +SOURCE_DIR="libIDL-$portVersion" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -19,27 +21,11 @@ PROVIDES=" libidl$secondaryArchSuffix = $portVersion lib:libIDL_2$secondaryArchSuffix = 0.0.0 compat >= 0 " - REQUIRES=" haiku$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix - lib:libintl$secondaryArchSuffix lib:libiconv$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libglib_2.0$secondaryArchSuffix - " - -BUILD_PREREQUIRES=" - cmd:make - cmd:gcc$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:autoconf - cmd:flex - cmd:bison - cmd:pkg_config$secondaryArchSuffix + lib:libintl$secondaryArchSuffix " PROVIDES_devel=" @@ -47,14 +33,23 @@ PROVIDES_devel=" cmd:libIDL_config_2$secondaryArchSuffix = $portVersion devel:libIDL_2$secondaryArchSuffix = 0.0.0 compat >= 0 " - REQUIRES_devel=" libidl$secondaryArchSuffix == $portVersion " -SOURCE_DIR="libIDL-$portVersion" - -#PATCHES="libidl-$portVersion.patchset" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libglib_2.0$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:bison + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + " BUILD() { diff --git a/dev-libs/libidl/patches/libidl-0.8.14.patchset b/dev-libs/libidl/patches/libidl-0.8.14.patchset deleted file mode 100644 index 60c656103..000000000 --- a/dev-libs/libidl/patches/libidl-0.8.14.patchset +++ /dev/null @@ -1,51 +0,0 @@ -From 5b768320419c034d19d2f4646365c3e3f2b93ff8 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 9 Dec 2013 18:27:26 -0700 -Subject: Attempt to bring libIDL into the modern age - - -diff --git a/acinclude.m4 b/acinclude.m4 -index 0481a2f..0fc8e87 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -1,4 +1,15 @@ - dnl Autoconf extension macros for libIDL -+# GLIB_AC_DIVERT_BEFORE_HELP(STUFF) -+# --------------------------------- -+# Put STUFF early enough so that they are available for $ac_help expansion. -+# Handle both classic (<= v2.13) and modern autoconf -+AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP], -+[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])], -+ [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])], -+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl -+$1 -+AC_DIVERT_POP()])])]) -+ - AC_DEFUN(AC_CPP_ACCEPT_IDL, - [AC_CACHE_CHECK([if C preprocessor likes IDL], - ac_cv_cpp_accept_idl, -diff --git a/configure.in b/configure.in -index 3b32bbe..a4af53d 100644 ---- a/configure.in -+++ b/configure.in -@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script. - - AC_INIT(IDL.h.new.in) - --AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl -+GLIB_AC_DIVERT_BEFORE_HELP([ - # - # Making releases: - # LIBIDL_MICRO_VERSION += 1; -@@ -20,7 +20,7 @@ LIBIDL_INTERFACE_AGE=4 - LIBIDL_BINARY_AGE=8 - LIBIDL_LIBRARY_VERSION=$LIBIDL_MAJOR_VERSION.$LIBIDL_MINOR_VERSION.$LIBIDL_MICRO_VERSION - GLIB_VERSION_REQUIRED=1.2.0 --AC_DIVERT_POP()dnl -+]) - - AC_SUBST(LIBIDL_MAJOR_VERSION) - AC_SUBST(LIBIDL_MINOR_VERSION) --- -1.8.3.4 - diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe index 6aae2e46c..dff62bcec 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe @@ -1,10 +1,11 @@ SUMMARY="Library for solving packages and reading repositories" DESCRIPTION="Library for solving packages and reading repositories." -LICENSE="BSD (3-clause)" -COPYRIGHT="2007-2013, Novell Inc." HOMEPAGE="http://github.com/openSUSE/libsolv" -SOURCE_URI="git+git://github.com/weinhold/libsolv.git#a53a69500a56fa1056c6f3a4b17cc91a50c51395" +COPYRIGHT="2007-2013, Novell Inc." +LICENSE="BSD (3-clause)" REVISION="2" +SOURCE_URI="git+git://github.com/weinhold/libsolv.git#a53a69500a56fa1056c6f3a4b17cc91a50c51395" + ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="libsolv = $portVersion @@ -15,6 +16,17 @@ REQUIRES="haiku lib:libexpat lib:libz " + +SUMMARY_devel="The libsolv development files" +PROVIDES_devel=" + libsolv_devel = $portVersion + devel:libsolv = $portVersion + devel:libsolvext = $portVersion + " +REQUIRES_devel=" + libsolv == $portVersion base + " + BUILD_REQUIRES=" devel:libexpat devel:libz @@ -27,7 +39,6 @@ BUILD_PREREQUIRES="haiku_devel cmd:sed " - BUILD() { rm -rf build @@ -62,15 +73,3 @@ INSTALL() $dataDir \ $developDir } - -# ----- devel package ------------------------------------------------------- - -SUMMARY_devel="The libsolv development files" -PROVIDES_devel=" - libsolv_devel = $portVersion - devel:libsolv = $portVersion - devel:libsolvext = $portVersion - " -REQUIRES_devel=" - libsolv == $portVersion base - " diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe index 1a1ca9eb4..42b751ddb 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe @@ -81,5 +81,3 @@ INSTALL() $dataDir \ $developDir } - -# ----- devel package ------------------------------------------------------- diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe index e9a929cc8..303a51741 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe @@ -1,13 +1,16 @@ SUMMARY="A library for solving packages and reading repositories" DESCRIPTION="A Library for solving packages and reading repositories." -LICENSE="BSD (3-clause)" -COPYRIGHT="2007-2013, Novell Inc." HOMEPAGE="http://github.com/openSUSE/libsolv" +COPYRIGHT="2007-2013, Novell Inc." +LICENSE="BSD (3-clause)" +REVISION="3" srcGitRev="01ed09a3e1f4637f72d4239fe3724fcafa39be94" SOURCE_URI="https://github.com/weinhold/libsolv/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="4e96208d44dc15ed7ac95a86f35790f34a2bb97c0f0aa3dc355263a54a6ea7e1" SOURCE_FILENAME="$portVersionedName.tar.gz" -REVISION="3" +SOURCE_DIR="libsolv-$srcGitRev" +PATCHES="libsolv-$portVersion.patchset" + ARCHITECTURES="x86_gcc2 x86 x86_64 ppc arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -21,6 +24,16 @@ REQUIRES=" lib:libexpat$secondaryArchSuffix lib:libz$secondaryArchSuffix " + +PROVIDES_devel=" + libsolv${secondaryArchSuffix}_devel = $portVersion + devel:libsolv${secondaryArchSuffix} = $portVersion + devel:libsolvext${secondaryArchSuffix} = $portVersion + " +REQUIRES_devel=" + libsolv${secondaryArchSuffix} == $portVersion base + " + BUILD_REQUIRES=" devel:libexpat$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -34,9 +47,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="libsolv-$srcGitRev" -PATCHES="libsolv-$portVersion.patchset" - PATCH() { sed -i 's,${CMAKE_INSTALL_PREFIX}/bin',$binDir, CMakeLists.txt @@ -74,14 +84,3 @@ INSTALL() $dataDir \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - libsolv${secondaryArchSuffix}_devel = $portVersion - devel:libsolv${secondaryArchSuffix} = $portVersion - devel:libsolvext${secondaryArchSuffix} = $portVersion - " -REQUIRES_devel=" - libsolv${secondaryArchSuffix} == $portVersion base - " diff --git a/dev-libs/libtommath/libtommath-1.0.1.recipe b/dev-libs/libtommath/libtommath-1.0.1.recipe index 54ec83cc9..3e5cb1856 100644 --- a/dev-libs/libtommath/libtommath-1.0.1.recipe +++ b/dev-libs/libtommath/libtommath-1.0.1.recipe @@ -7,7 +7,6 @@ LICENSE="Public Domain" REVISION="1" SOURCE_URI="https://github.com/libtom/libtommath/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="db2b6e6b512aac5cc9be7e4ffdd15d971c3f03d3fa35f91607bfe1a7fa75a7a7" -#PATCHES="libtommath-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" diff --git a/dev-libs/libyajl/libyajl-2.1.0.recipe b/dev-libs/libyajl/libyajl-2.1.0.recipe index 1cca8d2d4..6957c480c 100644 --- a/dev-libs/libyajl/libyajl-2.1.0.recipe +++ b/dev-libs/libyajl/libyajl-2.1.0.recipe @@ -42,12 +42,11 @@ BUILD_PREREQUIRES=" cmd:libtoolize$secondaryArchSuffix cmd:make " -# For TEST() -BUILD_PREREQUIRES+=" + +TEST_REQUIRES=" cmd:which " - BUILD() { mkdir -p haiku_build diff --git a/dev-libs/nspr/nspr-4.11.recipe b/dev-libs/nspr/nspr-4.11.recipe index dcf412a6f..c3483e0be 100644 --- a/dev-libs/nspr/nspr-4.11.recipe +++ b/dev-libs/nspr/nspr-4.11.recipe @@ -4,21 +4,21 @@ Netscape Portable Runtime (NSPR) provides a platform-neutral API for system \ level and libc-like functions. The API is used in the Mozilla clients, many \ of Red Hat's and Sun's server applications, and other software offerings. " +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" +COPYRIGHT="Mozilla Foundation" LICENSE=" GNU GPL v2 GNU LGPL v2.1 MPL v2.0 " -COPYRIGHT="Mozilla Foundation" -HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" +REVISION="1" SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$portVersion/src/nspr-$portVersion.tar.gz" CHECKSUM_SHA256="cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2" -REVISION="1" +SOURCE_DIR="nspr-$portVersion/nspr" +PATCHES="nspr-$portVersion.patchset" + ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -SOURCE_DIR="nspr-$portVersion/nspr" - -PATCHES="nspr-$portVersion.patchset" PROVIDES=" nspr$secondaryArchSuffix = $portVersion @@ -29,16 +29,28 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " + +PROVIDES_devel=" + nspr${secondaryArchSuffix}_devel = $portVersion compat >= 4 + cmd:nspr_config$secondaryArchSuffix = $portVersion compat >= 4 + devel:libnspr4$secondaryArchSuffix = $portVersion compat >= 4 + devel:libplc4$secondaryArchSuffix = $portVersion compat >= 4 + devel:libplds4$secondaryArchSuffix = $portVersion compat >= 4 + " +REQUIRES_devel=" + nspr${secondaryArchSuffix} == $portVersion base + " + BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel - cmd:autoconf cmd:aclocal + cmd:autoconf + cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make - cmd:awk cmd:perl " @@ -79,16 +91,3 @@ TEST() make $jobArgs make runtests } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - nspr${secondaryArchSuffix}_devel = $portVersion compat >= 4 - cmd:nspr_config$secondaryArchSuffix = $portVersion compat >= 4 - devel:libnspr4$secondaryArchSuffix = $portVersion compat >= 4 - devel:libplc4$secondaryArchSuffix = $portVersion compat >= 4 - devel:libplds4$secondaryArchSuffix = $portVersion compat >= 4 - " -REQUIRES_devel=" - nspr${secondaryArchSuffix} == $portVersion base - " diff --git a/dev-libs/nspr/nspr-4.12.recipe b/dev-libs/nspr/nspr-4.12.recipe index 2c77c6957..9ff0f241a 100644 --- a/dev-libs/nspr/nspr-4.12.recipe +++ b/dev-libs/nspr/nspr-4.12.recipe @@ -4,21 +4,21 @@ Netscape Portable Runtime (NSPR) provides a platform-neutral API for system \ level and libc-like functions. The API is used in the Mozilla clients, many \ of Red Hat's and Sun's server applications, and other software offerings. " +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" +COPYRIGHT="Mozilla Foundation" LICENSE=" GNU GPL v2 GNU LGPL v2.1 MPL v2.0 " -COPYRIGHT="Mozilla Foundation" -HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" +REVISION="3" SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$portVersion/src/nspr-$portVersion.tar.gz" CHECKSUM_SHA256="e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de" -REVISION="3" +SOURCE_DIR="nspr-$portVersion/nspr" +PATCHES="nspr-$portVersion.patchset" + ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -SOURCE_DIR="nspr-$portVersion/nspr" - -PATCHES="nspr-$portVersion.patchset" PROVIDES=" nspr$secondaryArchSuffix = $portVersion @@ -29,16 +29,28 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " + +PROVIDES_devel=" + nspr${secondaryArchSuffix}_devel = $portVersion compat >= 4 + cmd:nspr_config$secondaryArchSuffix = $portVersion compat >= 4 + devel:libnspr4$secondaryArchSuffix = $portVersion compat >= 4 + devel:libplc4$secondaryArchSuffix = $portVersion compat >= 4 + devel:libplds4$secondaryArchSuffix = $portVersion compat >= 4 + " +REQUIRES_devel=" + nspr${secondaryArchSuffix} == $portVersion base + " + BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel - cmd:autoconf cmd:aclocal + cmd:autoconf + cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make - cmd:awk cmd:perl " @@ -79,16 +91,3 @@ TEST() make $jobArgs make runtests } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - nspr${secondaryArchSuffix}_devel = $portVersion compat >= 4 - cmd:nspr_config$secondaryArchSuffix = $portVersion compat >= 4 - devel:libnspr4$secondaryArchSuffix = $portVersion compat >= 4 - devel:libplc4$secondaryArchSuffix = $portVersion compat >= 4 - devel:libplds4$secondaryArchSuffix = $portVersion compat >= 4 - " -REQUIRES_devel=" - nspr${secondaryArchSuffix} == $portVersion base - " diff --git a/dev-libs/nspr/nspr-4.19.recipe b/dev-libs/nspr/nspr-4.19.recipe index 8db625a4a..21c882038 100644 --- a/dev-libs/nspr/nspr-4.19.recipe +++ b/dev-libs/nspr/nspr-4.19.recipe @@ -4,21 +4,21 @@ Netscape Portable Runtime (NSPR) provides a platform-neutral API for system \ level and libc-like functions. The API is used in the Mozilla clients, many \ of Red Hat's and Sun's server applications, and other software offerings. " +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" +COPYRIGHT="Mozilla Foundation" LICENSE=" GNU GPL v2 GNU LGPL v2.1 MPL v2.0 " -COPYRIGHT="Mozilla Foundation" -HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" +REVISION="1" SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$portVersion/src/nspr-$portVersion.tar.gz" CHECKSUM_SHA256="2ed95917fa2277910d1d1cf36030607dccc0ba522bba08e2af13c113dcd8f729" -REVISION="1" +SOURCE_DIR="nspr-$portVersion/nspr" +PATCHES="nspr-$portVersion.patchset" + ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -SOURCE_DIR="nspr-$portVersion/nspr" - -PATCHES="nspr-$portVersion.patchset" PROVIDES=" nspr$secondaryArchSuffix = $portVersion @@ -29,16 +29,28 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " + +PROVIDES_devel=" + nspr${secondaryArchSuffix}_devel = $portVersion compat >= 4 + cmd:nspr_config$secondaryArchSuffix = $portVersion compat >= 4 + devel:libnspr4$secondaryArchSuffix = $portVersion compat >= 4 + devel:libplc4$secondaryArchSuffix = $portVersion compat >= 4 + devel:libplds4$secondaryArchSuffix = $portVersion compat >= 4 + " +REQUIRES_devel=" + nspr${secondaryArchSuffix} == $portVersion base + " + BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel - cmd:autoconf cmd:aclocal + cmd:autoconf + cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make - cmd:awk cmd:perl " @@ -79,16 +91,3 @@ TEST() make $jobArgs make runtests } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - nspr${secondaryArchSuffix}_devel = $portVersion compat >= 4 - cmd:nspr_config$secondaryArchSuffix = $portVersion compat >= 4 - devel:libnspr4$secondaryArchSuffix = $portVersion compat >= 4 - devel:libplc4$secondaryArchSuffix = $portVersion compat >= 4 - devel:libplds4$secondaryArchSuffix = $portVersion compat >= 4 - " -REQUIRES_devel=" - nspr${secondaryArchSuffix} == $portVersion base - " diff --git a/dev-libs/opencl_headers/opencl_headers-1.2~20180318.recipe b/dev-libs/opencl_headers/opencl_headers-1.2~20180318.recipe index 1c916ab7c..71f0217c2 100644 --- a/dev-libs/opencl_headers/opencl_headers-1.2~20180318.recipe +++ b/dev-libs/opencl_headers/opencl_headers-1.2~20180318.recipe @@ -10,9 +10,9 @@ HOMEPAGE="https://www.khronos.org/opencl_headers/" COPYRIGHT="2008-2015 The Khronos Group Inc." LICENSE="MIT" REVISION="2" -gitRevision="e986688daf750633898dfd3994e14a9e618f2aa5" -SOURCE_URI="https://github.com/KhronosGroup/OpenCL-Headers/archive/$gitRevision.zip" -SOURCE_DIR="OpenCL-Headers-$gitRevision" +srcGitRev="e986688daf750633898dfd3994e14a9e618f2aa5" +SOURCE_URI="https://github.com/KhronosGroup/OpenCL-Headers/archive/$srcGitRev.zip" +SOURCE_DIR="OpenCL-Headers-$srcGitRev" CHECKSUM_SHA256="264049db0538a017856b4a9a93f72180f677f095e4bcd806a9fd57e10b03f712" ARCHITECTURES="x86 x86_64" diff --git a/dev-libs/opencl_headers/opencl_headers-2.2~20180318.recipe b/dev-libs/opencl_headers/opencl_headers-2.2~20180318.recipe index 01f2fe9c5..59eddd639 100644 --- a/dev-libs/opencl_headers/opencl_headers-2.2~20180318.recipe +++ b/dev-libs/opencl_headers/opencl_headers-2.2~20180318.recipe @@ -10,9 +10,9 @@ HOMEPAGE="https://www.khronos.org/opencl_headers/" COPYRIGHT="2008-2015 The Khronos Group Inc." LICENSE="MIT" REVISION="2" -gitRevision="e986688daf750633898dfd3994e14a9e618f2aa5" -SOURCE_URI="https://github.com/KhronosGroup/OpenCL-Headers/archive/$gitRevision.zip" -SOURCE_DIR="OpenCL-Headers-$gitRevision" +srcGitRev="e986688daf750633898dfd3994e14a9e618f2aa5" +SOURCE_URI="https://github.com/KhronosGroup/OpenCL-Headers/archive/$srcGitRev.zip" +SOURCE_DIR="OpenCL-Headers-$srcGitRev" CHECKSUM_SHA256="264049db0538a017856b4a9a93f72180f677f095e4bcd806a9fd57e10b03f712" ARCHITECTURES="x86 x86_64" diff --git a/dev-qt/qml-box2d/qml_box2d-20160102.recipe b/dev-qt/qml-box2d/qml_box2d-20160102.recipe index 09bdbbe10..9a5c04fe5 100644 --- a/dev-qt/qml-box2d/qml_box2d-20160102.recipe +++ b/dev-qt/qml-box2d/qml_box2d-20160102.recipe @@ -17,10 +17,10 @@ COPYRIGHT=" " LICENSE="BSD (3-clause)" REVISION="1" -gitCommit="1b37be7d9dfb44ec6d520595a4e4f45f63717822" -SOURCE_URI="$HOMEPAGE/archive/$gitCommit.tar.gz" +srcGitRev="1b37be7d9dfb44ec6d520595a4e4f45f63717822" +SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="9a15af5b1ecc0d67f641545a76a725494ebf21165e5903afa7fc02b3c5000154" -SOURCE_DIR="qml-box2d-$gitCommit" +SOURCE_DIR="qml-box2d-$srcGitRev" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="?x86" @@ -34,9 +34,9 @@ REQUIRES=" lib:libGL$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Quick$secondaryArchSuffix - lib:libQt5Qml$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix + lib:libQt5Qml$secondaryArchSuffix + lib:libQt5Quick$secondaryArchSuffix " BUILD_REQUIRES=" @@ -44,9 +44,9 @@ BUILD_REQUIRES=" devel:libGL$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix - devel:libQt5Quick$secondaryArchSuffix - devel:libQt5Qml$secondaryArchSuffix devel:libQt5Network$secondaryArchSuffix + devel:libQt5Qml$secondaryArchSuffix + devel:libQt5Quick$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/dev-vcs/fossil/fossil-1.37.recipe b/dev-vcs/fossil/fossil-1.37.recipe index 2451547d4..5060805b1 100644 --- a/dev-vcs/fossil/fossil-1.37.recipe +++ b/dev-vcs/fossil/fossil-1.37.recipe @@ -22,19 +22,22 @@ PROVIDES=" " REQUIRES=" haiku - lib:libz lib:libssl + lib:libz " BUILD_REQUIRES=" haiku_devel - devel:libz devel:libssl + devel:libz " -# tests require cmd:tclsh BUILD_PREREQUIRES=" - cmd:make cmd:gcc + cmd:make + " + +TEST_REQUIRES=" + cmd:tclsh " BUILD() diff --git a/games-action/swars/swars-0.3.recipe b/games-action/swars/swars-0.3.recipe index 10edf4d32..d6585045a 100644 --- a/games-action/swars/swars-0.3.recipe +++ b/games-action/swars/swars-0.3.recipe @@ -29,7 +29,7 @@ SOURCE_URI="http://swars.vexillium.org/files/swars-0.3.tar.bz2" CHECKSUM_SHA256="01f44e5b792d41b138d361d04810a875cfa5f897c642a2b13d0dde633fabdacb" SOURCE_DIR="swars-$portVersion" PATCHES="swars_x86-0.3.patchset" -ADDITIONAL_FILES="ReadmeHaiku" #information on how to use swars in Haiku +ADDITIONAL_FILES="ReadmeHaiku" ARCHITECTURES="!x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86" @@ -41,20 +41,20 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libvorbisfile$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix - lib:libopenal$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix + lib:libopenal$secondaryArchSuffix + lib:libpng16$secondaryArchSuffix lib:libsdl$secondaryArchSuffix + lib:libvorbisfile$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libvorbisfile$secondaryArchSuffix - devel:libpng$secondaryArchSuffix - devel:libopenal$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix + devel:libopenal$secondaryArchSuffix + devel:libpng$secondaryArchSuffix devel:libsdl$secondaryArchSuffix + devel:libvorbisfile$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:awk diff --git a/games-arcade/nxengine/nxengine-1.0.0.4.recipe b/games-arcade/nxengine/nxengine-1.0.0.4.recipe index 8ac284bed..153720162 100644 --- a/games-arcade/nxengine/nxengine-1.0.0.4.recipe +++ b/games-arcade/nxengine/nxengine-1.0.0.4.recipe @@ -9,10 +9,10 @@ COPYRIGHT="2017 Retroguru" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/EXL/NXEngine/archive/v$portVersion-Rev4.tar.gz" -SOURCE_URI_2="http://www.cavestory.org/downloads/LIN64-NXEngine-$portVersion-Rev-4.tar.gz" # Game Data CHECKSUM_SHA256="d467c112e81d4c56337ebf6968bd8bd781bce9140f674e72009a5274d2c15784" -CHECKSUM_SHA256_2="ddc1f69349bd4239adc6485e0377b503425a7960bbd6696c1b30ea6ed11e1851" SOURCE_DIR="NXEngine-$portVersion-Rev4" +SOURCE_URI_2="http://www.cavestory.org/downloads/LIN64-NXEngine-$portVersion-Rev-4.tar.gz" +CHECKSUM_SHA256_2="ddc1f69349bd4239adc6485e0377b503425a7960bbd6696c1b30ea6ed11e1851" SOURCE_DIR_2="NXEngine" PATCHES="nxengine-$portVersion.patchset" diff --git a/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe b/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe index 3584ec17e..1f08accaf 100644 --- a/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe +++ b/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe @@ -1,21 +1,28 @@ SUMMARY="An SDL clone of Lode Runner" +DESCRIPTION=" +Grab all the diamonds, but don't get caught! Escape or trap ennemies by \ +digging holes in the ground, climb ladders and ropes, and, or course, run fast! +" HOMEPAGE="https://sourceforge.net/projects/sdlscavenger/files/" -LICENSE="GNU GPL v2" COPYRIGHT="1999-2010 Dave Ashley" +LICENSE="GNU GPL v2" +REVISION="2" SOURCE_URI="http://www.mirrorservice.org/sites/downloads.sourceforge.net/s/sd/sdlscavenger/sdlscav-145.1_2010_11_5.tgz" CHECKSUM_SHA256="c63666c0783d05b24895065781608994c43e4b359605be6806845b46f093d016" -REVISION="2" +SOURCE_DIR="sdlscav-145" +PATCHES="sdlscavenger-145.1.patchset" + ARCHITECTURES="x86_gcc2" PROVIDES=" sdlscavenger = $portVersion app:sdlscavenger = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix " + BUILD_REQUIRES=" devel:libsdl$secondaryArchSuffix " @@ -27,8 +34,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="sdlscav-145" -PATCHES="sdlscavenger-145.1.patchset" BUILD() { make $jobArgs @@ -41,10 +46,3 @@ INSTALL() cp -r data $appsDir/sdlscavenger/data addAppDeskbarSymlink $appsDir/sdlscavenger/sdlscav Scavenger } - -# ----- DESCRIPTION ----------------------------------------------------------- - -DESCRIPTION=" -Grab all the diamonds, but don't get caught! Escape or trap ennemies by \ -digging holes in the ground, climb ladders and ropes, and, or course, run fast! -" diff --git a/games-simulation/opencity/opencity-0.0.6.3.recipe b/games-simulation/opencity/opencity-0.0.6.3.recipe index 66c4f1b49..5c5cded2d 100644 --- a/games-simulation/opencity/opencity-0.0.6.3.recipe +++ b/games-simulation/opencity/opencity-0.0.6.3.recipe @@ -18,10 +18,17 @@ resources section, you can find the micro simulators' algorithm, design \ document, UML diagram and information about other issues. The UML diagram is \ edited with Umbrello, the free UML diagram editor for KDE." HOMEPAGE="http://www.opencity.info/" -SOURCE_URI="http://sourceforge.net/projects/opencity/files/Stable/0.0.6/opencity-0.0.6.3stable.tar.bz2" -SOURCE_DIR="opencity-0.0.6.3stable" -CHECKSUM_SHA256="23e31e44644c01f0a7d836a71fd03fa63ffbfd4bc983b4578e7836b345cfad03" +COPYRIGHT="2003-2008 Duong Khang NGUYEN + 2003-2008 Frederic RODRIGO + 2006-2007 Brodie THIESFIELD + 2006 Angelo 'Encelo' THEODOROU + 2002-2004 Yves BERQUIN + 1999 Jeff MOLOFEE" +LICENSE="GNU GPL v2" REVISION="1" +SOURCE_URI="http://sourceforge.net/projects/opencity/files/Stable/0.0.6/opencity-0.0.6.3stable.tar.bz2" +CHECKSUM_SHA256="23e31e44644c01f0a7d836a71fd03fa63ffbfd4bc983b4578e7836b345cfad03" +SOURCE_DIR="opencity-0.0.6.3stable" ARCHITECTURES="!x86_gcc2" SECONDARY_ARCHITECTURES="!x86" @@ -32,14 +39,13 @@ PROVIDES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libsdl_image$secondaryArchSuffix - devel:libsdl_mixer$secondaryArchSuffix - devel:libsdl_net_1.2$secondaryArchSuffix devel:libgl$secondaryArchSuffix devel:libglu$secondaryArchSuffix devel:libpng$secondaryArchSuffix + devel:libsdl_image$secondaryArchSuffix + devel:libsdl_mixer$secondaryArchSuffix + devel:libsdl_net_1.2$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:awk cmd:gcc$secondaryArchSuffix @@ -48,19 +54,13 @@ BUILD_PREREQUIRES=" cmd:sdl_config$secondaryArchSuffix " -BUILD() { +BUILD() +{ runConfigure ./configure make $jobArgs } -INSTALL() { +INSTALL() +{ make install } - -COPYRIGHT="2003-2008 Duong Khang NGUYEN - 2003-2008 Frederic RODRIGO - 2006-2007 Brodie THIESFIELD - 2006 Angelo 'Encelo' THEODOROU - 2002-2004 Yves BERQUIN - 1999 Jeff MOLOFEE" -LICENSE="GNU GPL v2" diff --git a/games-simulation/openttd_gfx/openttd_gfx-0.5.4.recipe b/games-simulation/openttd_gfx/openttd_gfx-0.5.4.recipe index bbc634b47..df75345f9 100644 --- a/games-simulation/openttd_gfx/openttd_gfx-0.5.4.recipe +++ b/games-simulation/openttd_gfx/openttd_gfx-0.5.4.recipe @@ -9,8 +9,8 @@ This package provides free to use graphics file. You can use them if you \ don't have the files from the original Transport Tycoon Deluxe game. " HOMEPAGE="http://www.openttd.org" -LICENSE="GNU GPL v2" COPYRIGHT="2005-2013 OpenTTD Team" +LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="http://bundles.openttdcoop.org/opengfx/releases/$portVersion/opengfx-$portVersion.zip#noarchive" CHECKSUM_SHA256="3d136d776906dbe8b5df1434cb9a68d1249511a3c4cfaca55cc24cc0028ae078" @@ -39,5 +39,3 @@ INSTALL() mkdir -p $dataDir/openttd/baseset/opengfx cp opengfx-$portVersion/* $dataDir/openttd/baseset/opengfx } - -# no TEST script available diff --git a/haiku-apps/album/album-0.9.4.recipe b/haiku-apps/album/album-0.9.4.recipe index b30141947..a7a4491c5 100644 --- a/haiku-apps/album/album-0.9.4.recipe +++ b/haiku-apps/album/album-0.9.4.recipe @@ -10,13 +10,17 @@ HOMEPAGE="https://github.com/HaikuArchives/Album/" COPYRIGHT="2006-2015 by Matjaž Kovač" LICENSE="MIT" REVISION="5" -COMMIT=19d7f4d658f09800a05f4d3d9c7260d87ece47ef -SOURCE_URI="https://github.com/HaikuArchives/Album/archive/$COMMIT.tar.gz" +srcGitRev="19d7f4d658f09800a05f4d3d9c7260d87ece47ef" +SOURCE_URI="https://github.com/HaikuArchives/Album/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="b0f256a72cf248637ce0cb2952c144d58dd4cff365bd8635ac962ab2d5c8398d" -SOURCE_DIR="Album-$COMMIT" +SOURCE_DIR="Album-$srcGitRev" ARCHITECTURES="x86_gcc2 ?x86 x86_64" +USER_SETTINGS_FILES=" + settings/Album_settings + " + PROVIDES=" album = $portVersion app:Album = $portVersion @@ -38,10 +42,6 @@ BUILD_PREREQUIRES=" cmd:make " -USER_SETTINGS_FILES=" - settings/Album_settings - " - BUILD() { cd src diff --git a/haiku-apps/archiver/archiver-1.0.0.recipe b/haiku-apps/archiver/archiver-1.0.0.recipe index a2d5bfb36..a9abd1835 100644 --- a/haiku-apps/archiver/archiver-1.0.0.recipe +++ b/haiku-apps/archiver/archiver-1.0.0.recipe @@ -5,10 +5,10 @@ HOMEPAGE="https://github.com/HaikuArchives/$APP" COPYRIGHT="2002 Marcin 'Shard' Konicki" LICENSE="MIT" REVISION="1" -COMMIT="3a9361a6214734293c65849b77b4f62d6242b749" -SOURCE_URI="https://github.com/HaikuArchives/$APP/archive/$COMMIT.tar.gz" +srcGitRev="3a9361a6214734293c65849b77b4f62d6242b749" +SOURCE_URI="https://github.com/HaikuArchives/$APP/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="ca224148993da6614baa53d2a4e02e96213cd01ec300487eaa6418bc24cb7c3a" -SOURCE_DIR="$APP-$COMMIT" +SOURCE_DIR="$APP-$srcGitRev" ARCHITECTURES="x86_gcc2 !x86_64" diff --git a/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe b/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe index e7b86342f..899d321f8 100644 --- a/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe +++ b/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe @@ -4,45 +4,40 @@ BeIndexed searches all your files and builds a database with their content. \ You can then search for files by content, like on Google etc. Index files with \ Indexer, Find files with Finder. " -HOMEPAGE="https://github.com/HaikuArchives/BeIndexed" #Or web.archive.org and eiman.tv/BeIndexed -SOURCE_URI="git://github.com/HaikuArchives/BeIndexed.git#4bbd3e9709d7288ffefbc215ab41a152a24a2276" - -REVISION="1" - -LICENSE="BSD (3-clause)" +HOMEPAGE="https://github.com/HaikuArchives/BeIndexed" COPYRIGHT="2003 Mikael Eiman" +LICENSE="BSD (3-clause)" +REVISION="1" +SOURCE_URI="git://github.com/HaikuArchives/BeIndexed.git#4bbd3e9709d7288ffefbc215ab41a152a24a2276" ARCHITECTURES="x86_gcc2 x86" +USER_SETTINGS_FILES=" + data/BeIndexed directory + " PROVIDES=" beindexed = $portVersion app:Finder = $portVersion cmd:Indexer = $portVersion " - REQUIRES=" haiku - lib:libsqlite3 lib:liblayout - " - -BUILD_PREREQUIRES=" - makefile_engine - cmd:g++ - cmd:xres - cmd:make + lib:libsqlite3 " BUILD_REQUIRES=" - makefile_engine haiku_devel - devel:libsqlite3 + makefile_engine devel:liblayout + devel:libsqlite3 " - -USER_SETTINGS_FILES=" - data/BeIndexed directory +BUILD_PREREQUIRES=" + makefile_engine + cmd:g++ + cmd:make + cmd:xres " BUILD() diff --git a/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe b/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe index 0483b3543..ae1d4093f 100644 --- a/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe +++ b/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe @@ -9,10 +9,10 @@ HOMEPAGE="http://eiman.tv/LnLauncher" COPYRIGHT="2000-2015 Mikael Eiman" LICENSE="MIT" REVISION="7" -commit="ddd60a641c31" -SOURCE_URI="https://bitbucket.org/m_eiman/lnlauncher/get/$commit.zip" +srcGitRev="ddd60a641c31" +SOURCE_URI="https://bitbucket.org/m_eiman/lnlauncher/get/$srcGitRev.zip" CHECKSUM_SHA256="9b8f1452a2f22a916954e6954e775cb4593b380e33ddf2bd3a3c3fd1d9a37cf6" -SOURCE_DIR="m_eiman-lnlauncher-$commit" +SOURCE_DIR="m_eiman-lnlauncher-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/haiku-apps/pe/patches/pe-2.4.5.patchset b/haiku-apps/pe/patches/pe-2.4.5.patchset deleted file mode 100644 index da8f20abd..000000000 --- a/haiku-apps/pe/patches/pe-2.4.5.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 9d30974e209c35115d24295622b5480e272a41fd Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 17 Jul 2017 20:40:32 +0200 -Subject: link JamExt against libstdc++. - - -diff --git a/Languages/Sources/Jamfile b/Languages/Sources/Jamfile -index 943b926..f67076d 100644 ---- a/Languages/Sources/Jamfile -+++ b/Languages/Sources/Jamfile -@@ -76,7 +76,7 @@ PeLanguage HtmlCssJsPhpExt - # - PeLanguage JamExt - : Jam_Language.cpp -- : be -+ : be $(STDC++LIB) - : keywords.jam.rsrc - ; - # --- -2.12.2 - diff --git a/haiku-apps/pe/pe-2.4.5.recipe b/haiku-apps/pe/pe-2.4.5.recipe index 791e3c5ff..9b15b957c 100644 --- a/haiku-apps/pe/pe-2.4.5.recipe +++ b/haiku-apps/pe/pe-2.4.5.recipe @@ -17,10 +17,13 @@ SOURCE_URI="https://github.com/HaikuArchives/Pe/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="94e3946437bc5f5e0163ed3f44b3f597c4471106999d00262ccd9fff763df091" SOURCE_FILENAME="pe-$srcGitRev.tar.gz" SOURCE_DIR="Pe-$srcGitRev" -PATCHSET="pe-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" +USER_SETTINGS_FILES=" + settings/pe directory + " + PROVIDES=" pe = $portVersion app:Pe = $portVersion compat >= 2 @@ -45,10 +48,6 @@ BUILD_PREREQUIRES=" cmd:ld " -USER_SETTINGS_FILES=" - settings/pe directory - " - BUILD() { # multi-job builds don't work reliably diff --git a/media-gfx/sane_backends/sane_backends-1.0.24.recipe b/media-gfx/sane_backends/sane_backends-1.0.24.recipe index 3cc2173e2..b0a5bd26a 100644 --- a/media-gfx/sane_backends/sane_backends-1.0.24.recipe +++ b/media-gfx/sane_backends/sane_backends-1.0.24.recipe @@ -15,12 +15,12 @@ This package includes scanners backends, the command line frontend scanimage, \ the saned server and the sane-find-scanner utility, along with their \ documentation. " - HOMEPAGE="http://www.sane-project.org" -LICENSE="GNU LGPL v2" COPYRIGHT="David Mosberger-Tang, Andy Beck" -SOURCE_URI="git://git.debian.org/sane/sane-backends.git#f6896e0de481fad5c63bf7ffc271aca89b9cbb01" +LICENSE="GNU LGPL v2" REVISION="3" +SOURCE_URI="git://git.debian.org/sane/sane-backends.git#f6896e0de481fad5c63bf7ffc271aca89b9cbb01" +PATCHES="sane_backends-1.0.24.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -40,34 +40,40 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix - lib:libusb_1.0$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libtiff$secondaryArchSuffix + lib:libusb_1.0$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +PROVIDES_devel=" + sane_backends${secondaryArchSuffix}_devel = $portVersion + devel:libsane$secondaryArchSuffix = portVersion compat >= 0 + " +REQUIRES_devel=" + sane_backends$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" - devel:libz$secondaryArchSuffix - devel:libusb_1.0$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libtiff$secondaryArchSuffix + devel:libusb_1.0$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake - cmd:libtoolize cmd:awk cmd:find cmd:gcc$secondaryArchSuffix cmd:libtoolize + cmd:libtoolize cmd:make cmd:pkg_config$secondaryArchSuffix " -PATCHES="sane_backends-1.0.24.patchset" - BUILD() { libtoolize --force --copy --install @@ -111,13 +117,3 @@ INSTALL() $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - sane_backends${secondaryArchSuffix}_devel = $portVersion - devel:libsane$secondaryArchSuffix = portVersion compat >= 0 - " -REQUIRES_devel=" - sane_backends$secondaryArchSuffix == $portVersion base - " diff --git a/media-libs/flickcurl/flickcurl-1.26.recipe b/media-libs/flickcurl/flickcurl-1.26.recipe index d92ce8c39..b3ffd79dc 100644 --- a/media-libs/flickcurl/flickcurl-1.26.recipe +++ b/media-libs/flickcurl/flickcurl-1.26.recipe @@ -19,30 +19,38 @@ COPYRIGHT=" LICENSE=" GNU LGPL v2.1 " +REVISION="5" SOURCE_URI="http://download.dajobe.org/flickcurl/flickcurl-$portVersion.tar.gz" CHECKSUM_SHA256="ff42a36c7c1c7d368246f6bc9b7d792ed298348e5f0f5d432e49f6803562f5a3" -REVISION="5" +PATCHES="flickcurl-$portVersion.patchset" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="flickcurl-$portVersion.patchset" - PROVIDES=" flickcurl$secondaryArchSuffix = $portVersion compat >= 1 - lib:libflickcurl$secondaryArchSuffix = 0.0.0 compat >= 0 cmd:flickcurl$secondaryArchSuffix cmd:flickrdf$secondaryArchSuffix + lib:libflickcurl$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix # required by libcurl lib:libcurl$secondaryArchSuffix + lib:libssl$secondaryArchSuffix # required by libcurl lib:libxml2$secondaryArchSuffix - # required by libcurl and libxml2 - lib:libz$secondaryArchSuffix - # required by libcurl - lib:libssl$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix + lib:libz$secondaryArchSuffix # required by libcurl and libxml2 " + +PROVIDES_devel=" + flickcurl${secondaryArchSuffix}_devel = $portVersion compat >= 1 + cmd:flickcurl_config$secondaryArchSuffix + devel:libflickcurl$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + flickcurl$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcurl$secondaryArchSuffix @@ -87,14 +95,3 @@ INSTALL() $binDir/flickcurl-config \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - flickcurl${secondaryArchSuffix}_devel = $portVersion compat >= 1 - cmd:flickcurl_config$secondaryArchSuffix - devel:libflickcurl$secondaryArchSuffix = 0.0.0 compat >= 0 - " -REQUIRES_devel=" - flickcurl$secondaryArchSuffix == $portVersion base - " diff --git a/media-libs/freetype/freetype-2.9.recipe b/media-libs/freetype/freetype-2.9.recipe index 9c7a0340f..571823cfb 100644 --- a/media-libs/freetype/freetype-2.9.recipe +++ b/media-libs/freetype/freetype-2.9.recipe @@ -21,27 +21,27 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix - lib:libz$secondaryArchSuffix >= 1 lib:libpng16$secondaryArchSuffix + lib:libz$secondaryArchSuffix >= 1 " -REQUIRES_devel=" - freetype${secondaryArchSuffix} == $portVersion base - devel:libbz2$secondaryArchSuffix - devel:libz$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - " PROVIDES_devel=" freetype${secondaryArchSuffix}_devel = $portVersion cmd:freetype_config${secondaryArchSuffix} = $portVersion devel:libfreetype${secondaryArchSuffix} = 6.16.0 compat >= 6 " +REQUIRES_devel=" + freetype${secondaryArchSuffix} == $portVersion base + devel:libbz2$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix - devel:libz$secondaryArchSuffix devel:libpng16$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/media-libs/guilib/guilib-1.2.1.recipe b/media-libs/guilib/guilib-1.2.1.recipe index b61597906..890b86a19 100644 --- a/media-libs/guilib/guilib-1.2.1.recipe +++ b/media-libs/guilib/guilib-1.2.1.recipe @@ -4,12 +4,12 @@ GUIlib is a very simple GUI library for SDL. It provides some general widgets \ like button, scrollbar, and image. " HOMEPAGE="http://www.libsdl.org/projects/GUIlib/" +COPYRIGHT="Public Domain" +LICENSE="Public Domain" +REVISION="1" SOURCE_URI="http://www.libsdl.org/projects/GUIlib/src/GUIlib-1.2.1.tar.gz" CHECKSUM_SHA256="3b383e537238048f4712395a38b9e3c65475d1dc93413e557f1b0a39c88f68df" -LICENSE="Public Domain" -COPYRIGHT="Public Domain" - -REVISION="1" +SOURCE_DIR="GUIlib-$portVersion" ARCHITECTURES="x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -19,28 +19,33 @@ PROVIDES=" lib:libGUI$secondaryArchSuffix = 1.2_0.0.1 compat >= 1.2_0 lib:libGUI_1.2$secondaryArchSuffix = 0.0.1 compat >= 0 " - REQUIRES=" haiku$secondaryArchSuffix - lib:libsdl$secondaryArchSuffix lib:libGL$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + " + +PROVIDES_devel=" + guilib${secondaryArchSuffix}_devel = $portVersion compat >= 1.2 + devel:libGUI$secondaryArchSuffix = 1.2_0.0.1 compat >= 1.2_0 + devel:libGUI_1.2$secondaryArchSuffix = 0.0.1 compat >= 0 + " +REQUIRES_devel=" + guilib$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix " - BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:libtool cmd:aclocal cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:libtool cmd:make " -SOURCE_DIR="GUIlib-$portVersion" - BUILD() { rm -f aclocal.m4 @@ -66,14 +71,3 @@ INSTALL() packageEntries devel \ $developDir } - -# ----- devel package ----------------------------------------- - -PROVIDES_devel=" - guilib${secondaryArchSuffix}_devel = $portVersion compat >= 1.2 - devel:libGUI$secondaryArchSuffix = 1.2_0.0.1 compat >= 1.2_0 - devel:libGUI_1.2$secondaryArchSuffix = 0.0.1 compat >= 0 - " -REQUIRES_devel=" - guilib$secondaryArchSuffix == $portVersion base - " diff --git a/media-libs/ilmbase/ilmbase-2.1.0.recipe b/media-libs/ilmbase/ilmbase-2.1.0.recipe index 20e83874c..a25873783 100644 --- a/media-libs/ilmbase/ilmbase-2.1.0.recipe +++ b/media-libs/ilmbase/ilmbase-2.1.0.recipe @@ -1,3 +1,4 @@ +SUMMARY="OpenEXR ILM Base libraries" DESCRIPTION=" IlmBase provides base libraries for OpenEXR. It contains five \ modules. Half encapsulates 16-bit floating-point format. IlmThread \ @@ -6,43 +7,58 @@ Windows threads. Imath implements 2D and 3D vectors, 3x3 and 4x4 \ matrices, quaternions and other useful math functions. Iex is an \ exception-handling library. There is also IexMath module. " -SUMMARY="OpenEXR ILM Base libraries" HOMEPAGE="http://www.openexr.com/" -LICENSE="BSD (3-clause)" COPYRIGHT="2002-2013 Industrial Light & Magic" +LICENSE="BSD (3-clause)" +REVISION="3" SOURCE_URI="http://download.savannah.nongnu.org/releases/openexr/ilmbase-$portVersion.tar.gz" CHECKSUM_SHA256="1e841ad89c5761940b07a125e6909ad22fe9fe0f99eadef45e0cca4efc6819b4" -REVISION="3" +PATCHES="ilmbase-2.1.0.patch" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -PATCHES="ilmbase-2.1.0.patch" - PROVIDES=" ilmbase$secondaryArchSuffix = $portVersion - lib:libilmbase$secondaryArchSuffix = $portVersion lib:libHalf$secondaryArchSuffix = $portVersion lib:libIex_2_1$secondaryArchSuffix = $portVersion lib:libIexMath_2_1$secondaryArchSuffix = $portVersion + lib:libilmbase$secondaryArchSuffix = $portVersion lib:libIlmThread_2_1$secondaryArchSuffix = $portVersion lib:libImath_2_1$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix " + +PROVIDES_devel=" + ilmbase${secondaryArchSuffix}_devel = $portVersion + devel:libHalf$secondaryArchSuffix = $portVersion + devel:libIex$secondaryArchSuffix = $portVersion + devel:libIex_2_1$secondaryArchSuffix = $portVersion + devel:libIexMath$secondaryArchSuffix = $portVersion + devel:libIexMath_2_1$secondaryArchSuffix = $portVersion + devel:libilmbase$secondaryArchSuffix = $portVersion + devel:libIlmThread$secondaryArchSuffix = $portVersion + devel:libIlmThread_2_1$secondaryArchSuffix = $portVersion + devel:libImath$secondaryArchSuffix = $portVersion + devel:libImath_2_1$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + ilmbase$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:which - cmd:autoconf - cmd:aclocal - cmd:libtoolize$secondaryArchSuffix " BUILD() @@ -68,22 +84,3 @@ INSTALL() # devel package packageEntries devel $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - ilmbase${secondaryArchSuffix}_devel = $portVersion - devel:libilmbase$secondaryArchSuffix = $portVersion - devel:libHalf$secondaryArchSuffix = $portVersion - devel:libIex_2_1$secondaryArchSuffix = $portVersion - devel:libIexMath_2_1$secondaryArchSuffix = $portVersion - devel:libIlmThread_2_1$secondaryArchSuffix = $portVersion - devel:libImath_2_1$secondaryArchSuffix = $portVersion - devel:libIex$secondaryArchSuffix = $portVersion - devel:libIexMath$secondaryArchSuffix = $portVersion - devel:libIlmThread$secondaryArchSuffix = $portVersion - devel:libImath$secondaryArchSuffix = $portVersion - " -REQUIRES_devel=" - ilmbase$secondaryArchSuffix == $portVersion base - " diff --git a/media-libs/leptonica/leptonica-1.69.recipe b/media-libs/leptonica/leptonica-1.69.recipe index 2e4648fcc..0b7ef478b 100644 --- a/media-libs/leptonica/leptonica-1.69.recipe +++ b/media-libs/leptonica/leptonica-1.69.recipe @@ -8,11 +8,16 @@ and image analysis operations. It's long list of features includes: * can open and save standard image formats " HOMEPAGE="http://code.google.com/p/leptonica" +COPYRIGHT="2001-2012 Dan Bloomberg" +LICENSE="BSD (2-clause)" +REVISION="2" SOURCE_URI="http://www.leptonica.org/source/leptonica-1.69.tar.gz" CHECKSUM_SHA256="3eb7669dcda7e417f399bb3698414ea523270797dfd36c59b08ef37a3fe0a72d" -LICENSE="BSD (2-clause)" -COPYRIGHT="2001-2012 Dan Bloomberg" -REVISION="2" +PATCHES=" + giflib6.patch + leptonica-1.69.patch + " + ARCHITECTURES="x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" @@ -21,7 +26,6 @@ PROVIDES=" lib:leptonica$secondaryArchSuffix = 3.0.0 lib:liblept$secondaryArchSuffix = 3.0.0 " - REQUIRES=" haiku$secondaryArchSuffix lib:libgif$secondaryArchSuffix @@ -31,67 +35,16 @@ REQUIRES=" lib:libz$secondaryArchSuffix " -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libgif$secondaryArchSuffix - devel:libjpeg$secondaryArchSuffix - devel:libpng$secondaryArchSuffix - devel:libwebp$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:ar$secondaryArchSuffix - cmd:autoconf - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:makeinfo - " - -PATCHES=" - giflib6.patch - leptonica-1.69.patch - " - -BUILD() -{ - libtoolize --force --copy --install - aclocal - autoconf - automake -a - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install - prepareInstalledDevelLibs liblept - - packageEntries devel \ - $developDir - - packageEntries tools \ - $binDir -} - -# ----- devel package ------------------------------------------------------- - PROVIDES_devel=" leptonica${secondaryArchSuffix}_devel = $portVersion devel:leptonica$secondaryArchSuffix = 3.0.0 devel:liblept$secondaryArchSuffix = 3.0.0 " - REQUIRES_devel=" haiku$secondaryArchSuffix leptonica$secondaryArchSuffix == $portVersion base " -# ----- tools package ------------------------------------------------------- - PROVIDES_tools=" leptonica${secondaryArchSuffix}_tools = $portVersion cmd:adaptmaptest$secondaryArchSuffix = $portVersion @@ -111,8 +64,8 @@ PROVIDES_tools=" cmd:binmorph3_reg$secondaryArchSuffix = $portVersion cmd:binmorph4_reg$secondaryArchSuffix = $portVersion cmd:binmorph5_reg$secondaryArchSuffix = $portVersion - cmd:blend_reg$secondaryArchSuffix = $portVersion cmd:blend2_reg$secondaryArchSuffix = $portVersion + cmd:blend_reg$secondaryArchSuffix = $portVersion cmd:blendcmaptest$secondaryArchSuffix = $portVersion cmd:blendtest1$secondaryArchSuffix = $portVersion cmd:buffertest$secondaryArchSuffix = $portVersion @@ -168,10 +121,10 @@ PROVIDES_tools=" cmd:fhmtauto_reg$secondaryArchSuffix = $portVersion cmd:fhmtautogen$secondaryArchSuffix = $portVersion cmd:fileinfo$secondaryArchSuffix = $portVersion - cmd:findpattern_reg$secondaryArchSuffix = $portVersion cmd:findpattern1$secondaryArchSuffix = $portVersion cmd:findpattern2$secondaryArchSuffix = $portVersion cmd:findpattern3$secondaryArchSuffix = $portVersion + cmd:findpattern_reg$secondaryArchSuffix = $portVersion cmd:flipdetect_reg$secondaryArchSuffix = $portVersion cmd:flipselgen$secondaryArchSuffix = $portVersion cmd:fmorphauto_reg$secondaryArchSuffix = $portVersion @@ -274,8 +227,8 @@ PROVIDES_tools=" cmd:seedspread_reg$secondaryArchSuffix = $portVersion cmd:selio_reg$secondaryArchSuffix = $portVersion cmd:sharptest$secondaryArchSuffix = $portVersion - cmd:shear_reg$secondaryArchSuffix = $portVersion cmd:shear2_reg$secondaryArchSuffix = $portVersion + cmd:shear_reg$secondaryArchSuffix = $portVersion cmd:sheartest$secondaryArchSuffix = $portVersion cmd:showedges$secondaryArchSuffix = $portVersion cmd:skew_reg$secondaryArchSuffix = $portVersion @@ -309,3 +262,44 @@ REQUIRES_tools=" haiku$secondaryArchSuffix leptonica$secondaryArchSuffix == $portVersion base " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libgif$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libwebp$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:ar$secondaryArchSuffix + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:makeinfo + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake -a + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs liblept + + packageEntries devel \ + $developDir + + packageEntries tools \ + $binDir +} diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe index d94b7fb53..f9aa8b83e 100644 --- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe +++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe @@ -11,11 +11,11 @@ Interest, as well as a two-phase rendering pipeline optimized for interactive \ display. " HOMEPAGE="http://www.levien.com/libart/" +COPYRIGHT="2001-2010 Mathieu Lacage and Raph Levien" +LICENSE="GNU LGPL v2.1" +REVISION="2" SOURCE_URI="http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.tar.gz" CHECKSUM_SHA256="2a10b1c884bb37c7bd5c5eba59dbd0d28bf68e64a42d7f2083c836f60f8e98fa" -REVISION="2" -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2001-2010 Mathieu Lacage and Raph Levien" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -27,16 +27,26 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " + +PROVIDES_devel=" + libart_lgpl_2$secondaryArchSuffix = $portVersion + cmd:libart2_config$secondaryArchSuffix = $portVersion compat >= 2 + devel:libart_lgpl_2$secondaryArchSuffix = 2.3.21 compat >= 2 + " +REQUIRES_devel=" + libart_lgpl_2$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal cmd:autoreconf + cmd:gcc${secondaryArchSuffix} + cmd:ld${secondaryArchSuffix} cmd:libtool cmd:make - cmd:ld${secondaryArchSuffix} - cmd:gcc${secondaryArchSuffix} " BUILD() @@ -59,14 +69,3 @@ INSTALL() $developDir \ $binDir } - -# ----- devel package - -PROVIDES_devel=" - libart_lgpl_2$secondaryArchSuffix = $portVersion - devel:libart_lgpl_2$secondaryArchSuffix = 2.3.21 compat >= 2 - cmd:libart2_config$secondaryArchSuffix = $portVersion compat >= 2 - " -REQUIRES_devel=" - libart_lgpl_2$secondaryArchSuffix == $portVersion base - " diff --git a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe index 48385b3b9..6f5151567 100644 --- a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe +++ b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe @@ -4,48 +4,53 @@ libdvdnav allows easy use of sophisticated DVD navigation features such as \ DVD menus, multiangle playback and even interactive DVD games. " HOMEPAGE="http://dvdnav.mplayerhq.hu/" -LICENSE="GNU GPL v2" COPYRIGHT="2000 Rich Wareham 2001-2004 the dvdnav project" +LICENSE="GNU GPL v2" +REVISION="3" SOURCE_URI="http://dvdnav.mplayerhq.hu/releases/libdvdnav-$portVersion.tar.xz" CHECKSUM_SHA256="7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372" -REVISION="3" +SOURCE_DIR="libdvdnav-${portVersion}" +PATCHES="libdvdnav-4.2.0.patch" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" -PATCHES="libdvdnav-4.2.0.patch" - PROVIDES=" libdvdnav$secondaryArchSuffix = $portVersion - lib:libdvdnav$secondaryArchSuffix cmd:dvdnav_config$secondaryArchSuffix + lib:libdvdnav$secondaryArchSuffix " - REQUIRES=" haiku$secondaryArchSuffix - libdvdread$secondaryArchSuffix libdvdcss$secondaryArchSuffix + libdvdread$secondaryArchSuffix + " + +PROVIDES_devel=" + libdvdnav${secondaryArchSuffix}_devel = $portVersion + devel:libdvdnav$secondaryArchSuffix = $portVersion + devel:libdvdnavmini$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + libdvdnav$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" - libdvdread${secondaryArchSuffix}_devel libdvdcss${secondaryArchSuffix}_devel + libdvdread${secondaryArchSuffix}_devel " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:libtoolize$secondaryArchSuffix cmd:aclocal cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make cmd:pkg_config$secondaryArchSuffix " -SOURCE_DIR="libdvdnav-${portVersion}" - BUILD() { ./autogen.sh @@ -68,14 +73,3 @@ INSTALL() packageEntries devel \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - libdvdnav${secondaryArchSuffix}_devel = $portVersion - devel:libdvdnav$secondaryArchSuffix = $portVersion - devel:libdvdnavmini$secondaryArchSuffix = $portVersion - " -REQUIRES_devel=" - libdvdnav$secondaryArchSuffix == $portVersion base - " diff --git a/media-libs/libdvdread/libdvdread-4.2.1.recipe b/media-libs/libdvdread/libdvdread-4.2.1.recipe index b868f0e29..c64a84fa5 100644 --- a/media-libs/libdvdread/libdvdread-4.2.1.recipe +++ b/media-libs/libdvdread/libdvdread-4.2.1.recipe @@ -6,44 +6,48 @@ parses IFO files, reads NAV-blocks, and performs CSS authentication and \ descrambling (if an external libdvdcss library is installed). " HOMEPAGE="http://dvdnav.mplayerhq.hu" -LICENSE="GNU GPL v2" COPYRIGHT="1998-1999 Eric Smith 2000-2002 Björn Englund 2000-2003 Håkan Hjort, et al." +LICENSE="GNU GPL v2" +REVISION="3" SOURCE_URI="http://dvdnav.mplayerhq.hu/releases/libdvdread-$portVersion.tar.xz" CHECKSUM_SHA256="af9b98f049580a6521d56c978b736d3d609562dd12955e11d50e26d97542dcd4" -REVISION="3" +SOURCE_DIR="libdvdread-${portVersion}" +PATCHES="libdvdread-4.2.1.patch" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="libdvdread-4.2.1.patch" - PROVIDES=" libdvdread$secondaryArchSuffix = $portVersion - lib:libdvdread$secondaryArchSuffix cmd:dvdread_config$secondaryArchSuffix + lib:libdvdread$secondaryArchSuffix " - REQUIRES=" haiku$secondaryArchSuffix " +PROVIDES_devel=" + libdvdread${secondaryArchSuffix}_devel = $portVersion + devel:libdvdread$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + libdvdread$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:libtoolize$secondaryArchSuffix cmd:aclocal cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make " -SOURCE_DIR="libdvdread-${portVersion}" - BUILD() { ./autogen.sh @@ -71,13 +75,3 @@ TEST() { make check } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - libdvdread${secondaryArchSuffix}_devel = $portVersion - devel:libdvdread$secondaryArchSuffix = $portVersion - " -REQUIRES_devel=" - libdvdread$secondaryArchSuffix == $portVersion base - " diff --git a/media-libs/libebur128/libebur128-1.2.3.recipe b/media-libs/libebur128/libebur128-1.2.3.recipe index 72a282a24..74bd7e191 100644 --- a/media-libs/libebur128/libebur128-1.2.3.recipe +++ b/media-libs/libebur128/libebur128-1.2.3.recipe @@ -22,8 +22,8 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - " # lib:libspeexdsp$secondaryArchSuffix + " PROVIDES_devel=" libebur128${secondaryArchSuffix}_devel = $portVersion diff --git a/media-libs/libfpx/libfpx-1.3.1.10.recipe b/media-libs/libfpx/libfpx-1.3.1.10.recipe index 2cc2ff306..3c34b6491 100644 --- a/media-libs/libfpx/libfpx-1.3.1.10.recipe +++ b/media-libs/libfpx/libfpx-1.3.1.10.recipe @@ -6,10 +6,9 @@ HOMEPAGE="http://www.i3a.org" COPYRIGHT="1999 Digital Imaging Group, Inc." LICENSE="Flashpix" REVISION="1" -libfpxVersion="${portVersion%.*}-${portVersion##*.}" -SOURCE_URI="http://www.imagemagick.org/download/delegates/libfpx-$libfpxVersion.tar.xz" +SOURCE_URI="http://www.imagemagick.org/download/delegates/libfpx-${portVersion%.*}-${portVersion##*.}.tar.xz" CHECKSUM_SHA256="491b55535580d27355669c45fe995446bd34df5dbcdc15312e58c3ebecc6a455" -SOURCE_DIR="libfpx-$libfpxVersion" +SOURCE_DIR="libfpx-${portVersion%.*}-${portVersion##*.}" ARCHITECTURES="x86_gcc2 ?x86 x86_64 ?arm" diff --git a/media-libs/libharu/libharu-2.3.0.recipe b/media-libs/libharu/libharu-2.3.0.recipe index e4394c290..152570b1e 100644 --- a/media-libs/libharu/libharu-2.3.0.recipe +++ b/media-libs/libharu/libharu-2.3.0.recipe @@ -17,15 +17,16 @@ COPYRIGHT=" 2007-2009 Antony Dovgal et al. " LICENSE="Zlib" -SOURCE_URI="https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz" -SOURCE_FILENAME="libharu-2.3.0.tar.gz" -CHECKSUM_SHA256="8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2" REVISION="1" +SOURCE_URI="https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz" +CHECKSUM_SHA256="8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2" +SOURCE_FILENAME="libharu-2.3.0.tar.gz" +SOURCE_DIR="libharu-RELEASE_2_3_0" +PATCHES="libharu-$portVersion.patchset" + ARCHITECTURES="x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="libharu-$portVersion.patchset" - PROVIDES=" libharu$secondaryArchSuffix = $portVersion compat >= 2 lib:libhpdf$secondaryArchSuffix = 2.3.0 compat >= 2 @@ -35,6 +36,15 @@ REQUIRES=" lib:libpng$secondaryArchSuffix lib:libz$secondaryArchSuffix " + +PROVIDES_devel=" + libharu${secondaryArchSuffix}_devel = $portVersion compat >= 2 + devel:libhpdf$secondaryArchSuffix = 2.3.0 compat >= 2 + " +REQUIRES_devel=" + libharu$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libpng$secondaryArchSuffix @@ -47,8 +57,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="libharu-RELEASE_2_3_0" - BUILD() { rm -rf build @@ -73,13 +81,3 @@ INSTALL() packageEntries devel \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - libharu${secondaryArchSuffix}_devel = $portVersion compat >= 2 - devel:libhpdf$secondaryArchSuffix = 2.3.0 compat >= 2 - " -REQUIRES_devel=" - libharu$secondaryArchSuffix == $portVersion base - " diff --git a/media-libs/libtimidity/libtimidity-0.1.0.recipe b/media-libs/libtimidity/libtimidity-0.1.0.recipe index 831437b4a..46c61fdd6 100644 --- a/media-libs/libtimidity/libtimidity-0.1.0.recipe +++ b/media-libs/libtimidity/libtimidity-0.1.0.recipe @@ -14,9 +14,10 @@ COPYRIGHT=" 2004 Konstantin Korikov " LICENSE="GNU LGPL v2.1" +REVISION="3" SOURCE_URI="http://downloads.sourceforge.net/project/libtimidity/libtimidity/$portVersion/libtimidity-$portVersion.tar.bz2" CHECKSUM_SHA256="52c6de6608ba640b4678041c01320290790a1f18c901ef03575fbf47807350bf" -REVISION="3" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -28,6 +29,16 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libao$secondaryArchSuffix " + +PROVIDES_devel=" + libtimidity${secondaryArchSuffix}_devel = $portVersion compat >= 0 + devel:libtimidity$secondaryArchSuffix = 0.1.0 compat >= 0 + devel:libtimidity_0.1$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + libtimidity$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libao$secondaryArchSuffix @@ -62,14 +73,3 @@ INSTALL() packageEntries devel \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - libtimidity${secondaryArchSuffix}_devel = $portVersion compat >= 0 - devel:libtimidity$secondaryArchSuffix = 0.1.0 compat >= 0 - devel:libtimidity_0.1$secondaryArchSuffix = 0.0.0 compat >= 0 - " -REQUIRES_devel=" - libtimidity$secondaryArchSuffix == $portVersion base - " diff --git a/media-libs/opencollada/opencollada-1.6.63.recipe b/media-libs/opencollada/opencollada-1.6.63.recipe index f29aa8a09..537c2dc8f 100644 --- a/media-libs/opencollada/opencollada-1.6.63.recipe +++ b/media-libs/opencollada/opencollada-1.6.63.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2013 The Khronos Group Inc." LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256='3a0e25f38262d872c393bbf14ff0ce2ef6a7d66bb0d57e080cfd9e37be7ee076' +CHECKSUM_SHA256="3a0e25f38262d872c393bbf14ff0ce2ef6a7d66bb0d57e080cfd9e37be7ee076" SOURCE_FILENAME="opencollada-$portVersion.tar.gz" SOURCE_DIR="OpenCOLLADA-$portVersion" PATCHES="opencollada-$portVersion.patchset" diff --git a/media-libs/opencolorio/opencolorio-1.0.9.recipe b/media-libs/opencolorio/opencolorio-1.0.9.recipe index 0790ac879..accc99649 100644 --- a/media-libs/opencolorio/opencolorio-1.0.9.recipe +++ b/media-libs/opencolorio/opencolorio-1.0.9.recipe @@ -12,15 +12,16 @@ COPYRIGHT=" 2003-2010 Sony Pictures Imageworks Inc., et al. " LICENSE="BSD (3-clause)" -SOURCE_URI="https://github.com/imageworks/OpenColorIO/archive/v$portVersion.tar.gz" -SOURCE_FILENAME="opencolorio-$portVersion.tar.gz" -CHECKSUM_SHA256="27c81e691c15753cd2b560c2ca4bd5679a60c2350eedd43c99d44ca25d65ea7f" REVISION="5" +SOURCE_URI="https://github.com/imageworks/OpenColorIO/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="27c81e691c15753cd2b560c2ca4bd5679a60c2350eedd43c99d44ca25d65ea7f" +SOURCE_FILENAME="opencolorio-$portVersion.tar.gz" +SOURCE_DIR="OpenColorIO-$portVersion" +PATCHES="opencolorio-$portVersion.patchset" + ARCHITECTURES="x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" -PATCHES="opencolorio-$portVersion.patchset" - PROVIDES=" opencolorio$secondaryArchSuffix = $portVersion compat >= 1 cmd:ociobakelut$secondaryArchSuffix @@ -32,22 +33,29 @@ REQUIRES=" lib:liblcms2$secondaryArchSuffix lib:libtinyxml$secondaryArchSuffix " + +PROVIDES_devel=" + opencolorio${secondaryArchSuffix}_devel = $portVersion compat >= 1 + devel:libopencolorio$secondaryArchSuffix = 1.0.9 compat >= 1 + " +REQUIRES_devel=" + opencolorio$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:liblcms2$secondaryArchSuffix devel:libtinyxml$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:cmake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make - cmd:cmake - cmd:pkg_config$secondaryArchSuffix cmd:patch + cmd:pkg_config$secondaryArchSuffix " -SOURCE_DIR="OpenColorIO-$portVersion" - BUILD() { cmake . \ @@ -80,13 +88,3 @@ INSTALL() packageEntries devel \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - opencolorio${secondaryArchSuffix}_devel = $portVersion compat >= 1 - devel:libopencolorio$secondaryArchSuffix = 1.0.9 compat >= 1 - " -REQUIRES_devel=" - opencolorio$secondaryArchSuffix == $portVersion base - " diff --git a/media-libs/openexr/openexr-2.1.0.recipe b/media-libs/openexr/openexr-2.1.0.recipe index 1216f2b6d..de0f79490 100644 --- a/media-libs/openexr/openexr-2.1.0.recipe +++ b/media-libs/openexr/openexr-2.1.0.recipe @@ -19,8 +19,6 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" openexr$secondaryArchSuffix = $portVersion - lib:libIlmImf$secondaryArchSuffix = $portVersion - lib:libIlmImf_Imf_2_1$secondaryArchSuffix = $portVersion cmd:exrenvmap$secondaryArchSuffix = $portVersion cmd:exrheader$secondaryArchSuffix = $portVersion cmd:exrmakepreview$secondaryArchSuffix = $portVersion @@ -28,43 +26,54 @@ PROVIDES=" cmd:exrmultipart$secondaryArchSuffix = $portVersion cmd:exrmultiview$secondaryArchSuffix = $portVersion cmd:exrstdattr$secondaryArchSuffix = $portVersion + lib:libIlmImf$secondaryArchSuffix = $portVersion + lib:libIlmImf_Imf_2_1$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix - lib:libilmbase$secondaryArchSuffix == $portVersion lib:libHalf$secondaryArchSuffix == $portVersion lib:libIex_2_1$secondaryArchSuffix == $portVersion lib:libIexMath_2_1$secondaryArchSuffix == $portVersion + lib:libilmbase$secondaryArchSuffix == $portVersion lib:libIlmThread_2_1$secondaryArchSuffix == $portVersion lib:libImath_2_1$secondaryArchSuffix == $portVersion lib:libz$secondaryArchSuffix " + +PROVIDES_devel=" + openexr${secondaryArchSuffix}_devel = $portVersion + devel:libIlmImf$secondaryArchSuffix = $portVersion + devel:libIlmImf_Imf_2_1$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + openexr$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel ilmbase${secondaryArchSuffix}_devel == $portVersion - devel:libilmbase$secondaryArchSuffix == $portVersion devel:libHalf$secondaryArchSuffix == $portVersion - devel:libIex_2_1$secondaryArchSuffix == $portVersion - devel:libIexMath_2_1$secondaryArchSuffix == $portVersion - devel:libIlmThread_2_1$secondaryArchSuffix == $portVersion - devel:libImath_2_1$secondaryArchSuffix == $portVersion devel:libIex$secondaryArchSuffix == $portVersion + devel:libIex_2_1$secondaryArchSuffix == $portVersion devel:libIexMath$secondaryArchSuffix == $portVersion + devel:libIexMath_2_1$secondaryArchSuffix == $portVersion + devel:libilmbase$secondaryArchSuffix == $portVersion devel:libIlmThread$secondaryArchSuffix == $portVersion + devel:libIlmThread_2_1$secondaryArchSuffix == $portVersion devel:libImath$secondaryArchSuffix == $portVersion + devel:libImath_2_1$secondaryArchSuffix == $portVersion devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" ilmbase$secondaryArchSuffix == $portVersion + cmd:aclocal + cmd:autoconf cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:make - cmd:which - cmd:autoconf - cmd:aclocal cmd:libtoolize$secondaryArchSuffix + cmd:make cmd:pkg_config$secondaryArchSuffix + cmd:which " BUILD() @@ -106,14 +115,3 @@ INSTALL() # devel package packageEntries devel $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - openexr${secondaryArchSuffix}_devel = $portVersion - devel:libIlmImf$secondaryArchSuffix = $portVersion - devel:libIlmImf_Imf_2_1$secondaryArchSuffix = $portVersion - " -REQUIRES_devel=" - openexr$secondaryArchSuffix == $portVersion base - " diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3.recipe b/media-libs/opensubdiv/opensubdiv-3.3.3.recipe index 84f5acf89..a8ff4369d 100644 --- a/media-libs/opensubdiv/opensubdiv-3.3.3.recipe +++ b/media-libs/opensubdiv/opensubdiv-3.3.3.recipe @@ -34,8 +34,8 @@ REQUIRES=" haiku$secondaryArchSuffix cmd:python2 lib:libGl$secondaryArchSuffix - lib:libglu$secondaryArchSuffix lib:libglew$secondaryArchSuffix + lib:libglu$secondaryArchSuffix lib:libgomp$secondaryArchSuffix lib:libopencl$secondaryArchSuffix lib:libtbb$secondaryArchSuffix @@ -56,8 +56,8 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libGl$secondaryArchSuffix - devel:libglu$secondaryArchSuffix devel:libglew$secondaryArchSuffix + devel:libglu$secondaryArchSuffix devel:libgomp$secondaryArchSuffix devel:libopencl$secondaryArchSuffix devel:libopencl_headers$secondaryArchSuffix @@ -66,11 +66,10 @@ BUILD_REQUIRES=" devel:libtbbmalloc_proxy$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:cmake - cmd:make cmd:gcc$secondaryArchSuffix + cmd:make cmd:python2 " diff --git a/media-libs/sbc/sbc-1.3.recipe b/media-libs/sbc/sbc-1.3.recipe index bbd3322dc..21b1bb40a 100644 --- a/media-libs/sbc/sbc-1.3.recipe +++ b/media-libs/sbc/sbc-1.3.recipe @@ -17,14 +17,14 @@ COPYRIGHT=" " LICENSE="GNU GPL v2 GNU LGPL v2.1" +REVISION="3" SOURCE_URI="http://www.kernel.org/pub/linux/bluetooth/sbc-$portVersion.tar.gz" CHECKSUM_SHA256="4a358581fb57b98e0c1c34606a35343f31f908f57c26659e51495f75e283785d" -REVISION="3" +PATCHES="sbc-$portVersion.patchset" + ARCHITECTURES="x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" -PATCHES="sbc-$portVersion.patchset" - PROVIDES=" sbc$secondaryArchSuffix = $portVersion compat >= 1 lib:libsbc$secondaryArchSuffix = 1.2.1 compat >= 1 @@ -33,6 +33,27 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libsndfile$secondaryArchSuffix " + +PROVIDES_devel=" + sbc${secondaryArchSuffix}_devel = $portVersion compat >= 1 + devel:libsbc$secondaryArchSuffix = 1.2.1 compat >= 1 + " +REQUIRES_devel=" + sbc$secondaryArchSuffix == $portVersion base + " + +SUMMARY_tools="The SBC tools" +PROVIDES_tools=" + sbc_tools$secondaryArchSuffix = $portVersion compat >= 1 + cmd:sbcdec = $portVersion compat >= 1 + cmd:sbcenc = $portVersion compat >= 1 + cmd:sbcinfo = $portVersion compat >= 1 + " +REQUIRES_tools=" + haiku$secondaryArchSuffix + sbc$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libsndfile$secondaryArchSuffix @@ -43,9 +64,9 @@ BUILD_PREREQUIRES=" cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:pkg_config$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " BUILD() @@ -70,27 +91,3 @@ INSTALL() packageEntries tools \ $binDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - sbc${secondaryArchSuffix}_devel = $portVersion compat >= 1 - devel:libsbc$secondaryArchSuffix = 1.2.1 compat >= 1 - " -REQUIRES_devel=" - sbc$secondaryArchSuffix == $portVersion base - " - -# ----- tools package ------------------------------------------------------- - -SUMMARY_tools="The SBC tools" -PROVIDES_tools=" - sbc_tools$secondaryArchSuffix = $portVersion compat >= 1 - cmd:sbcdec = $portVersion compat >= 1 - cmd:sbcenc = $portVersion compat >= 1 - cmd:sbcinfo = $portVersion compat >= 1 - " -REQUIRES_tools=" - haiku$secondaryArchSuffix - sbc$secondaryArchSuffix == $portVersion base - " diff --git a/media-libs/x264/x264-20160712.recipe b/media-libs/x264/x264-20160712.recipe index 3768e416b..8acf0e4b9 100644 --- a/media-libs/x264/x264-20160712.recipe +++ b/media-libs/x264/x264-20160712.recipe @@ -5,9 +5,8 @@ COPYRIGHT="2003-2016 VideoLan.org" LICENSE="GNU GPL v2" REVISION="3" SOURCE_URI="https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$portVersion-2245.tar.bz2" -SOURCE_DIR="x264-snapshot-$portVersion-2245" CHECKSUM_SHA256="d5033882bbc7e2908f74970931c7dc2044191cc9fa7c7435dc85ad334f23078e" -#PATCHES="x264-$portVersion.patchset" +SOURCE_DIR="x264-snapshot-$portVersion-2245" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/media-sound/csound/csound-6.06.0.recipe b/media-sound/csound/csound-6.06.0.recipe index 753d7ee7c..ffed6be58 100644 --- a/media-sound/csound/csound-6.06.0.recipe +++ b/media-sound/csound/csound-6.06.0.recipe @@ -5,7 +5,7 @@ having been used for many years in at least classical, pop, techno, and ambient. HOMEPAGE="https://github.com/csound/csound" COPYRIGHT="1991 Barry Vercoe, John ffitch" LICENSE="GNU LGPL v2.1" -REVISION="2" +REVISION="2" srcGitRev="be2e7e36946ce767329d330c5cf926def3aa5851" SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="6db8221e2074d9b9acb5eb0572da4406b11c5a896098a774f120b38927be4fb4" diff --git a/media-sound/dcadec/dcadec-0.2.0.recipe b/media-sound/dcadec/dcadec-0.2.0.recipe index 3cc9be0aa..84d817a6e 100644 --- a/media-sound/dcadec/dcadec-0.2.0.recipe +++ b/media-sound/dcadec/dcadec-0.2.0.recipe @@ -16,10 +16,11 @@ COPYRIGHT=" 2015 foo86 " LICENSE="GNU LGPL v2.1" -SOURCE_URI="https://github.com/foo86/dcadec/archive/v$portVersion.tar.gz" -SOURCE_FILENAME="dcadec-$portVersion.tar.gz" -CHECKSUM_SHA256="ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44" REVISION="2" +SOURCE_URI="https://github.com/foo86/dcadec/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44" +SOURCE_FILENAME="dcadec-$portVersion.tar.gz" + ARCHITECTURES="x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -31,6 +32,18 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " +CONFLICTS=" + libdca$secondaryArchSuffix + " + +PROVIDES_devel=" + dcadec${secondaryArchSuffix}_devel = $portVersion compat >= 0 + devel:libdcadec$secondaryArchSuffix = 0.1.0 compat >= 0 + " +REQUIRES_devel=" + dcadec$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -39,9 +52,6 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:make " -CONFLICTS=" - libdca$secondaryArchSuffix - " BUILD() { @@ -61,13 +71,3 @@ INSTALL() packageEntries devel \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - dcadec${secondaryArchSuffix}_devel = $portVersion compat >= 0 - devel:libdcadec$secondaryArchSuffix = 0.1.0 compat >= 0 - " -REQUIRES_devel=" - dcadec$secondaryArchSuffix == $portVersion base - " diff --git a/media-sound/fluidlite/fluidlite-1.0.0.recipe b/media-sound/fluidlite/fluidlite-1.0.0.recipe index dbeff31c9..4ef138725 100644 --- a/media-sound/fluidlite/fluidlite-1.0.0.recipe +++ b/media-sound/fluidlite/fluidlite-1.0.0.recipe @@ -15,10 +15,10 @@ HOMEPAGE="https://github.com/divideconcept/FluidLite" COPYRIGHT="2007-2012 Josh Green, Pedro Lopez-Cabanillas, David Henningsson" LICENSE="GNU LGPL v2.1" REVISION="3" -gitRevision="ba3a29d5976c0797b204ef5729430c295aab19d8" -SOURCE_URI="$HOMEPAGE/archive/$gitRevision.tar.gz" +srcGitRev="ba3a29d5976c0797b204ef5729430c295aab19d8" +SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="80ea81bb3ce7e20c0aeaf95fc4660b9f0f40d004acdb7eee1b6a9a2c7aeb1075" -SOURCE_DIR="FluidLite-$gitRevision" +SOURCE_DIR="FluidLite-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" diff --git a/media-sound/lmms/lmms-1.2.0~rc4.recipe b/media-sound/lmms/lmms-1.2.0~rc4.recipe index e33b7f5dc..2e6139dbf 100644 --- a/media-sound/lmms/lmms-1.2.0~rc4.recipe +++ b/media-sound/lmms/lmms-1.2.0~rc4.recipe @@ -12,7 +12,6 @@ REVISION="1" SOURCE_URI="https://github.com/LMMS/lmms/archive/v${portVersion/\~/-}.tar.gz" CHECKSUM_SHA256="ce6938b95e0c2af63b68c40180036b08c54127fba21737f2cd904aa67a36a00d" SOURCE_DIR="lmms-${portVersion/\~/-}" -#PATCHES="lmms-$portVersion.patchset" ADDITIONAL_FILES="LMMS.rdef" ARCHITECTURES="!x86_gcc2 x86_64" @@ -24,39 +23,39 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libfftw3f$secondaryArchSuffix + lib:libfluidsynth$secondaryArchSuffix + lib:libogg$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix lib:libQt5Xml$secondaryArchSuffix + lib:libsamplerate$secondaryArchSuffix + lib:libsdl_1.2$secondaryArchSuffix lib:libsndfile$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix lib:libvorbisenc$secondaryArchSuffix lib:libvorbisfile$secondaryArchSuffix - lib:libogg$secondaryArchSuffix - lib:libsdl_1.2$secondaryArchSuffix - lib:libfluidsynth$secondaryArchSuffix - lib:libsamplerate$secondaryArchSuffix - lib:libfftw3f$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libfftw3f$secondaryArchSuffix + devel:libfluidsynth$secondaryArchSuffix + devel:libogg$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix + devel:libsamplerate$secondaryArchSuffix + devel:libsdl$secondaryArchSuffix devel:libsndfile$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix - devel:libogg$secondaryArchSuffix - devel:libsdl$secondaryArchSuffix - devel:libfluidsynth$secondaryArchSuffix - devel:libsamplerate$secondaryArchSuffix - devel:libfftw3f$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake - cmd:pkg_config$secondaryArchSuffix cmd:g++$secondaryArchSuffix cmd:ninja + cmd:pkg_config$secondaryArchSuffix " BUILD() diff --git a/media-sound/ocp/ocp-0.1.22~git.recipe b/media-sound/ocp/ocp-0.1.22~git.recipe index 714e7acc1..d52e66426 100644 --- a/media-sound/ocp/ocp-0.1.22~git.recipe +++ b/media-sound/ocp/ocp-0.1.22~git.recipe @@ -4,10 +4,10 @@ HOMEPAGE="http://stian.cubic.org/project-ocp.php" COPYRIGHT="1994-2016 Niklas Beisert, Stian Skjelstad and others" LICENSE="GNU GPL v2" REVISION="1" -gitRevision="835bf803f590512848282bbf74986ebfaec17da3" -SOURCE_URI="https://sourceforge.net/code-snapshots/git/o/op/opencubicplayer/code.git/opencubicplayer-code-$gitRevision.zip" +srcGitRev="835bf803f590512848282bbf74986ebfaec17da3" +SOURCE_URI="https://sourceforge.net/code-snapshots/git/o/op/opencubicplayer/code.git/opencubicplayer-code-$srcGitRev.zip" CHECKSUM_SHA256="8691b9fa9f512c98307c6e4fb2723c10a4a8f212da8a3af1b9d15d2fe32764fb" -SOURCE_DIR="opencubicplayer-code-$gitRevision" +SOURCE_DIR="opencubicplayer-code-$srcGitRev" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/net-im/icq/icq-10~git.recipe b/net-im/icq/icq-10~git.recipe index b4d0219ce..8deeeb4f4 100644 --- a/net-im/icq/icq-10~git.recipe +++ b/net-im/icq/icq-10~git.recipe @@ -4,10 +4,10 @@ HOMEPAGE="http://www.icq.com" COPYRIGHT="2016 ICQ LLC (Mail.Ru Group)" LICENSE="Apache v2" REVISION="3" -gitCommit="fad5b8b0412aae4b23554ba7f63e0dcee92d16a7" -SOURCE_URI="https://github.com/mailru/icqdesktop/archive/$gitCommit.zip" +srcGitRev="fad5b8b0412aae4b23554ba7f63e0dcee92d16a7" +SOURCE_URI="https://github.com/mailru/icqdesktop/archive/$srcGitRev.zip" CHECKSUM_SHA256="7416858d72937c8dd427dcff593226356b1bfa00cdc162f8368aadb1928ae53a" -SOURCE_DIR="icqdesktop-$gitCommit" +SOURCE_DIR="icqdesktop-$srcGitRev" PATCHES="icq-$portVersion.patchset" ADDITIONAL_FILES="icq.rdef" @@ -24,16 +24,16 @@ REQUIRES=" lib:libavfilter$secondaryArchSuffix lib:libavformat$secondaryArchSuffix lib:libavutil$secondaryArchSuffix - lib:libidn$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix - lib:libcurl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libffi$secondaryArchSuffix lib:libgcrypt$secondaryArchSuffix lib:libGl$secondaryArchSuffix lib:libgnutls$secondaryArchSuffix lib:libgpg_error$secondaryArchSuffix + lib:libidn$secondaryArchSuffix lib:libopenal$secondaryArchSuffix lib:libpcre$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix @@ -51,16 +51,16 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libavcodec$secondaryArchSuffix - devel:libidn$secondaryArchSuffix devel:libboost_system$secondaryArchSuffix - devel:libcurl$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix devel:libexpat$secondaryArchSuffix devel:libffi$secondaryArchSuffix devel:libgcrypt$secondaryArchSuffix devel:libGl$secondaryArchSuffix devel:libgnutls$secondaryArchSuffix devel:libgpg_error$secondaryArchSuffix + devel:libidn$secondaryArchSuffix devel:libopenal$secondaryArchSuffix devel:libpcre$secondaryArchSuffix devel:libqt5$secondaryArchSuffix diff --git a/net-libs/libnatpmp/libnatpmp-20140401.recipe b/net-libs/libnatpmp/libnatpmp-20140401.recipe index 6213192c6..5907c9408 100644 --- a/net-libs/libnatpmp/libnatpmp-20140401.recipe +++ b/net-libs/libnatpmp/libnatpmp-20140401.recipe @@ -8,23 +8,32 @@ COPYRIGHT=" 2007-2009 Thomas Bernard " LICENSE="BSD (3-clause)" -SOURCE_URI="http://miniupnp.free.fr/files/download.php?file=libnatpmp-$portVersion.tar.gz" -SOURCE_FILENAME="libnatpmp-$portVersion.tar.gz" -CHECKSUM_SHA256="b2ce5e626a21c795cba2d118f26e54aaa89de29d4611c440fafc49a2a5bedabb" REVISION="2" +SOURCE_URI="http://miniupnp.free.fr/files/download.php?file=libnatpmp-$portVersion.tar.gz" +CHECKSUM_SHA256="b2ce5e626a21c795cba2d118f26e54aaa89de29d4611c440fafc49a2a5bedabb" +SOURCE_FILENAME="libnatpmp-$portVersion.tar.gz" +PATCHES="libnatpmp-$portVersion.patchset" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="libnatpmp-$portVersion.patchset" - PROVIDES=" libnatpmp$secondaryArchSuffix = $portVersion - lib:libnatpmp$secondaryArchSuffix = 1 cmd:natpmpc + lib:libnatpmp$secondaryArchSuffix = 1 " REQUIRES=" haiku$secondaryArchSuffix " + +PROVIDES_devel=" + libnatpmp${secondaryArchSuffix}_devel = $portVersion + devel:libnatpmp$secondaryArchSuffix = 1 + " +REQUIRES_devel=" + libnatpmp$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -52,13 +61,3 @@ INSTALL() packageEntries devel \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - libnatpmp${secondaryArchSuffix}_devel = $portVersion - devel:libnatpmp$secondaryArchSuffix = 1 - " -REQUIRES_devel=" - libnatpmp$secondaryArchSuffix == $portVersion base - " diff --git a/net-libs/neon/neon-0.29.6.recipe b/net-libs/neon/neon-0.29.6.recipe index 74b5ad899..ebc426646 100644 --- a/net-libs/neon/neon-0.29.6.recipe +++ b/net-libs/neon/neon-0.29.6.recipe @@ -17,17 +17,16 @@ simplifying handling XML HTTP response bodies property manipulation. " HOMEPAGE="http://www.webdav.org/neon/" -LICENSE="GNU LGPL v2" COPYRIGHT="1999-2011 Joe Orton" +LICENSE="GNU LGPL v2" +REVISION="9" SOURCE_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz" CHECKSUM_SHA256="9c640b728d6dc80ef1e48f83181166ab6bc95309cece5537e01ffdd01b96eb43" -REVISION="9" +PATCHES="neon-0.29.6.patch" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="neon-0.29.6.patch" - PROVIDES=" neon$secondaryArchSuffix = $portVersion compat >= 0.29 libneon$secondaryArchSuffix = 27.2.6 compat >= 27.2 @@ -41,6 +40,18 @@ REQUIRES=" lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix " + +PROVIDES_devel=" + neon${secondaryArchSuffix}_devel = $portVersion compat >= 0.29 + libneon${secondaryArchSuffix}_devel = 27.2.6 compat >= 27 + cmd:neon_config$secondaryArchSuffix = $portVersion compat >= 0.29 + devel:libneon$secondaryArchSuffix = 27.2.6 compat >= 27 + " +REQUIRES_devel=" + neon$secondaryArchSuffix == $portVersion base + libneon$secondaryArchSuffix == 27.2.6 + " + BUILD_REQUIRES=" devel:libcrypto$secondaryArchSuffix devel:libncurses$secondaryArchSuffix @@ -52,13 +63,12 @@ BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf - cmd:libtoolize cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:libtoolize cmd:make " - BUILD() { echo 'LT_INIT' >> configure.in @@ -93,16 +103,3 @@ INSTALL() $developDir \ $documentationDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - neon${secondaryArchSuffix}_devel = $portVersion compat >= 0.29 - libneon${secondaryArchSuffix}_devel = 27.2.6 compat >= 27 - cmd:neon_config$secondaryArchSuffix = $portVersion compat >= 0.29 - devel:libneon$secondaryArchSuffix = 27.2.6 compat >= 27 - " -REQUIRES_devel=" - neon$secondaryArchSuffix == $portVersion base - libneon$secondaryArchSuffix == 27.2.6 - " diff --git a/net-print/gutenprint/gutenprint-5.2.10.recipe b/net-print/gutenprint/gutenprint-5.2.10.recipe index 8bf9520e1..8b933e48c 100644 --- a/net-print/gutenprint/gutenprint-5.2.10.recipe +++ b/net-print/gutenprint/gutenprint-5.2.10.recipe @@ -16,14 +16,14 @@ COPYRIGHT=" 1999-2010 by the authors of Gutenprint " LICENSE="GNU GPL v2" +REVISION="1" SOURCE_URI="http://prdownloads.sourceforge.net/gimp-print/gutenprint-$portVersion.tar.bz2" CHECKSUM_SHA256="431f352b412dfb9809d126a85a37a1fcd1c1826275ace8cdcd4fd9a6ee360e59" -REVISION="1" +PATCHES="gutenprint-$portVersion.patchset" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="gutenprint-$portVersion.patchset" - PROVIDES=" gutenprint$secondaryArchSuffix = $portVersion compat >= 5 cmd:escputil$secondaryArchSuffix = $portVersion compat >= 5 @@ -33,6 +33,15 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " + +PROVIDES_devel=" + gutenprint${secondaryArchSuffix}_devel = $portVersion compat >= 5 + devel:libgutenprint$secondaryArchSuffix = 2.3.0 compat >= 2 + " +REQUIRES_devel=" + gutenprint$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -53,7 +62,6 @@ PATCH() sed -i '/#define DECLARE_MODEUSES.*/ {N;N;N;N;N; s/#define DECLARE_MODEUSES.*\}/#define DECLARE_MODEUSES(name) static const canon_modeuselist_t name##_modeuselist = \{ #name, sizeof(name##_modeuses) \/ sizeof(canon_modeuse_t), name##_modeuses \}/g}' src/main/canon-media-mode.h } - BUILD() { runConfigure ./configure @@ -72,13 +80,3 @@ INSTALL() $developDir \ $manDir/man1 } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - gutenprint${secondaryArchSuffix}_devel = $portVersion compat >= 5 - devel:libgutenprint$secondaryArchSuffix = 2.3.0 compat >= 2 - " -REQUIRES_devel=" - gutenprint$secondaryArchSuffix == $portVersion base - " diff --git a/net-print/gutenprint/gutenprint-5.2.9.recipe b/net-print/gutenprint/gutenprint-5.2.9.recipe index 62fc943a6..fa7d9eb80 100644 --- a/net-print/gutenprint/gutenprint-5.2.9.recipe +++ b/net-print/gutenprint/gutenprint-5.2.9.recipe @@ -16,14 +16,14 @@ COPYRIGHT=" 1999-2010 by the authors of Gutenprint " LICENSE="GNU GPL v2" +REVISION="1" SOURCE_URI="http://prdownloads.sourceforge.net/gimp-print/gutenprint-5.2.9.tar.bz2" CHECKSUM_SHA256="4b27e4f06f32d30271df89ecb6089bb11bcf2caec5f60b0909e083095354bca0" -REVISION="1" +PATCHES="gutenprint-$portVersion.patchset" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="gutenprint-$portVersion.patchset" - PROVIDES=" gutenprint$secondaryArchSuffix = $portVersion compat >= 5 cmd:escputil$secondaryArchSuffix = $portVersion compat >= 5 @@ -33,6 +33,15 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " + +PROVIDES_devel=" + gutenprint${secondaryArchSuffix}_devel = $portVersion compat >= 5 + devel:libgutenprint$secondaryArchSuffix = 2.1.0 compat >= 2 + " +REQUIRES_devel=" + gutenprint$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -46,13 +55,13 @@ BUILD_PREREQUIRES=" cmd:make cmd:sed " + PATCH() { # git doesn't handle correctly multilines with straybackspaces. sed -i '/#define DECLARE_MODEUSES.*/ {N;N;N;N;N; s/#define DECLARE_MODEUSES.*\}/#define DECLARE_MODEUSES(name) static const canon_modeuselist_t name##_modeuselist = \{ #name, sizeof(name##_modeuses) \/ sizeof(canon_modeuse_t), name##_modeuses \}/g}' src/main/canon-media-mode.h } - BUILD() { runConfigure ./configure @@ -73,13 +82,3 @@ INSTALL() $developDir \ $manDir/man1 } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - gutenprint${secondaryArchSuffix}_devel = $portVersion compat >= 5 - devel:libgutenprint$secondaryArchSuffix = 2.1.0 compat >= 2 - " -REQUIRES_devel=" - gutenprint$secondaryArchSuffix == $portVersion base - " diff --git a/net-voip/yate/yate-6.0.0.recipe b/net-voip/yate/yate-6.0.0.recipe index 6aff34b34..b6009b8ec 100644 --- a/net-voip/yate/yate-6.0.0.recipe +++ b/net-voip/yate/yate-6.0.0.recipe @@ -10,9 +10,8 @@ COPYRIGHT="2010-2017 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="http://yate.null.ro/tarballs/yate6/yate-$portVersion-1.tar.gz" -SOURCE_DIR="yate" CHECKSUM_SHA256="0ab76015651db8076031277b2003c23bd5d9eb940491801f30a6dc3c226c1817" -#ADDITIONAL_FILES="yate.rdef.in" +SOURCE_DIR="yate" PATCHES="yate-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 !x86_64" diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.2.recipe b/sci-libs/libgeotiff/libgeotiff-1.4.2.recipe index 5b8d8c1a8..c982a7449 100644 --- a/sci-libs/libgeotiff/libgeotiff-1.4.2.recipe +++ b/sci-libs/libgeotiff/libgeotiff-1.4.2.recipe @@ -7,7 +7,6 @@ LICENSE="GNU GPL v2" REVISION="2" SOURCE_URI="http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-$portVersion.tar.gz" CHECKSUM_SHA256="ad87048adb91167b07f34974a8e53e4ec356494c29f1748de95252e8f81a5e6e" -#PATCHES="libgeotiff-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" diff --git a/sci-libs/libgeotiff/patches/libgeotiff-1.4.2.patchset b/sci-libs/libgeotiff/patches/libgeotiff-1.4.2.patchset deleted file mode 100644 index c06180cc1..000000000 --- a/sci-libs/libgeotiff/patches/libgeotiff-1.4.2.patchset +++ /dev/null @@ -1,72 +0,0 @@ -From a1a4855588d674e61491802fc9d4f8131d3c377b Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Fri, 22 Aug 2014 16:28:23 +0000 -Subject: Haiku patch - - -diff --git a/configure.ac b/configure.ac -index 7172bee..28e1906 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -125,7 +125,7 @@ if test "$with_zip" != "" -a "x$with_zip" != "xno" ; then - AC_CHECK_HEADERS([zlib.h],, [AC_MSG_ERROR([cannot find zlib.h, bailing out])]) - AC_SEARCH_LIBS([inflateInit_], [z], - [ZIP_CONFIG=yes], [ZIP_CONFIG=no], -- [-L$with_zip/lib -lm]) -+ [-L$with_zip/lib]) - - else - AC_MSG_CHECKING([for zlib]) -@@ -167,7 +167,7 @@ if test "$with_jpeg" = "no" -o "$with_jpeg" = "" ; then - else - AC_SEARCH_LIBS([jinit_compress_master], [jpeg], - [JPEG_CONFIG=yes], [JPEG_CONFIG=no], -- [-L$with_jpeg/lib -lm]) -+ [-L$with_jpeg/lib]) - fi - - if test "${JPEG_CONFIG}" != "no" ; then -@@ -208,19 +208,19 @@ if test "$with_libtiff" != "" ; then - fi - LIBS_SAVED="$LIBS" - AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes], -- AC_MSG_ERROR([failed to link with -ltiff to find TIFFOpen]),-lm) -+ AC_MSG_ERROR([failed to link with -ltiff to find TIFFOpen]),) - AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes], - AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this version of --libgeotiff. Please upgrade or use an older version of libgeotiff.]),-lm) -+libgeotiff. Please upgrade or use an older version of libgeotiff.]),) - LIBS="$LIBS_SAVED" - else - AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes], - AC_MSG_ERROR([You will need to substantially rewrite libxtiff to --build libgeotiff without libtiff]),-lm) -+build libgeotiff without libtiff]),) - LIBS_SAVED="$LIBS" - AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes], - AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this version of --libgeotiff. Please upgrade libtiff or use an older version of libgeotiff.]),-lm) -+libgeotiff. Please upgrade libtiff or use an older version of libgeotiff.]),) - LIBS="$LIBS -ltiff" - TIFF_INC= - TIFF_CONFIG="yes" -@@ -280,13 +280,13 @@ elif test "$PROJ_LIB" != "" -a "$PROJ_INC" != "" ; then - PROJ_INC=-I$PROJ_INC - - AC_SUBST(PROJ_INC,$PROJ_INC) -- AC_DEFINE(HAVE_PROJECTS_H) -- AC_DEFINE(HAVE_LIBPROJ) -+ AC_DEFINE([HAVE_PROJECTS_H], [], [Description]) -+ AC_DEFINE([HAVE_LIBPROJ], [], [Description]) - AC_SUBST([HAVE_LIBPROJ]) - PROJ_CONFIG="yes" - - else -- AC_CHECK_LIB(proj,pj_init,,,-lm) -+ AC_CHECK_LIB(proj,pj_init,,,) - AC_CHECK_HEADERS(proj_api.h,,) - PROJ_CONFIG="yes" - fi --- -1.8.3.4 - diff --git a/sys-apps/man-pages-posix/man_pages_posix-2013.a.recipe b/sys-apps/man-pages-posix/man_pages_posix-2013.a.recipe index 698838d9d..3f2362f26 100644 --- a/sys-apps/man-pages-posix/man_pages_posix-2013.a.recipe +++ b/sys-apps/man-pages-posix/man_pages_posix-2013.a.recipe @@ -25,7 +25,8 @@ BUILD_PREREQUIRES=" cmd:perl " -PATCH() { +PATCH() +{ # Replace Linux's prolog with Haiku's local prolog="This manual page is part of the POSIX Programmer's Manual.\\n\ This interface might not be implemented on Haiku." diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index c4d5706eb..c0ded1daf 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -6,14 +6,16 @@ the person building the package is allowed to specify various configuration \ options. " HOMEPAGE="http://www.gnu.org/software/autoconf/" -SOURCE_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2" -CHECKSUM_SHA256="c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e571454332c8" -REVISION="5" -ARCHITECTURES="x86_gcc2 ?x86" +COPYRIGHT="1992-2010 Free Software Foundation, Inc." LICENSE=" GNU GPL v2 GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." +REVISION="5" +SOURCE_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2" +CHECKSUM_SHA256="c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e571454332c8" +BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL" + +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" autoconf = $portVersion compat >= 2.60 @@ -27,13 +29,16 @@ PROVIDES=" " REQUIRES=" haiku - cmd:awk coreutils diffutils + cmd:awk cmd:m4 >= 1.4 cmd:perl >= 5 cmd:sh " + +PROVIDES_source="autoconf_source = $portVersion" + BUILD_REQUIRES=" " BUILD_PREREQUIRES=" @@ -44,8 +49,6 @@ BUILD_PREREQUIRES=" cmd:sed " -BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL - BUILD() { autoreconf @@ -63,7 +66,3 @@ TEST() { make check } - -# ----- source package ------------------------------------------------------- - -PROVIDES_source="autoconf_source = $portVersion" diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe index 7f0915eb8..c712a4bf1 100644 --- a/sys-devel/gettext/gettext-0.18.1.1.recipe +++ b/sys-devel/gettext/gettext-0.18.1.1.recipe @@ -16,29 +16,18 @@ translated strings. A special GNU Emacs mode also helps interested parties in \ preparing these sets, or bringing them up to date. " HOMEPAGE="http://www.gnu.org/software/gettext/" -LICENSE="GNU GPL v3" COPYRIGHT="1998, 2010 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" +REVISION="7" SOURCE_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz" CHECKSUM_SHA256="93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9" -REVISION="7" +PATCHES="gettext-0.18.1.1.patch" + ARCHITECTURES="x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="gettext-0.18.1.1.patch" - PROVIDES=" gettext$secondaryArchSuffix = $portVersion compat >= 0.18.1 - devel:libasprintf$secondaryArchSuffix = 0.0.0 compat >= 0 - devel:libgettextlib$secondaryArchSuffix = $portVersion - devel:libgettextlib_0.18.1$secondaryArchSuffix = $portVersion - devel:libgettextpo$secondaryArchSuffix = 0.5.1 compat >= 0 - devel:libgettextsrc$secondaryArchSuffix = $portVersion - devel:libgettextsrc_0.18.1$secondaryArchSuffix = $portVersion - devel:libintl$secondaryArchSuffix = 8.1.1 compat >= 8 - lib:libasprintf$secondaryArchSuffix = 0.0.0 compat >= 0 - lib:libgettextlib_0.18.1$secondaryArchSuffix = $portVersion - lib:libgettextpo$secondaryArchSuffix = 0.5.1 compat >= 0 - lib:libgettextsrc_0.18.1$secondaryArchSuffix = $portVersion cmd:autopoint$secondaryArchSuffix = $portVersion compat >= 0 cmd:envsubst$secondaryArchSuffix = $portVersion compat >= 0 cmd:gettext$secondaryArchSuffix = $portVersion compat >= 0 @@ -61,13 +50,35 @@ PROVIDES=" cmd:ngettext$secondaryArchSuffix = $portVersion compat >= 0 cmd:recode_sr_latin$secondaryArchSuffix = $portVersion compat >= 0 cmd:xgettext$secondaryArchSuffix = $portVersion compat >= 0 + devel:libasprintf$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libgettextlib$secondaryArchSuffix = $portVersion + devel:libgettextlib_0.18.1$secondaryArchSuffix = $portVersion + devel:libgettextpo$secondaryArchSuffix = 0.5.1 compat >= 0 + devel:libgettextsrc$secondaryArchSuffix = $portVersion + devel:libgettextsrc_0.18.1$secondaryArchSuffix = $portVersion + devel:libintl$secondaryArchSuffix = 8.1.1 compat >= 8 + lib:libasprintf$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libgettextlib_0.18.1$secondaryArchSuffix = $portVersion + lib:libgettextpo$secondaryArchSuffix = 0.5.1 compat >= 0 + lib:libgettextsrc_0.18.1$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix gettext${secondaryArchSuffix}_libintl == $portVersion base + haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " + +SUMMARY_libintl="The gettext internationalization library" +PROVIDES_libintl=" + gettext${secondaryArchSuffix}_libintl = $portVersion compat >= 0.18.1 + lib:libintl${secondaryArchSuffix} = 8.1.1 compat >= 8 + " +REQUIRES_libintl=" + haiku${secondaryArchSuffix} + lib:libiconv${secondaryArchSuffix} + " + BUILD_REQUIRES=" devel:libiconv$secondaryArchSuffix devel:libncurses$secondaryArchSuffix @@ -114,15 +125,3 @@ TEST() cd gettext-runtime/tests make check } - -# ----- libintl package ------------------------------------------------------- - -SUMMARY_libintl="The gettext internationalization library" -PROVIDES_libintl=" - gettext${secondaryArchSuffix}_libintl = $portVersion compat >= 0.18.1 - lib:libintl${secondaryArchSuffix} = 8.1.1 compat >= 8 - " -REQUIRES_libintl=" - haiku${secondaryArchSuffix} - lib:libiconv${secondaryArchSuffix} - " diff --git a/sys-libs/libedit/libedit-2015_03_21_3.1.recipe b/sys-libs/libedit/libedit-2015_03_21_3.1.recipe index 5e1473090..50d32fc0a 100644 --- a/sys-libs/libedit/libedit-2015_03_21_3.1.recipe +++ b/sys-libs/libedit/libedit-2015_03_21_3.1.recipe @@ -5,17 +5,18 @@ This is an autotool- and libtoolized port of the NetBSD Editline library \ generic line editing, history, and tokenization functions, similar to those \ found in GNU Readline. " -LICENSE="BSD (3-clause)" -COPYRIGHT="1992-2014 The NetBSD Foundation, Inc." HOMEPAGE="http://www.thrysoee.dk/editline/" +COPYRIGHT="1992-2014 The NetBSD Foundation, Inc." +LICENSE="BSD (3-clause)" +REVISION="8" SOURCE_URI="http://www.thrysoee.dk/editline/libedit-20150325-3.1.tar.gz" CHECKSUM_SHA256="c88a5e4af83c5f40dda8455886ac98923a9c33125699742603a88a0253fcc8c5" -REVISION="8" +SOURCE_DIR="libedit-20150325-3.1" +PATCHES="libedit-2015_03_25_3.1.patchset" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -PATCHES="libedit-2015_03_25_3.1.patchset" - PROVIDES=" libedit$secondaryArchSuffix = $portVersion lib:libedit$secondaryArchSuffix = 0.0.53 compat >= 0 @@ -24,6 +25,15 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " + +PROVIDES_devel=" + libedit${secondaryArchSuffix}_devel = $portVersion + devel:libedit$secondaryArchSuffix = 0.0.53 compat >= 0 + " +REQUIRES_devel=" + libedit$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" devel:libncurses$secondaryArchSuffix " @@ -34,13 +44,11 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix + cmd:m4 cmd:make cmd:sed - cmd:m4 " -SOURCE_DIR="libedit-20150325-3.1" - BUILD() { mkdir m4 @@ -69,14 +77,3 @@ TEST() { make check } - - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - libedit${secondaryArchSuffix}_devel = $portVersion - devel:libedit$secondaryArchSuffix = 0.0.53 compat >= 0 - " -REQUIRES_devel=" - libedit$secondaryArchSuffix == $portVersion base - " diff --git a/sys-libs/mesa/mesa-10.1.1.recipe b/sys-libs/mesa/mesa-10.1.1.recipe index f1e977ae6..746227518 100644 --- a/sys-libs/mesa/mesa-10.1.1.recipe +++ b/sys-libs/mesa/mesa-10.1.1.recipe @@ -96,7 +96,6 @@ INSTALL() "$addOnsDir/opengl/Software Rasterizer" } -# ----- devel package ------------------------------------------------------- PROVIDES_devel=" mesa${secondaryArchSuffix}_devel = $portVersion @@ -107,8 +106,6 @@ REQUIRES_devel=" mesa$secondaryArchSuffix == $portVersion base " -# ===== Mesa OpenGL Add-ons ================================================== -# ----- swrast package ------------------------------------------------------- SUMMARY_swrast="Mesa software rasterization renderer" DESCRIPTION_swrast="This 3D BGLRenderer add-on provides Mesa software @@ -124,8 +121,6 @@ REQUIRED_swrast=" mesa$secondaryArchSuffix == $portVersion base " -# ===== Gallium OpenGL Add-ons =============================================== -# ----- swpipe package ------------------------------------------------------- SUMMARY_swpipe="The Mesa LLVM enhanced Gallium software pipe renderer" DESCRIPTION_swpipe="This 3D BGLRenderer add-on provides Gallium LLVM diff --git a/x11-libs/cairo/cairo-1.12.16.recipe b/x11-libs/cairo/cairo-1.12.16.recipe index 6258fad5e..d242105b1 100644 --- a/x11-libs/cairo/cairo-1.12.16.recipe +++ b/x11-libs/cairo/cairo-1.12.16.recipe @@ -25,14 +25,14 @@ LICENSE=" GNU LGPL v2.1 MPL v1.1 " +REVISION="1" SOURCE_URI="http://cairographics.org/releases/cairo-$portVersion.tar.xz" CHECKSUM_SHA256="2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846" -REVISION="1" +PATCHES="cairo-$portVersion.patchset" + ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -PATCHES="cairo-$portVersion.patchset" - PROVIDES=" cairo$secondaryArchSuffix = $portVersion compat >= 1 lib:libcairo$secondaryArchSuffix = 2.11200.16 compat >= 2 @@ -40,25 +40,33 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix # required by fontconfig lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libpixman_1$secondaryArchSuffix lib:libpng15$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix # required by fontconfig lib:libz$secondaryArchSuffix - # required by fontconfig - lib:libbz2$secondaryArchSuffix - lib:libxml2$secondaryArchSuffix " + +PROVIDES_devel=" + cairo${secondaryArchSuffix}_devel = $portVersion compat >= 1 + devel:libcairo$secondaryArchSuffix = 2.11200.16 compat >= 2 + devel:libcairo_script_interpreter$secondaryArchSuffix = 2.11200.16 compat >= 2 + " +REQUIRES_devel=" + cairo$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libbz2$secondaryArchSuffix # required by fontconfig devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libpixman_1$secondaryArchSuffix devel:libpng15$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix # required by fontconfig devel:libz$secondaryArchSuffix - # required by fontconfig - devel:libbz2$secondaryArchSuffix - devel:libxml2$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal @@ -90,14 +98,3 @@ INSTALL() packageEntries devel \ $developDir } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - cairo${secondaryArchSuffix}_devel = $portVersion compat >= 1 - devel:libcairo$secondaryArchSuffix = 2.11200.16 compat >= 2 - devel:libcairo_script_interpreter$secondaryArchSuffix = 2.11200.16 compat >= 2 - " -REQUIRES_devel=" - cairo$secondaryArchSuffix == $portVersion base - "