From 9157c823aee653229d9da28843252f116e7265fa Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 5 Sep 2018 14:26:47 +0200 Subject: [PATCH] code reformat. --- .../festival/festival-2.4.recipe | 4 +- app-accessibility/flite/flite-2.0.0.recipe | 6 +- app-arch/ha/ha-0999.recipe | 17 ++--- app-benchmarks/iozone/iozone-3.326.recipe | 9 ++- app-crypt/gpgme/gpgme-1.9.0.recipe | 8 +-- app-crypt/signify/signify-23.recipe | 2 +- sci-libs/atlas/atlas-3.10.3.recipe | 10 +-- sci-libs/openblas/openblas-0.3.2.recipe | 2 +- sci-libs/suitesparse/suitesparse-5.3.0.recipe | 64 +++++-------------- sci-libs/superlu/superlu-5.2.1.recipe | 6 +- sys-apps/coreutils/coreutils-8.22.recipe | 15 ++--- sys-apps/coreutils/coreutils-8.23.recipe | 15 ++--- sys-apps/coreutils/coreutils-8.24.recipe | 15 ++--- sys-apps/coreutils/coreutils-8.29.recipe | 4 +- sys-apps/grep/grep-2.14.recipe | 13 ++-- sys-libs/readline/readline-7.0.3.recipe | 2 +- sys-libs/readline/readline6-6.3.8.recipe | 10 +-- www-client/bezilla/bezilla-2.0.0.22.recipe | 20 +++--- www-client/netsurf/netsurf-3.7.recipe | 24 ++++--- .../qutebrowser/qutebrowser-1.2.0.recipe | 8 +-- www-servers/nginx/nginx-1.7.4_hg.recipe | 3 +- x11-libs/libxpm/libxpm-3.5.12.recipe | 3 +- 22 files changed, 107 insertions(+), 153 deletions(-) diff --git a/app-accessibility/festival/festival-2.4.recipe b/app-accessibility/festival/festival-2.4.recipe index 3357a34ea..981358cd3 100644 --- a/app-accessibility/festival/festival-2.4.recipe +++ b/app-accessibility/festival/festival-2.4.recipe @@ -44,8 +44,8 @@ PROVIDES_devel=" devel:libFestival$secondaryArchSuffix = $portVersion " REQUIRES_devel=" - haiku${secondaryArchSuffix}_devel festival$secondaryArchSuffix == $portVersion base + haiku${secondaryArchSuffix}_devel speech_tools${secondaryArchSuffix}_devel >= 2.4 devel:libncurses$secondaryArchSuffix " @@ -58,8 +58,8 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:awk cmd:find - cmd:make cmd:gcc$secondaryArchSuffix + cmd:make cmd:mkdepend " diff --git a/app-accessibility/flite/flite-2.0.0.recipe b/app-accessibility/flite/flite-2.0.0.recipe index 6f53cc007..93e7e33f5 100644 --- a/app-accessibility/flite/flite-2.0.0.recipe +++ b/app-accessibility/flite/flite-2.0.0.recipe @@ -30,13 +30,13 @@ PROVIDES=" flite$secondaryArchSuffix = $portVersion flite_tools = $portVersion cmd:flite$secondaryArchSuffix = $portVersion - cmd:flite_time$secondaryArchSuffix = $portVersion cmd:flite_cmu_time_awb = $portVersion cmd:flite_cmu_us_awb = $portVersion cmd:flite_cmu_us_kal = $portVersion cmd:flite_cmu_us_kal16 = $portVersion cmd:flite_cmu_us_rms = $portVersion cmd:flite_cmu_us_slt = $portVersion + cmd:flite_time$secondaryArchSuffix = $portVersion lib:libflite$secondaryArchSuffix = $portVersion compat >= 2 lib:libflite_cmu_grapheme_lang$secondaryArchSuffix = $portVersion compat >= 2 lib:libflite_cmu_grapheme_lex$secondaryArchSuffix = $portVersion compat >= 2 @@ -72,8 +72,8 @@ PROVIDES_devel=" devel:libflite_usenglish$secondaryArchSuffix = $portVersion compat >= 2 " REQUIRES_devel=" - haiku${secondaryArchSuffix}_devel flite$secondaryArchSuffix == $portVersion base + haiku${secondaryArchSuffix}_devel " BUILD_REQUIRES=" @@ -81,8 +81,8 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" makefile_engine - cmd:awk cmd:autoconf + cmd:awk cmd:gcc$secondaryArchSuffix cmd:make " diff --git a/app-arch/ha/ha-0999.recipe b/app-arch/ha/ha-0999.recipe index 618b3b3b8..f1d18e136 100644 --- a/app-arch/ha/ha-0999.recipe +++ b/app-arch/ha/ha-0999.recipe @@ -1,11 +1,15 @@ SUMMARY="An archiver using the HSC compression method" DESCRIPTION="HA is an archiver that uses the HSC compression method." -LICENSE="GNU GPL v2" -COPYRIGHT="1993-1995 Harri Hirvola" HOMEPAGE="https://code.google.com/p/ak-various-projects/" +COPYRIGHT="1993-1995 Harri Hirvola" +LICENSE="GNU GPL v2" +REVISION="1" SOURCE_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ak-various-projects/ha0999.tgz" CHECKSUM_SHA256="641417d256f645c92fe1ee042b9c133b5173d33d540af99ed4932f7d79a30228" -REVISION="1" +# This is intentionally empty to make haikuporter happy with the +# way the source tarball is packaged +SOURCE_DIR="" + ARCHITECTURES="x86 ?x86_gcc2 ?x86_64" PROVIDES=" @@ -15,18 +19,15 @@ PROVIDES=" REQUIRES=" haiku " + BUILD_REQUIRES=" haiku_devel " BUILD_PREREQUIRES=" - cmd:make cmd:gcc + cmd:make " -# This is intentionally empty to make haikuporter happy with the -# way the source tarball is packaged -SOURCE_DIR="" - BUILD() { make -f makefile.nix diff --git a/app-benchmarks/iozone/iozone-3.326.recipe b/app-benchmarks/iozone/iozone-3.326.recipe index 0d819e6fb..66a827a24 100644 --- a/app-benchmarks/iozone/iozone-3.326.recipe +++ b/app-benchmarks/iozone/iozone-3.326.recipe @@ -7,11 +7,9 @@ operations: Read, write, re-read, re-write, read backwards, read strided, fread, fwrite, \ random read, pread, mmap, aio_read, aio_write" - # NOTE: The author retains the exclusive right to publish derivative works # based on this work, including, but not limited to, revised versions of # this work. - HOMEPAGE="http://www.iozone.org/" COPYRIGHT=" 1991-2001 William D. Norcott @@ -27,16 +25,17 @@ PATCHES="iozone-3.326.patchset" ARCHITECTURES="x86_gcc2 ?x86 x86_64" PROVIDES=" - cmd:iozone = $portVersion - cmd:fileop = $portVersion iozone = $portVersion + cmd:fileop = $portVersion + cmd:iozone = $portVersion " REQUIRES=" haiku " + BUILD_REQUIRES=" - cmd:make cmd:cc + cmd:make " BUILD_PREREQUIRES=" haiku_devel diff --git a/app-crypt/gpgme/gpgme-1.9.0.recipe b/app-crypt/gpgme/gpgme-1.9.0.recipe index 00262fbfa..a3b8dcf85 100644 --- a/app-crypt/gpgme/gpgme-1.9.0.recipe +++ b/app-crypt/gpgme/gpgme-1.9.0.recipe @@ -32,9 +32,9 @@ PROVIDES=" " REQUIRES=" haiku${secondaryArchSuffix} - lib:libgpg_error${secondaryArchSuffix} - lib:libglib_2.0$secondaryArchSuffix lib:libassuan${secondaryArchSuffix} + lib:libglib_2.0$secondaryArchSuffix + lib:libgpg_error${secondaryArchSuffix} " PROVIDES_devel=" @@ -48,9 +48,9 @@ REQUIRES_devel=" " BUILD_REQUIRES=" - devel:libgpg_error${secondaryArchSuffix} - devel:libglib_2.0$secondaryArchSuffix devel:libassuan${secondaryArchSuffix} + devel:libglib_2.0$secondaryArchSuffix + devel:libgpg_error${secondaryArchSuffix} " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/app-crypt/signify/signify-23.recipe b/app-crypt/signify/signify-23.recipe index 81b221df9..f1a5b22dd 100644 --- a/app-crypt/signify/signify-23.recipe +++ b/app-crypt/signify/signify-23.recipe @@ -33,8 +33,8 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - cmd:make cmd:cc$secondaryArchSuffix + cmd:make " PATCH() diff --git a/sci-libs/atlas/atlas-3.10.3.recipe b/sci-libs/atlas/atlas-3.10.3.recipe index f157dab0b..3bc75fbd2 100644 --- a/sci-libs/atlas/atlas-3.10.3.recipe +++ b/sci-libs/atlas/atlas-3.10.3.recipe @@ -8,15 +8,15 @@ REVISION="1" SOURCE_URI="https://downloads.sf.net/math-atlas/atlas$portVersion.tar.bz2" CHECKSUM_SHA256="2688eb733a6c5f78a18ef32144039adcd62fabce66f2eb51dd59dde806a6d2b7" SOURCE_DIR="ATLAS" -PATCHES="atlas-$portVersion.patchset" archlinuxCommit="286cdb8eafb3756cdb3d63f0f6c6084e55a31169" archlinuxRepoBaseUri="https://aur.archlinux.org/cgit/aur.git/plain/" -SOURCE_FILENAME_2="makefile.shared.mt" -SOURCE_FILENAME_3="makefile.shared.st" SOURCE_URI_2="$archlinuxRepoBaseUri/$SOURCE_FILENAME_2?h=atlas-lapack&id=$archlinuxCommit#noarchive" -SOURCE_URI_3="$archlinuxRepoBaseUri/$SOURCE_FILENAME_3?h=atlas-lapack&id=$archlinuxCommit#noarchive" CHECKSUM_SHA256_2="7627446a0d598b55bc8f2795f8ff2028f134928b9ca597b76bf8dd5622dbff69" +SOURCE_FILENAME_2="makefile.shared.mt" +SOURCE_URI_3="$archlinuxRepoBaseUri/$SOURCE_FILENAME_3?h=atlas-lapack&id=$archlinuxCommit#noarchive" CHECKSUM_SHA256_3="18cfd59a104451c03c3b91020786260cf2b2581642a9c8f8598ba1d26b9cb3bf" +SOURCE_FILENAME_3="makefile.shared.st" +PATCHES="atlas-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86" @@ -61,10 +61,10 @@ BUILD_PREREQUIRES=" binutils$secondaryArchSuffix cmd:awk cmd:bzip2 - cmd:gfortran$secondaryArchSuffix cmd:fgrep cmd:find cmd:g++$secondaryArchSuffix + cmd:gfortran$secondaryArchSuffix cmd:make cmd:sed " diff --git a/sci-libs/openblas/openblas-0.3.2.recipe b/sci-libs/openblas/openblas-0.3.2.recipe index a3fcfecf2..58e07001f 100644 --- a/sci-libs/openblas/openblas-0.3.2.recipe +++ b/sci-libs/openblas/openblas-0.3.2.recipe @@ -43,8 +43,8 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:awk - cmd:gfortran$secondaryArchSuffix cmd:g++$secondaryArchSuffix + cmd:gfortran$secondaryArchSuffix cmd:make cmd:perl cmd:pkg_config$secondaryArchSuffix diff --git a/sci-libs/suitesparse/suitesparse-5.3.0.recipe b/sci-libs/suitesparse/suitesparse-5.3.0.recipe index 8e70b20d9..39027c67e 100644 --- a/sci-libs/suitesparse/suitesparse-5.3.0.recipe +++ b/sci-libs/suitesparse/suitesparse-5.3.0.recipe @@ -76,7 +76,6 @@ REQUIRES=" PROVIDES_devel=" suitesparse${secondaryArchSuffix}_devel = $portVersion - devel:suitesparse$secondaryArchSuffix = $libSUITESPARSE_CONFIGVersion devel:libamd$secondaryArchSuffix = $libAMDVersion devel:libbtf$secondaryArchSuffix = $libBTFVersion devel:libcamd$secondaryArchSuffix = $libCAMDVersion @@ -93,6 +92,7 @@ PROVIDES_devel=" devel:libspqr$secondaryArchSuffix = $libSPQRVersion devel:libsuitesparseconfig$secondaryArchSuffix = $libSUITESPARSE_CONFIGVersion devel:libumfpack$secondaryArchSuffix = $libUMFPACKVersion + devel:suitesparse$secondaryArchSuffix = $libSUITESPARSE_CONFIGVersion " REQUIRES_devel=" haiku${secondaryArchSuffix}_devel @@ -104,11 +104,8 @@ REQUIRES_devel=" devel:libtbb$secondaryArchSuffix " -#==================== -# AMD SUMMARY_amd="$SUMMARY (AMD)" DESCRIPTION_amd="$DESCRIPTION (AMD)" - PROVIDES_amd=" suitesparse${secondaryArchSuffix}_amd = $libAMDVersion lib:libamd$secondaryArchSuffix = $libAMDVersionCompat @@ -118,11 +115,9 @@ REQUIRES_amd=" suitesparse$secondaryArchSuffix == $portVersion base lib:libexecinfo$secondaryArchSuffix " -#==================== -# BTF + SUMMARY_btf="$SUMMARY (BTF)" DESCRIPTION_btf="$DESCRIPTION (BTF)" - PROVIDES_btf=" suitesparse${secondaryArchSuffix}_btf = $libBTFVersion lib:libbtf$secondaryArchSuffix = $libBTFVersionCompat @@ -132,11 +127,9 @@ REQUIRES_btf=" suitesparse$secondaryArchSuffix == $portVersion base lib:libexecinfo$secondaryArchSuffix " -#==================== -# CAMD + SUMMARY_camd="$SUMMARY (CAMD)" DESCRIPTION_camd="$DESCRIPTION (CAMD)" - PROVIDES_camd=" suitesparse${secondaryArchSuffix}_camd = $libCAMDVersion lib:libcamd$secondaryArchSuffix = $libCAMDVersionCompat @@ -146,11 +139,9 @@ REQUIRES_camd=" suitesparse$secondaryArchSuffix == $portVersion base lib:libexecinfo$secondaryArchSuffix " -#==================== -# CCOLAMD + SUMMARY_ccolamd="$SUMMARY (CCOLAMD)" DESCRIPTION_ccolamd="$DESCRIPTION (CCOLAMD)" - PROVIDES_ccolamd=" suitesparse${secondaryArchSuffix}_colamd = $libCCOLAMDVersion lib:libccolamd$secondaryArchSuffix = $libCCOLAMDVersionCompat @@ -160,11 +151,9 @@ REQUIRES_ccolamd=" suitesparse$secondaryArchSuffix == $portVersion base lib:libexecinfo$secondaryArchSuffix " -#==================== -# CHOLMOD + SUMMARY_cholmod="$SUMMARY (CHOLMOD)" DESCRIPTION_cholmod="$DESCRIPTION (CHOLMOD)" - PROVIDES_cholmod=" suitesparse${secondaryArchSuffix}_cholmod = $libCHOLMODVersion lib:libcholmod$secondaryArchSuffix = $libCHOLMODVersionCompat @@ -182,11 +171,9 @@ REQUIRES_cholmod=" lib:libmetis$secondaryArchSuffix lib:libopenblas$secondaryArchSuffix " -#==================== -# COLAMD + SUMMARY_colamd="$SUMMARY (COLAMD)" DESCRIPTION_colamd="$DESCRIPTION (COLAMD)" - PROVIDES_colamd=" suitesparse${secondaryArchSuffix}_colamd = $libCOLAMDVersion lib:libcolamd$secondaryArchSuffix = $libCOLAMDVersionCompat @@ -196,11 +183,9 @@ REQUIRES_colamd=" suitesparse$secondaryArchSuffix == $portVersion base lib:libexecinfo$secondaryArchSuffix " -#==================== -# CXXSPARSE + SUMMARY_cxsparse="$SUMMARY (CXXSPARSE)" DESCRIPTION_cxsparse="$DESCRIPTION (CXXSPARSE)" - PROVIDES_cxsparse=" suitesparse${secondaryArchSuffix}_cxsparse = $libCXSPARSEVersion lib:libcxsparse$secondaryArchSuffix = $libCXSPARSEVersionCompat @@ -210,11 +195,9 @@ REQUIRES_cxsparse=" suitesparse$secondaryArchSuffix == $portVersion base lib:libexecinfo$secondaryArchSuffix " -#==================== -# GRAPHBLAS + SUMMARY_graphblas="$SUMMARY (GRAPHBLAS)" DESCRIPTION_graphblas="$DESCRIPTION (GRAPHBLAS)" - PROVIDES_graphblas=" suitesparse${secondaryArchSuffix}_graphblas = $libGRAPHBLASVersion lib:libgraphblas$secondaryArchSuffix = $libGRAPHBLASVersionCompat @@ -225,11 +208,9 @@ REQUIRES_graphblas=" lib:libexecinfo$secondaryArchSuffix lib:libgomp$secondaryArchSuffix " -#==================== -# KLU + SUMMARY_klu="$SUMMARY (KLU)" DESCRIPTION_klu="$DESCRIPTION (KLU)" - PROVIDES_klu=" suitesparse${secondaryArchSuffix}_klu = $libKLUVersion lib:libklu$secondaryArchSuffix = $libKLUVersionCompat @@ -242,11 +223,9 @@ REQUIRES_klu=" lib:libcolamd$secondaryArchSuffix lib:libexecinfo$secondaryArchSuffix " -#==================== -# LDL + SUMMARY_ldl="$SUMMARY (LDL)" DESCRIPTION_ldl="$DESCRIPTION (LDL)" - PROVIDES_ldl=" suitesparse${secondaryArchSuffix}_ldl = $libLDLVersion lib:libldl$secondaryArchSuffix = $libLDLVersionCompat @@ -256,11 +235,9 @@ REQUIRES_ldl=" suitesparse$secondaryArchSuffix == $portVersion base lib:libexecinfo$secondaryArchSuffix " -#==================== -# METIS + SUMMARY_metis="$SUMMARY (METIS)" DESCRIPTION_metis="$DESCRIPTION (METIS)" - PROVIDES_metis=" suitesparse${secondaryArchSuffix}_metis = $libMETISVersion lib:libmetis$secondaryArchSuffix = $libMETISVersionCompat @@ -270,11 +247,9 @@ REQUIRES_metis=" suitesparse$secondaryArchSuffix == $portVersion base lib:libexecinfo$secondaryArchSuffix " -#==================== -# MONGOOSE + SUMMARY_mongoose="$SUMMARY (MONGOOSE)" DESCRIPTION_mongoose="$DESCRIPTION (MONGOOSE)" - PROVIDES_mongoose=" suitesparse${secondaryArchSuffix}_mongoose = $libMONGOOSEVersion lib:libmongoose$secondaryArchSuffix = $libMONGOOSEVersionCompat @@ -284,11 +259,9 @@ REQUIRES_mongoose=" suitesparse$secondaryArchSuffix == $portVersion base lib:libexecinfo$secondaryArchSuffix " -#==================== -# RBIO + SUMMARY_rbio="$SUMMARY (RBIO)" DESCRIPTION_rbio="$DESCRIPTION (RBIO)" - PROVIDES_rbio=" suitesparse${secondaryArchSuffix}_rbio = $libRBIOVersion lib:librbio$secondaryArchSuffix = $libRBIOVersionCompat @@ -298,11 +271,9 @@ REQUIRES_rbio=" suitesparse$secondaryArchSuffix == $portVersion base lib:libexecinfo$secondaryArchSuffix " -#==================== -# SPQR + SUMMARY_spqr="$SUMMARY (SPQR)" DESCRIPTION_spqr="$DESCRIPTION (SPQR)" - PROVIDES_spqr=" suitesparse${secondaryArchSuffix}_spqr = $libSPQRVersion lib:libspqr$secondaryArchSuffix = $libSPQRVersionCompat @@ -311,18 +282,16 @@ REQUIRES_spqr=" haiku$secondaryArchSuffix suitesparse$secondaryArchSuffix == $portVersion base lib:libamd$secondaryArchSuffix - lib:libcolamd$secondaryArchSuffix lib:libcholmod$secondaryArchSuffix + lib:libcolamd$secondaryArchSuffix lib:libexecinfo$secondaryArchSuffix lib:liblapack$secondaryArchSuffix lib:libopenblas$secondaryArchSuffix lib:libtbb$secondaryArchSuffix " -#==================== -# UMFPACK + SUMMARY_umfpack="$SUMMARY (UMFPACK)" DESCRIPTION_umfpack="$DESCRIPTION (UMFPACK)" - PROVIDES_umfpack=" suitesparse${secondaryArchSuffix}_umfpack = $libUMFPACKVersion lib:libumfpack$secondaryArchSuffix = $libUMFPACKVersionCompat @@ -336,7 +305,6 @@ REQUIRES_umfpack=" lib:liblapack$secondaryArchSuffix lib:libopenblas$secondaryArchSuffix " -#==================== BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/sci-libs/superlu/superlu-5.2.1.recipe b/sci-libs/superlu/superlu-5.2.1.recipe index 7bafc9851..2f9d13274 100644 --- a/sci-libs/superlu/superlu-5.2.1.recipe +++ b/sci-libs/superlu/superlu-5.2.1.recipe @@ -22,8 +22,8 @@ LICENSE="BSD (3-clause)" # TODO: see "External software" in License.txt REVISION="2" SOURCE_URI="http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_5.2.1.tar.gz" -SOURCE_DIR="SuperLU_$portVersion" CHECKSUM_SHA256="28fb66d6107ee66248d5cf508c79de03d0621852a0ddeba7301801d3d859f463" +SOURCE_DIR="SuperLU_$portVersion" PATCHES="superlu-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -50,9 +50,9 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:cmake - cmd:make - #cmd:gfortran cmd:g++$secondaryArchSuffix + #cmd:gfortran + cmd:make " BUILD() diff --git a/sys-apps/coreutils/coreutils-8.22.recipe b/sys-apps/coreutils/coreutils-8.22.recipe index 078ac2f3f..03f50373b 100644 --- a/sys-apps/coreutils/coreutils-8.22.recipe +++ b/sys-apps/coreutils/coreutils-8.22.recipe @@ -19,11 +19,9 @@ uptime users vdir wc who whoami yes HOMEPAGE="http://www.gnu.org/software/coreutils" COPYRIGHT="1994-2013 Free Software Foundation, Inc." LICENSE="GNU GPL v3" +REVISION="2" SOURCE_URI="http://ftp.gnu.org/gnu/coreutils/coreutils-$portVersion.tar.xz" CHECKSUM_SHA256="5b3e94998152c017e6c75d56b9b994188eb71bf46d4038a642cb9141f6ff1212" -REVISION="2" -ARCHITECTURES="x86_gcc2 x86 x86_64 arm" - PATCHES=" coreutils-$portVersion.patchset import-Haiku-changes.patch @@ -34,6 +32,8 @@ if [ $effectiveTargetArchitecture = x86_gcc2 ]; then " fi +ARCHITECTURES="x86_gcc2 x86 x86_64 arm" + PROVIDES=" coreutils = $portVersion compat >= 8 cmd:[ = $portVersion compat >= 8 @@ -134,21 +134,20 @@ PROVIDES=" cmd:whoami = $portVersion compat >= 8 cmd:yes = $portVersion compat >= 8 " - REQUIRES=" haiku " BUILD_PREREQUIRES=" haiku_devel + cmd:awk cmd:gcc cmd:grep + cmd:help2man cmd:ld cmd:make - cmd:awk - cmd:sed - cmd:help2man cmd:makeinfo + cmd:sed " defineDebugInfoPackage coreutils \ @@ -248,7 +247,7 @@ defineDebugInfoPackage coreutils \ $binDir/vdir \ $binDir/wc \ $binDir/whoami \ - $binDir/yes \ + $binDir/yes PATCH() { diff --git a/sys-apps/coreutils/coreutils-8.23.recipe b/sys-apps/coreutils/coreutils-8.23.recipe index 5bd993bb6..6fb52bc5d 100644 --- a/sys-apps/coreutils/coreutils-8.23.recipe +++ b/sys-apps/coreutils/coreutils-8.23.recipe @@ -19,11 +19,9 @@ uptime users vdir wc who whoami yes HOMEPAGE="http://www.gnu.org/software/coreutils" COPYRIGHT="1994-2013 Free Software Foundation, Inc." LICENSE="GNU GPL v3" +REVISION="1" SOURCE_URI="http://ftp.gnu.org/gnu/coreutils/coreutils-$portVersion.tar.xz" CHECKSUM_SHA256="ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d" -REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64 arm" - PATCHES=" coreutils-$portVersion.patchset import-Haiku-changes.patch @@ -34,6 +32,8 @@ if [ $effectiveTargetArchitecture = x86_gcc2 ]; then " fi +ARCHITECTURES="x86_gcc2 x86 x86_64 arm" + PROVIDES=" coreutils = $portVersion compat >= 8 cmd:[ = $portVersion compat >= 8 @@ -134,21 +134,20 @@ PROVIDES=" cmd:whoami = $portVersion compat >= 8 cmd:yes = $portVersion compat >= 8 " - REQUIRES=" haiku " BUILD_PREREQUIRES=" haiku_devel + cmd:awk cmd:gcc cmd:grep + cmd:help2man cmd:ld cmd:make - cmd:awk - cmd:sed - cmd:help2man cmd:makeinfo + cmd:sed " defineDebugInfoPackage coreutils \ @@ -248,7 +247,7 @@ defineDebugInfoPackage coreutils \ $binDir/vdir \ $binDir/wc \ $binDir/whoami \ - $binDir/yes \ + $binDir/yes PATCH() { diff --git a/sys-apps/coreutils/coreutils-8.24.recipe b/sys-apps/coreutils/coreutils-8.24.recipe index e07505917..b26c75071 100644 --- a/sys-apps/coreutils/coreutils-8.24.recipe +++ b/sys-apps/coreutils/coreutils-8.24.recipe @@ -19,11 +19,9 @@ uptime users vdir wc who whoami yes HOMEPAGE="http://www.gnu.org/software/coreutils" COPYRIGHT="1994-2013 Free Software Foundation, Inc." LICENSE="GNU GPL v3" +REVISION="1" SOURCE_URI="http://ftp.gnu.org/gnu/coreutils/coreutils-$portVersion.tar.xz" CHECKSUM_SHA256="a2d75286a4b9ef3a13039c2da3868a61be4ee9f17d8ae380a35a97e506972170" -REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64 arm" - PATCHES=" coreutils-$portVersion.patchset " @@ -33,6 +31,8 @@ if [ $effectiveTargetArchitecture = x86_gcc2 ]; then " fi +ARCHITECTURES="x86_gcc2 x86 x86_64 arm" + PROVIDES=" coreutils = $portVersion compat >= 8 cmd:[ = $portVersion compat >= 8 @@ -133,21 +133,20 @@ PROVIDES=" cmd:whoami = $portVersion compat >= 8 cmd:yes = $portVersion compat >= 8 " - REQUIRES=" haiku " BUILD_PREREQUIRES=" haiku_devel + cmd:awk cmd:gcc cmd:grep + cmd:help2man cmd:ld cmd:make - cmd:awk - cmd:sed - cmd:help2man cmd:makeinfo + cmd:sed " defineDebugInfoPackage coreutils \ @@ -247,7 +246,7 @@ defineDebugInfoPackage coreutils \ $binDir/vdir \ $binDir/wc \ $binDir/whoami \ - $binDir/yes \ + $binDir/yes PATCH() { diff --git a/sys-apps/coreutils/coreutils-8.29.recipe b/sys-apps/coreutils/coreutils-8.29.recipe index bc436a531..a83106ae6 100644 --- a/sys-apps/coreutils/coreutils-8.29.recipe +++ b/sys-apps/coreutils/coreutils-8.29.recipe @@ -26,7 +26,6 @@ PATCHES="coreutils-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 ?x86 x86_64 ?arm" binVersionCompat="$portVersion compat >= ${portVersion%%.*}" - PROVIDES=" coreutils = $binVersionCompat cmd:[ = $binVersionCompat @@ -144,6 +143,7 @@ BUILD_PREREQUIRES=" cmd:makeinfo cmd:sed " + defineDebugInfoPackage coreutils \ $binDir/[ \ $binDir/b2sum \ @@ -243,7 +243,7 @@ defineDebugInfoPackage coreutils \ $binDir/vdir \ $binDir/wc \ $binDir/whoami \ - $binDir/yes \ + $binDir/yes PATCH() { diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index 6ebf88729..b7c596ff5 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -4,18 +4,15 @@ The grep command searches one or more input files for lines containing a match \ to a specified pattern. By default, grep prints the matching lines. " HOMEPAGE="http://www.gnu.org/software/grep/" -LICENSE="GNU GPL v3" COPYRIGHT="1992-2012 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" +REVISION="5" SOURCE_URI="http://ports-space.haiku-files.org/source/grep-2.14.tar.bz2" CHECKSUM_SHA256="0aa728dbb92eeec776f9551fcee1931717984a91cfd8c3df3dfb40709243ae6f" -# XZ file format: -#SOURCE_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz" -#CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab" -REVISION="5" -ARCHITECTURES="x86_gcc2 x86 x86_64 arm" - PATCHES="grep-2.14-gcc2.patch" +ARCHITECTURES="x86_gcc2 x86 x86_64 arm" + PROVIDES=" grep = $portVersion compat >= 2 cmd:egrep = $portVersion compat >= 2 @@ -27,6 +24,7 @@ REQUIRES=" lib:libiconv lib:libintl " + BUILD_REQUIRES=" devel:libiconv devel:libintl @@ -48,7 +46,6 @@ defineDebugInfoPackage grep \ $binDir/fgrep \ $binDir/grep - BUILD() { libtoolize --force --copy --install diff --git a/sys-libs/readline/readline-7.0.3.recipe b/sys-libs/readline/readline-7.0.3.recipe index 8c7946aa2..e1be4f481 100644 --- a/sys-libs/readline/readline-7.0.3.recipe +++ b/sys-libs/readline/readline-7.0.3.recipe @@ -15,13 +15,13 @@ LICENSE="GNU GPL v3" REVISION="2" SOURCE_URI="ftp://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz" CHECKSUM_SHA256="750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334" +SOURCE_DIR="readline-7.0" for i in {001..003}; do eval "SOURCE_URI_$i=\"https://ftp.gnu.org/gnu/readline/readline-7.0-patches/readline70-$i#noarchive\"" done CHECKSUM_SHA256_001="9ac1b3ac2ec7b1bf0709af047f2d7d2a34ccde353684e57c6b47ebca77d7a376" CHECKSUM_SHA256_002="8747c92c35d5db32eae99af66f17b384abaca961653e185677f9c9a571ed2d58" CHECKSUM_SHA256_003="9e43aa93378c7e9f7001d8174b1beb948deefa6799b6f581673f465b7d9d4780" -SOURCE_DIR="readline-7.0" PATCHES="readline-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/sys-libs/readline/readline6-6.3.8.recipe b/sys-libs/readline/readline6-6.3.8.recipe index 71eb13d7e..22dfa71e0 100644 --- a/sys-libs/readline/readline6-6.3.8.recipe +++ b/sys-libs/readline/readline6-6.3.8.recipe @@ -14,6 +14,7 @@ LICENSE="GNU GPL v3" REVISION="2" SOURCE_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz" CHECKSUM_SHA256="56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" +SOURCE_DIR="readline-6.3" for i in {001..008}; do eval "SOURCE_URI_$i=\"https://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-$i#noarchive\"" done @@ -25,7 +26,6 @@ CHECKSUM_SHA256_005="877788f9228d1a9907a4bcfe3d6dd0439c08d728949458b41208d9bf906 CHECKSUM_SHA256_006="5c237ab3c6c97c23cf52b2a118adc265b7fb411b57c93a5f7c221d50fafbe556" CHECKSUM_SHA256_007="4d79b5a2adec3c2e8114cbd3d63c1771f7c6cf64035368624903d257014f5bea" CHECKSUM_SHA256_008="3bc093cf526ceac23eb80256b0ec87fa1735540d659742107b6284d635c43787" -SOURCE_DIR="readline-6.3" PATCHES="readline-6.3.patch" ARCHITECTURES="x86_gcc2 x86 ?x86_64" @@ -67,6 +67,10 @@ BUILD_PREREQUIRES=" cmd:patch " +defineDebugInfoPackage readline6$secondaryArchSuffix \ + $libDir/libhistory.so.6.3 \ + $libDir/libreadline.so.6.3 + PATCH() { for i in {001..008}; do @@ -76,10 +80,6 @@ PATCH() done } -defineDebugInfoPackage readline6$secondaryArchSuffix \ - $libDir/libhistory.so.6.3 \ - $libDir/libreadline.so.6.3 - BUILD() { libtoolize --force --copy --install diff --git a/www-client/bezilla/bezilla-2.0.0.22.recipe b/www-client/bezilla/bezilla-2.0.0.22.recipe index b0e9a3b29..2a8654a14 100644 --- a/www-client/bezilla/bezilla-2.0.0.22.recipe +++ b/www-client/bezilla/bezilla-2.0.0.22.recipe @@ -8,16 +8,16 @@ LICENSE="MPL v1.1" REVISION="7" srcGitRev="6862542e81d0407f8fbdb8cf96a48fdc3156e902" SOURCE_URI="https://github.com/mmadia/bezilla/archive/$srcGitRev.zip" -SOURCE_DIR="bezilla-$srcGitRev" CHECKSUM_SHA256="61dd1e12fc0a183d2ded7cbc16adbe1fb7bee565ce7d12acc48bfbe5954f80ce" +SOURCE_DIR="bezilla-$srcGitRev" PATCHES="bezilla-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86_64" PROVIDES=" bezilla= $portVersion - cmd:firefox= $portVersion app:BeZilla= $portVersion + cmd:firefox= $portVersion " REQUIRES=" haiku @@ -43,29 +43,27 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku_devel - devel:libIDL_2 devel:libglib_2.0 + devel:libIDL_2 devel:libpng16 " - if [ $effectiveTargetArchitecture == x86_64 ]; then BUILD_REQUIRES+=" devel:libnspr4 " fi - BUILD_PREREQUIRES=" + cmd:autoconf_2.13 + cmd:gawk cmd:gcc + cmd:libtoolize cmd:m4 cmd:make - cmd:gawk cmd:perl - cmd:xargs - cmd:tar - cmd:zip - cmd:autoconf_2.13 - cmd:libtoolize cmd:pkg_config + cmd:tar + cmd:xargs + cmd:zip " BUILD() diff --git a/www-client/netsurf/netsurf-3.7.recipe b/www-client/netsurf/netsurf-3.7.recipe index bd13e70b6..634938e6e 100644 --- a/www-client/netsurf/netsurf-3.7.recipe +++ b/www-client/netsurf/netsurf-3.7.recipe @@ -26,39 +26,38 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libexpat$secondaryArchSuffix + lib:libhubbub$secondaryArchSuffix lib:libiconv$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix lib:libnsbmp$secondaryArchSuffix lib:libnsgif$secondaryArchSuffix lib:libpng16$secondaryArchSuffix - lib:libjpeg$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libutf8proc$secondaryArchSuffix - lib:libz$secondaryArchSuffix - lib:libhubbub$secondaryArchSuffix lib:libwapcaplet$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libcurl$secondaryArchSuffix devel:libcheck$secondaryArchSuffix + devel:libcss$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libdom$secondaryArchSuffix devel:libexpat$secondaryArchSuffix + devel:libhubbub$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix - devel:libpng$secondaryArchSuffix - devel:libssl$secondaryArchSuffix - devel:libz$secondaryArchSuffix - - devel:libcss$secondaryArchSuffix - devel:libdom$secondaryArchSuffix - devel:libhubbub$secondaryArchSuffix devel:libnsbmp$secondaryArchSuffix devel:libnsgif$secondaryArchSuffix devel:libnsutils$secondaryArchSuffix devel:libparserutils$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libssl$secondaryArchSuffix devel:libsvgtiny$secondaryArchSuffix devel:libutf8proc$secondaryArchSuffix devel:libwapcaplet$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" html_parser >= 3.70 @@ -68,9 +67,8 @@ BUILD_PREREQUIRES=" cmd:git cmd:gperf cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:nsgenbind + cmd:pkg_config$secondaryArchSuffix " BUILD() diff --git a/www-client/qutebrowser/qutebrowser-1.2.0.recipe b/www-client/qutebrowser/qutebrowser-1.2.0.recipe index 65cd2bc96..0711bab80 100644 --- a/www-client/qutebrowser/qutebrowser-1.2.0.recipe +++ b/www-client/qutebrowser/qutebrowser-1.2.0.recipe @@ -18,11 +18,8 @@ PROVIDES=" qutebrowser$secondaryArchSuffix = $portVersion app:QuteBrowser$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - cmd:python$PYTHON_VERSION attrs_python3 jinja_python3 pygments_python3 @@ -30,18 +27,19 @@ REQUIRES=" pyqt_python3 pyyaml_python3 setuptools_python3 + cmd:python$PYTHON_VERSION + lib:libQt5Core$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel attrs_python3 jinja_python3 - setuptools_python3 pygments_python3 pypeg2_python3 pyyaml_python3 + setuptools_python3 " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:python$PYTHON_VERSION diff --git a/www-servers/nginx/nginx-1.7.4_hg.recipe b/www-servers/nginx/nginx-1.7.4_hg.recipe index 921925638..35dcbee24 100644 --- a/www-servers/nginx/nginx-1.7.4_hg.recipe +++ b/www-servers/nginx/nginx-1.7.4_hg.recipe @@ -21,7 +21,6 @@ GLOBAL_WRITABLE_FILES=" #FIXME: on ./auto/configure: #grep: /etc/group: No such file or directory - PROVIDES=" nginx$secondaryArchSuffix = $portVersion cmd:nginx$secondaryArchSuffix = $portVersion @@ -41,12 +40,12 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:awk + cmd:find cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:make cmd:ranlib cmd:sed - cmd:find " BUILD() diff --git a/x11-libs/libxpm/libxpm-3.5.12.recipe b/x11-libs/libxpm/libxpm-3.5.12.recipe index c71a00de9..0c4226542 100644 --- a/x11-libs/libxpm/libxpm-3.5.12.recipe +++ b/x11-libs/libxpm/libxpm-3.5.12.recipe @@ -24,11 +24,10 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" libxpm$secondaryArchSuffix = $portVersion - lib:libXpm$secondaryArchSuffix = $libVersionCompat cmd:cxpm$secondaryArchSuffix cmd:sxpm$secondaryArchSuffix + lib:libXpm$secondaryArchSuffix = $libVersionCompat " - REQUIRES=" haiku$secondaryArchSuffix lib:libintl$secondaryArchSuffix