From a1d2a10ce82c1ff027206f594821e7332b7b71f1 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Tue, 9 Dec 2014 20:24:01 +0100 Subject: [PATCH 01/28] becheckers: Fix the build --- haiku-games/becheckers/becheckers-1.0.1.recipe | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/haiku-games/becheckers/becheckers-1.0.1.recipe b/haiku-games/becheckers/becheckers-1.0.1.recipe index 525258e52..b1479ef31 100644 --- a/haiku-games/becheckers/becheckers-1.0.1.recipe +++ b/haiku-games/becheckers/becheckers-1.0.1.recipe @@ -4,10 +4,10 @@ BeCheckers is a simple checkers game for two players. It follows almost all \ American Checker Federation (ACF) rules. " HOMEPAGE="https://github.com/HaikuArchives/BeCheckers" -SRC_URI="git://github.com/HaikuArchives/BeCheckers.git#930d3e37339c4570d58e59c3300dba7d69dd4439" +SRC_URI="git://github.com/HaikuArchives/BeCheckers.git#d4fbfc69656ba5861184d37f7932b9a53ff28373" LICENSE="MIT" COPYRIGHT="2000 Jeremy J. Gibbons" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" PROVIDES=" @@ -28,7 +28,6 @@ BUILD_PREREQUIRES=" BUILD() { - cd trunk g++ -o BeCheckers -lbe \ BeCheckers.cpp BeCheckersWindow.cpp \ Checker.cpp CheckerBoard.cpp @@ -37,6 +36,6 @@ BUILD() INSTALL() { mkdir -p $appsDir - cp trunk/BeCheckers $appsDir + cp BeCheckers $appsDir addAppDeskbarSymlink $appsDir/BeCheckers } From 58e1cef72f87f8ad52ce64aa7eb0685717f82330 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 9 Dec 2014 17:47:21 -0500 Subject: [PATCH 02/28] HaikuTwitter: update to latest version. It now builds, but due to not having OAuth tokens it doesn't work. --- haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe b/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe index f4f974d05..9fb01b977 100644 --- a/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe +++ b/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe @@ -4,10 +4,10 @@ based off the open-source TwitCurl library." COPYRIGHT="2012 Martin Pedersen" LICENSE="MIT" HOMEPAGE="https://github.com/HaikuArchives/HaikuTwitter" -SRC_URI="https://github.com/HaikuArchives/HaikuTwitter/archive/a9241f8de96e8427ddc12c947dadcfc6350c1124.tar.gz" -CHECKSUM_SHA256="2b5f1906cea0d863ac3dca5a2d064cfeb28f99c2880eaf1b5e69e9197ac351a1" -SOURCE_DIR="HaikuTwitter-a9241f8de96e8427ddc12c947dadcfc6350c1124" -REVISION="1" +SRC_URI="https://github.com/HaikuArchives/HaikuTwitter/archive/918dd954b6db3c5ed476b3a4826910992f3b4566.tar.gz" +CHECKSUM_SHA256="bc330cb15c8e10362306eef7d85228f5dee08db667d16a15c0a5245f6013b1e1" +SOURCE_DIR="HaikuTwitter-918dd954b6db3c5ed476b3a4826910992f3b4566" +REVISION="2" ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then From 6a368c914595f59e2519abad16d0838e357b1379 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Wed, 10 Dec 2014 17:58:09 +0200 Subject: [PATCH 03/28] Move exiv2 to media-gfx --- {dev-libs => media-gfx}/exiv2/exiv2-0.24.recipe | 0 {dev-libs => media-gfx}/exiv2/patches/exiv2-0.24.patch | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {dev-libs => media-gfx}/exiv2/exiv2-0.24.recipe (100%) rename {dev-libs => media-gfx}/exiv2/patches/exiv2-0.24.patch (100%) diff --git a/dev-libs/exiv2/exiv2-0.24.recipe b/media-gfx/exiv2/exiv2-0.24.recipe similarity index 100% rename from dev-libs/exiv2/exiv2-0.24.recipe rename to media-gfx/exiv2/exiv2-0.24.recipe diff --git a/dev-libs/exiv2/patches/exiv2-0.24.patch b/media-gfx/exiv2/patches/exiv2-0.24.patch similarity index 100% rename from dev-libs/exiv2/patches/exiv2-0.24.patch rename to media-gfx/exiv2/patches/exiv2-0.24.patch From aba2561915cf23e741ad5ea6682a650bbc5b118d Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 10 Dec 2014 22:09:16 -0500 Subject: [PATCH 04/28] libburndevice: fix recipe & update to v1.0. --- ...ce-git.recipe => libburndevice-1.0.recipe} | 96 ++++++++----------- 1 file changed, 41 insertions(+), 55 deletions(-) rename haiku-libs/libburndevice/{libburndevice-git.recipe => libburndevice-1.0.recipe} (58%) diff --git a/haiku-libs/libburndevice/libburndevice-git.recipe b/haiku-libs/libburndevice/libburndevice-1.0.recipe similarity index 58% rename from haiku-libs/libburndevice/libburndevice-git.recipe rename to haiku-libs/libburndevice/libburndevice-1.0.recipe index f31c0db88..f13628c13 100644 --- a/haiku-libs/libburndevice/libburndevice-git.recipe +++ b/haiku-libs/libburndevice/libburndevice-1.0.recipe @@ -1,71 +1,24 @@ SUMMARY="A disc burning library for Haiku" -DESCRIPTION=" -LibBurnDevice is a disc burning library for Haiku -" - +DESCRIPTION="LibBurnDevice is a disc burning library for Haiku." HOMEPAGE="https://github.com/HaikuArchives/Lava" -SRC_URI="git+https://github.com/HaikuArchives/Lava.git" - -REVISION="1" - +SRC_URI="https://github.com/HaikuArchives/Lava/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="0c1899141eac1fca086a554d56527f38baa70ae7bff0a6db37cd180084c01c71" +SOURCE_DIR="Lava-$portVersion" LICENSE="Public Domain" -COPYRIGHT=" - 2007, 2010 Team MAUI - 2003-2006 Haiku Inc. - " - +COPYRIGHT="2007, 2010 Team MAUI + 2003-2006 Haiku Inc." +REVISION="1" ARCHITECTURES="x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTRUES="x86_gcc2 x86" PROVIDES=" - libburndevice = $portVersion + libburndevice$secondaryArchSuffix = $portVersion lib:libburndevice$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion cmd:cdrtools " -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - " -BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:mkdepend - makefile_engine" - -BUILD() -{ - exit 0 - cd LibBurnDevice - make TYPE=SHARED OBJ_DIR=objects-shared \ - BUILDHOME=$(finddir B_SYSTEM_DEVELOP_DIRECTORY) - - make TYPE=STATIC OBJ_DIR=objects-static \ - BUILDHOME=$(finddir B_SYSTEM_DEVELOP_DIRECTORY) -} - -INSTALL() -{ - mkdir -p $libDir $developLibDir $includeDir/burndevice - - cd LibBurnDevice - - cp objects-static/libburndevice.a $developLibDir - cp objects-shared/libburndevice $libDir/libburndevice.so - - cp BurnDevice.h $includeDir/burndevice - - symlinkRelative -s $libDir/libburndevice.so $developLibDir - - packageEntries devel \ - $developLibDir \ - $includeDir - -} - -# -------- devel package -------------------------------------------------- PROVIDES_devel=" libburndevice${secondaryArchSuffix}_devel = $portVersion @@ -74,3 +27,36 @@ PROVIDES_devel=" REQUIRES_devel=" libburndevice$secondaryArchSuffix == $portVersion base " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:mkdepend + " + +BUILD() +{ + cd LibBurnDevice + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + cd LibBurnDevice + mkdir -p $libDir $developLibDir $includeDir/burndevice + + cp objects/libburndevice.so $libDir/libburndevice.so + cp BurnDevice.h $includeDir/burndevice + + prepareInstalledDevelLibs \ + libburndevice + + packageEntries devel \ + $developLibDir \ + $includeDir +} From 58c0e562a388e5517fb120878dd4f7687931fcbd Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 10 Dec 2014 22:24:01 -0500 Subject: [PATCH 05/28] BurnItNow: recipe for 0.1.0. --- haiku-apps/burnitnow/burnitnow-0.1.0.recipe | 58 +++++++++++++++++++++ haiku-apps/burnitnow/burnitnow-trunk.recipe | 49 ----------------- 2 files changed, 58 insertions(+), 49 deletions(-) create mode 100644 haiku-apps/burnitnow/burnitnow-0.1.0.recipe delete mode 100644 haiku-apps/burnitnow/burnitnow-trunk.recipe diff --git a/haiku-apps/burnitnow/burnitnow-0.1.0.recipe b/haiku-apps/burnitnow/burnitnow-0.1.0.recipe new file mode 100644 index 000000000..ace579a61 --- /dev/null +++ b/haiku-apps/burnitnow/burnitnow-0.1.0.recipe @@ -0,0 +1,58 @@ +SUMMARY="A GUI frontend for burning CDs" +DESCRIPTION="BurnItNow is a GUI frontend for CDRecord and mkisofs. \ +It supports Audio CD, MixCD (on the fly), Data CD (on the fly, multisession), \ +BootableCD and burning an BFS image." +HOMEPAGE="https://github.com/HaikuArchives/BurnItNow" +SRC_URI="https://github.com/HaikuArchives/BurnItNow/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="7db12d261ddebcbfe82e2ab5e7aed4227caef476f01488a1ccec4f58287833d2" +SOURCE_DIR="BurnItNow-$portVersion" +REVISION="1" +COPYRIGHT="2010-2014 BurnItNow Team" +LICENSE="MIT" + +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + burnitnow$secondaryArchSuffix = $portVersion + app:BurnItNow = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:cdrecord + cmd:mkisofs + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:mkdepend + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + cd Source + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + cd Source + mkdir -p $appsDir + cp objects/BurnItNow $appsDir + addAppDeskbarSymlink $appsDir/BurnItNow +} diff --git a/haiku-apps/burnitnow/burnitnow-trunk.recipe b/haiku-apps/burnitnow/burnitnow-trunk.recipe deleted file mode 100644 index a948a91ed..000000000 --- a/haiku-apps/burnitnow/burnitnow-trunk.recipe +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY="A utility for burning CD" -DESCRIPTION=" -BurnItNow is a CD burning utility application for Haiku. -" -HOMEPAGE="https://github.com/HaikuArchives/BurnItNow" -SRC_URI="git+https://github.com/HaikuArchives/BurnItNow.git#a790db9a87" -REVISION="1" -COPYRIGHT=" - 2010-2013 BurnItNow Team - " -LICENSE="MIT" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - burnitnow = $portVersion - app:BurnItNow = $portVersion - " - -REQUIRES=" - haiku >= $haikuVersion - cmd:cdrecord - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - " - -BUILD_PREREQUIRES=" - cmd:cmake - cmd:make - cmd:gcc$secondaryArchSuffix - " - -#SOURCE_DIR="$portName/burnitnow2" - -BUILD() -{ - cmake . - make -} - -INSTALL() -{ - mkdir -p $appsDir/BurnItNow - cp BurnItNow $appsDir/BurnItNow - addAppDeskbarSymlink $appsDir/BurnItNow/BurnItNow -} From 0d5ca0970fbb40a09c1facd2ddcea3ff3acc8fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 11 Dec 2014 16:12:40 +0100 Subject: [PATCH 06/28] virtualbox_guest_additions: add TODO about post_install We want VBoxTray to be installed in Deskbar automatically --- .../virtualbox_guest_additions-4.3.53_svn.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe b/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe index b95af61af..cc75347cf 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe +++ b/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe @@ -26,6 +26,8 @@ PROVIDES=" cmd:VBoxTray$secondaryArchSuffix = $portVersion " +# TODO: POST_INSTALL_SCRIPTS="" + REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion openssl$secondaryArchSuffix >= 1.0.0 From da5f30bcf1eb99cd32c249f7cac418518b347235 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Tue, 9 Dec 2014 17:43:55 +0100 Subject: [PATCH 07/28] Add recipe for gcal --- app-misc/gcal/gcal-3.6.3.recipe | 56 +++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 app-misc/gcal/gcal-3.6.3.recipe diff --git a/app-misc/gcal/gcal-3.6.3.recipe b/app-misc/gcal/gcal-3.6.3.recipe new file mode 100644 index 000000000..326acaa90 --- /dev/null +++ b/app-misc/gcal/gcal-3.6.3.recipe @@ -0,0 +1,56 @@ +SUMMARY="Program for calculating and printing calendars" +DESCRIPTION=" +Gcal is a program for calculating and printing calendars. Gcal displays hybrid \ +and proleptic Julian and Gregorian calendar sheets, respectively for one month, \ +three months, or a whole year. It also displays eternal holiday lists for many \ +countries around the globe, and features a very powerful creation of fixed date \ +lists that can be used for reminding purposes. +" +HOMEPAGE="http://www.gnu.org/software/gcal/" +SRC_URI="http://ftp.gnu.org/gnu/gcal/gcal-3.6.3.tar.gz" +CHECKSUM_SHA256="9d9be60841150a5c60e27fc5e0f2c06c06635ac44c18698d6a48ef7bb47ba86d" +LICENSE="GNU GPL v3" +REVISION="1" +COPYRIGHT="1994-2013 Free Software Foundation Inc." + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + gcal = $portVersion + cmd:gcal + cmd:gcal2txt + cmd:tcal + cmd:txt2gcal + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:grep + cmd:make + cmd:sed + cmd:gcc + cmd:awk + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check +} From 59dad832147739761e1a30adb401d2aa0ac88ada Mon Sep 17 00:00:00 2001 From: Jim Date: Thu, 11 Dec 2014 08:53:35 -0800 Subject: [PATCH 08/28] Update yab_ide to use yab-compress.c bversion. --- haiku-apps/yab_ide/yab_ide-2.2.3.recipe | 85 +++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 haiku-apps/yab_ide/yab_ide-2.2.3.recipe diff --git a/haiku-apps/yab_ide/yab_ide-2.2.3.recipe b/haiku-apps/yab_ide/yab_ide-2.2.3.recipe new file mode 100644 index 000000000..da89bf515 --- /dev/null +++ b/haiku-apps/yab_ide/yab_ide-2.2.3.recipe @@ -0,0 +1,85 @@ +SUMMARY="integrated development environment for yab." +DESCRIPTION=" +Yab allows fast prototyping with simple and clean code. yab contains a large \ +number of BeAPI specific commands for GUI creation and much, much more. + +yab wouldn't be complete without the yab-IDE, a powerful development \ +environment, which of course is programmed in yab itself. +" +HOMEPAGE="http://sourceforge.net/projects/yab-interpreter" +SRC_URI="https://github.com/HaikuArchives/Yab/archive/v1.7.3.tar.gz" +CHECKSUM_SIZE="1176449" +CHECKSUM_RMD160="f62fa02a585d9f6c5ee3eb9b781a06083352bd6f" +CHECKSUM_SHA512="a74edcf9718ee9a13a16ab0a99fbbed3cceebf1ea4bfac714b098d51531de7fdd0738e126b9a2e5d2f8d84fd0c153d9b7702e806cc91c6a97537dda11411e915" +SOURCE_DIR="Yab-1.7.3" + +REVISION="1" + +LICENSE="Artistic" +COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic) + 2006-2009 Jan Bungeroth (yab improvements) + 2013 Jim Saxton (yab improvements)" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + yab_ide$secondaryArchSuffix = $portVersion + app:yab_IDE = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libncurses$secondaryArchSuffix + yab$secondaryArchSuffix >= 1.7.02 + devel:libncurses$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libncurses$secondaryArchSuffix + devel:libz$secondaryArchSuffix +" + +BUILD_PREREQUIRES=" + cmd:bison + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:mkdepend + cmd:perl + makefile_engine + " + +BUILD() +{ + cd src + make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + unzip -o App_YAB.zip + copyattr App_YAB yab + cd ../yab-IDE/BuildFactory + gcc -o yab-compress yab-compress.c -lz +} + +INSTALL() +{ + mkdir -p $binDir + mkdir -p tmp + mkdir -p tmp/buildfactory + + cp -r src/* tmp/buildfactory + cp -r yab-IDE/BuildFactory/* tmp/buildfactory/ + unzip -o tmp/buildfactory/parts/yabstuff.zip -d tmp/buildfactory/parts + cp yab-IDE/src/yab-IDE.yab tmp/buildfactory/ + + pushd tmp/buildfactory + BuildFactory.yab yab-IDE yab-IDE.yab application/x-vnd.yab-IDE + popd + + mkdir -p $appsDir + cp -r yab-IDE/ $appsDir/ + cp tmp/buildfactory/yab-IDE $appsDir/yab-IDE/ + cp yab-IDE/src/yab-IDE.yab $appsDir/yab-IDE/src/ + + addAppDeskbarSymlink $appsDir/yab-IDE/yab-IDE "Yab IDE" +} From 7d2fc2d2686c6ac4a40543511346aab3611fe435 Mon Sep 17 00:00:00 2001 From: Jim Date: Thu, 11 Dec 2014 09:32:15 -0800 Subject: [PATCH 09/28] Update yab recipe to use tar.gz archive. --- dev-lang/yab/yab-1.7.02.recipe | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-lang/yab/yab-1.7.02.recipe b/dev-lang/yab/yab-1.7.02.recipe index cd45c0cbc..76692b48f 100644 --- a/dev-lang/yab/yab-1.7.02.recipe +++ b/dev-lang/yab/yab-1.7.02.recipe @@ -4,10 +4,14 @@ yab is an extended version of yabasic, a BASIC programming language, with \ special commands designed for Haiku. " HOMEPAGE="http://sourceforge.net/projects/yab-interpreter" -SRC_URI="git+https://github.com/HaikuArchives/Yab.git#a5681d8a3403c142eae0ad416a59abd2aa7a28e4" +SRC_URI="https://github.com/HaikuArchives/Yab/archive/v1.7.3.tar.gz" +CHECKSUM_SIZE="1176449" +CHECKSUM_RMD160="f62fa02a585d9f6c5ee3eb9b781a06083352bd6f" +CHECKSUM_SHA512="a74edcf9718ee9a13a16ab0a99fbbed3cceebf1ea4bfac714b098d51531de7fdd0738e126b9a2e5d2f8d84fd0c153d9b7702e806cc91c6a97537dda11411e915" +SOURCE_DIR="Yab-1.7.3" -REVISION="2" +REVISION="3" LICENSE="Artistic" From bb4b3f855fd54aa7efaf3f35c96a8bf930f38d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Thu, 11 Dec 2014 19:16:23 +0000 Subject: [PATCH 10/28] Added recipe for xmoto --- games-sports/xmoto/patches/xmoto-0.5.11.patch | 100 ++++++++++++++++++ games-sports/xmoto/xmoto-0.5.11.recipe | 91 ++++++++++++++++ 2 files changed, 191 insertions(+) create mode 100644 games-sports/xmoto/patches/xmoto-0.5.11.patch create mode 100644 games-sports/xmoto/xmoto-0.5.11.recipe diff --git a/games-sports/xmoto/patches/xmoto-0.5.11.patch b/games-sports/xmoto/patches/xmoto-0.5.11.patch new file mode 100644 index 000000000..a21deb0fd --- /dev/null +++ b/games-sports/xmoto/patches/xmoto-0.5.11.patch @@ -0,0 +1,100 @@ +Only in xmoto-0.5.11-patch/: autom4te.cache +diff -ur xmoto-0.5.11/configure xmoto-0.5.11-patch/configure +--- xmoto-0.5.11/configure 2014-03-29 10:38:54.037748736 +0000 ++++ xmoto-0.5.11-patch/configure 2014-12-11 05:23:06.159383552 +0000 +@@ -7565,13 +7565,13 @@ + + + # m +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 +-$as_echo_n "checking for floor in -lm... " >&6; } +-if ${ac_cv_lib_m_floor+:} false; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lroot" >&5 ++$as_echo_n "checking for floor in -lroot... " >&6; } ++if ${ac_cv_lib_root_floor+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lm $LIBS" ++LIBS="-lroot $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -7591,22 +7591,22 @@ + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_m_floor=yes ++ ac_cv_lib_root_floor=yes + else +- ac_cv_lib_m_floor=no ++ ac_cv_lib_root_floor=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 +-$as_echo "$ac_cv_lib_m_floor" >&6; } +-if test "x$ac_cv_lib_m_floor" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_floor" >&5 ++$as_echo "$ac_cv_lib_root_floor" >&6; } ++if test "x$ac_cv_lib_root_floor" = xyes; then : + cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBM 1 ++#define HAVE_LIBROOT 1 + _ACEOF + +- LIBS="-lm $LIBS" ++ LIBS="-lroot $LIBS" + + else + as_fn_error $? "No math library found" "$LINENO" 5 +diff -ur xmoto-0.5.11/configure.in xmoto-0.5.11-patch/configure.in +--- xmoto-0.5.11/configure.in 2014-03-29 10:35:24.036700160 +0000 ++++ xmoto-0.5.11-patch/configure.in 2014-12-11 05:18:39.246153216 +0000 +@@ -155,7 +155,7 @@ + AM_CONDITIONAL([USE_SDLGFX], test "$USE_SDLGFX" = "1") + + # m +-AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found)) ++AC_CHECK_LIB(root, floor, , AC_MSG_ERROR(No math library found)) + + AC_SEARCH_LIBS(lua_pushboolean,lua lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.1, liblua50, or liblua required)]) + AC_SEARCH_LIBS(luaopen_math,lualib lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.1, liblualib50, or liblualib required)]) +diff -ur xmoto-0.5.11/src/GameInit.cpp xmoto-0.5.11-patch/src/GameInit.cpp +--- xmoto-0.5.11/src/GameInit.cpp 2011-10-11 20:18:35.013369344 +0000 ++++ xmoto-0.5.11-patch/src/GameInit.cpp 2014-12-11 05:17:55.756023296 +0000 +@@ -269,7 +269,7 @@ + struct sigaction v_act; + + v_act.sa_handler = xmexit_term; +-#if !defined(__APPLE__) && !defined(__FreeBSD__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__HAIKU__) + v_act.sa_restorer = NULL; + #endif + sigemptyset(&v_act.sa_mask); +diff -ur xmoto-0.5.11/src/net/extSDL_net.cpp xmoto-0.5.11-patch/src/net/extSDL_net.cpp +--- xmoto-0.5.11/src/net/extSDL_net.cpp 2011-10-11 20:18:28.058720256 +0000 ++++ xmoto-0.5.11-patch/src/net/extSDL_net.cpp 2014-12-11 02:57:51.884998144 +0000 +@@ -22,7 +22,7 @@ + #include + + // read the .h to understand why i redefine SDLNet_TCP_Send +-#if !defined(WIN32) && !defined(__APPLE__) ++#if !defined(WIN32) && !defined(__APPLE__) && !defined(__HAIKU__) + #include + + #define SOCKET int +diff -ur xmoto-0.5.11/src/VFileIO.cpp xmoto-0.5.11-patch/src/VFileIO.cpp +--- xmoto-0.5.11/src/VFileIO.cpp 2011-10-11 20:18:35.002883584 +0000 ++++ xmoto-0.5.11-patch/src/VFileIO.cpp 2014-12-11 05:09:19.959709184 +0000 +@@ -106,7 +106,7 @@ + #endif + } + +-#if !defined(WIN32) && !defined(__MORPHOS__) && !defined(__amigaos4__) ++#if !defined(WIN32) && !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__HAIKU__) + void strlwr(char *pc) { + for(unsigned int i=0; i Date: Tue, 9 Dec 2014 21:15:42 +0000 Subject: [PATCH 11/28] Add autoconf 2.13 --- sys-devel/autoconf213/autoconf213-2.13.recipe | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 sys-devel/autoconf213/autoconf213-2.13.recipe diff --git a/sys-devel/autoconf213/autoconf213-2.13.recipe b/sys-devel/autoconf213/autoconf213-2.13.recipe new file mode 100644 index 000000000..3c9e90005 --- /dev/null +++ b/sys-devel/autoconf213/autoconf213-2.13.recipe @@ -0,0 +1,57 @@ +SUMMARY="A tool for automatically configuring source code" +DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. Using \ +autoconf, programmers can create portable and configurable packages, because \ +the person building the package is allowed to specify various configuration \ +options." +HOMEPAGE="http://www.gnu.org/software/autoconf/" +SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz" +CHECKSUM_SHA256="f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e" +REVISION="1" + +SOURCE_DIR="autoconf-2.13" + +LICENSE="GNU GPL v2" +COPYRIGHT="1992-1998 Free Software Foundation, Inc." + +ARCHITECTURES="x86_gcc2 x86 arm" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 arm" + +PROVIDES=" + autoconf_2.13$secondaryArchSuffix = $portVersion + cmd:autoconf_2.13$secondaryArchSuffix = $portVersion + cmd:autoheader_2.13$secondaryArchSuffix = $portVersion + cmd:autoreconf_2.13$secondaryArchSuffix = $portVersion + cmd:autoscan_2.13$secondaryArchSuffix = $portVersion + cmd:autoupdate_2.13$secondaryArchSuffix = $portVersion + cmd:ifnames_2.13$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:autoconf + " + +BUILD() +{ + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + for bin in $(ls $binDir); do + mv $binDir/$bin $binDir/${bin}-2.13 + done +} From 5f6bcadfeede56f186959851fe767bd15a342f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Thu, 11 Dec 2014 23:54:50 +0000 Subject: [PATCH 12/28] Made xmoto's configure search for floor --- games-sports/xmoto/patches/xmoto-0.5.11.patch | 65 ++++++++++++------- 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/games-sports/xmoto/patches/xmoto-0.5.11.patch b/games-sports/xmoto/patches/xmoto-0.5.11.patch index a21deb0fd..6fe7e593b 100644 --- a/games-sports/xmoto/patches/xmoto-0.5.11.patch +++ b/games-sports/xmoto/patches/xmoto-0.5.11.patch @@ -1,64 +1,83 @@ Only in xmoto-0.5.11-patch/: autom4te.cache diff -ur xmoto-0.5.11/configure xmoto-0.5.11-patch/configure --- xmoto-0.5.11/configure 2014-03-29 10:38:54.037748736 +0000 -+++ xmoto-0.5.11-patch/configure 2014-12-11 05:23:06.159383552 +0000 -@@ -7565,13 +7565,13 @@ ++++ xmoto-0.5.11-patch/configure 2014-12-11 21:25:12.893386752 +0000 +@@ -7565,13 +7565,12 @@ # m -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 -$as_echo_n "checking for floor in -lm... " >&6; } -if ${ac_cv_lib_m_floor+:} false; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lroot" >&5 -+$as_echo_n "checking for floor in -lroot... " >&6; } -+if ${ac_cv_lib_root_floor+:} false; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing floor" >&5 ++$as_echo_n "checking for library containing floor... " >&6; } ++if ${ac_cv_search_floor+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS +- ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -+LIBS="-lroot $LIBS" ++ ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -7591,22 +7591,22 @@ +@@ -7590,23 +7589,35 @@ + return 0; } _ACEOF - if ac_fn_c_try_link "$LINENO"; then : +-if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_floor=yes -+ ac_cv_lib_root_floor=yes - else +-else - ac_cv_lib_m_floor=no -+ ac_cv_lib_root_floor=no ++for ac_lib in '' ; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_floor=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS ++ conftest$ac_exeext ++ if ${ac_cv_search_floor+:} false; then : ++ break fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 -$as_echo "$ac_cv_lib_m_floor" >&6; } -if test "x$ac_cv_lib_m_floor" = xyes; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_floor" >&5 -+$as_echo "$ac_cv_lib_root_floor" >&6; } -+if test "x$ac_cv_lib_root_floor" = xyes; then : - cat >>confdefs.h <<_ACEOF +- cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -+#define HAVE_LIBROOT 1 - _ACEOF +-_ACEOF ++done ++if ${ac_cv_search_floor+:} false; then : - LIBS="-lm $LIBS" -+ LIBS="-lroot $LIBS" ++else ++ ac_cv_search_floor=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_floor" >&5 ++$as_echo "$ac_cv_search_floor" >&6; } ++ac_res=$ac_cv_search_floor ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" else as_fn_error $? "No math library found" "$LINENO" 5 diff -ur xmoto-0.5.11/configure.in xmoto-0.5.11-patch/configure.in --- xmoto-0.5.11/configure.in 2014-03-29 10:35:24.036700160 +0000 -+++ xmoto-0.5.11-patch/configure.in 2014-12-11 05:18:39.246153216 +0000 ++++ xmoto-0.5.11-patch/configure.in 2014-12-11 21:40:34.446955520 +0000 @@ -155,7 +155,7 @@ AM_CONDITIONAL([USE_SDLGFX], test "$USE_SDLGFX" = "1") # m -AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found)) -+AC_CHECK_LIB(root, floor, , AC_MSG_ERROR(No math library found)) ++AC_SEARCH_LIBS(floor, , , AC_MSG_ERROR(No math library found)) AC_SEARCH_LIBS(lua_pushboolean,lua lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.1, liblua50, or liblua required)]) AC_SEARCH_LIBS(luaopen_math,lualib lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.1, liblualib50, or liblualib required)]) From 38291e1fb7d1448385243e44d1e3a952c001bd13 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Thu, 11 Dec 2014 10:24:37 +0100 Subject: [PATCH 13/28] Add recipe for Substrate --- haiku-apps/substrate/substrate-1.0.recipe | 42 +++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 haiku-apps/substrate/substrate-1.0.recipe diff --git a/haiku-apps/substrate/substrate-1.0.recipe b/haiku-apps/substrate/substrate-1.0.recipe new file mode 100644 index 000000000..932eb950a --- /dev/null +++ b/haiku-apps/substrate/substrate-1.0.recipe @@ -0,0 +1,42 @@ +SUMMARY="Screensaver drawing interesting city-like structures." +DESCRIPTION=" +Substrate is a screensaver which creates interesting images from lines and circles. \ +Inspired by xscreensaver's Substrate. +" +HOMEPAGE="https://github.com/atalax/haiku-substrate" +SRC_URI="git+https://github.com/atalax/haiku-substrate.git#1bd0a5" +REVISION="1" +COPYRIGHT="2014 Josef Gajdusek" +LICENSE="MIT" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + substrate = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:mkdepend + cmd:make + cmd:gcc + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $addOnsDir/Screen\ Savers/ + cp objects/Substrate $addOnsDir/Screen\ Savers/ +} From 097caf6c050521cbcc4d8af6b392c5b81733cc37 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Thu, 11 Dec 2014 22:18:58 +0200 Subject: [PATCH 14/28] Add Bezilla port --- www-client/bezilla/bezilla-git.recipe | 72 +++++++++++++++++++ .../bezilla/patches/bezilla-git.patchset | 31 ++++++++ 2 files changed, 103 insertions(+) create mode 100644 www-client/bezilla/bezilla-git.recipe create mode 100644 www-client/bezilla/patches/bezilla-git.patchset diff --git a/www-client/bezilla/bezilla-git.recipe b/www-client/bezilla/bezilla-git.recipe new file mode 100644 index 000000000..924ef3d18 --- /dev/null +++ b/www-client/bezilla/bezilla-git.recipe @@ -0,0 +1,72 @@ +SUMMARY="Bezilla is a version of Firefox 2 for Haiku" +DESCRIPTION="Bezilla is an open source web browser. \ +It achieves balance between ease of use and customization, catering to the \ +needs of both casual and power users." +HOMEPAGE="https://github.com/mmadia/bezilla" +SRC_URI="git+https://github.com/mmadia/bezilla.git#686254" +REVISION="1" +LICENSE="MPL v1.1" +COPYRIGHT="1998-1999 Netscape Communications Corporation" + +ARCHITECTURES="x86_gcc2 x86 ?arm" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?arm" + +PROVIDES=" + bezilla$secondaryArchSuffix = $portVersion + app:Bezilla$secondaryArchSuffix = $portVersion + cmd:Bezilla_config$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + devel:libidl$secondaryArchSuffix + devel:libglib$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:m4 + cmd:gawk + cmd:perl + cmd:xargs + cmd:tar + cmd:autoconf_2.13$secondaryArchSuffix + " + +PATCHES="bezilla-git.patchset" + +BUILD() +{ + cd mozilla + autoconf-2.13 + + cd nsprpub + autoconf-2.13 + cd .. + + cd directory/c-sdk + autoconf-2.13 + cd ../.. + + runConfigure --omit-dirs 'docDir dataRootDir' ./configure \ + --enable-application=browser --disable-canvas \ + --disable-svg --disable-updater + make +} + +INSTALL() +{ + cd mozilla + make install + + mkdir $appsDir + + mv $binDir/firefox $appsDir/Bezilla + mv $libDir/firefox-2.0.0.22pre/firefox-bin $libDir/firefox-2.0.0.22pre/Bezilla-bin + mv $binDir/firefox-config $binDir/Bezilla-config +} diff --git a/www-client/bezilla/patches/bezilla-git.patchset b/www-client/bezilla/patches/bezilla-git.patchset new file mode 100644 index 000000000..e37edf2c2 --- /dev/null +++ b/www-client/bezilla/patches/bezilla-git.patchset @@ -0,0 +1,31 @@ +From 7b84740f39ed0292e8f726705590ba24581c2c52 Mon Sep 17 00:00:00 2001 +From: Theodore Kokkoris +Date: Fri, 12 Dec 2014 13:45:46 +0200 +Subject: [PATCH] Enable Haiku support in configure.in + +--- + mozilla/configure.in | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/mozilla/configure.in b/mozilla/configure.in +index 23cc7e7..9bd8cb5 100755 +--- a/mozilla/configure.in ++++ b/mozilla/configure.in +@@ -885,12 +885,8 @@ if test -n "$CROSS_COMPILE"; then + mingw*) OS_ARCH=WINNT ;; + wince*) OS_ARCH=WINCE ;; + darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; +- beos* | haiku*) OS_ARCH=BeOS OS_TARGET=BeOS ;; +-dnl ------------------------------------------------------- +-dnl Cross-compiling-haiku - This should probably be +-dnl beos*) OS_ARCH=BeOS OS_TARGET=BeOS ;; +-dnl haiku*) OS_ARCH=Haiku OS_TARGET=Haiku ;; +-dnl ------------------------------------------------------- ++ beos*) OS_ARCH=BeOS OS_TARGET=BeOS ;; ++ haiku*) OS_ARCH=Haiku OS_TARGET=Haiku ;; + esac + else + OS_TARGET=`uname -s` +-- +1.8.3.4 + From 01a43a2a06abf99fe1e2978b8a1c55dae723a067 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 12 Dec 2014 10:02:28 -0500 Subject: [PATCH 15/28] Lava: v1.0. This recipe does not work yet, as cdrtools is broken due to a bug in HaikuPorter [1] ... [1]: https://bitbucket.org/haikuports/haikuporter/issue/49 --- haiku-apps/lava/lava-1.0.recipe | 46 +++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 haiku-apps/lava/lava-1.0.recipe diff --git a/haiku-apps/lava/lava-1.0.recipe b/haiku-apps/lava/lava-1.0.recipe new file mode 100644 index 000000000..c10365b3f --- /dev/null +++ b/haiku-apps/lava/lava-1.0.recipe @@ -0,0 +1,46 @@ +SUMMARY="A disc burning suite for Haiku" +DESCRIPTION="Lava is a disc burning suite for Haiku. It's a Tracker add-on." +HOMEPAGE="https://github.com/HaikuArchives/Lava" +SRC_URI="https://github.com/HaikuArchives/Lava/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="0c1899141eac1fca086a554d56527f38baa70ae7bff0a6db37cd180084c01c71" +SOURCE_DIR="Lava-$portVersion" +LICENSE="Public Domain" +COPYRIGHT="2007, 2010 Team MAUI + 2003-2006 Haiku Inc." +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + lava = $portVersion + add_on:Lava = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + lib:libburndevice + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libburndevice + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:ld + cmd:make + cmd:mkdepend + " + +BUILD() +{ + cd Add-On + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + cd Add-On + mkdir -p $addOnsDir/Tracker/ + + cp objects/Lava-L $addOnsDir/Tracker/ +} From 5a036e5d2923af07790c08c2d066781d4a37a8c7 Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 12 Dec 2014 19:23:36 +0200 Subject: [PATCH 16/28] Fixed the recipe for apr_x86-1.5.0 --- dev-libs/apr/apr-1.5.0.recipe | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe index 33f922f0b..b0a6c1112 100644 --- a/dev-libs/apr/apr-1.5.0.recipe +++ b/dev-libs/apr/apr-1.5.0.recipe @@ -6,23 +6,27 @@ COPYRIGHT="2012 The Apache Software Foundation." LICENSE="Apache v2" REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" PATCHES="apr-1.5.0.patch" PROVIDES=" - apr = $portVersion compat >= 1 - lib:libapr_1 = 0.5.0 compat >= 0 + apr$secondaryArchSuffix = $portVersion compat >= 1 + lib:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0 + cmd:apr_1_config$secondaryArchSuffix " REQUIRES=" haiku >= $haikuVersion + lib:libnetwork$secondaryArchSuffix >= $haikuVersion + lib:libroot$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:ld cmd:libtoolize cmd:make @@ -109,3 +113,4 @@ PROVIDES_devel=" REQUIRES_devel=" apr == $portVersion base " + From 781dfed6b51d9f2e3dc36c6084ca06b4e244e9e0 Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 12 Dec 2014 19:30:26 +0200 Subject: [PATCH 17/28] Fixed the recipe for apr_x86-1.5.0 --- dev-libs/apr/apr-1.5.0.recipe | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe index b0a6c1112..f70fae35b 100644 --- a/dev-libs/apr/apr-1.5.0.recipe +++ b/dev-libs/apr/apr-1.5.0.recipe @@ -13,7 +13,6 @@ PATCHES="apr-1.5.0.patch" PROVIDES=" apr$secondaryArchSuffix = $portVersion compat >= 1 lib:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0 - cmd:apr_1_config$secondaryArchSuffix " REQUIRES=" haiku >= $haikuVersion @@ -106,11 +105,11 @@ following: # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - apr_devel = portVersion compat >= 1 - cmd:apr_1_config = portVersion compat >= 1 - devel:libapr_1 = 0.5.0 compat >= 0 + apr_devel$secondaryArchSuffix = portVersion compat >= 1 + cmd:apr_1_config$secondaryArchSuffix = portVersion compat >= 1 + devel:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0 " REQUIRES_devel=" - apr == $portVersion base + apr$secondaryArchSuffix == $portVersion base " From e0a28b803fe2e49000ac06b0d539bbc54994db92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Fri, 12 Dec 2014 17:01:00 +0000 Subject: [PATCH 18/28] Changed xmoto recipe - now uses autoconf and patchset. --- games-sports/xmoto/patches/xmoto-0.5.11.patch | 119 ------------------ .../xmoto/patches/xmoto_x86-0.5.11.patchset | 61 +++++++++ games-sports/xmoto/xmoto-0.5.11.recipe | 6 +- 3 files changed, 65 insertions(+), 121 deletions(-) delete mode 100644 games-sports/xmoto/patches/xmoto-0.5.11.patch create mode 100644 games-sports/xmoto/patches/xmoto_x86-0.5.11.patchset diff --git a/games-sports/xmoto/patches/xmoto-0.5.11.patch b/games-sports/xmoto/patches/xmoto-0.5.11.patch deleted file mode 100644 index 6fe7e593b..000000000 --- a/games-sports/xmoto/patches/xmoto-0.5.11.patch +++ /dev/null @@ -1,119 +0,0 @@ -Only in xmoto-0.5.11-patch/: autom4te.cache -diff -ur xmoto-0.5.11/configure xmoto-0.5.11-patch/configure ---- xmoto-0.5.11/configure 2014-03-29 10:38:54.037748736 +0000 -+++ xmoto-0.5.11-patch/configure 2014-12-11 21:25:12.893386752 +0000 -@@ -7565,13 +7565,12 @@ - - - # m --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 --$as_echo_n "checking for floor in -lm... " >&6; } --if ${ac_cv_lib_m_floor+:} false; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing floor" >&5 -+$as_echo_n "checking for library containing floor... " >&6; } -+if ${ac_cv_search_floor+:} false; then : - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lm $LIBS" -+ ac_func_search_save_LIBS=$LIBS - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -7590,23 +7589,35 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_m_floor=yes --else -- ac_cv_lib_m_floor=no -+for ac_lib in '' ; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_search_floor=$ac_res - fi - rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ conftest$ac_exeext -+ if ${ac_cv_search_floor+:} false; then : -+ break - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 --$as_echo "$ac_cv_lib_m_floor" >&6; } --if test "x$ac_cv_lib_m_floor" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBM 1 --_ACEOF -+done -+if ${ac_cv_search_floor+:} false; then : - -- LIBS="-lm $LIBS" -+else -+ ac_cv_search_floor=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_floor" >&5 -+$as_echo "$ac_cv_search_floor" >&6; } -+ac_res=$ac_cv_search_floor -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - else - as_fn_error $? "No math library found" "$LINENO" 5 -diff -ur xmoto-0.5.11/configure.in xmoto-0.5.11-patch/configure.in ---- xmoto-0.5.11/configure.in 2014-03-29 10:35:24.036700160 +0000 -+++ xmoto-0.5.11-patch/configure.in 2014-12-11 21:40:34.446955520 +0000 -@@ -155,7 +155,7 @@ - AM_CONDITIONAL([USE_SDLGFX], test "$USE_SDLGFX" = "1") - - # m --AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found)) -+AC_SEARCH_LIBS(floor, , , AC_MSG_ERROR(No math library found)) - - AC_SEARCH_LIBS(lua_pushboolean,lua lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.1, liblua50, or liblua required)]) - AC_SEARCH_LIBS(luaopen_math,lualib lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.1, liblualib50, or liblualib required)]) -diff -ur xmoto-0.5.11/src/GameInit.cpp xmoto-0.5.11-patch/src/GameInit.cpp ---- xmoto-0.5.11/src/GameInit.cpp 2011-10-11 20:18:35.013369344 +0000 -+++ xmoto-0.5.11-patch/src/GameInit.cpp 2014-12-11 05:17:55.756023296 +0000 -@@ -269,7 +269,7 @@ - struct sigaction v_act; - - v_act.sa_handler = xmexit_term; --#if !defined(__APPLE__) && !defined(__FreeBSD__) -+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__HAIKU__) - v_act.sa_restorer = NULL; - #endif - sigemptyset(&v_act.sa_mask); -diff -ur xmoto-0.5.11/src/net/extSDL_net.cpp xmoto-0.5.11-patch/src/net/extSDL_net.cpp ---- xmoto-0.5.11/src/net/extSDL_net.cpp 2011-10-11 20:18:28.058720256 +0000 -+++ xmoto-0.5.11-patch/src/net/extSDL_net.cpp 2014-12-11 02:57:51.884998144 +0000 -@@ -22,7 +22,7 @@ - #include - - // read the .h to understand why i redefine SDLNet_TCP_Send --#if !defined(WIN32) && !defined(__APPLE__) -+#if !defined(WIN32) && !defined(__APPLE__) && !defined(__HAIKU__) - #include - - #define SOCKET int -diff -ur xmoto-0.5.11/src/VFileIO.cpp xmoto-0.5.11-patch/src/VFileIO.cpp ---- xmoto-0.5.11/src/VFileIO.cpp 2011-10-11 20:18:35.002883584 +0000 -+++ xmoto-0.5.11-patch/src/VFileIO.cpp 2014-12-11 05:09:19.959709184 +0000 -@@ -106,7 +106,7 @@ - #endif - } - --#if !defined(WIN32) && !defined(__MORPHOS__) && !defined(__amigaos4__) -+#if !defined(WIN32) && !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__HAIKU__) - void strlwr(char *pc) { - for(unsigned int i=0; i +Date: Fri, 12 Dec 2014 16:46:15 +0000 +Subject: Patched the files to make them work on haiku. + + +diff --git a/configure.in b/configure.in +index 452f196..0948bc8 100644 +--- a/configure.in ++++ b/configure.in +@@ -155,7 +155,7 @@ fi + AM_CONDITIONAL([USE_SDLGFX], test "$USE_SDLGFX" = "1") + + # m +-AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found)) ++AC_SEARCH_LIBS(floor, m, , AC_MSG_ERROR(No math library found)) + + AC_SEARCH_LIBS(lua_pushboolean,lua lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.1, liblua50, or liblua required)]) + AC_SEARCH_LIBS(luaopen_math,lualib lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.1, liblualib50, or liblualib required)]) +diff --git a/src/GameInit.cpp b/src/GameInit.cpp +index 0ae9373..86f23d7 100644 +--- a/src/GameInit.cpp ++++ b/src/GameInit.cpp +@@ -269,7 +269,7 @@ void GameApp::run_load(int nNumArgs, char** ppcArgs) { + struct sigaction v_act; + + v_act.sa_handler = xmexit_term; +-#if !defined(__APPLE__) && !defined(__FreeBSD__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__HAIKU__) + v_act.sa_restorer = NULL; + #endif + sigemptyset(&v_act.sa_mask); +diff --git a/src/VFileIO.cpp b/src/VFileIO.cpp +index 7d6c7d9..cd95f58 100644 +--- a/src/VFileIO.cpp ++++ b/src/VFileIO.cpp +@@ -106,7 +106,7 @@ std::string getPWDDir(bool i_asUtf8 = false) { + #endif + } + +-#if !defined(WIN32) && !defined(__MORPHOS__) && !defined(__amigaos4__) ++#if !defined(WIN32) && !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__HAIKU__) + void strlwr(char *pc) { + for(unsigned int i=0; i + + // read the .h to understand why i redefine SDLNet_TCP_Send +-#if !defined(WIN32) && !defined(__APPLE__) ++#if !defined(WIN32) && !defined(__APPLE__) && !defined(__HAIKU__) + #include + + #define SOCKET int +-- +1.8.3.4 + diff --git a/games-sports/xmoto/xmoto-0.5.11.recipe b/games-sports/xmoto/xmoto-0.5.11.recipe index e20fc7e82..141fe5c52 100644 --- a/games-sports/xmoto/xmoto-0.5.11.recipe +++ b/games-sports/xmoto/xmoto-0.5.11.recipe @@ -11,7 +11,7 @@ REVISION="1" ARCHITECTURES="x86_gcc2" SECONDARY_ARCHITECTURES="x86" -PATCHES="xmoto-0.5.11.patch" +PATCHES="xmoto_x86-0.5.11.patchset" PROVIDES=" xmoto$secondaryArchSuffix = $portVersion @@ -62,16 +62,18 @@ BUILD_PREREQUIRES=" cmd:make cmd:sed cmd:grep - cmd:ode_config + cmd:ode_config$secondaryArchSuffix cmd:awk cmd:find cmd:gettext$secondaryArchSuffix cmd:automake cmd:pkg_config$secondaryArchSuffix + cmd:autoconf " BUILD() { + autoconf export CFLAGS="-lGL" export CXXFLAGS="-lGL" runConfigure ./configure --with-internal-xdg=1 From a960f3ca3b81ed2b1e213cda966911496b1b254b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Fri, 12 Dec 2014 20:05:49 +0000 Subject: [PATCH 19/28] Added libraries to libode REQUIRES. --- dev-games/ode/ode-0.12.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index 09da5fc0d..7cc7d6f16 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -25,6 +25,8 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" From fb18f921871fd8adc1dfa9aa808b97454cdb5b2e Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 12 Dec 2014 22:24:57 +0200 Subject: [PATCH 20/28] Fixed revision at apr-1.5.0.recipe --- dev-libs/apr/apr-1.5.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe index f70fae35b..72cace833 100644 --- a/dev-libs/apr/apr-1.5.0.recipe +++ b/dev-libs/apr/apr-1.5.0.recipe @@ -4,7 +4,7 @@ SRC_URI="http://archive.apache.org/dist/apr/apr-1.5.0.tar.gz" CHECKSUM_SHA256="9879f02054cb22e99f605f6fdbf47f4c028af4cd4f351cf64186a7ee447f35d7" COPYRIGHT="2012 The Apache Software Foundation." LICENSE="Apache v2" -REVISION="2" +REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" From 241ab26fd972518776cdd803499766a42c9c64c4 Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 12 Dec 2014 23:12:11 +0200 Subject: [PATCH 21/28] Updated recipe --- dev-libs/apr/apr-1.5.0.recipe | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe index 72cace833..4c42f26ff 100644 --- a/dev-libs/apr/apr-1.5.0.recipe +++ b/dev-libs/apr/apr-1.5.0.recipe @@ -4,7 +4,7 @@ SRC_URI="http://archive.apache.org/dist/apr/apr-1.5.0.tar.gz" CHECKSUM_SHA256="9879f02054cb22e99f605f6fdbf47f4c028af4cd4f351cf64186a7ee447f35d7" COPYRIGHT="2012 The Apache Software Foundation." LICENSE="Apache v2" -REVISION="1" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -15,9 +15,7 @@ PROVIDES=" lib:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0 " REQUIRES=" - haiku >= $haikuVersion - lib:libnetwork$secondaryArchSuffix >= $haikuVersion - lib:libroot$secondaryArchSuffix + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" " From f939fb9db5366fbb4482dd612b44fd81fa1aa971 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 12 Dec 2014 22:56:22 +0000 Subject: [PATCH 22/28] wget: bump version * strip the patchset: uptream is now gcc2 friendly. --- net-misc/wget/patches/wget-1.16.1.patchset | 120 +++ net-misc/wget/patches/wget-1.16.patchset | 829 ------------------ .../{wget-1.16.recipe => wget-1.16.1.recipe} | 13 +- 3 files changed, 128 insertions(+), 834 deletions(-) create mode 100644 net-misc/wget/patches/wget-1.16.1.patchset delete mode 100644 net-misc/wget/patches/wget-1.16.patchset rename net-misc/wget/{wget-1.16.recipe => wget-1.16.1.recipe} (85%) diff --git a/net-misc/wget/patches/wget-1.16.1.patchset b/net-misc/wget/patches/wget-1.16.1.patchset new file mode 100644 index 000000000..febc906fc --- /dev/null +++ b/net-misc/wget/patches/wget-1.16.1.patchset @@ -0,0 +1,120 @@ +From d95daf9cb193a1fad78540947f57e8737c170835 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Mon, 19 May 2014 15:38:37 +0000 +Subject: apply wget-1.14.patch + + +diff --git a/configure.ac b/configure.ac +index 3cbe618..e617bb2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -170,6 +170,7 @@ AC_HEADER_STDBOOL + AC_CHECK_HEADERS(unistd.h sys/time.h) + AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h) + AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h) ++AC_CHECK_HEADERS(arpa/inet.h) + + AC_CHECK_DECLS(h_errno,,,[#include ]) + +diff --git a/m4/wget.m4 b/m4/wget.m4 +index 777e973..5a8b75d 100644 +--- a/m4/wget.m4 ++++ b/m4/wget.m4 +@@ -88,6 +88,7 @@ AC_DEFUN([WGET_POSIX_CLOCK], [ + + dnl Check whether we need to link with -lnsl and -lsocket, as is the + dnl case on e.g. Solaris. ++dnl Haiku needs libnetwork + + AC_DEFUN([WGET_NSL_SOCKET], [ + dnl On Solaris, -lnsl is needed to use gethostbyname. But checking +@@ -107,6 +108,8 @@ AC_DEFUN([WGET_NSL_SOCKET], [ + AC_CHECK_LIB(nsl, $wget_check_in_nsl) + fi + AC_CHECK_LIB(socket, socket) ++ AC_CHECK_LIB(network, gethostbyname) ++ AC_CHECK_LIB(network, socket) + ]) + + +diff --git a/src/config.h.in b/src/config.h.in +index 879ce64..22bd801 100644 +--- a/src/config.h.in ++++ b/src/config.h.in +@@ -699,6 +699,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_LANGINFO_H + ++/* Define to 1 if you have the `bind' library (-lbind). */ ++#undef HAVE_LIBBIND ++ + /* Define to 1 if you have the `dl' library (-ldl). */ + #undef HAVE_LIBDL + +@@ -711,6 +714,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_LIBINTL_H + ++/* Define to 1 if you have the `network' library (-lnetwork). */ ++#undef HAVE_LIBNETWORK ++ + /* Define to 1 if you have the `nsl' library (-lnsl). */ + #undef HAVE_LIBNSL + +diff --git a/src/connect.c b/src/connect.c +index 1fb1819..f2c832b 100644 +--- a/src/connect.c ++++ b/src/connect.c +@@ -46,7 +46,7 @@ as that of the covered work. */ + # include + # endif /* def __VMS [else] */ + # include +-# ifndef __BEOS__ ++# ifdef HAVE_ARPA_INET_H + # include + # endif + #endif /* not WINDOWS */ +diff --git a/src/host.h b/src/host.h +index 84f3d13..e664e7f 100644 +--- a/src/host.h ++++ b/src/host.h +@@ -42,9 +42,9 @@ as that of the covered work. */ + # endif /* def __VMS [else] */ + # include + # include +-#ifndef __BEOS__ +-# include +-#endif ++# ifdef HAVE_ARPA_INET_H ++# include ++# endif + #endif + + struct url; +-- +1.8.3.4 + + +From 429d0bbb2c9d1243d009df399045028cc062684e Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Mon, 19 May 2014 15:47:24 +0000 +Subject: apply and augment wget-1.14-build-fixes.patch + + +diff --git a/src/utils.c b/src/utils.c +index 78c282e..6a21164 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -64,7 +64,9 @@ as that of the covered work. */ + #include + + /* For TIOCGWINSZ and friends: */ ++#ifndef __HAIKU__ + #include ++#endif + #include + + /* Needed for Unix version of run_with_timeout. */ +-- +1.8.3.4 + diff --git a/net-misc/wget/patches/wget-1.16.patchset b/net-misc/wget/patches/wget-1.16.patchset deleted file mode 100644 index d97b6e476..000000000 --- a/net-misc/wget/patches/wget-1.16.patchset +++ /dev/null @@ -1,829 +0,0 @@ -From d95daf9cb193a1fad78540947f57e8737c170835 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 19 May 2014 15:38:37 +0000 -Subject: apply wget-1.14.patch - - -diff --git a/configure.ac b/configure.ac -index 3cbe618..e617bb2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -170,6 +170,7 @@ AC_HEADER_STDBOOL - AC_CHECK_HEADERS(unistd.h sys/time.h) - AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h) - AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h) -+AC_CHECK_HEADERS(arpa/inet.h) - - AC_CHECK_DECLS(h_errno,,,[#include ]) - -diff --git a/m4/wget.m4 b/m4/wget.m4 -index 777e973..5a8b75d 100644 ---- a/m4/wget.m4 -+++ b/m4/wget.m4 -@@ -88,6 +88,7 @@ AC_DEFUN([WGET_POSIX_CLOCK], [ - - dnl Check whether we need to link with -lnsl and -lsocket, as is the - dnl case on e.g. Solaris. -+dnl Haiku needs libnetwork - - AC_DEFUN([WGET_NSL_SOCKET], [ - dnl On Solaris, -lnsl is needed to use gethostbyname. But checking -@@ -107,6 +108,8 @@ AC_DEFUN([WGET_NSL_SOCKET], [ - AC_CHECK_LIB(nsl, $wget_check_in_nsl) - fi - AC_CHECK_LIB(socket, socket) -+ AC_CHECK_LIB(network, gethostbyname) -+ AC_CHECK_LIB(network, socket) - ]) - - -diff --git a/src/config.h.in b/src/config.h.in -index 879ce64..22bd801 100644 ---- a/src/config.h.in -+++ b/src/config.h.in -@@ -699,6 +699,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_LANGINFO_H - -+/* Define to 1 if you have the `bind' library (-lbind). */ -+#undef HAVE_LIBBIND -+ - /* Define to 1 if you have the `dl' library (-ldl). */ - #undef HAVE_LIBDL - -@@ -711,6 +714,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_LIBINTL_H - -+/* Define to 1 if you have the `network' library (-lnetwork). */ -+#undef HAVE_LIBNETWORK -+ - /* Define to 1 if you have the `nsl' library (-lnsl). */ - #undef HAVE_LIBNSL - -diff --git a/src/connect.c b/src/connect.c -index 1fb1819..f2c832b 100644 ---- a/src/connect.c -+++ b/src/connect.c -@@ -46,7 +46,7 @@ as that of the covered work. */ - # include - # endif /* def __VMS [else] */ - # include --# ifndef __BEOS__ -+# ifdef HAVE_ARPA_INET_H - # include - # endif - #endif /* not WINDOWS */ -diff --git a/src/host.h b/src/host.h -index 84f3d13..e664e7f 100644 ---- a/src/host.h -+++ b/src/host.h -@@ -42,9 +42,9 @@ as that of the covered work. */ - # endif /* def __VMS [else] */ - # include - # include --#ifndef __BEOS__ --# include --#endif -+# ifdef HAVE_ARPA_INET_H -+# include -+# endif - #endif - - struct url; --- -1.8.3.4 - - -From 429d0bbb2c9d1243d009df399045028cc062684e Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 19 May 2014 15:47:24 +0000 -Subject: apply and augment wget-1.14-build-fixes.patch - - -diff --git a/src/ftp-basic.c b/src/ftp-basic.c -index b6e67e2..61cf7a4 100644 ---- a/src/ftp-basic.c -+++ b/src/ftp-basic.c -@@ -965,8 +965,6 @@ ftp_list (int csock, const char *file, bool avoid_list_a, bool avoid_list, - bool ok = false; - size_t i = 0; - -- *list_a_used = false; -- - /* 2013-10-12 Andrea Urbani (matfanjol) - For more information about LIST and "LIST -a" please look at ftp.c, - function getftp, text "__LIST_A_EXPLANATION__". -@@ -975,7 +973,9 @@ ftp_list (int csock, const char *file, bool avoid_list_a, bool avoid_list, - later "i" variable. */ - const char *list_commands[] = { "LIST -a", - "LIST" }; -+ *list_a_used = false; - -+ - if (avoid_list_a) - { - i = countof (list_commands)- 1; -diff --git a/src/html-url.c b/src/html-url.c -index 903864e..ebeb382 100644 ---- a/src/html-url.c -+++ b/src/html-url.c -@@ -790,6 +790,7 @@ get_urls_file (const char *file) - char *url_text; - struct urlpos *entry; - struct url *url; -+ char *new_url; - - const char *line_beg = text; - const char *line_end = memchr (text, '\n', text_end - text); -@@ -822,7 +823,7 @@ get_urls_file (const char *file) - url_text = merged; - } - -- char *new_url = rewrite_shorthand_url (url_text); -+ new_url = rewrite_shorthand_url (url_text); - if (new_url) - { - xfree (url_text); -diff --git a/src/http.c b/src/http.c -index 4b99c17..5ecf43b 100644 ---- a/src/http.c -+++ b/src/http.c -@@ -1532,6 +1532,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen, - int warc_payload_offset = 0; - FILE *warc_tmp = NULL; - int warcerr = 0; -+ int flags; - - if (opt.warc_filename != NULL) - { -@@ -1568,7 +1569,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen, - } - - /* Read the response body. */ -- int flags = 0; -+ flags = 0; - if (contlen != -1) - /* If content-length is present, read that much; otherwise, read - until EOF. The HTTP spec doesn't require the server to -@@ -1673,6 +1674,7 @@ static uerr_t - gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy, - struct iri *iri, int count) - { -+ int warc_tmp_written; - struct request *req; - - char *type; -@@ -2141,10 +2143,11 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy, - if (write_error >= 0 && warc_tmp != NULL) - { - /* Remember end of headers / start of payload. */ -+ int warc_tmp_written; - warc_payload_offset = ftello (warc_tmp); - - /* Write a copy of the data to the WARC record. */ -- int warc_tmp_written = fwrite (opt.body_data, 1, body_data_size, warc_tmp); -+ warc_tmp_written = fwrite (opt.body_data, 1, body_data_size, warc_tmp); - if (warc_tmp_written != body_data_size) - write_error = -2; - } -@@ -2325,6 +2328,7 @@ read_header: - - if (statcode == HTTP_STATUS_UNAUTHORIZED) - { -+ uerr_t auth_err; - /* Authorization is required. */ - - /* Normally we are not interested in the response body. -@@ -2363,7 +2367,7 @@ read_header: - } - - pconn.authorized = false; -- uerr_t auth_err = RETROK; -+ auth_err = RETROK; - if (!auth_finished && (user && passwd)) - { - /* IIS sends multiple copies of WWW-Authenticate, one with -diff --git a/src/main.c b/src/main.c -index 1ada822..a72249d 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -987,13 +987,18 @@ main (int argc, char **argv) - int i, ret, longindex; - int nurl; - bool append_to_log = false; -+ struct ptimer *timer; -+ double start_time; -+ int arglen; -+ int argstring_length; -+ char *p; - - total_downloaded_bytes = 0; - - program_name = argv[0]; - -- struct ptimer *timer = ptimer_new (); -- double start_time = ptimer_measure (timer); -+ timer = ptimer_new (); -+ start_time = ptimer_measure (timer); - - i18n_initialize (); - -@@ -1015,10 +1020,10 @@ main (int argc, char **argv) - #endif - - /* Construct the arguments string. */ -- int argstring_length = 1; -+ argstring_length = 1; - for (i = 1; i < argc; i++) - argstring_length += strlen (argv[i]) + 2 + 1; -- char *p = program_argstring = malloc (argstring_length * sizeof (char)); -+ p = program_argstring = malloc (argstring_length * sizeof (char)); - if (p == NULL) - { - fprintf (stderr, _("Memory allocation problem\n")); -@@ -1027,7 +1032,7 @@ main (int argc, char **argv) - for (i = 1; i < argc; i++) - { - *p++ = '"'; -- int arglen = strlen (argv[i]); -+ arglen = strlen (argv[i]); - memcpy (p, argv[i], arglen); - p += arglen; - *p++ = '"'; -@@ -1702,10 +1707,12 @@ outputting to a regular file.\n")); - total_downloaded_bytes != 0) - { - double end_time = ptimer_measure (timer); -+ char *wall_time; -+ char *download_time; - ptimer_destroy (timer); - -- char *wall_time = xstrdup (secs_to_human_time (end_time - start_time)); -- char *download_time = xstrdup (secs_to_human_time (total_download_time)); -+ wall_time = xstrdup (secs_to_human_time (end_time - start_time)); -+ download_time = xstrdup (secs_to_human_time (total_download_time)); - logprintf (LOG_NOTQUIET, - _("FINISHED --%s--\nTotal wall clock time: %s\n" - "Downloaded: %d files, %s in %s (%s)\n"), -diff --git a/src/retr.c b/src/retr.c -index 71b5c28..0c7c29f 100644 ---- a/src/retr.c -+++ b/src/retr.c -@@ -378,8 +378,9 @@ fd_read_body (const char *downloaded_filename, int fd, FILE *out, wgint toread, - - if (ret > 0) - { -+ int write_res; - sum_read += ret; -- int write_res = write_data (out, out2, dlbuf, ret, &skip, &sum_written); -+ write_res = write_data (out, out2, dlbuf, ret, &skip, &sum_written); - if (write_res < 0) - { - ret = (write_res == -3) ? -3 : -2; -diff --git a/src/utils.c b/src/utils.c -index 78c282e..6a21164 100644 ---- a/src/utils.c -+++ b/src/utils.c -@@ -64,7 +64,9 @@ as that of the covered work. */ - #include - - /* For TIOCGWINSZ and friends: */ -+#ifndef __HAIKU__ - #include -+#endif - #include - - /* Needed for Unix version of run_with_timeout. */ -diff --git a/src/warc.c b/src/warc.c -index 46459ac..fdef2d6 100644 ---- a/src/warc.c -+++ b/src/warc.c -@@ -163,10 +163,11 @@ warc_write_buffer (const char *buffer, size_t size) - static bool - warc_write_string (const char *str) - { -+ size_t n; - if (!warc_write_ok) - return false; - -- size_t n = strlen (str); -+ n = strlen (str); - if (n != warc_write_buffer (str, n)) - warc_write_ok = false; - -@@ -254,6 +255,8 @@ static bool - warc_write_block_from_file (FILE *data_in) - { - /* Add the Content-Length header. */ -+ char buffer[BUFSIZ]; -+ size_t s; - char content_length[MAX_INT_TO_STRING_LEN(off_t)]; - fseeko (data_in, 0L, SEEK_END); - number_to_string (content_length, ftello (data_in)); -@@ -266,8 +269,6 @@ warc_write_block_from_file (FILE *data_in) - warc_write_ok = false; - - /* Copy the data in the file to the WARC record. */ -- char buffer[BUFSIZ]; -- size_t s; - while (warc_write_ok && (s = fread (buffer, 1, BUFSIZ, data_in)) > 0) - { - if (warc_write_buffer (buffer, s) < s) -@@ -292,6 +293,12 @@ warc_write_end_record (void) - /* We start a new gzip stream for each record. */ - if (warc_write_ok && warc_current_gzfile) - { -+ size_t result; -+ char static_header[GZIP_STATIC_HEADER_SIZE]; -+ off_t current_offset; -+ off_t uncompressed_size; -+ off_t compressed_size; -+ char extra_header[EXTRA_GZIP_HEADER_SIZE]; - if (gzclose (warc_current_gzfile) != Z_OK) - { - warc_write_ok = false; -@@ -317,17 +324,16 @@ warc_write_end_record (void) - */ - - /* Calculate the uncompressed and compressed sizes. */ -- off_t current_offset = ftello (warc_current_file); -- off_t uncompressed_size = current_offset - warc_current_gzfile_offset; -- off_t compressed_size = warc_current_gzfile_uncompressed_size; -+ current_offset = ftello (warc_current_file); -+ uncompressed_size = current_offset - warc_current_gzfile_offset; -+ compressed_size = warc_current_gzfile_uncompressed_size; - - /* Go back to the static GZIP header. */ - fseeko (warc_current_file, warc_current_gzfile_offset - + EXTRA_GZIP_HEADER_SIZE, SEEK_SET); - - /* Read the header. */ -- char static_header[GZIP_STATIC_HEADER_SIZE]; -- size_t result = fread (static_header, 1, GZIP_STATIC_HEADER_SIZE, -+ result = fread (static_header, 1, GZIP_STATIC_HEADER_SIZE, - warc_current_file); - if (result != GZIP_STATIC_HEADER_SIZE) - { -@@ -344,7 +350,6 @@ warc_write_end_record (void) - fwrite (static_header, 1, GZIP_STATIC_HEADER_SIZE, warc_current_file); - - /* Prepare the extra GZIP header. */ -- char extra_header[EXTRA_GZIP_HEADER_SIZE]; - /* XLEN, the length of the extra header fields. */ - extra_header[0] = ((EXTRA_GZIP_HEADER_SIZE - 2) & 255); - extra_header[1] = ((EXTRA_GZIP_HEADER_SIZE - 2) >> 8) & 255; -@@ -661,13 +666,15 @@ warc_write_warcinfo_record (char *filename) - /* Write warc-info record as the first record of the file. */ - /* We add the record id of this info record to the other records in the - file. */ -+ char timestamp[22]; -+ char *filename_copy, *filename_basename; -+ FILE *warc_tmp; -+ - warc_current_warcinfo_uuid_str = (char *) malloc (48); - warc_uuid_str (warc_current_warcinfo_uuid_str); - -- char timestamp[22]; - warc_timestamp (timestamp); - -- char *filename_copy, *filename_basename; - filename_copy = strdup (filename); - filename_basename = strdup (basename (filename_copy)); - -@@ -679,7 +686,7 @@ warc_write_warcinfo_record (char *filename) - warc_write_header ("WARC-Filename", filename_basename); - - /* Create content. */ -- FILE *warc_tmp = warc_tempfile (); -+ warc_tmp = warc_tempfile (); - if (warc_tmp == NULL) - { - free (filename_copy); -@@ -729,6 +736,10 @@ warc_write_warcinfo_record (char *filename) - static bool - warc_start_new_file (bool meta) - { -+ int base_filename_length; -+ char *new_filename; -+ const char *extension; -+ - if (opt.warc_filename == NULL) - return false; - -@@ -740,9 +751,9 @@ warc_start_new_file (bool meta) - - warc_current_file_number++; - -- int base_filename_length = strlen (opt.warc_filename); -+ base_filename_length = strlen (opt.warc_filename); - /* filename format: base + "-" + 5 digit serial number + ".warc.gz" */ -- char *new_filename = malloc (base_filename_length + 1 + 5 + 8 + 1); -+ new_filename = malloc (base_filename_length + 1 + 5 + 8 + 1); - warc_current_filename = new_filename; - - #ifdef __VMS -@@ -752,9 +763,9 @@ warc_start_new_file (bool meta) - #endif /* def __VMS [else] */ - - #ifdef HAVE_LIBZ -- const char *extension = (opt.warc_compression_enabled ? WARC_GZ : "warc"); -+ extension = (opt.warc_compression_enabled ? WARC_GZ : "warc"); - #else -- const char *extension = "warc"; -+ extension = "warc"; - #endif - - /* If max size is enabled, we add a serial number to the file names. */ -@@ -828,12 +839,13 @@ static bool - warc_parse_cdx_header (char *lineptr, int *field_num_original_url, - int *field_num_checksum, int *field_num_record_id) - { -+ char *token; -+ char *save_ptr; -+ - *field_num_original_url = -1; - *field_num_checksum = -1; - *field_num_record_id = -1; - -- char *token; -- char *save_ptr; - token = strtok_r (lineptr, CDX_FIELDSEP, &save_ptr); - - if (token != NULL && strcmp (token, "CDX") == 0) -@@ -877,10 +889,12 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, - - char *token; - char *save_ptr; -+ int field_num; -+ - token = strtok_r (lineptr, CDX_FIELDSEP, &save_ptr); - - /* Read this line to get the fields we need. */ -- int field_num = 0; -+ field_num = 0; - while (token != NULL) - { - char **val; -@@ -942,10 +956,7 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, - static bool - warc_load_cdx_dedup_file (void) - { -- FILE *f = fopen (opt.warc_cdx_dedup_filename, "r"); -- if (f == NULL) -- return false; -- -+ FILE *f; - int field_num_original_url = -1; - int field_num_checksum = -1; - int field_num_record_id = -1; -@@ -954,6 +965,10 @@ warc_load_cdx_dedup_file (void) - size_t n = 0; - ssize_t line_length; - -+ f = fopen (opt.warc_cdx_dedup_filename, "r"); -+ if (f == NULL) -+ return false; -+ - /* The first line should contain the CDX header. - Format: " CDX x x x x x" - where x are field type indicators. For our purposes, we only -@@ -981,6 +996,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); - } - else - { -+ int nrecords; - /* Initialize the table. */ - warc_cdx_dedup_table = hash_table_new (1000, warc_hash_sha1_digest, - warc_cmp_sha1_digest); -@@ -998,7 +1014,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); - while (line_length != -1); - - /* Print results. */ -- int nrecords = hash_table_count (warc_cdx_dedup_table); -+ nrecords = hash_table_count (warc_cdx_dedup_table); - logprintf (LOG_VERBOSE, ngettext ("Loaded %d record from CDX.\n\n", - "Loaded %d records from CDX.\n\n", - nrecords), -@@ -1018,10 +1034,11 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); - static struct warc_cdx_record * - warc_find_duplicate_cdx_record (char *url, char *sha1_digest_payload) - { -+ struct warc_cdx_record *rec_existing; - if (warc_cdx_dedup_table == NULL) - return NULL; - -- struct warc_cdx_record *rec_existing -+ rec_existing - = hash_table_get (warc_cdx_dedup_table, sha1_digest_payload); - - if (rec_existing && strcmp (rec_existing->url, url) == 0) -@@ -1093,11 +1110,13 @@ warc_init (void) - static void - warc_write_metadata (void) - { -+ char manifest_uuid [48]; -+ FILE * warc_tmp_fp; -+ - /* If there are multiple WARC files, the metadata should be written to a separate file. */ - if (opt.warc_maxsize > 0) - warc_start_new_file (true); - -- char manifest_uuid [48]; - warc_uuid_str (manifest_uuid); - - fflush (warc_manifest_fp); -@@ -1107,7 +1126,7 @@ warc_write_metadata (void) - warc_manifest_fp, -1); - /* warc_write_resource_record has closed warc_manifest_fp. */ - -- FILE * warc_tmp_fp = warc_tempfile (); -+ warc_tmp_fp = warc_tempfile (); - if (warc_tmp_fp == NULL) - { - logprintf (LOG_NOTQUIET, _("Could not open temporary WARC file.\n")); -@@ -1161,6 +1180,7 @@ warc_close (void) - FILE * - warc_tempfile (void) - { -+ int fd; - char filename[100]; - if (path_search (filename, 100, opt.warc_tempdir, "wget", true) == -1) - return NULL; -@@ -1180,7 +1200,7 @@ warc_tempfile (void) - return fopen (tfn, "w+", "fop=tmd"); /* Create auto-delete temp file. */ - } - #else /* def __VMS */ -- int fd = mkostemp (filename, O_TEMPORARY); -+ fd = mkostemp (filename, O_TEMPORARY); - if (fd < 0) - return NULL; - -@@ -1242,8 +1262,11 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, - off_t offset, const char *warc_filename _GL_UNUSED, - const char *response_uuid) - { -- /* Transform the timestamp. */ -+ char offset_string[MAX_INT_TO_STRING_LEN(off_t)]; - char timestamp_str_cdx [15]; -+ const char *checksum; -+ -+ /* Transform the timestamp. */ - memcpy (timestamp_str_cdx , timestamp_str , 4); /* "YYYY" "-" */ - memcpy (timestamp_str_cdx + 4, timestamp_str + 5, 2); /* "mm" "-" */ - memcpy (timestamp_str_cdx + 6, timestamp_str + 8, 2); /* "dd" "T" */ -@@ -1253,7 +1276,6 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, - timestamp_str_cdx[14] = '\0'; - - /* Rewrite the checksum. */ -- const char *checksum; - if (payload_digest != NULL) - checksum = payload_digest + 5; /* Skip the "sha1:" */ - else -@@ -1264,7 +1286,6 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, - if (redirect_location == NULL || strlen(redirect_location) == 0) - redirect_location = "-"; - -- char offset_string[MAX_INT_TO_STRING_LEN(off_t)]; - number_to_string (offset_string, offset); - - /* Print the CDX line. */ -@@ -1296,10 +1317,11 @@ warc_write_revisit_record (char *url, char *timestamp_str, - char *refers_to, ip_address *ip, FILE *body) - { - char revisit_uuid [48]; -- warc_uuid_str (revisit_uuid); -- - char *block_digest = NULL; - char sha1_res_block[SHA1_DIGEST_SIZE]; -+ -+ warc_uuid_str (revisit_uuid); -+ - sha1_stream (body, sha1_res_block); - block_digest = warc_base32_sha1_digest (sha1_res_block); - -@@ -1350,6 +1372,9 @@ warc_write_response_record (char *url, char *timestamp_str, - char sha1_res_block[SHA1_DIGEST_SIZE]; - char sha1_res_payload[SHA1_DIGEST_SIZE]; - -+ char response_uuid [48]; -+ off_t offset; -+ - if (opt.warc_digests_enabled) - { - /* Calculate the block and payload digests. */ -@@ -1393,11 +1418,10 @@ warc_write_response_record (char *url, char *timestamp_str, - - /* Not a revisit, just store the record. */ - -- char response_uuid [48]; - warc_uuid_str (response_uuid); - - fseeko (warc_current_file, 0L, SEEK_END); -- off_t offset = ftello (warc_current_file); -+ offset = ftello (warc_current_file); - - warc_write_start_record (); - warc_write_header ("WARC-Type", "response"); --- -1.8.3.4 - - -From 9c955c94b7c3c9da50351fd68bfa1a9d6dca80ba Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 1 Dec 2014 18:00:02 +0000 -Subject: Fix OpenSSL compile-time check for TLSv1.1 and TLSv1.2 - -from upstream - -diff --git a/src/openssl.c b/src/openssl.c -index e24954a..3f42b8f 100644 ---- a/src/openssl.c -+++ b/src/openssl.c -@@ -216,13 +216,20 @@ ssl_init (void) - case secure_protocol_tlsv1: - meth = TLSv1_client_method (); - break; --#if OPENSSL_VERSION_NUMBER >= 0x01001000 -+#if OPENSSL_VERSION_NUMBER >= 0x10001000 - case secure_protocol_tlsv1_1: - meth = TLSv1_1_client_method (); - break; - case secure_protocol_tlsv1_2: - meth = TLSv1_2_client_method (); - break; -+#else -+ case secure_protocol_tlsv1_1: -+ logprintf (LOG_NOTQUIET, _("Your OpenSSL version is too old to support TLSv1.1\n")); -+ goto error; -+ case secure_protocol_tlsv1_2: -+ logprintf (LOG_NOTQUIET, _("Your OpenSSL version is too old to support TLSv1.2\n")); -+ goto error; - #endif - default: - abort (); --- -1.8.3.4 - - -From 02ca916f8dddcb1c27cefa1f6ab4c99525d6bdc2 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 1 Dec 2014 18:14:50 +0000 -Subject: gcc2 fixes - - -diff --git a/src/ftp.c b/src/ftp.c -index 054cb61..723776c 100644 ---- a/src/ftp.c -+++ b/src/ftp.c -@@ -2220,9 +2220,9 @@ has_insecure_name_p (const char *s) - static bool - is_invalid_entry (struct fileinfo *f) - { -+ char *f_name = f->name; - struct fileinfo *cur; - cur = f; -- char *f_name = f->name; - /* If the node we're currently checking has a duplicate later, we eliminate - * the current node and leave the next one intact. */ - while (cur->next) -diff --git a/src/http.c b/src/http.c -index 5ecf43b..4176678 100644 ---- a/src/http.c -+++ b/src/http.c -@@ -1189,8 +1189,8 @@ static bool - parse_content_disposition (const char *hdr, char **filename) - { - param_token name, value; -- *filename = NULL; - bool is_url_encoded = false; -+ *filename = NULL; - for ( ; extract_param (&hdr, &name, &value, ';', &is_url_encoded); - is_url_encoded = false) - { -diff --git a/src/main.c b/src/main.c -index a72249d..50dc562 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -992,6 +992,9 @@ main (int argc, char **argv) - int arglen; - int argstring_length; - char *p; -+ int retconf; -+ bool use_userconfig = false; -+ bool noconfig = false; - - total_downloaded_bytes = 0; - -@@ -1048,9 +1051,6 @@ main (int argc, char **argv) - /* This separate getopt_long is needed to find the user config file - option ("--config") and parse it before the other user options. */ - longindex = -1; -- int retconf; -- bool use_userconfig = false; -- bool noconfig = false; - - while ((retconf = getopt_long (argc, argv, - short_options, long_options, &longindex)) != -1) -diff --git a/src/openssl.c b/src/openssl.c -index 3f42b8f..c1d1f52 100644 ---- a/src/openssl.c -+++ b/src/openssl.c -@@ -167,6 +167,8 @@ static int ssl_true_initialized = 0; - bool - ssl_init (void) - { -+ SSL_METHOD const *meth; -+ - #if OPENSSL_VERSION_NUMBER >= 0x00907000 - if (ssl_true_initialized == 0) - { -@@ -174,9 +176,7 @@ ssl_init (void) - ssl_true_initialized = 1; - } - #endif -- -- SSL_METHOD const *meth; -- -+ - if (ssl_ctx) - /* The SSL has already been initialized. */ - return true; -diff --git a/src/progress.c b/src/progress.c -index 5ba542d..f0da019 100644 ---- a/src/progress.c -+++ b/src/progress.c -@@ -903,6 +903,8 @@ get_eta (int *bcd) - static void - create_image (struct bar_progress *bp, double dl_total_time, bool done) - { -+ int cols_diff; -+ const char * down_size; - const int MAX_FILENAME_COLS = bp->width / 4; - char *p = bp->buffer; - wgint size = bp->initial_length + bp->count; -@@ -964,6 +966,7 @@ create_image (struct bar_progress *bp, double dl_total_time, bool done) - } - else - { -+ int padding; - int offset_cols; - int bytes_in_filename, offset_bytes, col; - int *cols_ret = &col; -@@ -976,7 +979,7 @@ create_image (struct bar_progress *bp, double dl_total_time, bool done) - bytes_in_filename = cols_to_bytes (bp->f_download + offset_bytes, MAX_FILENAME_COLS, cols_ret); - memcpy (p, bp->f_download + offset_bytes, bytes_in_filename); - p += bytes_in_filename; -- int padding = MAX_FILENAME_COLS - *cols_ret; -+ padding = MAX_FILENAME_COLS - *cols_ret; - for (;padding;padding--) - *p++ = ' '; - *p++ = ' '; -@@ -1059,8 +1062,8 @@ create_image (struct bar_progress *bp, double dl_total_time, bool done) - ++bp->tick; - - /* " 234.56M" */ -- const char * down_size = human_readable (size, 1000, 2); -- int cols_diff = 7 - count_cols (down_size); -+ down_size = human_readable (size, 1000, 2); -+ cols_diff = 7 - count_cols (down_size); - while (cols_diff > 0) - { - *p++=' '; -diff --git a/src/retr.c b/src/retr.c -index 0c7c29f..cb5fa3f 100644 ---- a/src/retr.c -+++ b/src/retr.c -@@ -1059,6 +1059,7 @@ retrieve_from_file (const char *file, bool html, int *count) - int dt; - struct iri *tmpiri = iri_dup (iri); - struct url *parsed_url = NULL; -+ char *proxy; - - if (cur_url->ignore_when_downloading) - continue; -@@ -1071,7 +1072,7 @@ retrieve_from_file (const char *file, bool html, int *count) - - parsed_url = url_parse (cur_url->url->url, NULL, tmpiri, true); - -- char *proxy = getproxy (cur_url->url); -+ proxy = getproxy (cur_url->url); - if ((opt.recursive || opt.page_requisites) - && (cur_url->url->scheme != SCHEME_FTP || proxy)) - { -@@ -1283,10 +1284,11 @@ getproxy (struct url *u) - bool - url_uses_proxy (struct url * u) - { -+ char *proxy; - bool ret; - if (!u) - return false; -- char *proxy = getproxy (u); -+ proxy = getproxy (u); - ret = proxy != NULL; - free(proxy); - return ret; --- -1.8.3.4 - diff --git a/net-misc/wget/wget-1.16.recipe b/net-misc/wget/wget-1.16.1.recipe similarity index 85% rename from net-misc/wget/wget-1.16.recipe rename to net-misc/wget/wget-1.16.1.recipe index db80df47a..3dd4d2231 100644 --- a/net-misc/wget/wget-1.16.recipe +++ b/net-misc/wget/wget-1.16.1.recipe @@ -6,7 +6,7 @@ scripts. " HOMEPAGE="http://www.gnu.org/software/wget" SRC_URI="http://ftp.gnu.org/gnu/wget/wget-$portVersion.tar.gz" -CHECKSUM_SHA256="b977fc10ac7a72d987d48136251aeb332f2dced1aabd50d6d56bdf72e2b79101" +CHECKSUM_SHA256="3b834ce69366d4681f295307fce36ee14e122c4ee68a4d1291b62b0b26755a77" LICENSE="GNU GPL v3" COPYRIGHT="1996-2014 Free Software Foundation" REVISION="1" @@ -20,6 +20,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libintl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -30,6 +31,7 @@ BUILD_REQUIRES=" devel:libcrypto$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix >= 1.2.3 + devel:libintl$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix @@ -39,6 +41,9 @@ BUILD_PREREQUIRES=" cmd:make cmd:makeinfo cmd:pod2man + cmd:gettext + cmd:find + cmd:pkg_config$secondaryArchSuffix " USER_SETTINGS_FILES=" @@ -49,13 +54,11 @@ GLOBAL_WRITABLE_FILES=" settings/wgetrc keep-old " -PATCHES="wget-1.16.patchset" +PATCHES="wget-$portVersion.patchset" BUILD() { - libtoolize --force --copy --install - aclocal -I m4 - autoconf + autoreconf -fi runConfigure ./configure --with-ssl=openssl make } From b54dd3d4b2bb743857ff283a86713a8d2cc71830 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 13 Dec 2014 00:00:20 +0000 Subject: [PATCH 23/28] python: enable 2.7 for x86 --- dev-lang/python/python-2.7.1.recipe | 41 ----------------------------- dev-lang/python/python-2.7.8.recipe | 2 +- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 dev-lang/python/python-2.7.1.recipe diff --git a/dev-lang/python/python-2.7.1.recipe b/dev-lang/python/python-2.7.1.recipe deleted file mode 100644 index a9294c883..000000000 --- a/dev-lang/python/python-2.7.1.recipe +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.7.1/Python-2.7.1.tar.bz2" -CHECKSUM_MD5="aa27bc25725137ba155910bd8e5ddc4f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/readline >= 6.0" -BUILD() -{ - cd Python-2.7.1/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-shared \ - LDFLAGS=-L/boot/common/lib \ - CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL() -{ - cd Python-2.7.1 - make install -} - -TEST() -{ - cd Python-2.7.1 - cd Lib/test - rm test_asynchat.py # this one stalls, so skip it for now - rm test_multiprocessing.py # this one stalls, so skip it for now - - python regrtest.py -} - -LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" diff --git a/dev-lang/python/python-2.7.8.recipe b/dev-lang/python/python-2.7.8.recipe index 4ec8cdbc4..15d017e8c 100644 --- a/dev-lang/python/python-2.7.8.recipe +++ b/dev-lang/python/python-2.7.8.recipe @@ -14,7 +14,7 @@ COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" CHECKSUM_SHA256="edde10a0cb7d14e2735e682882d5b287028d1485c456758154c19573db68075a" REVISION="1" -ARCHITECTURES="x86_gcc2 !x86 x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="python-$portVersion.patchset" From 4beeb05bc887c2e12fd6ed9a0eddd5b8c52722d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 13 Dec 2014 01:34:45 +0100 Subject: [PATCH 24/28] libburndevice: Fix require There's no such cmd:cdrtools, just cdrtools or cmd:cdrecord. --- haiku-libs/libburndevice/libburndevice-1.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-libs/libburndevice/libburndevice-1.0.recipe b/haiku-libs/libburndevice/libburndevice-1.0.recipe index f13628c13..f4377bbf7 100644 --- a/haiku-libs/libburndevice/libburndevice-1.0.recipe +++ b/haiku-libs/libburndevice/libburndevice-1.0.recipe @@ -17,7 +17,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - cmd:cdrtools + cmd:cdrecord " PROVIDES_devel=" From 8e49231363132404fbe2a37c54bc8f725fb789ee Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Fri, 12 Dec 2014 21:52:36 +0100 Subject: [PATCH 25/28] Add recipe for flare --- games-rpg/flare/flare-0.19.recipe | 66 ++++++++++++++++++++++++ games-rpg/flare/patches/flare-0.19.patch | 58 +++++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 games-rpg/flare/flare-0.19.recipe create mode 100644 games-rpg/flare/patches/flare-0.19.patch diff --git a/games-rpg/flare/flare-0.19.recipe b/games-rpg/flare/flare-0.19.recipe new file mode 100644 index 000000000..fcfebb1ab --- /dev/null +++ b/games-rpg/flare/flare-0.19.recipe @@ -0,0 +1,66 @@ +SUMMARY="Single-player 2D action RPG." +DESCRIPTION="Flare is a a single-player 2D action RPG with fast-paced action \ +and a dark fantasy style." +HOMEPAGE="http://flarerpg.org" +SRC_URI="http://downloads.sourceforge.net/project/flare-game/Linux/flare.0.19.tar.gz" +CHECKSUM_SHA256="c96995fff6b71d44ddeae611b1ae4cd35162655f73088000786d03478f0a924e" +SOURCE_DIR="flare.0.19" +REVISION="1" +LICENSE="GNU GPL v3" +COPYRIGHT="2010-2013 Clint Bellanger" + +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + flare$secondaryArchSuffix = $portVersion + app:Flare$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl$secondaryArchSuffix + lib:libsdl_mixer$secondaryArchSuffix + lib:libsdl_image$secondaryArchSuffix + lib:libsdl_ttf$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix + devel:sdl_mixer$secondaryArchSuffix + devel:sdl_image$secondaryArchSuffix + devel:sdl_ttf$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:cmake + cmd:gcc$secondaryArchSuffix + " + +PATCHES="flare-0.19.patch" + +USER_SETTINGS_FILES=" + settings/flare + " + +BUILD() +{ + cmake . + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir + mkdir -p $dataDir/flare + cp flare $appsDir + cp -r mods $dataDir/flare/ + addAppDeskbarSymlink $appsDir/flare "Flare" +} diff --git a/games-rpg/flare/patches/flare-0.19.patch b/games-rpg/flare/patches/flare-0.19.patch new file mode 100644 index 000000000..d40cbc0e8 --- /dev/null +++ b/games-rpg/flare/patches/flare-0.19.patch @@ -0,0 +1,58 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ef6577f..b7631b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,6 +23,10 @@ elseif () + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-enforce-eh-specs") + endif () + ++if(HAIKU) ++ set(CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS}" "-lbe") ++endif() ++ + if(CMAKE_BUILD_TYPE STREQUAL "Release") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -g0") + elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") +diff --git a/src/Settings.cpp b/src/Settings.cpp +index 8beaeed..c22cc09 100644 +--- a/src/Settings.cpp ++++ b/src/Settings.cpp +@@ -34,6 +34,12 @@ using namespace std; + #include "UtilsFileSystem.h" + #include "SharedResources.h" + ++#ifdef __HAIKU__ ++#include ++#include ++#include ++#endif ++ + #ifdef _MSC_VER + #define log2(x) logf(x)/logf(2) + #endif +@@ -232,6 +238,25 @@ void setPaths() { + if (dirExists(CUSTOM_PATH_DATA)) PATH_DATA = CUSTOM_PATH_DATA; + else if (!CUSTOM_PATH_DATA.empty()) fprintf(stderr, "Error: Could not find specified game data directory.\n"); + } ++ ++#elif __HAIKU__ ++// Haiku paths ++void setPaths() { ++ BPath path; ++ find_directory(B_USER_SETTINGS_DIRECTORY, &path); ++ BString str = path.Path(); ++ str << "/flare/"; ++ createDir(str.String()); ++ PATH_CONF = str; ++ PATH_USER = str; ++ PATH_DEFAULT_USER = str; ++ find_directory(B_SYSTEM_DATA_DIRECTORY, &path); ++ str = path.Path(); ++ str << "/flare/"; ++ PATH_DATA = str; ++ PATH_DEFAULT_DATA = str; ++} ++ + #else + void setPaths() { + From 7f69e026349f74c644927a9112ab8bbaa78e6463 Mon Sep 17 00:00:00 2001 From: Nav Date: Sun, 14 Dec 2014 00:44:24 +0200 Subject: [PATCH 26/28] Fixed apr_util-1.5.4 recipe for x86 build --- dev-libs/apr_util/apr_util-1.5.4.recipe | 36 ++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dev-libs/apr_util/apr_util-1.5.4.recipe b/dev-libs/apr_util/apr_util-1.5.4.recipe index 175ba1f1f..14c99b0f6 100644 --- a/dev-libs/apr_util/apr_util-1.5.4.recipe +++ b/dev-libs/apr_util/apr_util-1.5.4.recipe @@ -16,30 +16,31 @@ LICENSE="Apache v2" COPYRIGHT="2011 The Apache Software Foundation." REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" PATCHES="apr_util-1.5.3.patch" PROVIDES=" - apr_util = $portVersion compat >= 1 - lib:libaprutil_1 = 0.5.4 compat >= 0 + apr_util$secondaryArchSuffix = $portVersion compat >= 1 + lib:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0 " REQUIRES=" - haiku >= $haikuVersion - lib:libapr_1 - lib:libexpat - lib:libiconv + haiku$secondaryArchSuffix >= $haikuVersion + lib:libapr_1$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libapr_1 >= 0.5.0 - devel:libexpat - devel:libiconv + devel:libapr_1$secondaryArchSuffix >= 0.5.0 + devel:libexpat$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:autoheader - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:ld cmd:libtoolize cmd:make @@ -54,8 +55,7 @@ PATCH() BUILD() { - aprInstallDir=$portPackageLinksDir/lib~libapr_1 - expatInstallDir=$portPackageLinksDir/lib~libexpat + expatInstallDir=$portPackageLinksDir/lib~libexpat$secondaryArchSuffix rm -rf aclocal.m4 mkdir -p m4 @@ -77,7 +77,7 @@ BUILD() ln -sfn $sourceDir/libtool /libtool runConfigure ./configure \ - --with-apr=$aprInstallDir \ + --with-apr=/$relativeBinDir \ --with-expat=$expatInstallDir make $jobArgs } @@ -108,10 +108,10 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - apr_util_devel = portVersion compat >= 1 - cmd:apu_1_config = $portVersion compat >= 1 - devel:libaprutil_1 = 0.5.4 compat >= 0 + apr_util_devel$secondaryArchSuffix = portVersion compat >= 1 + cmd:apu_1_config$secondaryArchSuffix = $portVersion compat >= 1 + devel:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0 " REQUIRES_devel=" - apr_util == $portVersion base + apr_util$secondaryArchSuffix == $portVersion base " From ea5a602d8de8bf628e9e929b29ff38d09f2e7692 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 13 Dec 2014 11:57:32 +0000 Subject: [PATCH 27/28] autoconf213: use --program-suffix --- sys-devel/autoconf213/autoconf213-2.13.recipe | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/sys-devel/autoconf213/autoconf213-2.13.recipe b/sys-devel/autoconf213/autoconf213-2.13.recipe index 3c9e90005..1d2598027 100644 --- a/sys-devel/autoconf213/autoconf213-2.13.recipe +++ b/sys-devel/autoconf213/autoconf213-2.13.recipe @@ -4,26 +4,26 @@ autoconf, programmers can create portable and configurable packages, because \ the person building the package is allowed to specify various configuration \ options." HOMEPAGE="http://www.gnu.org/software/autoconf/" -SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz" +SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-$portVersion.tar.gz" CHECKSUM_SHA256="f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e" -REVISION="1" +REVISION="2" -SOURCE_DIR="autoconf-2.13" +SOURCE_DIR="autoconf-$portVersion" LICENSE="GNU GPL v2" COPYRIGHT="1992-1998 Free Software Foundation, Inc." -ARCHITECTURES="x86_gcc2 x86 arm" -SECONDARY_ARCHITECTURES="x86_gcc2 x86 arm" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - autoconf_2.13$secondaryArchSuffix = $portVersion - cmd:autoconf_2.13$secondaryArchSuffix = $portVersion - cmd:autoheader_2.13$secondaryArchSuffix = $portVersion - cmd:autoreconf_2.13$secondaryArchSuffix = $portVersion - cmd:autoscan_2.13$secondaryArchSuffix = $portVersion - cmd:autoupdate_2.13$secondaryArchSuffix = $portVersion - cmd:ifnames_2.13$secondaryArchSuffix = $portVersion + autoconf213$secondaryArchSuffix = $portVersion + cmd:autoconf_$portVersion$secondaryArchSuffix = $portVersion + cmd:autoheader_$portVersion$secondaryArchSuffix = $portVersion + cmd:autoreconf_$portVersion$secondaryArchSuffix = $portVersion + cmd:autoscan_$portVersion$secondaryArchSuffix = $portVersion + cmd:autoupdate_$portVersion$secondaryArchSuffix = $portVersion + cmd:ifnames_$portVersion$secondaryArchSuffix = $portVersion " REQUIRES=" @@ -31,10 +31,10 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:make cmd:autoconf @@ -43,15 +43,11 @@ BUILD_PREREQUIRES=" BUILD() { autoconf - runConfigure ./configure + runConfigure ./configure --program-suffix=-$portVersion make $jobArgs } INSTALL() { make install - - for bin in $(ls $binDir); do - mv $binDir/$bin $binDir/${bin}-2.13 - done } From a7a8cf91c91888926036f5bbd2b62836f5ff7114 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 14 Dec 2014 10:39:05 +0000 Subject: [PATCH 28/28] sqlite: bump version --- .../{sqlite-3.8.7.1.recipe => sqlite-3.8.7.4.recipe} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename dev-db/sqlite/{sqlite-3.8.7.1.recipe => sqlite-3.8.7.4.recipe} (86%) diff --git a/dev-db/sqlite/sqlite-3.8.7.1.recipe b/dev-db/sqlite/sqlite-3.8.7.4.recipe similarity index 86% rename from dev-db/sqlite/sqlite-3.8.7.1.recipe rename to dev-db/sqlite/sqlite-3.8.7.4.recipe index 16696d240..bd9edac62 100644 --- a/dev-db/sqlite/sqlite-3.8.7.1.recipe +++ b/dev-db/sqlite/sqlite-3.8.7.4.recipe @@ -6,8 +6,9 @@ SQLite is the most widely deployed SQL database engine in the world. The \ source code for SQLite is in the public domain. " HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/2014/sqlite-autoconf-3080701.tar.gz" -CHECKSUM_SHA256="9d2854bec7b26dfe9aceb1faa17d40674daa15a23bbab67018191ffbe0339533" +sqliteVersion=$(echo $portVersion | sed 's/\.\([0-9]\)/0\1/g') +SRC_URI="http://www.sqlite.org/2014/sqlite-autoconf-$sqliteVersion.tar.gz" +CHECKSUM_SHA256="86370f139405fdfe03334fd618171a74e50f589f17ccbe5933361ed1f58359ec" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -41,7 +42,7 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="sqlite-autoconf-3080701" +SOURCE_DIR="sqlite-autoconf-$sqliteVersion" BUILD() {