diff --git a/app-text/hippo/hippo-0.1~git.recipe b/app-text/hippo/hippo-0.1~git.recipe index cf711bda2..bb1785e43 100644 --- a/app-text/hippo/hippo-0.1~git.recipe +++ b/app-text/hippo/hippo-0.1~git.recipe @@ -22,7 +22,6 @@ srcGitRev_2="866da331087c62dc4ff413535379ee5c6c763156" SOURCE_URI_2="https://github.com/Vytax/CuteLogger/archive/$srcGitRev_2.tar.gz" CHECKSUM_SHA256_2="d3ddcad99e060fd3bb395f26f0df7b1c77d88c3f2de3ecdba1d43734fba48d2b" SOURCE_DIR_2="CuteLogger-$srcGitRev_2" - ADDITIONAL_FILES="hippo.rdef.in" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -42,9 +41,9 @@ REQUIRES=" lib:libQt5Gui$secondaryArchSuffix lib:libQt5PrintSupport$secondaryArchSuffix lib:libQt5Sql$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix lib:libQt5WebKit$secondaryArchSuffix lib:libQt5WebKitWidgets$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -58,9 +57,9 @@ BUILD_REQUIRES=" devel:libQt5Gui$secondaryArchSuffix devel:libQt5PrintSupport$secondaryArchSuffix devel:libQt5Sql$secondaryArchSuffix - devel:libQt5Widgets$secondaryArchSuffix devel:libQt5WebKit$secondaryArchSuffix devel:libQt5WebKitWidgets$secondaryArchSuffix + devel:libQt5Widgets$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/app-text/kchmviewer/kchmviewer-7.7.recipe b/app-text/kchmviewer/kchmviewer-7.7.recipe index 0738d0b55..c1d76cab4 100644 --- a/app-text/kchmviewer/kchmviewer-7.7.recipe +++ b/app-text/kchmviewer/kchmviewer-7.7.recipe @@ -69,7 +69,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix devel:libzip$secondaryArchSuffix " -BUILD_PREREQUIRES=" +BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/dev-lang/php/php-5.6.37.recipe b/dev-lang/php/php-5.6.37.recipe index e658c6fa6..6fd349773 100644 --- a/dev-lang/php/php-5.6.37.recipe +++ b/dev-lang/php/php-5.6.37.recipe @@ -14,6 +14,10 @@ PATCHES="php-$portVersion.patchset" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +GLOBAL_WRITABLE_FILES=" + settings/pear.conf keep-old + " + PROVIDES=" php = $portVersion cmd:pear @@ -26,38 +30,33 @@ PROVIDES=" cmd:php_config cmd:phpize " - REQUIRES=" haiku - lib:libicuuc - lib:libxml2 - lib:libz lib:libbz2 - lib:libssl lib:libcrypto lib:libcurl + lib:libfreetype + lib:libicuuc + lib:libjpeg lib:libpcre lib:libpng16 - lib:libjpeg - lib:libfreetype - " - -GLOBAL_WRITABLE_FILES=" - settings/pear.conf keep-old + lib:libssl + lib:libxml2 + lib:libz " BUILD_REQUIRES=" - devel:libicuuc - devel:libxml2 - devel:libz devel:libbz2 - devel:libssl devel:libcrypto devel:libcurl + devel:libfreetype + devel:libicuuc + devel:libjpeg devel:libpcre devel:libpng16 - devel:libjpeg - devel:libfreetype + devel:libssl + devel:libxml2 + devel:libz " BUILD_PREREQUIRES=" haiku_devel @@ -65,12 +64,12 @@ BUILD_PREREQUIRES=" cmd:awk cmd:bison cmd:dos2unix + cmd:freetype_config cmd:gcc + cmd:icu_config cmd:make cmd:pkg_config - cmd:freetype_config cmd:xml2_config - cmd:icu_config " PATCH() diff --git a/dev-libs/log4cxx/log4cxx-0.10.0_20180322.recipe b/dev-libs/log4cxx/log4cxx-0.10.0_20180322.recipe index d98c33006..badb6291b 100644 --- a/dev-libs/log4cxx/log4cxx-0.10.0_20180322.recipe +++ b/dev-libs/log4cxx/log4cxx-0.10.0_20180322.recipe @@ -16,7 +16,7 @@ SOURCE_DIR="logging-log4cxx-$srcGitRev" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion=10.0.0 +libVersion="10.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" diff --git a/dev-util/gdb/gdb-6.3.recipe b/dev-util/gdb/gdb-6.3.recipe index 5814b1483..f5687fe93 100644 --- a/dev-util/gdb/gdb-6.3.recipe +++ b/dev-util/gdb/gdb-6.3.recipe @@ -47,8 +47,8 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" haiku_devel cmd:awk - cmd:cmp cmd:bison + cmd:cmp cmd:flex cmd:gcc cmd:ld diff --git a/dev-util/gdb/gdb-8.1.recipe b/dev-util/gdb/gdb-8.1.recipe index 5ee4c538f..cdf8011a2 100644 --- a/dev-util/gdb/gdb-8.1.recipe +++ b/dev-util/gdb/gdb-8.1.recipe @@ -35,33 +35,33 @@ PROVIDES=" " REQUIRES=" haiku - lib:libz + lib:libexpat lib:libiconv lib:libncurses lib:libpython2.7 - lib:libexpat + lib:libz " BUILD_REQUIRES=" - devel:libz + devel:libexpat devel:libiconv devel:libncurses devel:libpython2.7 - devel:libexpat + devel:libz " BUILD_PREREQUIRES=" haiku_devel cmd:awk - cmd:cmp cmd:bison + cmd:cmp cmd:flex cmd:gcc cmd:ld cmd:m4 cmd:make cmd:makeinfo - cmd:yacc cmd:python + cmd:yacc " TEST_REQUIRES=" diff --git a/games-board/peg-e/peg_e-1.2.6.recipe b/games-board/peg-e/peg_e-1.2.6.recipe index d24dad075..bea76ce16 100644 --- a/games-board/peg-e/peg_e-1.2.6.recipe +++ b/games-board/peg-e/peg_e-1.2.6.recipe @@ -8,8 +8,8 @@ COPYRIGHT="2018 Graeme Gott" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://gottcode.org/peg-e/peg-e-$portVersion-src.tar.bz2" -SOURCE_DIR="peg-e-$portVersion" CHECKSUM_SHA256="b7a644397a6e8fd24c5df72a8c5950af8de035c9fafc712fea5eae87eea15d81" +SOURCE_DIR="peg-e-$portVersion" ADDITIONAL_FILES="peg_e.rdef.in" ARCHITECTURES="!x86_gcc2 x86 x86_64" diff --git a/games-board/qsolocards/qsolocards-0.99.1.recipe b/games-board/qsolocards/qsolocards-0.99.1.recipe index 4ee32e99d..4fce8f70b 100644 --- a/games-board/qsolocards/qsolocards-0.99.1.recipe +++ b/games-board/qsolocards/qsolocards-0.99.1.recipe @@ -11,8 +11,8 @@ COPYRIGHT="2009 Steve Moore" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="http://downloads.sourceforge.net/project/qsolocards/qsolocards/$portVersion/QSoloCards-$portVersion-src.tar.gz" -SOURCE_DIR="QSoloCards-$portVersion" CHECKSUM_SHA256="d962a976c335c4bbe239ec4479db60222906411bee3e24498593f2878761b418" +SOURCE_DIR="QSoloCards-$portVersion" PATCHES="qsolocards-$portVersion.patchset" ADDITIONAL_FILES="qsolocards.rdef.in" diff --git a/games-board/simsu/simsu-1.3.7.recipe b/games-board/simsu/simsu-1.3.7.recipe index 5e626ed00..914dffa59 100644 --- a/games-board/simsu/simsu-1.3.7.recipe +++ b/games-board/simsu/simsu-1.3.7.recipe @@ -9,8 +9,8 @@ COPYRIGHT="2018 Graeme Gott" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://gottcode.org/simsu/simsu-$portVersion-src.tar.bz2" -SOURCE_DIR="simsu-$portVersion" CHECKSUM_SHA256="a3c56b6339fd314b198b7ec89d27f1919d4b480e7e0eae03980dda5fec31cd6a" +SOURCE_DIR="simsu-$portVersion" ADDITIONAL_FILES="simsu.rdef.in" ARCHITECTURES="!x86_gcc2 x86 x86_64" diff --git a/games-board/solitaire-mahjong/solitaire_mahjong-2.2.4.recipe b/games-board/solitaire-mahjong/solitaire_mahjong-2.2.4.recipe index f1f4fc73b..14f9bf199 100644 --- a/games-board/solitaire-mahjong/solitaire_mahjong-2.2.4.recipe +++ b/games-board/solitaire-mahjong/solitaire_mahjong-2.2.4.recipe @@ -7,8 +7,8 @@ COPYRIGHT="2008-2017 Thomas S. Ullrich" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="http://star.physics.yale.edu/~ullrich/software/SolitaireMahjong/Distributions/$portVersion/SolitaireMahjong-2.24-src.tgz" -SOURCE_DIR="SolitaireMahjong" CHECKSUM_SHA256="42e2f5201c8562775fd655e296ce23e06a8ca2595ce9f7263b1ccecde52bc4cd" +SOURCE_DIR="SolitaireMahjong" ADDITIONAL_FILES="solitaire_mahjong.rdef.in" ARCHITECTURES="!x86_gcc2 x86 x86_64" diff --git a/games-puzzle/hexalate/hexalate-1.1.4.recipe b/games-puzzle/hexalate/hexalate-1.1.4.recipe index 271c32d00..8173157e2 100644 --- a/games-puzzle/hexalate/hexalate-1.1.4.recipe +++ b/games-puzzle/hexalate/hexalate-1.1.4.recipe @@ -8,8 +8,8 @@ COPYRIGHT="2018 Graeme Gott" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://gottcode.org/hexalate/hexalate-$portVersion-src.tar.bz2" -SOURCE_DIR="hexalate-$portVersion" CHECKSUM_SHA256="9dfdaaf802f792dbd539b7e87674f942a773970aa50c298cd395b5d21a9acca3" +SOURCE_DIR="hexalate-$portVersion" ADDITIONAL_FILES="hexalate.rdef.in" ARCHITECTURES="!x86_gcc2 x86 x86_64" diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe index 84bb3aaad..335104a95 100644 --- a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe +++ b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe @@ -10,8 +10,8 @@ LICENSE="Zlib" REVISION="3" srcGitRev="92df9d48db9e1e684e9d28405e7a05f05e6671aa" SOURCE_URI="https://github.com/HaikuArchives/BDH-Calc/archive/$srcGitRev.tar.gz" -SOURCE_DIR="BDH-Calc-$srcGitRev" CHECKSUM_SHA256="1668d4f0b09dd0e929dfeba2c4413e1f17490ccbbbff2ac83cbcb44617be0343" +SOURCE_DIR="BDH-Calc-$srcGitRev" ARCHITECTURES="x86 x86_gcc2 x86_64" diff --git a/haiku-apps/calendar/calendar-1.0.recipe b/haiku-apps/calendar/calendar-1.0.recipe index 138b63ef1..2600fe9f2 100644 --- a/haiku-apps/calendar/calendar-1.0.recipe +++ b/haiku-apps/calendar/calendar-1.0.recipe @@ -38,9 +38,9 @@ BUILD_REQUIRES=" devel:libsqlite3$secondaryArchSuffix " BUILD_PREREQUIRES=" + makefile_engine cmd:gcc$secondaryArchSuffix cmd:make - makefile_engine " BUILD() diff --git a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe index 225650fa1..7db164ce1 100644 --- a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe +++ b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe @@ -8,8 +8,8 @@ LICENSE="MIT" REVISION="2" srcGitRev="bd43e4a8d9139c35ba34bd9791f293e4421ca082" SOURCE_URI="https://github.com/HaikuArchives/PPViewer/archive/$srcGitRev.tar.gz" -SOURCE_DIR="PPViewer-$srcGitRev" CHECKSUM_SHA256="f6f250a9b764088b33f9e11187221bad3b5449ffd6004c312536f340576eba98" +SOURCE_DIR="PPViewer-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/kde-apps/krdc/krdc-18.08.0.recipe b/kde-apps/krdc/krdc-18.08.0.recipe index 339730b36..5c5eb6684 100644 --- a/kde-apps/krdc/krdc-18.08.0.recipe +++ b/kde-apps/krdc/krdc-18.08.0.recipe @@ -15,9 +15,9 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" krdc$secondaryArchSuffix = $portVersion + app:KRDC$secondaryArchSuffix = $portVersion cmd:krdc$secondaryArchSuffix = $portVersion lib:libkrdccore$secondaryArchSuffix = $portVersion - app:KRDC$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -37,8 +37,8 @@ REQUIRES=" lib:libKF5Notifications$secondaryArchSuffix lib:libKF5NotifyConfig$secondaryArchSuffix lib:libKF5Service$secondaryArchSuffix - lib:libKF5Wallet$secondaryArchSuffix lib:libKF5TextWidgets$secondaryArchSuffix + lib:libKF5Wallet$secondaryArchSuffix lib:libKF5WidgetsAddons$secondaryArchSuffix lib:libKF5XmlGui$secondaryArchSuffix lib:libQt5DBus$secondaryArchSuffix diff --git a/kde-frameworks/attica/attica-5.47.0.recipe b/kde-frameworks/attica/attica-5.47.0.recipe index 3e1792b53..6391ca7fb 100644 --- a/kde-frameworks/attica/attica-5.47.0.recipe +++ b/kde-frameworks/attica/attica-5.47.0.recipe @@ -41,7 +41,7 @@ BUILD_REQUIRES=" extra_cmake_modules >= $portVersion devel:libQt5Core$secondaryArchSuffix >= 5.7 " -BUILD_PREREQUIRES=" +BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix cmd:make diff --git a/media-video/vlc/vlc-2.2.8.recipe b/media-video/vlc/vlc-2.2.8.recipe index 50fb56b16..f9c9f3791 100644 --- a/media-video/vlc/vlc-2.2.8.recipe +++ b/media-video/vlc/vlc-2.2.8.recipe @@ -192,6 +192,7 @@ PATCH() # _FORTIFY_SOURCE is set to 2 by default on Haiku, remove redefine warnings. sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die } + BUILD() { autoreconf diff --git a/net-im/psi_plus/psi_plus-1.3.400.recipe b/net-im/psi_plus/psi_plus-1.3.400.recipe index 64cb1d5cf..a7916af3e 100644 --- a/net-im/psi_plus/psi_plus-1.3.400.recipe +++ b/net-im/psi_plus/psi_plus-1.3.400.recipe @@ -2,21 +2,21 @@ SUMMARY="A development branch of Psi IM XMPP/Jabber client" DESCRIPTION="Psi is a cross-platform powerful XMPP/Jabber client (Qt, C++) \ designed for the Jabber power users." HOMEPAGE="http://psi-plus.com/" +COPYRIGHT="2005-2018, Psi+ Project" +LICENSE="GNU GPL v2" +REVISION="2" SOURCE_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/$portVersion.tar.gz" -SOURCE_DIR="psi-plus-snapshots-$portVersion" CHECKSUM_SHA256="4c6d172b4d3e4475bf129531b6f4b925951a25c3a6e5f6ff6c8172733157905b" +SOURCE_DIR="psi-plus-snapshots-$portVersion" SOURCE_URI_2="https://github.com/psi-plus/psi-plus-l10n/archive/$portVersion.tar.gz" +CHECKSUM_SHA256_2="1c10b1732eb3fd39fe4bf8036ca6a015fcb27b748b5659c5832d39943b2d935a" SOURCE_FILENAME_2="psi-plus-l10n-$portVersion.tar.gz" SOURCE_DIR_2="psi-plus-l10n-$portVersion" -CHECKSUM_SHA256_2="1c10b1732eb3fd39fe4bf8036ca6a015fcb27b748b5659c5832d39943b2d935a" -REVISION="2" -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2018, Psi+ Project" +PATCHES="psi_plus-$portVersion.patchset" +ADDITIONAL_FILES="psi-plus.rdef.in" ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" -ADDITIONAL_FILES="psi-plus.rdef.in" -PATCHES="psi_plus-$portVersion.patchset" PROVIDES=" psi_plus$secondaryArchSuffix = $portVersion @@ -32,20 +32,13 @@ REQUIRES=" lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix lib:libQt5WebKit$secondaryArchSuffix lib:libQt5WebKitWidgets$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:g++$secondaryArchSuffix - cmd:make - cmd:patch - cmd:pkg_config$secondaryArchSuffix - cmd:which - " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcrypto$secondaryArchSuffix @@ -54,15 +47,23 @@ BUILD_REQUIRES=" devel:libidn$secondaryArchSuffix devel:libotr$secondaryArchSuffix devel:libqca$secondaryArchSuffix >= 2.1.3 - devel:libQt5Gui$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix devel:libQt5Network$secondaryArchSuffix - devel:libQt5Widgets$secondaryArchSuffix devel:libQt5WebKit$secondaryArchSuffix devel:libQt5WebKitWidgets$secondaryArchSuffix + devel:libQt5Widgets$secondaryArchSuffix devel:libtidys$secondaryArchSuffix devel:libz$secondaryArchSuffix " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + cmd:patch + cmd:pkg_config$secondaryArchSuffix + cmd:which + " BUILD() { diff --git a/net-libs/nghttp2/nghttp2-1.32.1.recipe b/net-libs/nghttp2/nghttp2-1.32.1.recipe index 18d367085..4a67dd30c 100644 --- a/net-libs/nghttp2/nghttp2-1.32.1.recipe +++ b/net-libs/nghttp2/nghttp2-1.32.1.recipe @@ -11,7 +11,7 @@ CHECKSUM_SHA256="71ad04489b8e52df23a80166dfbf29d39bc48e39bc081e1e83ca8c94feeab7d ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -libVersion=14.16.3 +libVersion="14.16.3" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" diff --git a/x11-libs/libfm-qt/libfm_qt-0.13.0.recipe b/x11-libs/libfm-qt/libfm_qt-0.13.0.recipe index acd9fb63c..6737c0476 100644 --- a/x11-libs/libfm-qt/libfm_qt-0.13.0.recipe +++ b/x11-libs/libfm-qt/libfm_qt-0.13.0.recipe @@ -13,7 +13,7 @@ PATCHES="libfm_qt-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion=5.0.0 +libVersion="5.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" diff --git a/x11-libs/libxau/libxau-1.0.8.recipe b/x11-libs/libxau/libxau-1.0.8.recipe index 38212945e..ac5a6aa1c 100644 --- a/x11-libs/libxau/libxau-1.0.8.recipe +++ b/x11-libs/libxau/libxau-1.0.8.recipe @@ -15,7 +15,7 @@ PATCHES="libxau-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -libVersion=6.0.0 +libVersion="6.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.9.recipe b/x11-libs/libxkbfile/libxkbfile-1.0.9.recipe index 051d0cb82..43eaf7b61 100644 --- a/x11-libs/libxkbfile/libxkbfile-1.0.9.recipe +++ b/x11-libs/libxkbfile/libxkbfile-1.0.9.recipe @@ -11,7 +11,7 @@ CHECKSUM_SHA256="51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16 ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion=1.0.2 +libVersion="1.0.2" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES="