From 38023d41f059dc9332affad95e955cae163e612f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 7 Sep 2018 16:15:17 +0200 Subject: [PATCH] code reformat. --- media-fonts/droid/droid-4.3_r2.2.recipe | 13 ++- .../noto_sans_cjk/noto_sans_cjk-1.004.recipe | 78 ++++++++-------- media-fonts/open_sans/open_sans-1.0.recipe | 12 +-- media-gfx/blender/blender-2.79b.recipe | 20 ++-- media-gfx/graphviz/graphviz-2.40.1.recipe | 19 ++-- media-gfx/icoutils/icoutils-0.32.3.recipe | 2 +- media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe | 93 +++++++++---------- media-sound/audacity/audacity-2.1.2.recipe | 40 ++++---- media-sound/mpg123/mpg123-1.25.10.recipe | 7 +- media-sound/opensound/opensound-4.2.recipe | 9 +- 10 files changed, 143 insertions(+), 150 deletions(-) diff --git a/media-fonts/droid/droid-4.3_r2.2.recipe b/media-fonts/droid/droid-4.3_r2.2.recipe index d31b58ae2..d4a521dbe 100644 --- a/media-fonts/droid/droid-4.3_r2.2.recipe +++ b/media-fonts/droid/droid-4.3_r2.2.recipe @@ -6,24 +6,23 @@ comfort on a mobile handset. The Droid fonts were optimized for use in \ application menus, web browsers and for other screen text. " HOMEPAGE="http://www.droidfonts.com" +COPYRIGHT="2005-2008 The Android Open Source Project" +LICENSE="Apache v2" +REVISION="2" # source zip extracted from git clone https://android.googlesource.com/platform/frameworks/base tag android-4.3_r2.2 /data/fonts SOURCE_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-4.3_r2.2.zip" CHECKSUM_SHA256="221133c329efdb2b911c18ef222eeb3fcb011e5be7c37623e68faa90c15b8cd0" -LICENSE="Apache v2" -COPYRIGHT="2005-2008 The Android Open Source Project" -REVISION="2" +SOURCE_DIR="fonts" ARCHITECTURES="any" -DISABLE_SOURCE_PACKAGE=yes +DISABLE_SOURCE_PACKAGE="yes" PROVIDES="droid = $portVersion" REQUIRES="" + BUILD_REQUIRES="" BUILD_PREREQUIRES="coreutils" -SOURCE_DIR="fonts" - - BUILD() { true diff --git a/media-fonts/noto_sans_cjk/noto_sans_cjk-1.004.recipe b/media-fonts/noto_sans_cjk/noto_sans_cjk-1.004.recipe index 2d04bbc0b..0165e428a 100644 --- a/media-fonts/noto_sans_cjk/noto_sans_cjk-1.004.recipe +++ b/media-fonts/noto_sans_cjk/noto_sans_cjk-1.004.recipe @@ -1,8 +1,4 @@ SUMMARY="The Noto font for CJK languages" -SUMMARY_jp="The Noto font for CJK languages (default Japanese)" -SUMMARY_kr="The Noto font for CJK languages (default Korean)" -SUMMARY_sc="The Noto font for CJK languages (default Simple Chinese)" -SUMMARY_tc="The Noto font for CJK languages (default Traditional Chinese)" DESCRIPTION="The Noto fonts have superseded the Droid fonts, which were \ originally designed for the use in Google's Android. Noto's aim is to be a \ free for everyone, with beautiful glyphs for all languages, looking good \ @@ -20,108 +16,110 @@ baseURL="https://raw.githubusercontent.com/googlei18n/noto-cjk" srcGitRev="f36eda03dfa5582a6d49abbfb5c83d0209584158" # Japanese SOURCE_URI="$baseURL/$srcGitRev/NotoSansCJKjp-Black.otf#noarchive" -SOURCE_URI_2="$baseURL/$srcGitRev/NotoSansCJKjp-Bold.otf#noarchive" -SOURCE_URI_3="$baseURL/$srcGitRev/NotoSansCJKjp-DemiLight.otf#noarchive" -SOURCE_URI_4="$baseURL/$srcGitRev/NotoSansCJKjp-Light.otf#noarchive" -SOURCE_URI_5="$baseURL/$srcGitRev/NotoSansCJKjp-Medium.otf#noarchive" -SOURCE_URI_6="$baseURL/$srcGitRev/NotoSansCJKjp-Regular.otf#noarchive" -SOURCE_URI_7="$baseURL/$srcGitRev/NotoSansCJKjp-Thin.otf#noarchive" -SOURCE_URI_8="$baseURL/$srcGitRev/NotoSansMonoCJKjp-Bold.otf#noarchive" -SOURCE_URI_9="$baseURL/$srcGitRev/NotoSansMonoCJKjp-Regular.otf#noarchive" CHECKSUM_SHA256="30bd064f624484ddc4ed77e2baab834b762078b8c3140a406eb7c42436beb7c3" +SOURCE_DIR="" +SOURCE_URI_2="$baseURL/$srcGitRev/NotoSansCJKjp-Bold.otf#noarchive" CHECKSUM_SHA256_2="9ca911f033c616162bc2d2f1d61c6739df8bc7a9bd027df0ed57c96029b33a7a" +SOURCE_URI_3="$baseURL/$srcGitRev/NotoSansCJKjp-DemiLight.otf#noarchive" CHECKSUM_SHA256_3="8c7692687ac032cd98cfbcd14392d87d301a766ebd1317550542f7826775ee46" +SOURCE_URI_4="$baseURL/$srcGitRev/NotoSansCJKjp-Light.otf#noarchive" CHECKSUM_SHA256_4="8a27ee3bccde01b4d084ff2c51f34e37f7f420fda52a2c035fa4a2f4cfb3fbac" +SOURCE_URI_5="$baseURL/$srcGitRev/NotoSansCJKjp-Medium.otf#noarchive" CHECKSUM_SHA256_5="bcda0bcc22bab28ea4fedae800bfbf9ec76d71cc3b9f851779a35b7e438a839d" +SOURCE_URI_6="$baseURL/$srcGitRev/NotoSansCJKjp-Regular.otf#noarchive" CHECKSUM_SHA256_6="f18253affd968c8ea592d8df6d84b1d4c5d3a46d267e53a1f6749e6c4f76a23d" +SOURCE_URI_7="$baseURL/$srcGitRev/NotoSansCJKjp-Thin.otf#noarchive" CHECKSUM_SHA256_7="d6d322494b97484247fb7d9deaaeb8593bac81eedfdc627968414b2dc6295a94" +SOURCE_URI_8="$baseURL/$srcGitRev/NotoSansMonoCJKjp-Bold.otf#noarchive" CHECKSUM_SHA256_8="206addf6fada3766e9fee5d03e51d3be3e683a2e730cf6baec5460ce4c3c18dc" +SOURCE_URI_9="$baseURL/$srcGitRev/NotoSansMonoCJKjp-Regular.otf#noarchive" CHECKSUM_SHA256_9="4b97c72f9e7d5ebaa83ece66968908027dd30c3e54f468ead74731ab0508bf45" # Korean SOURCE_URI_10="$baseURL/$srcGitRev/NotoSansCJKkr-Black.otf#noarchive" -SOURCE_URI_11="$baseURL/$srcGitRev/NotoSansCJKkr-Bold.otf#noarchive" -SOURCE_URI_12="$baseURL/$srcGitRev/NotoSansCJKkr-DemiLight.otf#noarchive" -SOURCE_URI_13="$baseURL/$srcGitRev/NotoSansCJKkr-Light.otf#noarchive" -SOURCE_URI_14="$baseURL/$srcGitRev/NotoSansCJKkr-Medium.otf#noarchive" -SOURCE_URI_15="$baseURL/$srcGitRev/NotoSansCJKkr-Regular.otf#noarchive" -SOURCE_URI_16="$baseURL/$srcGitRev/NotoSansCJKkr-Thin.otf#noarchive" -SOURCE_URI_17="$baseURL/$srcGitRev/NotoSansMonoCJKkr-Bold.otf#noarchive" -SOURCE_URI_18="$baseURL/$srcGitRev/NotoSansMonoCJKkr-Regular.otf#noarchive" CHECKSUM_SHA256_10="089a475a2c348daa81cdd8c9261036841f5711f6cce9e0932beb6fd9e348c94d" +SOURCE_URI_11="$baseURL/$srcGitRev/NotoSansCJKkr-Bold.otf#noarchive" CHECKSUM_SHA256_11="f14686e17455ba0b0f691fa58c6ddd8b146544bae2f1729e495dbb51043d424b" +SOURCE_URI_12="$baseURL/$srcGitRev/NotoSansCJKkr-DemiLight.otf#noarchive" CHECKSUM_SHA256_12="6913976f7c49070ca536c2f0a9e2e33dacd904311e38b1d8770996a0520e25b7" +SOURCE_URI_13="$baseURL/$srcGitRev/NotoSansCJKkr-Light.otf#noarchive" CHECKSUM_SHA256_13="fa383799c2a97b8a38d8e0e74fbeed94935fb4d4ab6acc9b31821ad03715e851" +SOURCE_URI_14="$baseURL/$srcGitRev/NotoSansCJKkr-Medium.otf#noarchive" CHECKSUM_SHA256_14="4bf8e8b95b40747ddb0c3e210a07efd1cc75a4b227ebc0320eb179c8a5594ce1" +SOURCE_URI_15="$baseURL/$srcGitRev/NotoSansCJKkr-Regular.otf#noarchive" CHECKSUM_SHA256_15="d4be2f9ead6e512cb3da51a339ecd7ed2684d2474b376181be9389cbedd85a38" +SOURCE_URI_16="$baseURL/$srcGitRev/NotoSansCJKkr-Thin.otf#noarchive" CHECKSUM_SHA256_16="2cd8ed727c39181c9b2c3948ae56ea55d014290b14de6d3534e1e2c456d6dde3" +SOURCE_URI_17="$baseURL/$srcGitRev/NotoSansMonoCJKkr-Bold.otf#noarchive" CHECKSUM_SHA256_17="0720bdc4d06d0314380fe74646effc16effba7d4698231b7eeed1e1460cb989b" +SOURCE_URI_18="$baseURL/$srcGitRev/NotoSansMonoCJKkr-Regular.otf#noarchive" CHECKSUM_SHA256_18="509b1a3aec34c02f86d1b73cc1aa9594b863142021e6441af407dcb4a7cf9029" # Simple Chinese SOURCE_URI_19="$baseURL/$srcGitRev/NotoSansCJKsc-Black.otf#noarchive" -SOURCE_URI_20="$baseURL/$srcGitRev/NotoSansCJKsc-Bold.otf#noarchive" -SOURCE_URI_21="$baseURL/$srcGitRev/NotoSansCJKsc-DemiLight.otf#noarchive" -SOURCE_URI_22="$baseURL/$srcGitRev/NotoSansCJKsc-Light.otf#noarchive" -SOURCE_URI_23="$baseURL/$srcGitRev/NotoSansCJKsc-Medium.otf#noarchive" -SOURCE_URI_24="$baseURL/$srcGitRev/NotoSansCJKsc-Regular.otf#noarchive" -SOURCE_URI_25="$baseURL/$srcGitRev/NotoSansCJKsc-Thin.otf#noarchive" -SOURCE_URI_26="$baseURL/$srcGitRev/NotoSansMonoCJKsc-Bold.otf#noarchive" -SOURCE_URI_27="$baseURL/$srcGitRev/NotoSansMonoCJKsc-Regular.otf#noarchive" CHECKSUM_SHA256_19="4f64a0adc660f0066baf25a361cb5f2206952d3e71d05dcade25088c89857c4d" +SOURCE_URI_20="$baseURL/$srcGitRev/NotoSansCJKsc-Bold.otf#noarchive" CHECKSUM_SHA256_20="9cd6c106d54cec938405ae19388cb4bc685ad2ff0270d03358bf61aa67e1ccb9" +SOURCE_URI_21="$baseURL/$srcGitRev/NotoSansCJKsc-DemiLight.otf#noarchive" CHECKSUM_SHA256_21="4f9015dfba78ae3e0b5c307e71731dabd075eb10b19183af8cb73caa27a830eb" +SOURCE_URI_22="$baseURL/$srcGitRev/NotoSansCJKsc-Light.otf#noarchive" CHECKSUM_SHA256_22="9ebc2050fc73480c2806df9d2ac35dd5cec2ad67d48a7d8c8d4df9378c25294c" +SOURCE_URI_23="$baseURL/$srcGitRev/NotoSansCJKsc-Medium.otf#noarchive" CHECKSUM_SHA256_23="0d01ee04b015315b457dfacdd3442e305d5bb183a9f355c0afda501f6fef39c6" +SOURCE_URI_24="$baseURL/$srcGitRev/NotoSansCJKsc-Regular.otf#noarchive" CHECKSUM_SHA256_24="1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd" +SOURCE_URI_25="$baseURL/$srcGitRev/NotoSansCJKsc-Thin.otf#noarchive" CHECKSUM_SHA256_25="53850c9e3d21f83b249b1acaad701156d4053f61f52cda7169c420c9072680c9" +SOURCE_URI_26="$baseURL/$srcGitRev/NotoSansMonoCJKsc-Bold.otf#noarchive" CHECKSUM_SHA256_26="9ccb57035e388a53f9fb6c1a4385b83e824ff6b781dbe55cf0657ae2205247a0" +SOURCE_URI_27="$baseURL/$srcGitRev/NotoSansMonoCJKsc-Regular.otf#noarchive" CHECKSUM_SHA256_27="2b1dbdc50df666a00c50ecd77377e2394c6babd35a71e37505ab411ff55c7906" # Traditional Chinese SOURCE_URI_28="$baseURL/$srcGitRev/NotoSansCJKtc-Black.otf#noarchive" -SOURCE_URI_29="$baseURL/$srcGitRev/NotoSansCJKtc-Bold.otf#noarchive" -SOURCE_URI_30="$baseURL/$srcGitRev/NotoSansCJKtc-DemiLight.otf#noarchive" -SOURCE_URI_31="$baseURL/$srcGitRev/NotoSansCJKtc-Light.otf#noarchive" -SOURCE_URI_32="$baseURL/$srcGitRev/NotoSansCJKtc-Medium.otf#noarchive" -SOURCE_URI_33="$baseURL/$srcGitRev/NotoSansCJKtc-Regular.otf#noarchive" -SOURCE_URI_34="$baseURL/$srcGitRev/NotoSansCJKtc-Thin.otf#noarchive" -SOURCE_URI_35="$baseURL/$srcGitRev/NotoSansMonoCJKtc-Bold.otf#noarchive" -SOURCE_URI_36="$baseURL/$srcGitRev/NotoSansMonoCJKtc-Regular.otf#noarchive" CHECKSUM_SHA256_28="203cf8985ba88adbe5e315f931ca61b9f053c5e5f358bf0c91576eb380597ac5" +SOURCE_URI_29="$baseURL/$srcGitRev/NotoSansCJKtc-Bold.otf#noarchive" CHECKSUM_SHA256_29="977833121efae44b1c2115282724383b3201bdc104064d7bb2c1c92da928aafc" +SOURCE_URI_30="$baseURL/$srcGitRev/NotoSansCJKtc-DemiLight.otf#noarchive" CHECKSUM_SHA256_30="4afca0a8f81a4c149d307a24c44403fe23c5e84e9fa745ac9f0d9d9a6097fede" +SOURCE_URI_31="$baseURL/$srcGitRev/NotoSansCJKtc-Light.otf#noarchive" CHECKSUM_SHA256_31="baf3e2718c919472af2b2c107d79d71abf4ce6fb2bd46e45f2e2b6acf686f83c" +SOURCE_URI_32="$baseURL/$srcGitRev/NotoSansCJKtc-Medium.otf#noarchive" CHECKSUM_SHA256_32="07aaf9190313301b18bda707c4db7ac75eaae6ef222eb5c38f97ed78700fd4f2" +SOURCE_URI_33="$baseURL/$srcGitRev/NotoSansCJKtc-Regular.otf#noarchive" CHECKSUM_SHA256_33="f57e46120a3dd025ac993801981849622405d1359b32093b1f046490f7885711" +SOURCE_URI_34="$baseURL/$srcGitRev/NotoSansCJKtc-Thin.otf#noarchive" CHECKSUM_SHA256_34="a78bd02326203aad6efcd1bd51ba8ae20db8252f2d4244180178a7e42a626d3c" +SOURCE_URI_35="$baseURL/$srcGitRev/NotoSansMonoCJKtc-Bold.otf#noarchive" CHECKSUM_SHA256_35="a7d6d87c73884e666ddb847e0a4992a58f85b56f4f0064842d8288730083b44c" +SOURCE_URI_36="$baseURL/$srcGitRev/NotoSansMonoCJKtc-Regular.otf#noarchive" CHECKSUM_SHA256_36="bce991d5a4132bd389b899a7c654fe50fe7ec9acedd93f47e9d77f4a728dacff" -SOURCE_DIR="" - ARCHITECTURES="any" -DISABLE_SOURCE_PACKAGE=yes +DISABLE_SOURCE_PACKAGE="yes" # noto_sans_cjk-$portVersion-any.hpkg is intentionally empty and can be removed. - PROVIDES=" noto_sans_cjk=$portVersion # empty. ToDo: prevent creating empty hpkg " REQUIRES="" +SUMMARY_jp="The Noto font for CJK languages (default Japanese)" PROVIDES_jp=" noto_sans_cjk_jp=$portVersion # Japanese default " REQUIRES_jp="" +SUMMARY_kr="The Noto font for CJK languages (default Korean)" PROVIDES_kr=" noto_sans_cjk_kr=$portVersion # Korean default " REQUIRES_kr="" +SUMMARY_sc="The Noto font for CJK languages (default Simple Chinese)" PROVIDES_sc=" noto_sans_cjk_sc=$portVersion # Simple Chinese default " REQUIRES_sc="" +SUMMARY_tc="The Noto font for CJK languages (default Traditional Chinese)" PROVIDES_tc=" noto_sans_cjk_tc=$portVersion # Traditional Chinese default " diff --git a/media-fonts/open_sans/open_sans-1.0.recipe b/media-fonts/open_sans/open_sans-1.0.recipe index b88690107..69aacb44f 100644 --- a/media-fonts/open_sans/open_sans-1.0.recipe +++ b/media-fonts/open_sans/open_sans-1.0.recipe @@ -4,6 +4,9 @@ Type Director of Ascender Corp. Open Sans was designed with an upright stress, \ open forms and a neutral, yet friendly appearance. It was optimized for print, web, \ and mobile interfaces, and has excellent legibility characteristics in its letterforms." HOMEPAGE="http://www.google.com/fonts/specimen/Open+Sans" +COPYRIGHT="2010-2011 Google Corporation" +LICENSE="Apache v2" +REVISION="2" # From Google fonts, # http://www.google.com/fonts#UsePlace:use/Collection:Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800 # Leave out the checksum here as the file is generated on the fly. @@ -11,6 +14,7 @@ HOMEPAGE="http://www.google.com/fonts/specimen/Open+Sans" srcGitRev="beaec0837bd21524b57ecb435158f9011fc03999" SOURCE_URI="https://github.com/google/fonts/raw/$srcGitRev/apache/opensans/OpenSans-Bold.ttf#noarchive" CHECKSUM_SHA256="1b43de2449d39b65ff6f63315d4afda585f72fbbec2e3d9a56f59de6c75149d3" +SOURCE_DIR="" SOURCE_URI_2="https://github.com/google/fonts/raw/$srcGitRev/apache/opensans/OpenSans-BoldItalic.ttf#noarchive" CHECKSUM_SHA256_2="3575d2afaaad69970380237a5d6357b6db241f53b77607482eaf9f299b8c07ec" SOURCE_URI_3="https://github.com/google/fonts/raw/$srcGitRev/apache/opensans/OpenSans-ExtraBold.ttf#noarchive" @@ -29,20 +33,16 @@ SOURCE_URI_9="https://github.com/google/fonts/raw/$srcGitRev/apache/opensans/Ope CHECKSUM_SHA256_9="b4c2050b25d3d296d5cf58589ca00816dc72df42262c2f629d5c6a984a161aa4" SOURCE_URI_10="https://github.com/google/fonts/raw/$srcGitRev/apache/opensans/OpenSans-SemiBoldItalic.ttf#noarchive" CHECKSUM_SHA256_10="a8f2af8e79f46686b1cfcfb3a1fd53e94e88308d7c6ee7f85c733f4796fcc3a0" -LICENSE="Apache v2" -COPYRIGHT="2010-2011 Google Corporation" -REVISION="2" ARCHITECTURES="any" -DISABLE_SOURCE_PACKAGE=yes +DISABLE_SOURCE_PACKAGE="yes" PROVIDES="open_sans = $portVersion" REQUIRES="" + BUILD_REQUIRES="" BUILD_PREREQUIRES="coreutils" -SOURCE_DIR="" - BUILD() { true diff --git a/media-gfx/blender/blender-2.79b.recipe b/media-gfx/blender/blender-2.79b.recipe index c6844ddac..5ec906cd8 100644 --- a/media-gfx/blender/blender-2.79b.recipe +++ b/media-gfx/blender/blender-2.79b.recipe @@ -31,6 +31,8 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + python3_numpy + requests_python3 lib:libalembic$secondaryArchSuffix lib:libavcodec$secondaryArchSuffix lib:libavdevice$secondaryArchSuffix @@ -80,13 +82,11 @@ REQUIRES=" lib:libsdl2_2.0$secondaryArchSuffix lib:libsndfile$secondaryArchSuffix lib:libtbb$secondaryArchSuffix - lib:libtinyxml$secondaryArchSuffix lib:libtiff$secondaryArchSuffix + lib:libtinyxml$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libyaml_cpp$secondaryArchSuffix lib:libz$secondaryArchSuffix - python3_numpy - requests_python3 " BUILD_REQUIRES=" @@ -96,7 +96,6 @@ BUILD_REQUIRES=" devel:libalembic$secondaryArchSuffix devel:libavcodec$secondaryArchSuffix devel:libavdevice$secondaryArchSuffix - lib:libavdevice$secondaryArchSuffix # REQUIRED devel:libboost_atomic$secondaryArchSuffix devel:libboost_chrono$secondaryArchSuffix devel:libboost_date_time$secondaryArchSuffix @@ -141,25 +140,26 @@ BUILD_REQUIRES=" devel:libsdl2_2.0$secondaryArchSuffix devel:libsndfile$secondaryArchSuffix devel:libtbb$secondaryArchSuffix - devel:libtinyxml$secondaryArchSuffix devel:libtiff$secondaryArchSuffix + devel:libtinyxml$secondaryArchSuffix devel:libxml2$secondaryArchSuffix devel:libyaml_cpp$secondaryArchSuffix devel:libz$secondaryArchSuffix + lib:libavdevice$secondaryArchSuffix # REQUIRED " BUILD_PREREQUIRES=" + llvm$secondaryArchSuffix + python3_numpy + requests_python3 cmd:cmake - cmd:git - cmd:gcc$secondaryArchSuffix cmd:find + cmd:gcc$secondaryArchSuffix + cmd:git cmd:ld$secondaryArchSuffix cmd:make cmd:python${PYTHON_VERSION} cmd:sed cmd:strip - llvm$secondaryArchSuffix - python3_numpy - requests_python3 " defineDebugInfoPackage blender$secondaryArchSuffix \ diff --git a/media-gfx/graphviz/graphviz-2.40.1.recipe b/media-gfx/graphviz/graphviz-2.40.1.recipe index 5eb78a39b..9fe6e2e8d 100644 --- a/media-gfx/graphviz/graphviz-2.40.1.recipe +++ b/media-gfx/graphviz/graphviz-2.40.1.recipe @@ -43,7 +43,6 @@ portVersionCompat="$portVersion compat >= 2" for i in $graphvizLibs; do eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\"" done - PROVIDES=" graphviz$secondaryArchSuffix = $portVersionCompat cmd:acyclic$secondaryArchSuffix @@ -53,9 +52,9 @@ PROVIDES=" cmd:cluster$secondaryArchSuffix cmd:diffimg$secondaryArchSuffix cmd:dijkstra$secondaryArchSuffix - cmd:dot_builtins$secondaryArchSuffix cmd:dot$secondaryArchSuffix cmd:dot2gxl$secondaryArchSuffix + cmd:dot_builtins$secondaryArchSuffix cmd:edgepaint$secondaryArchSuffix cmd:fdp$secondaryArchSuffix cmd:gc$secondaryArchSuffix @@ -65,10 +64,10 @@ PROVIDES=" cmd:gv2gxl$secondaryArchSuffix cmd:gvcolor$secondaryArchSuffix cmd:gvgen$secondaryArchSuffix - cmd:gvpack$secondaryArchSuffix - cmd:gvpr$secondaryArchSuffix cmd:gvmap$secondaryArchSuffix cmd:gvmap.sh$secondaryArchSuffix + cmd:gvpack$secondaryArchSuffix + cmd:gvpr$secondaryArchSuffix cmd:gxl2dot$secondaryArchSuffix cmd:gxl2gv$secondaryArchSuffix cmd:mm2gv$secondaryArchSuffix @@ -92,14 +91,14 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libfreetype$secondaryArchSuffix lib:libexpat$secondaryArchSuffix + lib:libfontconfig$secondaryArchSuffix + lib:libfreetype$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libgd$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix - lib:libfontconfig$secondaryArchSuffix lib:libltdl$secondaryArchSuffix + lib:libpng16$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -120,12 +119,12 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libexpat$secondaryArchSuffix + devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libgd$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix - devel:libfontconfig$secondaryArchSuffix devel:libltdl$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal @@ -135,11 +134,11 @@ BUILD_PREREQUIRES=" cmd:awk cmd:bison cmd:flex + cmd:freetype_config$secondaryArchSuffix cmd:gcc$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix - cmd:freetype_config$secondaryArchSuffix " defineDebugInfoPackage graphviz$secondaryArchSuffix \ diff --git a/media-gfx/icoutils/icoutils-0.32.3.recipe b/media-gfx/icoutils/icoutils-0.32.3.recipe index 352641ffc..05dfbd5a8 100644 --- a/media-gfx/icoutils/icoutils-0.32.3.recipe +++ b/media-gfx/icoutils/icoutils-0.32.3.recipe @@ -22,9 +22,9 @@ PROVIDES=" " REQUIRES=" haiku + cmd:perl lib:libpng16 lib:libz - cmd:perl " BUILD_REQUIRES=" diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe index 549eec1ea..bfc4df8da 100644 --- a/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe +++ b/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe @@ -3,64 +3,61 @@ DESCRIPTION=" tuxpaint - Drawing program designed for young children. " HOMEPAGE="http://www.tuxpaint.org/" -#SOURCE_URI="cvs://:pserver:anonymous@tuxpaint.cvs.sourceforge.net:/cvsroot/tuxpaint/tuxpaint" -SOURCE_URI="http://ports-space.haiku-files.org/source/tuxpaint-snapshot-2013-11-06.zip" -CHECKSUM_SHA256="8eca858c590b7aad4cfebe252ea1e5745d043bd46c18bc4c4e5bb59fd47d41d3" COPYRIGHT="2002-2010 Bill Kendrick and others" LICENSE="GNU GPL v2" REVISION="1" +#SOURCE_URI="cvs://:pserver:anonymous@tuxpaint.cvs.sourceforge.net:/cvsroot/tuxpaint/tuxpaint" +SOURCE_URI="http://ports-space.haiku-files.org/source/tuxpaint-snapshot-2013-11-06.zip" +CHECKSUM_SHA256="8eca858c590b7aad4cfebe252ea1e5745d043bd46c18bc4c4e5bb59fd47d41d3" +SOURCE_DIR="tuxpaint" ARCHITECTURES="x86 x86_gcc2 ?x86_64" -PROVIDES=" - tuxpaint = $portVersion - " - -REQUIRES=" - haiku - lib:libpaper - lib:libsdl - lib:libintl - lib:libSDL_ttf - lib:libSDL_image - lib:libSDL_mixer - lib:libfribidi - lib:freetype - lib:gettext - lib:libpng - lib:libiconv - lib:libz - " - -BUILD_REQUIRES=" - devel:libsdl - devel:libintl - devel:libpaper - devel:libSDL_ttf - devel:libSDL_image - devel:libSDL_mixer - devel:libfribidi -# devel:freetype -# devel:gettext - devel:libpng - devel:libz - devel:libiconv - " - -BUILD_PREREQUIRES=" - haiku_devel - cmd:make - cmd:gcc - cmd:gperf - cmd:pkg_config - cmd:ld - " - USER_SETTINGS_FILES=" settings/TuxPaint directory " -SOURCE_DIR="tuxpaint" +PROVIDES=" + tuxpaint = $portVersion + " +REQUIRES=" + haiku + lib:freetype + lib:gettext + lib:libfribidi + lib:libiconv + lib:libintl + lib:libpaper + lib:libpng + lib:libsdl + lib:libSDL_image + lib:libSDL_mixer + lib:libSDL_ttf + lib:libz + " + +BUILD_REQUIRES=" +# devel:freetype +# devel:gettext + devel:libfribidi + devel:libiconv + devel:libintl + devel:libpaper + devel:libpng + devel:libsdl + devel:libSDL_image + devel:libSDL_mixer + devel:libSDL_ttf + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel + cmd:gcc + cmd:gperf + cmd:ld + cmd:make + cmd:pkg_config + " BUILD() { diff --git a/media-sound/audacity/audacity-2.1.2.recipe b/media-sound/audacity/audacity-2.1.2.recipe index bdd237962..801e7c094 100644 --- a/media-sound/audacity/audacity-2.1.2.recipe +++ b/media-sound/audacity/audacity-2.1.2.recipe @@ -23,44 +23,44 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix wxqt$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libsndfile$secondaryArchSuffix -# lib:libid3tag$secondaryArchSuffix -- missing pkgconfig -# lib:libmad$secondaryArchSuffix -- missing pkgconfig - lib:libflac$secondaryArchSuffix - lib:libexpat$secondaryArchSuffix lib:libavcodec$secondaryArchSuffix lib:libavformat$secondaryArchSuffix lib:libavutil$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:libflac$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix +# lib:libid3tag$secondaryArchSuffix -- missing pkgconfig + lib:libintl$secondaryArchSuffix +# lib:libmad$secondaryArchSuffix -- missing pkgconfig + lib:libsndfile$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel wxqt${secondaryArchSuffix}_devel - devel:libintl$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix - devel:libsndfile$secondaryArchSuffix -# devel:libid3tag$secondaryArchSuffix -# devel:libmad$secondaryArchSuffix - devel:libflac$secondaryArchSuffix - devel:libexpat$secondaryArchSuffix devel:libavcodec$secondaryArchSuffix devel:libavformat$secondaryArchSuffix devel:libavutil$secondaryArchSuffix + devel:libexpat$secondaryArchSuffix + devel:libflac$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix +# devel:libid3tag$secondaryArchSuffix + devel:libintl$secondaryArchSuffix +# devel:libmad$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix + devel:libsndfile$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:cmake - cmd:pkg_config$secondaryArchSuffix - cmd:wx_config$secondaryArchSuffix cmd:awk + cmd:cmake cmd:diff - cmd:gettext$secondaryArchSuffix - cmd:which - cmd:make cmd:gcc$secondaryArchSuffix + cmd:gettext$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:which + cmd:wx_config$secondaryArchSuffix " PATCH() diff --git a/media-sound/mpg123/mpg123-1.25.10.recipe b/media-sound/mpg123/mpg123-1.25.10.recipe index c68260c05..24e16517b 100644 --- a/media-sound/mpg123/mpg123-1.25.10.recipe +++ b/media-sound/mpg123/mpg123-1.25.10.recipe @@ -15,15 +15,14 @@ libmpg123Version="0.44.8" libout123Version="0.2.2" libmpg123VersionCompat="$libmpg123Version compat >= ${libmpg123Version%%.*}" libout123VersionCompat="$libout123Version compat >= ${libout123Version%%.*}" - PROVIDES=" mpg123$secondaryArchSuffix = $portVersion - lib:libmpg123$secondaryArchSuffix = $libmpg123VersionCompat - lib:libout123$secondaryArchSuffix = $libout123VersionCompat cmd:mpg123$secondaryArchSuffix = $portVersion cmd:mpg123_id3dump$secondaryArchSuffix = $portVersion cmd:mpg123_strip$secondaryArchSuffix = $portVersion cmd:out123$secondaryArchSuffix = $portVersion + lib:libmpg123$secondaryArchSuffix = $libmpg123VersionCompat + lib:libout123$secondaryArchSuffix = $libout123VersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -62,7 +61,7 @@ defineDebugInfoPackage mpg123$secondaryArchSuffix \ "$binDir"/out123 \ "$libDir"/libmpg123.so.$libmpg123Version \ "$libDir"/libout123.so.$libout123Version \ - "$libDir"/mpg123/output_dummy.so \ + "$libDir"/mpg123/output_dummy.so BUILD() { diff --git a/media-sound/opensound/opensound-4.2.recipe b/media-sound/opensound/opensound-4.2.recipe index d1ddf7870..4e44f493c 100644 --- a/media-sound/opensound/opensound-4.2.recipe +++ b/media-sound/opensound/opensound-4.2.recipe @@ -32,15 +32,15 @@ GLOBAL_WRITABLE_FILES=" settings/kernel/drivers/oss_trident keep-old settings/kernel/drivers/oss_userdev keep-old settings/kernel/drivers/oss_ymf7xx keep-old - " # settings/kernel/drivers directory keep-old + " PROVIDES=" opensound$secondaryArchSuffix = $portVersion - cmd:ossplay$secondaryArchSuffix cmd:ossinfo$secondaryArchSuffix cmd:ossmix$secondaryArchSuffix cmd:ossphone$secondaryArchSuffix + cmd:ossplay$secondaryArchSuffix cmd:ossrecord$secondaryArchSuffix cmd:osstest$secondaryArchSuffix cmd:savemixer$secondaryArchSuffix @@ -49,14 +49,15 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix cmd:awk cmd:find + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make "