From ea7e85f9d1461b034ee95461bd4aae71a2e60523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Sun, 8 Dec 2013 22:14:24 +0000 Subject: [PATCH 001/116] DOSBox 0.74 --- games-emulation/dosbox/dosbox-0.74-svn.patch | 20 - games-emulation/dosbox/dosbox-0.74.recipe | 68 + games-emulation/dosbox/dosbox-0.74_svn.recipe | 27 - games-emulation/dosbox/patches/powf.patch | 3901 +++++++++++++++++ 4 files changed, 3969 insertions(+), 47 deletions(-) delete mode 100644 games-emulation/dosbox/dosbox-0.74-svn.patch create mode 100644 games-emulation/dosbox/dosbox-0.74.recipe delete mode 100644 games-emulation/dosbox/dosbox-0.74_svn.recipe create mode 100644 games-emulation/dosbox/patches/powf.patch diff --git a/games-emulation/dosbox/dosbox-0.74-svn.patch b/games-emulation/dosbox/dosbox-0.74-svn.patch deleted file mode 100644 index 1e81c8f9e..000000000 --- a/games-emulation/dosbox/dosbox-0.74-svn.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 3798) -+++ configure.in (working copy) -@@ -121,13 +121,8 @@ - - - dnl Check for powf --AC_MSG_CHECKING(for powf in libm); --LIBS_BACKUP=$LIBS; --LIBS="$LIBS -lm"; --AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],[[ -- powf(1.0f, 1.0f); --]])], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[libm doesn't include powf])]) --LIBS=$LIBS_BACKUP -+AC_SEARCH_LIBS([powf], [m], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[no powf function available])]) -+AC_SEARCH_LIBS([getpeername], [network]) - - - dnl Checks for libraries. diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe new file mode 100644 index 000000000..df5801447 --- /dev/null +++ b/games-emulation/dosbox/dosbox-0.74.recipe @@ -0,0 +1,68 @@ +SUMMARY="DOSBox is a DOS-Emulator that uses SDL library" +DESCRIPTION="DOSBox is a DOS-emulator that uses the SDL-library which +makes DOSBox very easy to port to different platforms. DOSBox has +already been ported to many different platforms, such as Windows, +BeOS, Linux, MacOS X... + +DOSBox also emulates CPU:286/386 realmode/protected mode, Directory +FileSystem/XMS/EMS, Tandy/Hercules/CGA/EGA/VGA/VESA graphics, a +SoundBlaster/Gravis Ultra Sound card for excellent sound compatibility +with older games... + +You can "re-live" the good old days with the help of DOSBox, it can +run plenty of the old classics that don't run on your new computer! + +DOSBox is totally free of charge and OpenSource." +HOMEPAGE="http://www.dosbox.com" +SRC_URI="http://sourceforge.net/projects/dosbox/files/dosbox/0.74/dosbox-0.74.tar.gz/download" +CHECKSUM_MD5="b9b240fa87104421962d14eee71351e8" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2013 The DosBox Team" + +ARCHITECTURES="x86 x86_64" +SECONDARY_ARCHITECTURES="x86 x86_64" + +PROVIDES=" + dosbox$secondaryArchSuffix = $portVersion + app:dosbox$secondaryArchSuffix = $portVersion +" +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl$secondaryArchSuffix + lib:libglu$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libz$secondaryArchSuffix +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libglu$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libz$secondaryArchSuffix + libsdl${secondaryArchSuffix}_devel +" +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:libtoolize + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:aclocal +" +SOURCE_DIR="dosbox-0.74" + +PATCHES=" + powf.patch +" + +BUILD() +{ + #libtoolize --force --copy --install + ./configure --prefix=$prefix --disable-dynamic-core --bindir=$appsDir --datarootdir=$dataDir + make +} +INSTALL() +{ + make install + addAppDeskbarSymlink $appsDir/dosbox "DOSBox" +} diff --git a/games-emulation/dosbox/dosbox-0.74_svn.recipe b/games-emulation/dosbox/dosbox-0.74_svn.recipe deleted file mode 100644 index e6b48bf79..000000000 --- a/games-emulation/dosbox/dosbox-0.74_svn.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="an x86 emulator with DOS" -MESSAGE="This port requires gcc4." -HOMEPAGE="http://www.dosbox.com/" -SRC_URI="svn://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk/" -REVISION="1" -STATUS_HAIKU="unstable" -DEPEND="media-libs/libsdl >= 1.2 < " - -BUILD() -{ - cd dosbox-0.74-svn - libtoolize --force --copy --install - ./autogen.sh - ./configure --prefix=/boot/common --disable-dynamic-x86 - make -} - -INSTALL() -{ - cd dosbox-0.74-svn - make install -} - -# no TEST script available - -COPYRIGHT="2012 The DOSBox Team" -LICENSE="GNU GPL v2" diff --git a/games-emulation/dosbox/patches/powf.patch b/games-emulation/dosbox/patches/powf.patch new file mode 100644 index 000000000..b78ae7acc --- /dev/null +++ b/games-emulation/dosbox/patches/powf.patch @@ -0,0 +1,3901 @@ +diff --git a/config.guess b/config.guess +index c2246a4..1804e9f 100755 +--- a/config.guess ++++ b/config.guess +@@ -1,14 +1,14 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012, 2013 Free Software Foundation, Inc. + +-timestamp='2009-12-30' ++timestamp='2012-12-29' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or ++# the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, but +@@ -17,26 +17,22 @@ timestamp='2009-12-30' + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +- +-# Originally written by Per Bothner. Please send patches (context +-# diff format) to and include a ChangeLog +-# entry. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). + # +-# This script attempts to guess a canonical system name similar to +-# config.sub. If it succeeds, it prints the system name on stdout, and +-# exits with 0. Otherwise, it exits with 1. ++# Originally written by Per Bothner. + # + # You can get the latest version of this script from: + # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++# ++# Please send patches with a ChangeLog entry to config-patches@gnu.org. ++ + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -57,8 +53,8 @@ GNU config.guess ($timestamp) + + Originally written by Per Bothner. + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +-Software Foundation, Inc. ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, ++2012, 2013 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -145,7 +141,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -181,7 +177,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -202,6 +198,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +@@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -296,12 +299,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; +@@ -481,8 +484,8 @@ EOF + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -495,7 +498,7 @@ EOF + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -552,7 +555,7 @@ EOF + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -595,52 +598,52 @@ EOF + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c + +- #define _HPUX_SOURCE +- #include +- #include ++ #define _HPUX_SOURCE ++ #include ++ #include + +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); + +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -731,22 +734,22 @@ EOF + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; +@@ -770,14 +773,14 @@ EOF + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +@@ -789,30 +792,35 @@ EOF + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) +- case ${UNAME_MACHINE} in ++ case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +@@ -858,6 +866,13 @@ EOF + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +@@ -867,7 +882,7 @@ EOF + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; +- esac ++ esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +@@ -879,20 +894,29 @@ EOF + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + LIBC=gnu +@@ -934,7 +958,7 @@ EOF + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu +@@ -960,7 +984,7 @@ EOF + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -968,14 +992,17 @@ EOF + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. +@@ -984,11 +1011,11 @@ EOF + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) +@@ -1020,7 +1047,7 @@ EOF + fi + exit ;; + i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; +@@ -1048,13 +1075,13 @@ EOF + exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i586. ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp +- exit ;; ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; +@@ -1089,8 +1116,8 @@ EOF + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ +@@ -1133,10 +1160,10 @@ EOF + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm +@@ -1162,11 +1189,11 @@ EOF + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; +@@ -1179,6 +1206,9 @@ EOF + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1231,7 +1261,10 @@ EOF + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1276,13 +1309,13 @@ EOF + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; +@@ -1300,11 +1333,11 @@ EOF + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c < + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + +diff --git a/config.sub b/config.sub +index c2d1257..802a224 100755 +--- a/config.sub ++++ b/config.sub +@@ -1,38 +1,33 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012, 2013 Free Software Foundation, Inc. + +-timestamp='2010-01-22' ++timestamp='2012-12-29' + +-# This file is (in principle) common to ALL GNU software. +-# The presence of a machine in this file suggests that SOME GNU software +-# can handle that machine. It does not imply ALL GNU software can. +-# +-# This file is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or ++# This file is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + # +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). + + +-# Please send patches to . Submit a context +-# diff and a properly formatted GNU ChangeLog entry. ++# Please send patches with a ChangeLog entry to config-patches@gnu.org. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. +@@ -76,8 +71,8 @@ version="\ + GNU config.sub ($timestamp) + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +-Software Foundation, Inc. ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, ++2012, 2013 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -124,13 +119,18 @@ esac + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ +- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -153,12 +153,12 @@ case $os in + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray | -microblaze) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; +- -bluegene*) +- os=-cnk ++ -bluegene*) ++ os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= +@@ -174,10 +174,10 @@ case $os in + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; +@@ -222,6 +222,12 @@ case $os in + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -246,20 +252,27 @@ case $basic_machine in + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | arc \ ++ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ ++ | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep | metag \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -282,29 +295,39 @@ case $basic_machine in + | moxie \ + | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ +- | rx \ ++ | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +- | spu | strongarm \ +- | tahoe | thumb | tic4x | tic80 | tron \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ +- | v850 | v850e \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ +- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12 | picochip) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -314,6 +337,21 @@ case $basic_machine in + basic_machine=mt-unknown + ;; + ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +@@ -328,25 +366,30 @@ case $basic_machine in + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ ++ | be32-* | be64-* \ + | bfin-* | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +@@ -368,26 +411,29 @@ case $basic_machine in + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* | rx-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ +- | tahoe-* | thumb-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ +- | tile-* | tilegx-* \ ++ | tile*-* \ + | tron-* \ + | ubicom32-* \ +- | v850-* | v850e-* | vax-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) +@@ -412,7 +458,7 @@ case $basic_machine in + basic_machine=a29k-amd + os=-udi + ;; +- abacus) ++ abacus) + basic_machine=abacus-unknown + ;; + adobe68k) +@@ -482,11 +528,20 @@ case $basic_machine in + basic_machine=powerpc-ibm + os=-cnk + ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; +- cegcc) ++ cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; +@@ -518,7 +573,7 @@ case $basic_machine in + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16) ++ cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; +@@ -676,7 +731,6 @@ case $basic_machine in + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -734,9 +788,13 @@ case $basic_machine in + basic_machine=ns32k-utek + os=-sysv + ;; +- microblaze) ++ microblaze*) + basic_machine=microblaze-xilinx + ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -773,10 +831,18 @@ case $basic_machine in + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -841,6 +907,12 @@ case $basic_machine in + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -923,9 +995,10 @@ case $basic_machine in + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +@@ -950,7 +1023,11 @@ case $basic_machine in + basic_machine=i586-unknown + os=-pw32 + ;; +- rdos) ++ rdos | rdos64) ++ basic_machine=x86_64-pc ++ os=-rdos ++ ;; ++ rdos32) + basic_machine=i386-pc + os=-rdos + ;; +@@ -1019,6 +1096,9 @@ case $basic_machine in + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -1075,25 +1155,8 @@ case $basic_machine in + basic_machine=t90-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff +- ;; +- tic55x | c55x*) +- basic_machine=tic55x-unknown +- os=-coff +- ;; +- tic6x | c6x*) +- basic_machine=tic6x-unknown +- os=-coff +- ;; +- # This must be matched before tile*. +- tilegx*) +- basic_machine=tilegx-unknown +- os=-linux-gnu +- ;; + tile*) +- basic_machine=tile-unknown ++ basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) +@@ -1163,6 +1226,9 @@ case $basic_machine in + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos +@@ -1260,11 +1326,11 @@ esac + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. +- -auroraux) +- os=-auroraux ++ -auroraux) ++ os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` +@@ -1294,14 +1360,15 @@ case $os in + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -openbsd* | -solidbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +@@ -1348,7 +1415,7 @@ case $os in + -opened*) + os=-openedition + ;; +- -os400*) ++ -os400*) + os=-os400 + ;; + -wince*) +@@ -1397,7 +1464,7 @@ case $os in + -sinix*) + os=-sysv4 + ;; +- -tpf*) ++ -tpf*) + os=-tpf + ;; + -triton*) +@@ -1442,8 +1509,8 @@ case $os in + -dicos*) + os=-dicos + ;; +- -nacl*) +- ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +@@ -1466,10 +1533,10 @@ else + # system, and we'll never get to this point. + + case $basic_machine in +- score-*) ++ score-*) + os=-elf + ;; +- spu-*) ++ spu-*) + os=-elf + ;; + *-acorn) +@@ -1481,8 +1548,20 @@ case $basic_machine in + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) +@@ -1502,14 +1581,11 @@ case $basic_machine in + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; +- mep-*) ++ mep-*) + os=-elf + ;; + mips*-cisco) +@@ -1536,7 +1612,7 @@ case $basic_machine in + *-ibm) + os=-aix + ;; +- *-knuth) ++ *-knuth) + os=-mmixware + ;; + *-wec) +diff --git a/configure b/configure +index 0dbc2e3..84cda9d 100755 +--- a/configure ++++ b/configure +@@ -1,11 +1,9 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.65 for dosbox 0.74. ++# Generated by GNU Autoconf 2.69 for dosbox 0.74. + # + # +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. + # + # + # This configure script is free software; the Free Software Foundation +@@ -89,6 +87,7 @@ fi + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. ++as_myself= + case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -133,6 +132,31 @@ export LANGUAGE + # CDPATH. + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + ++# Use a proper internal environment variable to ensure we don't fall ++ # into an infinite loop, continuously re-executing ourselves. ++ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then ++ _as_can_reexec=no; export _as_can_reexec; ++ # We cannot yet assume a decent shell, so we have to provide a ++# neutralization value for shells without unset; and this also ++# works around shells that cannot unset nonexistent variables. ++# Preserve -v and -x to the replacement shell. ++BASH_ENV=/dev/null ++ENV=/dev/null ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++esac ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} ++# Admittedly, this is quite paranoid, since all the known shells bail ++# out after a failed `exec'. ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 ++as_fn_exit 255 ++ fi ++ # We don't want this to propagate to other subprocesses. ++ { _as_can_reexec=; unset _as_can_reexec;} + if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh +@@ -166,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + else + exitcode=1; echo positional parameters were not saved. + fi +-test x\$exitcode = x0 || exit 1" ++test x\$exitcode = x0 || exit 1 ++test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && +@@ -211,14 +236,25 @@ IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : +- # We cannot yet assume a decent shell, so we have to provide a +- # neutralization value for shells without unset; and this also +- # works around shells that cannot unset nonexistent variables. +- BASH_ENV=/dev/null +- ENV=/dev/null +- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++ export CONFIG_SHELL ++ # We cannot yet assume a decent shell, so we have to provide a ++# neutralization value for shells without unset; and this also ++# works around shells that cannot unset nonexistent variables. ++# Preserve -v and -x to the replacement shell. ++BASH_ENV=/dev/null ++ENV=/dev/null ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++esac ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} ++# Admittedly, this is quite paranoid, since all the known shells bail ++# out after a failed `exec'. ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 ++exit 255 + fi + + if test x$as_have_required = xno; then : +@@ -316,10 +352,18 @@ $as_echo X"$as_dir" | + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p ++ ++# as_fn_executable_p FILE ++# ----------------------- ++# Test if FILE is an executable regular file. ++as_fn_executable_p () ++{ ++ test -f "$1" && test -x "$1" ++} # as_fn_executable_p + # as_fn_append VAR VALUE + # ---------------------- + # Append the text in VALUE to the end of the definition contained in VAR. Take +@@ -356,19 +400,19 @@ else + fi # as_fn_arith + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -441,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + ++ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have ++ # already done that, so ensure we don't try to do so again and fall ++ # in an infinite loop. This has already happened in practice. ++ _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). +@@ -475,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. ++ # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null +@@ -496,28 +544,8 @@ else + as_mkdir_p=false + fi + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in #( +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x ++as_test_x='test -x' ++as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -530,7 +558,7 @@ test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +@@ -793,8 +821,9 @@ do + fi + + case $ac_option in +- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *) ac_optarg=yes ;; ++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *=) ac_optarg= ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. +@@ -839,7 +868,7 @@ do + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -865,7 +894,7 @@ do + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1069,7 +1098,7 @@ do + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1085,7 +1114,7 @@ do + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1115,8 +1144,8 @@ do + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) as_fn_error "unrecognized option: \`$ac_option' +-Try \`$0 --help' for more information." ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" + ;; + + *=*) +@@ -1124,7 +1153,7 @@ Try \`$0 --help' for more information." + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) +- as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; +@@ -1134,7 +1163,7 @@ Try \`$0 --help' for more information." + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 +- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ++ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +@@ -1142,13 +1171,13 @@ done + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- as_fn_error "missing argument to $ac_option" ++ as_fn_error $? "missing argument to $ac_option" + fi + + if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; +- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1171,7 +1200,7 @@ do + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" ++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1185,8 +1214,6 @@ target=$target_alias + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -1201,9 +1228,9 @@ test "$silent" = yes && exec 6>/dev/null + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- as_fn_error "working directory cannot be determined" ++ as_fn_error $? "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- as_fn_error "pwd does not report name of working directory" ++ as_fn_error $? "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1242,11 +1269,11 @@ else + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" ++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1286,7 +1313,7 @@ Configuration: + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking...' messages ++ -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files +@@ -1453,9 +1480,9 @@ test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF + dosbox configure 0.74 +-generated by GNU Autoconf 2.65 ++generated by GNU Autoconf 2.69 + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2012 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1499,7 +1526,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile +@@ -1525,7 +1552,7 @@ $as_echo "$ac_try_echo"; } >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } >/dev/null && { ++ test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : +@@ -1536,7 +1563,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_c_try_cpp +@@ -1574,7 +1601,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_compile +@@ -1616,7 +1643,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=$ac_status + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_c_try_run +@@ -1648,7 +1675,7 @@ $as_echo "$ac_try_echo"; } >&5 + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext ++ test -x conftest$ac_exeext + }; then : + ac_retval=0 + else +@@ -1662,7 +1689,7 @@ fi + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_c_try_link +@@ -1676,7 +1703,7 @@ ac_fn_c_check_type () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=no" +@@ -1717,7 +1744,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_type + +@@ -1730,7 +1757,7 @@ ac_fn_c_check_header_compile () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -1748,7 +1775,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_header_compile + +@@ -1769,7 +1796,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) >= 0)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -1785,7 +1813,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -1811,7 +1840,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) < 0)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -1827,7 +1857,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -1861,7 +1892,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -1925,7 +1957,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + rm -f conftest.val + + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + + } # ac_fn_c_compute_int +@@ -1938,10 +1970,10 @@ rm -f conftest.val + ac_fn_c_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + fi + eval ac_res=\$$3 +@@ -1977,7 +2009,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : + else + ac_header_preproc=no + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 + $as_echo "$ac_header_preproc" >&6; } + +@@ -2004,7 +2036,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=\$ac_header_compiler" +@@ -2013,7 +2045,7 @@ eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_header_mongrel + +@@ -2025,7 +2057,7 @@ ac_fn_c_check_func () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2080,7 +2112,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_func + cat >config.log <<_ACEOF +@@ -2088,7 +2120,7 @@ This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by dosbox $as_me 0.74, which was +-generated by GNU Autoconf 2.65. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +@@ -2198,11 +2230,9 @@ trap 'exit_status=$? + { + echo + +- cat <<\_ASBOX +-## ---------------- ## ++ $as_echo "## ---------------- ## + ## Cache variables. ## +-## ---------------- ## +-_ASBOX ++## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, + ( +@@ -2236,11 +2266,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + ) + echo + +- cat <<\_ASBOX +-## ----------------- ## ++ $as_echo "## ----------------- ## + ## Output variables. ## +-## ----------------- ## +-_ASBOX ++## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do +@@ -2253,11 +2281,9 @@ _ASBOX + echo + + if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## ++ $as_echo "## ------------------- ## + ## File substitutions. ## +-## ------------------- ## +-_ASBOX ++## ------------------- ##" + echo + for ac_var in $ac_subst_files + do +@@ -2271,11 +2297,9 @@ _ASBOX + fi + + if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## ++ $as_echo "## ----------- ## + ## confdefs.h. ## +-## ----------- ## +-_ASBOX ++## ----------- ##" + echo + cat confdefs.h + echo +@@ -2330,7 +2354,12 @@ _ACEOF + ac_site_file1=NONE + ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE ++ # We do not want a PATH search for config.site. ++ case $CONFIG_SITE in #(( ++ -*) ac_site_file1=./$CONFIG_SITE;; ++ */*) ac_site_file1=$CONFIG_SITE;; ++ *) ac_site_file1=./$CONFIG_SITE;; ++ esac + elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +@@ -2345,7 +2374,11 @@ do + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" ++ . "$ac_site_file" \ ++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "failed to load site script $ac_site_file ++See \`config.log' for more details" "$LINENO" 5; } + fi + done + +@@ -2421,7 +2454,7 @@ if $ac_cache_corrupted; then + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 + $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + fi + ## -------------------- ## + ## Main body of script. ## +@@ -2439,16 +2472,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- for ac_t in install-sh install.sh shtool; do +- if test -f "$ac_dir/$ac_t"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/$ac_t -c" +- break 2 +- fi +- done ++ if test -f "$ac_dir/install-sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install-sh -c" ++ break ++ elif test -f "$ac_dir/install.sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install.sh -c" ++ break ++ elif test -f "$ac_dir/shtool"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/shtool install -c" ++ break ++ fi + done + if test -z "$ac_aux_dir"; then +- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -2462,27 +2501,27 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 ++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +-if test "${ac_cv_build+set}" = set; then : ++if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_build_alias=$build_alias + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -2500,14 +2539,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 + $as_echo_n "checking host system type... " >&6; } +-if test "${ac_cv_host+set}" = set; then : ++if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +@@ -2515,7 +2554,7 @@ fi + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -2552,7 +2591,7 @@ am__api_version='1.11' + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 + $as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then : ++if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2572,7 +2611,7 @@ case $as_dir/ in #(( + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -2639,11 +2678,11 @@ am_lf=' + ' + case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) +- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; ++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; + esac + case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; ++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + esac + + # Do `set' in a subshell so we don't clobber the current shell's +@@ -2665,7 +2704,7 @@ if ( + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". +- as_fn_error "ls -t appears to fail. Make sure there is not a broken ++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + +@@ -2675,7 +2714,7 @@ then + # Ok. + : + else +- as_fn_error "newly created file is older than distributed files! ++ as_fn_error $? "newly created file is older than distributed files! + Check your system clock" "$LINENO" 5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +@@ -2729,7 +2768,7 @@ if test "$cross_compiling" != no; then + set dummy ${ac_tool_prefix}strip; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then : ++if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -2741,7 +2780,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2769,7 +2808,7 @@ if test -z "$ac_cv_prog_STRIP"; then + set dummy strip; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -2781,7 +2820,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2822,7 +2861,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 + $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + if test -z "$MKDIR_P"; then +- if test "${ac_cv_path_mkdir+set}" = set; then : ++ if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2832,7 +2871,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do +- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue ++ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ +@@ -2873,7 +2912,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AWK+set}" = set; then : ++if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then +@@ -2885,7 +2924,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2913,7 +2952,7 @@ done + $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} + ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -2921,7 +2960,7 @@ SHELL = /bin/sh + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; +@@ -2955,7 +2994,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then +- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 ++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi + fi + +@@ -3018,7 +3057,7 @@ ac_config_headers="$ac_config_headers config.h" + $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} + ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -3026,7 +3065,7 @@ SHELL = /bin/sh + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; +@@ -3055,7 +3094,7 @@ if test -n "$ac_tool_prefix"; then + set dummy ${ac_tool_prefix}gcc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3067,7 +3106,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3095,7 +3134,7 @@ if test -z "$ac_cv_prog_CC"; then + set dummy gcc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3107,7 +3146,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3148,7 +3187,7 @@ if test -z "$CC"; then + set dummy ${ac_tool_prefix}cc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3160,7 +3199,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3188,7 +3227,7 @@ if test -z "$CC"; then + set dummy cc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3201,7 +3240,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -3247,7 +3286,7 @@ if test -z "$CC"; then + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3259,7 +3298,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3291,7 +3330,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3303,7 +3342,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3345,8 +3384,8 @@ fi + + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "no acceptable C compiler found in \$PATH +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5; } + + # Provide some information about the compiler. + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +@@ -3460,9 +3499,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "C compiler cannot create executables +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "C compiler cannot create executables ++See \`config.log' for more details" "$LINENO" 5; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +@@ -3504,8 +3542,8 @@ done + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details" "$LINENO" 5; } + fi + rm -f conftest conftest$ac_cv_exeext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +@@ -3562,9 +3600,9 @@ $as_echo "$ac_try_echo"; } >&5 + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run C compiled programs. ++as_fn_error $? "cannot run C compiled programs. + If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5; } + fi + fi + fi +@@ -3575,7 +3613,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out + ac_clean_files=$ac_clean_files_save + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } +-if test "${ac_cv_objext+set}" = set; then : ++if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -3615,8 +3653,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details" "$LINENO" 5; } + fi + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +@@ -3626,7 +3664,7 @@ OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then : ++if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -3663,7 +3701,7 @@ ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then : ++if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag +@@ -3741,7 +3779,7 @@ else + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then : ++if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no +@@ -3750,8 +3788,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +-#include +-#include ++struct stat; + /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ + struct buf { int x; }; + FILE * (*rcsopen) (struct buf *, struct stat *, int); +@@ -3902,7 +3939,7 @@ depcc="$CC" am_compiler_list= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : ++if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -4037,7 +4074,7 @@ if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then : ++ if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -4067,7 +4104,7 @@ else + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -4083,11 +4120,11 @@ else + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -4126,7 +4163,7 @@ else + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -4142,18 +4179,18 @@ else + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5; } + fi + + ac_ext=c +@@ -4178,7 +4215,7 @@ if test -z "$CXX"; then + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CXX+set}" = set; then : ++if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CXX"; then +@@ -4190,7 +4227,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4222,7 +4259,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : ++if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CXX"; then +@@ -4234,7 +4271,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4300,7 +4337,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 + $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : ++if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4337,7 +4374,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 + $as_echo_n "checking whether $CXX accepts -g... " >&6; } +-if test "${ac_cv_prog_cxx_g+set}" = set; then : ++if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag +@@ -4423,7 +4460,7 @@ depcc="$CXX" am_compiler_list= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : ++if ${am_cv_CXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -4552,7 +4589,7 @@ if test -n "$ac_tool_prefix"; then + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_RANLIB+set}" = set; then : ++if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then +@@ -4564,7 +4601,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4592,7 +4629,7 @@ if test -z "$ac_cv_prog_RANLIB"; then + set dummy ranlib; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : ++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then +@@ -4604,7 +4641,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4689,7 +4726,7 @@ fi + set dummy sdl-config; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_SDL_CONFIG+set}" = set; then : ++if ${ac_cv_path_SDL_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 + else + case $SDL_CONFIG in +@@ -4703,7 +4740,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4882,7 +4919,7 @@ rm -f core conftest.err conftest.$ac_objext \ + fi + SDL_CFLAGS="" + SDL_LIBS="" +- as_fn_error "*** SDL version $SDL_VERSION not found!" "$LINENO" 5 ++ as_fn_error $? "*** SDL version $SDL_VERSION not found!" "$LINENO" 5 + + fi + +@@ -4913,14 +4950,14 @@ else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- as_fn_error "Only libSDL 1.2.X supported" "$LINENO" 5 ++ as_fn_error $? "Only libSDL 1.2.X supported" "$LINENO" 5 + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 + $as_echo_n "checking for an ANSI C-conforming const... " >&6; } +-if test "${ac_cv_c_const+set}" = set; then : ++if ${ac_cv_c_const+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4929,11 +4966,11 @@ else + int + main () + { +-/* FIXME: Include the comments suggested by Paul. */ ++ + #ifndef __cplusplus +- /* Ultrix mips cc rejects this. */ ++ /* Ultrix mips cc rejects this sort of thing. */ + typedef int charset[2]; +- const charset cs; ++ const charset cs = { 0, 0 }; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; +@@ -4950,8 +4987,9 @@ main () + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; +- { /* SCO 3.2v4 cc rejects this. */ +- char *t; ++ { /* SCO 3.2v4 cc rejects this sort of thing. */ ++ char tx; ++ char *t = &tx; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; +@@ -4967,10 +5005,10 @@ main () + iptr p = 0; + ++p; + } +- { /* AIX XL C 1.02.0.0 rejects this saying ++ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ +- struct s { int j; const int *ap[3]; }; +- struct s *b; b->j = 5; ++ struct s { int j; const int *ap[3]; } bx; ++ struct s *b = &bx; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; +@@ -5000,7 +5038,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 + $as_echo_n "checking for inline... " >&6; } +-if test "${ac_cv_c_inline+set}" = set; then : ++if ${ac_cv_c_inline+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_c_inline=no +@@ -5043,7 +5081,7 @@ esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then : ++if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -5057,7 +5095,7 @@ do + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue ++ as_fn_executable_p "$ac_path_GREP" || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP + case `"$ac_path_GREP" --version 2>&1` in +@@ -5092,7 +5130,7 @@ esac + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP +@@ -5106,7 +5144,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 + $as_echo_n "checking for egrep... " >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then : ++if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -5123,7 +5161,7 @@ do + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue ++ as_fn_executable_p "$ac_path_EGREP" || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP + case `"$ac_path_EGREP" --version 2>&1` in +@@ -5158,7 +5196,7 @@ esac + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -5173,7 +5211,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then : ++if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -5290,8 +5328,7 @@ do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -5302,7 +5339,7 @@ done + + + ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +-if test "x$ac_cv_type_size_t" = x""yes; then : ++if test "x$ac_cv_type_size_t" = xyes; then : + + else + +@@ -5314,7 +5351,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 + $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } +-if test "${ac_cv_struct_tm+set}" = set; then : ++if ${ac_cv_struct_tm+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -5353,7 +5390,7 @@ fi + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned char" >&5 + $as_echo_n "checking size of unsigned char... " >&6; } +-if test "${ac_cv_sizeof_unsigned_char+set}" = set; then : ++if ${ac_cv_sizeof_unsigned_char+:} false; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned char))" "ac_cv_sizeof_unsigned_char" "$ac_includes_default"; then : +@@ -5362,9 +5399,8 @@ else + if test "$ac_cv_type_unsigned_char" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (unsigned char) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (unsigned char) ++See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_char=0 + fi +@@ -5387,7 +5423,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned short" >&5 + $as_echo_n "checking size of unsigned short... " >&6; } +-if test "${ac_cv_sizeof_unsigned_short+set}" = set; then : ++if ${ac_cv_sizeof_unsigned_short+:} false; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned short))" "ac_cv_sizeof_unsigned_short" "$ac_includes_default"; then : +@@ -5396,9 +5432,8 @@ else + if test "$ac_cv_type_unsigned_short" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (unsigned short) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (unsigned short) ++See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_short=0 + fi +@@ -5421,7 +5456,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int" >&5 + $as_echo_n "checking size of unsigned int... " >&6; } +-if test "${ac_cv_sizeof_unsigned_int+set}" = set; then : ++if ${ac_cv_sizeof_unsigned_int+:} false; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int))" "ac_cv_sizeof_unsigned_int" "$ac_includes_default"; then : +@@ -5430,9 +5465,8 @@ else + if test "$ac_cv_type_unsigned_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (unsigned int) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (unsigned int) ++See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_int=0 + fi +@@ -5455,7 +5489,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5 + $as_echo_n "checking size of unsigned long... " >&6; } +-if test "${ac_cv_sizeof_unsigned_long+set}" = set; then : ++if ${ac_cv_sizeof_unsigned_long+:} false; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long" "$ac_includes_default"; then : +@@ -5464,9 +5498,8 @@ else + if test "$ac_cv_type_unsigned_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (unsigned long) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (unsigned long) ++See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_long=0 + fi +@@ -5489,7 +5522,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long long" >&5 + $as_echo_n "checking size of unsigned long long... " >&6; } +-if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then : ++if ${ac_cv_sizeof_unsigned_long_long+:} false; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long long))" "ac_cv_sizeof_unsigned_long_long" "$ac_includes_default"; then : +@@ -5498,9 +5531,8 @@ else + if test "$ac_cv_type_unsigned_long_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (unsigned long long) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (unsigned long long) ++See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_long_long=0 + fi +@@ -5523,7 +5555,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 + $as_echo_n "checking size of int *... " >&6; } +-if test "${ac_cv_sizeof_int_p+set}" = set; then : ++if ${ac_cv_sizeof_int_p+:} false; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : +@@ -5532,9 +5564,8 @@ else + if test "$ac_cv_type_int_p" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (int *) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (int *) ++See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_int_p=0 + fi +@@ -5556,8 +5587,7 @@ for ac_header in stdlib.h sys/types.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -5583,8 +5613,7 @@ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include >confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -5698,38 +5727,6 @@ $as_echo "no" >&6; } + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for powf in libm" >&5 +-$as_echo_n "checking for powf in libm... " >&6; }; +-LIBS_BACKUP=$LIBS; +-LIBS="$LIBS -lm"; +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-int +-main () +-{ +- +- powf(1.0f, 1.0f); +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +-else +- +-$as_echo "#define DB_HAVE_NO_POWF 1" >>confdefs.h +- +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$LIBS_BACKUP +- +- +- + #Check if the compiler support attributes + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler allows __attribute__" >&5 +@@ -5993,7 +5990,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_ctl_open in -lasound" >&5 + $as_echo_n "checking for snd_ctl_open in -lasound... " >&6; } +-if test "${ac_cv_lib_asound_snd_ctl_open+set}" = set; then : ++if ${ac_cv_lib_asound_snd_ctl_open+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6027,7 +6024,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_ctl_open" >&5 + $as_echo "$ac_cv_lib_asound_snd_ctl_open" >&6; } +-if test "x$ac_cv_lib_asound_snd_ctl_open" = x""yes; then : ++if test "x$ac_cv_lib_asound_snd_ctl_open" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBASOUND 1 + _ACEOF +@@ -6067,7 +6064,7 @@ fi + #Check for big endian machine, should #define WORDS_BIGENDIAN if so + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 + $as_echo_n "checking whether byte ordering is bigendian... " >&6; } +-if test "${ac_cv_c_bigendian+set}" = set; then : ++if ${ac_cv_c_bigendian+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_c_bigendian=unknown +@@ -6285,7 +6282,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + + ;; #( + *) +- as_fn_error "unknown endianness ++ as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac + +@@ -6297,14 +6294,14 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; + ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" +-if test "x$ac_cv_header_curses_h" = x""yes; then : ++if test "x$ac_cv_header_curses_h" = xyes; then : + have_curses_h=yes + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5 + $as_echo_n "checking for initscr in -lcurses... " >&6; } +-if test "${ac_cv_lib_curses_initscr+set}" = set; then : ++if ${ac_cv_lib_curses_initscr+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6338,13 +6335,13 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5 + $as_echo "$ac_cv_lib_curses_initscr" >&6; } +-if test "x$ac_cv_lib_curses_initscr" = x""yes; then : ++if test "x$ac_cv_lib_curses_initscr" = xyes; then : + have_curses_lib=yes + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5 + $as_echo_n "checking for initscr in -lncurses... " >&6; } +-if test "${ac_cv_lib_ncurses_initscr+set}" = set; then : ++if ${ac_cv_lib_ncurses_initscr+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6378,13 +6375,13 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5 + $as_echo "$ac_cv_lib_ncurses_initscr" >&6; } +-if test "x$ac_cv_lib_ncurses_initscr" = x""yes; then : ++if test "x$ac_cv_lib_ncurses_initscr" = xyes; then : + have_ncurses_lib=yes + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lpdcurses" >&5 + $as_echo_n "checking for initscr in -lpdcurses... " >&6; } +-if test "${ac_cv_lib_pdcurses_initscr+set}" = set; then : ++if ${ac_cv_lib_pdcurses_initscr+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6418,7 +6415,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pdcurses_initscr" >&5 + $as_echo "$ac_cv_lib_pdcurses_initscr" >&6; } +-if test "x$ac_cv_lib_pdcurses_initscr" = x""yes; then : ++if test "x$ac_cv_lib_pdcurses_initscr" = xyes; then : + have_pdcurses_lib=yes + fi + +@@ -6451,7 +6448,7 @@ $as_echo "Debugger not enabled" >&6; } + + fi + else +- as_fn_error "Can't find curses, which is required for debug mode" "$LINENO" 5 ++ as_fn_error $? "Can't find curses, which is required for debug mode" "$LINENO" 5 + fi + + fi +@@ -6659,14 +6656,14 @@ fi + + + ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" +-if test "x$ac_cv_header_png_h" = x""yes; then : ++if test "x$ac_cv_header_png_h" = xyes; then : + have_png_h=yes + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_io_ptr in -lpng" >&5 + $as_echo_n "checking for png_get_io_ptr in -lpng... " >&6; } +-if test "${ac_cv_lib_png_png_get_io_ptr+set}" = set; then : ++if ${ac_cv_lib_png_png_get_io_ptr+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6700,7 +6697,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_get_io_ptr" >&5 + $as_echo "$ac_cv_lib_png_png_get_io_ptr" >&6; } +-if test "x$ac_cv_lib_png_png_get_io_ptr" = x""yes; then : ++if test "x$ac_cv_lib_png_png_get_io_ptr" = xyes; then : + have_png_lib=yes + fi + +@@ -6716,7 +6713,7 @@ fi + + + ac_fn_c_check_header_mongrel "$LINENO" "SDL_net.h" "ac_cv_header_SDL_net_h" "$ac_includes_default" +-if test "x$ac_cv_header_SDL_net_h" = x""yes; then : ++if test "x$ac_cv_header_SDL_net_h" = xyes; then : + have_sdl_net_h=yes + fi + +@@ -6753,7 +6750,7 @@ rm -f core conftest.err conftest.$ac_objext \ + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDLNet_Init in -lSDL_net" >&5 + $as_echo_n "checking for SDLNet_Init in -lSDL_net... " >&6; } +-if test "${ac_cv_lib_SDL_net_SDLNet_Init+set}" = set; then : ++if ${ac_cv_lib_SDL_net_SDLNet_Init+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6787,7 +6784,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_net_SDLNet_Init" >&5 + $as_echo "$ac_cv_lib_SDL_net_SDLNet_Init" >&6; } +-if test "x$ac_cv_lib_SDL_net_SDLNet_Init" = x""yes; then : ++if test "x$ac_cv_lib_SDL_net_SDLNet_Init" = xyes; then : + have_sdl_net_lib=yes + fi + +@@ -6806,7 +6803,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lX11" >&5 + $as_echo_n "checking for main in -lX11... " >&6; } +-if test "${ac_cv_lib_X11_main+set}" = set; then : ++if ${ac_cv_lib_X11_main+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6834,14 +6831,14 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_main" >&5 + $as_echo "$ac_cv_lib_X11_main" >&6; } +-if test "x$ac_cv_lib_X11_main" = x""yes; then : ++if test "x$ac_cv_lib_X11_main" = xyes; then : + have_x11_lib=yes + else + have_x11_lib=no + fi + + ac_fn_c_check_header_mongrel "$LINENO" "X11/XKBlib.h" "ac_cv_header_X11_XKBlib_h" "$ac_includes_default" +-if test "x$ac_cv_header_X11_XKBlib_h" = x""yes; then : ++if test "x$ac_cv_header_X11_XKBlib_h" = xyes; then : + have_x11_h=yes + else + have_x11_h=no +@@ -6864,7 +6861,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lGL" >&5 + $as_echo_n "checking for main in -lGL... " >&6; } +-if test "${ac_cv_lib_GL_main+set}" = set; then : ++if ${ac_cv_lib_GL_main+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6892,7 +6889,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_main" >&5 + $as_echo "$ac_cv_lib_GL_main" >&6; } +-if test "x$ac_cv_lib_GL_main" = x""yes; then : ++if test "x$ac_cv_lib_GL_main" = xyes; then : + have_gl_lib=yes + else + have_gl_lib=no +@@ -6900,7 +6897,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lopengl32" >&5 + $as_echo_n "checking for main in -lopengl32... " >&6; } +-if test "${ac_cv_lib_opengl32_main+set}" = set; then : ++if ${ac_cv_lib_opengl32_main+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -6928,14 +6925,14 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opengl32_main" >&5 + $as_echo "$ac_cv_lib_opengl32_main" >&6; } +-if test "x$ac_cv_lib_opengl32_main" = x""yes; then : ++if test "x$ac_cv_lib_opengl32_main" = xyes; then : + have_opengl32_lib=yes + else + have_opengl32_lib=no + fi + + ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" +-if test "x$ac_cv_header_GL_gl_h" = x""yes; then : ++if test "x$ac_cv_header_GL_gl_h" = xyes; then : + have_gl_h=yes + else + have_gl_h=no +@@ -6983,14 +6980,14 @@ fi + + + ac_fn_c_check_header_mongrel "$LINENO" "SDL_sound.h" "ac_cv_header_SDL_sound_h" "$ac_includes_default" +-if test "x$ac_cv_header_SDL_sound_h" = x""yes; then : ++if test "x$ac_cv_header_SDL_sound_h" = xyes; then : + have_SDL_sound_h=yes + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Sound_Init in -lSDL_sound" >&5 + $as_echo_n "checking for Sound_Init in -lSDL_sound... " >&6; } +-if test "${ac_cv_lib_SDL_sound_Sound_Init+set}" = set; then : ++if ${ac_cv_lib_SDL_sound_Sound_Init+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7024,13 +7021,13 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_sound_Sound_Init" >&5 + $as_echo "$ac_cv_lib_SDL_sound_Sound_Init" >&6; } +-if test "x$ac_cv_lib_SDL_sound_Sound_Init" = x""yes; then : ++if test "x$ac_cv_lib_SDL_sound_Sound_Init" = xyes; then : + have_SDL_sound_init=yes + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Sound_Seek in -lSDL_sound" >&5 + $as_echo_n "checking for Sound_Seek in -lSDL_sound... " >&6; } +-if test "${ac_cv_lib_SDL_sound_Sound_Seek+set}" = set; then : ++if ${ac_cv_lib_SDL_sound_Sound_Seek+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7064,7 +7061,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_sound_Sound_Seek" >&5 + $as_echo "$ac_cv_lib_SDL_sound_Sound_Seek" >&6; } +-if test "x$ac_cv_lib_SDL_sound_Sound_Seek" = x""yes; then : ++if test "x$ac_cv_lib_SDL_sound_Sound_Seek" = xyes; then : + have_SDL_sound_seek=yes + fi + +@@ -7084,10 +7081,10 @@ fi + + + ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_mman_h" = x""yes; then : ++if test "x$ac_cv_header_sys_mman_h" = xyes; then : + + ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect" +-if test "x$ac_cv_func_mprotect" = x""yes; then : ++if test "x$ac_cv_func_mprotect" = xyes; then : + $as_echo "#define C_HAVE_MPROTECT 1" >>confdefs.h + + fi +@@ -7127,7 +7124,7 @@ case "$host" in + for ac_header in ddraw.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "ddraw.h" "ac_cv_header_ddraw_h" "$ac_includes_default" +-if test "x$ac_cv_header_ddraw_h" = x""yes; then : ++if test "x$ac_cv_header_ddraw_h" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_DDRAW_H 1 + _ACEOF +@@ -7185,7 +7182,7 @@ case "$host" in + set dummy ${ac_tool_prefix}windres; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_WINDRES+set}" = set; then : ++if ${ac_cv_prog_WINDRES+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$WINDRES"; then +@@ -7197,7 +7194,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_WINDRES="${ac_tool_prefix}windres" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7225,7 +7222,7 @@ if test -z "$ac_cv_prog_WINDRES"; then + set dummy windres; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then : ++if ${ac_cv_prog_ac_ct_WINDRES+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_WINDRES"; then +@@ -7237,7 +7234,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_WINDRES="windres" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7354,10 +7351,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + :end' >>confcache + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then +- test "x$cache_file" != "x/dev/null" && ++ if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 + $as_echo "$as_me: updating cache $cache_file" >&6;} +- cat confcache >$cache_file ++ if test ! -f "$cache_file" || test -h "$cache_file"; then ++ cat confcache >"$cache_file" ++ else ++ case $cache_file in #( ++ */* | ?:*) ++ mv -f confcache "$cache_file"$$ && ++ mv -f "$cache_file"$$ "$cache_file" ;; #( ++ *) ++ mv -f confcache "$cache_file" ;; ++ esac ++ fi ++ fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 + $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} +@@ -7373,6 +7381,7 @@ DEFS=-DHAVE_CONFIG_H + + ac_libobjs= + ac_ltlibobjs= ++U= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +@@ -7396,24 +7405,24 @@ else + fi + + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- as_fn_error "conditional \"AMDEP\" was never defined. ++ as_fn_error $? "conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- as_fn_error "conditional \"am__fastdepCC\" was never defined. ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then +- as_fn_error "conditional \"am__fastdepCXX\" was never defined. ++ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + if test -z "${HAVE_WINDRES_TRUE}" && test -z "${HAVE_WINDRES_FALSE}"; then +- as_fn_error "conditional \"HAVE_WINDRES\" was never defined. ++ as_fn_error $? "conditional \"HAVE_WINDRES\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + +-: ${CONFIG_STATUS=./config.status} ++: "${CONFIG_STATUS=./config.status}" + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +@@ -7514,6 +7523,7 @@ fi + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. ++as_myself= + case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -7559,19 +7569,19 @@ export LANGUAGE + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -7709,16 +7719,16 @@ if (echo >conf$$.file) 2>/dev/null; then + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. ++ # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null +@@ -7767,7 +7777,7 @@ $as_echo X"$as_dir" | + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -7778,28 +7788,16 @@ else + as_mkdir_p=false + fi + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in #( +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x ++ ++# as_fn_executable_p FILE ++# ----------------------- ++# Test if FILE is an executable regular file. ++as_fn_executable_p () ++{ ++ test -f "$1" && test -x "$1" ++} # as_fn_executable_p ++as_test_x='test -x' ++as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -7821,7 +7819,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # values after options handling. + ac_log=" + This file was extended by dosbox $as_me 0.74, which was +-generated by GNU Autoconf 2.65. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -7887,10 +7885,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + dosbox config.status 0.74 +-configured by $0, generated by GNU Autoconf 2.65, ++configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2012 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -7908,11 +7906,16 @@ ac_need_defaults=: + while test $# != 0 + do + case $1 in +- --*=*) ++ --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; ++ --*=) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ ac_shift=: ++ ;; + *) + ac_option=$1 + ac_optarg=$2 +@@ -7934,6 +7937,7 @@ do + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; +@@ -7946,7 +7950,7 @@ do + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- as_fn_error "ambiguous option: \`$1' ++ as_fn_error $? "ambiguous option: \`$1' + Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; +@@ -7955,7 +7959,7 @@ Try \`$0 --help' for more information.";; + ac_cs_silent=: ;; + + # This is an error. +- -*) as_fn_error "unrecognized option: \`$1' ++ -*) as_fn_error $? "unrecognized option: \`$1' + Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" +@@ -7975,7 +7979,7 @@ fi + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + if \$ac_cs_recheck; then +- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' +@@ -8036,7 +8040,7 @@ do + "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; + "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; + +- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac + done + +@@ -8059,9 +8063,10 @@ fi + # after its creation but before its name has been assigned to `$tmp'. + $debug || + { +- tmp= ++ tmp= ac_tmp= + trap 'exit_status=$? +- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++ : "${ac_tmp:=$tmp}" ++ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + ' 0 + trap 'as_fn_exit 1' 1 2 13 15 + } +@@ -8069,12 +8074,13 @@ $debug || + + { + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && +- test -n "$tmp" && test -d "$tmp" ++ test -d "$tmp" + } || + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 ++ac_tmp=$tmp + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -8091,12 +8097,12 @@ if test "x$ac_cr" = x; then + fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\r' ++ ac_cs_awk_cr='\\r' + else + ac_cs_awk_cr=$ac_cr + fi + +-echo 'BEGIN {' >"$tmp/subs1.awk" && ++echo 'BEGIN {' >"$ac_tmp/subs1.awk" && + _ACEOF + + +@@ -8105,18 +8111,18 @@ _ACEOF + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" + } >conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -8124,7 +8130,7 @@ done + rm -f conf$$subs.sh + + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-cat >>"\$tmp/subs1.awk" <<\\_ACAWK && ++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && + _ACEOF + sed -n ' + h +@@ -8172,7 +8178,7 @@ t delim + rm -f conf$$subs.awk + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + _ACAWK +-cat >>"\$tmp/subs1.awk" <<_ACAWK && ++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +@@ -8204,21 +8210,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" + else + cat +-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || as_fn_error "could not setup config files machinery" "$LINENO" 5 ++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ ++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + _ACEOF + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir), ++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty + # (actually we leave an empty line to preserve line numbers). + if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/ +-s/:*\${srcdir}:*/:/ +-s/:*@srcdir@:*/:/ +-s/^\([^=]*=[ ]*\):*/\1/ ++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ ++h ++s/// ++s/^/:/ ++s/[ ]*$/:/ ++s/:\$(srcdir):/:/g ++s/:\${srcdir}:/:/g ++s/:@srcdir@:/:/g ++s/^:*// + s/:*$// ++x ++s/\(=[ ]*\).*/\1/ ++G ++s/\n// + s/^[^=]*=[ ]*$// + }' + fi +@@ -8230,7 +8244,7 @@ fi # test -n "$CONFIG_FILES" + # No need to generate them if there are no CONFIG_HEADERS. + # This happens for instance with `./config.status Makefile'. + if test -n "$CONFIG_HEADERS"; then +-cat >"$tmp/defines.awk" <<\_ACAWK || ++cat >"$ac_tmp/defines.awk" <<\_ACAWK || + BEGIN { + _ACEOF + +@@ -8242,11 +8256,11 @@ _ACEOF + # handling of long lines. + ac_delim='%!_!# ' + for ac_last_try in false false :; do +- ac_t=`sed -n "/$ac_delim/p" confdefs.h` +- if test -z "$ac_t"; then ++ ac_tt=`sed -n "/$ac_delim/p" confdefs.h` ++ if test -z "$ac_tt"; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -8331,7 +8345,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- as_fn_error "could not setup config headers machinery" "$LINENO" 5 ++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -8344,7 +8358,7 @@ do + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -8363,7 +8377,7 @@ do + for ac_f + do + case $ac_f in +- -) ac_f="$tmp/stdin";; ++ -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. +@@ -8372,7 +8386,7 @@ do + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" +@@ -8398,8 +8412,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} + esac + + case $ac_tag in +- *:-:* | *:-) cat >"$tmp/stdin" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; ++ *:-:* | *:-) cat >"$ac_tmp/stdin" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -8535,23 +8549,24 @@ s&@INSTALL@&$ac_INSTALL&;t t + s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack + " +-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ ++ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && +- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && +- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ ++ "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&5 ++which seems to be undefined. Please make sure it is defined" >&5 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&2;} ++which seems to be undefined. Please make sure it is defined" >&2;} + +- rm -f "$tmp/stdin" ++ rm -f "$ac_tmp/stdin" + case $ac_file in +- -) cat "$tmp/out" && rm -f "$tmp/out";; +- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; ++ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; ++ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -8560,21 +8575,21 @@ which seems to be undefined. Please make sure it is defined." >&2;} + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" +- } >"$tmp/config.h" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 +- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then ++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" ++ } >"$ac_tmp/config.h" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" +- mv "$tmp/config.h" "$ac_file" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ mv "$ac_tmp/config.h" "$ac_file" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || as_fn_error "could not create -" "$LINENO" 5 ++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ ++ || as_fn_error $? "could not create -" "$LINENO" 5 + fi + # Compute "$ac_file"'s index in $config_headers. + _am_arg="$ac_file" +@@ -8724,7 +8739,7 @@ _ACEOF + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -8745,7 +8760,7 @@ if test "$no_create" != yes; then + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || as_fn_exit $? ++ $ac_cs_success || as_fn_exit 1 + fi + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +diff --git a/install-sh b/install-sh +index 6781b98..377bb86 100755 +--- a/install-sh ++++ b/install-sh +@@ -1,7 +1,7 @@ + #!/bin/sh + # install - install a program, script, or datafile + +-scriptversion=2009-04-28.21; # UTC ++scriptversion=2011-11-20.07; # UTC + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +@@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC + # FSF changes to this file are in the public domain. + # + # Calling this script install-sh is preferred over install.sh, to prevent +-# `make' implicit rules from creating a file called install from it ++# 'make' implicit rules from creating a file called install from it + # when there is no Makefile. + # + # This script is compatible with the BSD install script, but was written +@@ -156,6 +156,10 @@ while test $# -ne 0; do + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 ++ # Protect names problematic for 'test' and other utilities. ++ case $dst_arg in ++ -* | [=\(\)!]) dst_arg=./$dst_arg;; ++ esac + shift;; + + -T) no_target_directory=true;; +@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + fi + shift # arg + dst_arg=$arg ++ # Protect names problematic for 'test' and other utilities. ++ case $dst_arg in ++ -* | [=\(\)!]) dst_arg=./$dst_arg;; ++ esac + done + fi + +@@ -194,13 +202,17 @@ if test $# -eq 0; then + echo "$0: no input file specified." >&2 + exit 1 + fi +- # It's OK to call `install-sh -d' without argument. ++ # It's OK to call 'install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 + fi + + if test -z "$dir_arg"; then +- trap '(exit $?); exit' 1 2 13 15 ++ do_exit='(exit $ret); exit $ret' ++ trap "ret=129; $do_exit" 1 ++ trap "ret=130; $do_exit" 2 ++ trap "ret=141; $do_exit" 13 ++ trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. +@@ -228,9 +240,9 @@ fi + + for src + do +- # Protect names starting with `-'. ++ # Protect names problematic for 'test' and other utilities. + case $src in +- -*) src=./$src;; ++ -* | [=\(\)!]) src=./$src;; + esac + + if test -n "$dir_arg"; then +@@ -252,12 +264,7 @@ do + echo "$0: no destination specified." >&2 + exit 1 + fi +- + dst=$dst_arg +- # Protect names starting with `-'. +- case $dst in +- -*) dst=./$dst;; +- esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. +@@ -347,7 +354,7 @@ do + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or +- # other-writeable bit of parent directory when it shouldn't. ++ # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in +@@ -385,7 +392,7 @@ do + + case $dstdir in + /*) prefix='/';; +- -*) prefix='./';; ++ [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + +@@ -403,7 +410,7 @@ do + + for d + do +- test -z "$d" && continue ++ test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then From 5562da1157ace6ef8d1d087627446818e075cc21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 10 Dec 2013 14:37:06 +0000 Subject: [PATCH 002/116] DOSBox Fixed Patch --- games-emulation/dosbox/dosbox-0.74.recipe | 3 +-- .../dosbox/patches/dosbox-0.74.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 games-emulation/dosbox/patches/dosbox-0.74.patch diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe index df5801447..0ecba93f7 100644 --- a/games-emulation/dosbox/dosbox-0.74.recipe +++ b/games-emulation/dosbox/dosbox-0.74.recipe @@ -52,12 +52,11 @@ BUILD_PREREQUIRES=" SOURCE_DIR="dosbox-0.74" PATCHES=" - powf.patch + dosbox-0.74.patch " BUILD() { - #libtoolize --force --copy --install ./configure --prefix=$prefix --disable-dynamic-core --bindir=$appsDir --datarootdir=$dataDir make } diff --git a/games-emulation/dosbox/patches/dosbox-0.74.patch b/games-emulation/dosbox/patches/dosbox-0.74.patch new file mode 100644 index 000000000..1e81c8f9e --- /dev/null +++ b/games-emulation/dosbox/patches/dosbox-0.74.patch @@ -0,0 +1,20 @@ +Index: configure.in +=================================================================== +--- configure.in (revision 3798) ++++ configure.in (working copy) +@@ -121,13 +121,8 @@ + + + dnl Check for powf +-AC_MSG_CHECKING(for powf in libm); +-LIBS_BACKUP=$LIBS; +-LIBS="$LIBS -lm"; +-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],[[ +- powf(1.0f, 1.0f); +-]])], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[libm doesn't include powf])]) +-LIBS=$LIBS_BACKUP ++AC_SEARCH_LIBS([powf], [m], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[no powf function available])]) ++AC_SEARCH_LIBS([getpeername], [network]) + + + dnl Checks for libraries. From fd7abeaf07ee749ff6dd57c69feecf4d9bc0de23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 10 Dec 2013 15:04:00 +0000 Subject: [PATCH 003/116] DOSBox new patch --- games-emulation/dosbox/dosbox-0.74.recipe | 2 +- .../dosbox/patches/dosbox-0.74.patch | 20 - games-emulation/dosbox/patches/powf.patch | 3904 +---------------- 3 files changed, 13 insertions(+), 3913 deletions(-) delete mode 100644 games-emulation/dosbox/patches/dosbox-0.74.patch diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe index 0ecba93f7..ca588599d 100644 --- a/games-emulation/dosbox/dosbox-0.74.recipe +++ b/games-emulation/dosbox/dosbox-0.74.recipe @@ -52,7 +52,7 @@ BUILD_PREREQUIRES=" SOURCE_DIR="dosbox-0.74" PATCHES=" - dosbox-0.74.patch + powf.patch " BUILD() diff --git a/games-emulation/dosbox/patches/dosbox-0.74.patch b/games-emulation/dosbox/patches/dosbox-0.74.patch deleted file mode 100644 index 1e81c8f9e..000000000 --- a/games-emulation/dosbox/patches/dosbox-0.74.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 3798) -+++ configure.in (working copy) -@@ -121,13 +121,8 @@ - - - dnl Check for powf --AC_MSG_CHECKING(for powf in libm); --LIBS_BACKUP=$LIBS; --LIBS="$LIBS -lm"; --AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],[[ -- powf(1.0f, 1.0f); --]])], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[libm doesn't include powf])]) --LIBS=$LIBS_BACKUP -+AC_SEARCH_LIBS([powf], [m], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[no powf function available])]) -+AC_SEARCH_LIBS([getpeername], [network]) - - - dnl Checks for libraries. diff --git a/games-emulation/dosbox/patches/powf.patch b/games-emulation/dosbox/patches/powf.patch index b78ae7acc..5f3f309ae 100644 --- a/games-emulation/dosbox/patches/powf.patch +++ b/games-emulation/dosbox/patches/powf.patch @@ -1,3901 +1,21 @@ -diff --git a/config.guess b/config.guess -index c2246a4..1804e9f 100755 ---- a/config.guess -+++ b/config.guess -@@ -1,14 +1,14 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012, 2013 Free Software Foundation, Inc. +diff --git a/configure.in b/configure.in +index 016ea95..b114016 100644 +--- a/configure.in ++++ b/configure.in +@@ -120,16 +120,6 @@ d_test.d_type = 0; + }],[AC_MSG_RESULT(yes);AC_DEFINE(DIRENT_HAS_D_TYPE,1,[struct dirent has d_type])],AC_MSG_RESULT(no)) --timestamp='2009-12-30' -+timestamp='2012-12-29' - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # - # This program is distributed in the hope that it will be useful, but -@@ -17,26 +17,22 @@ timestamp='2009-12-30' - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- -- --# Originally written by Per Bothner. Please send patches (context --# diff format) to and include a ChangeLog --# entry. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - # --# This script attempts to guess a canonical system name similar to --# config.sub. If it succeeds, it prints the system name on stdout, and --# exits with 0. Otherwise, it exits with 1. -+# Originally written by Per Bothner. - # - # You can get the latest version of this script from: - # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+# -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. -+ - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -57,8 +53,8 @@ GNU config.guess ($timestamp) - - Originally written by Per Bothner. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free --Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -+2012, 2013 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -145,7 +141,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -181,7 +177,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -202,6 +198,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -@@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit ;; -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead -@@ -296,12 +299,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) -- echo powerpc-ibm-os400 -+ echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; -@@ -481,8 +484,8 @@ EOF - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -495,7 +498,7 @@ EOF - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -552,7 +555,7 @@ EOF - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[456]) -+ *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -595,52 +598,52 @@ EOF - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac -+ esac ;; -+ esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ sed 's/^ //' << EOF >$dummy.c - -- #define _HPUX_SOURCE -- #include -- #include -+ #define _HPUX_SOURCE -+ #include -+ #include - -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); - -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -731,22 +734,22 @@ EOF - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; -@@ -770,14 +773,14 @@ EOF - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -@@ -789,30 +792,35 @@ EOF - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- case ${UNAME_MACHINE} in -- pc98) -- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - i*:windows32*:*) -- # uname -m includes "-pc" on this system. -- echo ${UNAME_MACHINE}-mingw32 -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) -- case ${UNAME_MACHINE} in -+ case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; -@@ -858,6 +866,13 @@ EOF - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -867,7 +882,7 @@ EOF - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -+ esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -@@ -879,20 +894,29 @@ EOF - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else -- echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ fi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - LIBC=gnu -@@ -934,7 +958,7 @@ EOF - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -- echo or32-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu -@@ -960,7 +984,7 @@ EOF - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -968,14 +992,17 @@ EOF - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -+ tile*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -984,11 +1011,11 @@ EOF - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) -@@ -1020,7 +1047,7 @@ EOF - fi - exit ;; - i*86:*:5:[678]*) -- # UnixWare 7.x, OpenUNIX and OpenServer 6. -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; -@@ -1048,13 +1075,13 @@ EOF - exit ;; - pc:*:*:*) - # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i586. -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp -- exit ;; -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; -@@ -1089,8 +1116,8 @@ EOF - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && { echo i486-ncr-sysv4; exit; } ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ -@@ -1133,10 +1160,10 @@ EOF - echo ns32k-sni-sysv - fi - exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm -@@ -1162,11 +1189,11 @@ EOF - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-unknown-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; -@@ -1179,6 +1206,9 @@ EOF - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1231,7 +1261,10 @@ EOF - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NEO-?:NONSTOP_KERNEL:*:*) -+ echo neo-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1276,13 +1309,13 @@ EOF - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -+ echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; -@@ -1300,11 +1333,11 @@ EOF - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c < - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - -diff --git a/config.sub b/config.sub -index c2d1257..802a224 100755 ---- a/config.sub -+++ b/config.sub -@@ -1,38 +1,33 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012, 2013 Free Software Foundation, Inc. - --timestamp='2010-01-22' -+timestamp='2012-12-29' - --# This file is (in principle) common to ALL GNU software. --# The presence of a machine in this file suggests that SOME GNU software --# can handle that machine. It does not imply ALL GNU software can. --# --# This file is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# This file is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - - --# Please send patches to . Submit a context --# diff and a properly formatted GNU ChangeLog entry. -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. -@@ -76,8 +71,8 @@ version="\ - GNU config.sub ($timestamp) - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free --Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -+2012, 2013 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -124,13 +119,18 @@ esac - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -+ android-linux) -+ os=-linux-android -+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -+ ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -153,12 +153,12 @@ case $os in - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray | -microblaze) -+ -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; -- -bluegene*) -- os=-cnk -+ -bluegene*) -+ os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= -@@ -174,10 +174,10 @@ case $os in - os=-chorusos - basic_machine=$1 - ;; -- -chorusrdb) -- os=-chorusrdb -+ -chorusrdb) -+ os=-chorusrdb - basic_machine=$1 -- ;; -+ ;; - -hiux*) - os=-hiuxwe2 - ;; -@@ -222,6 +222,12 @@ case $os in - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -lynx*178) -+ os=-lynxos178 -+ ;; -+ -lynx*5) -+ os=-lynxos5 -+ ;; - -lynx*) - os=-lynxos - ;; -@@ -246,20 +252,27 @@ case $basic_machine in - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | arc \ -+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ -+ | avr | avr32 \ -+ | be32 | be64 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -+ | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -+ | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | mcore | mep | metag \ -+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -282,29 +295,39 @@ case $basic_machine in - | moxie \ - | mt \ - | msp430 \ -+ | nds32 | nds32le | nds32be \ - | nios | nios2 \ - | ns16k | ns32k \ -+ | open8 \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -- | rx \ -+ | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu | strongarm \ -- | tahoe | thumb | tic4x | tic80 | tron \ -+ | spu \ -+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ -- | v850 | v850e \ -+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ -- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12 | picochip) -- # Motorola 68HC11/12. -+ c54x) -+ basic_machine=tic54x-unknown -+ ;; -+ c55x) -+ basic_machine=tic55x-unknown -+ ;; -+ c6x) -+ basic_machine=tic6x-unknown -+ ;; -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -314,6 +337,21 @@ case $basic_machine in - basic_machine=mt-unknown - ;; - -+ strongarm | thumb | xscale) -+ basic_machine=arm-unknown -+ ;; -+ xgate) -+ basic_machine=$basic_machine-unknown -+ os=-none -+ ;; -+ xscaleeb) -+ basic_machine=armeb-unknown -+ ;; -+ -+ xscaleel) -+ basic_machine=armel-unknown -+ ;; -+ - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. -@@ -328,25 +366,30 @@ case $basic_machine in - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ -+ | be32-* | be64-* \ - | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -+ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -+ | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -+ | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -@@ -368,26 +411,29 @@ case $basic_machine in - | mmix-* \ - | mt-* \ - | msp430-* \ -+ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ -+ | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ -- | romp-* | rs6000-* | rx-* \ -+ | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -- | tile-* | tilegx-* \ -+ | tile*-* \ - | tron-* \ - | ubicom32-* \ -- | v850-* | v850e-* | vax-* \ -+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -+ | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) -@@ -412,7 +458,7 @@ case $basic_machine in - basic_machine=a29k-amd - os=-udi - ;; -- abacus) -+ abacus) - basic_machine=abacus-unknown - ;; - adobe68k) -@@ -482,11 +528,20 @@ case $basic_machine in - basic_machine=powerpc-ibm - os=-cnk - ;; -+ c54x-*) -+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c55x-*) -+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c6x-*) -+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -- cegcc) -+ cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; -@@ -518,7 +573,7 @@ case $basic_machine in - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16) -+ cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; -@@ -676,7 +731,6 @@ case $basic_machine in - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; --# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 -@@ -734,9 +788,13 @@ case $basic_machine in - basic_machine=ns32k-utek - os=-sysv - ;; -- microblaze) -+ microblaze*) - basic_machine=microblaze-xilinx - ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ os=-mingw64 -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 -@@ -773,10 +831,18 @@ case $basic_machine in - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; -+ msys) -+ basic_machine=i386-pc -+ os=-msys -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; -+ nacl) -+ basic_machine=le32-unknown -+ os=-nacl -+ ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 -@@ -841,6 +907,12 @@ case $basic_machine in - np1) - basic_machine=np1-gould - ;; -+ neo-tandem) -+ basic_machine=neo-tandem -+ ;; -+ nse-tandem) -+ basic_machine=nse-tandem -+ ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -923,9 +995,10 @@ case $basic_machine in - ;; - power) basic_machine=power-ibm - ;; -- ppc) basic_machine=powerpc-unknown -+ ppc | ppcbe) basic_machine=powerpc-unknown - ;; -- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc-* | ppcbe-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -@@ -950,7 +1023,11 @@ case $basic_machine in - basic_machine=i586-unknown - os=-pw32 - ;; -- rdos) -+ rdos | rdos64) -+ basic_machine=x86_64-pc -+ os=-rdos -+ ;; -+ rdos32) - basic_machine=i386-pc - os=-rdos - ;; -@@ -1019,6 +1096,9 @@ case $basic_machine in - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -1075,25 +1155,8 @@ case $basic_machine in - basic_machine=t90-cray - os=-unicos - ;; -- tic54x | c54x*) -- basic_machine=tic54x-unknown -- os=-coff -- ;; -- tic55x | c55x*) -- basic_machine=tic55x-unknown -- os=-coff -- ;; -- tic6x | c6x*) -- basic_machine=tic6x-unknown -- os=-coff -- ;; -- # This must be matched before tile*. -- tilegx*) -- basic_machine=tilegx-unknown -- os=-linux-gnu -- ;; - tile*) -- basic_machine=tile-unknown -+ basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) -@@ -1163,6 +1226,9 @@ case $basic_machine in - xps | xps100) - basic_machine=xps100-honeywell - ;; -+ xscale-* | xscalee[bl]-*) -+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` -+ ;; - ymp) - basic_machine=ymp-cray - os=-unicos -@@ -1260,11 +1326,11 @@ esac - if [ x"$os" != x"" ] - then - case $os in -- # First match some system type aliases -- # that might get confused with valid system types. -+ # First match some system type aliases -+ # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -- -auroraux) -- os=-auroraux -+ -auroraux) -+ os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` -@@ -1294,14 +1360,15 @@ case $os in - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -- | -openbsd* | -solidbsd* \ -+ | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ -+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -@@ -1348,7 +1415,7 @@ case $os in - -opened*) - os=-openedition - ;; -- -os400*) -+ -os400*) - os=-os400 - ;; - -wince*) -@@ -1397,7 +1464,7 @@ case $os in - -sinix*) - os=-sysv4 - ;; -- -tpf*) -+ -tpf*) - os=-tpf - ;; - -triton*) -@@ -1442,8 +1509,8 @@ case $os in - -dicos*) - os=-dicos - ;; -- -nacl*) -- ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1466,10 +1533,10 @@ else - # system, and we'll never get to this point. - - case $basic_machine in -- score-*) -+ score-*) - os=-elf - ;; -- spu-*) -+ spu-*) - os=-elf - ;; - *-acorn) -@@ -1481,8 +1548,20 @@ case $basic_machine in - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ hexagon-*) -+ os=-elf -+ ;; -+ tic54x-*) -+ os=-coff -+ ;; -+ tic55x-*) -+ os=-coff -+ ;; -+ tic6x-*) -+ os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) -@@ -1502,14 +1581,11 @@ case $basic_machine in - ;; - m68000-sun) - os=-sunos3 -- # This also exists in the configure program, but was not the -- # default. -- # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; -- mep-*) -+ mep-*) - os=-elf - ;; - mips*-cisco) -@@ -1536,7 +1612,7 @@ case $basic_machine in - *-ibm) - os=-aix - ;; -- *-knuth) -+ *-knuth) - os=-mmixware - ;; - *-wec) -diff --git a/configure b/configure -index 0dbc2e3..84cda9d 100755 ---- a/configure -+++ b/configure -@@ -1,11 +1,9 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.65 for dosbox 0.74. -+# Generated by GNU Autoconf 2.69 for dosbox 0.74. - # - # --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. - # - # - # This configure script is free software; the Free Software Foundation -@@ -89,6 +87,7 @@ fi - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. -+as_myself= - case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -133,6 +132,31 @@ export LANGUAGE - # CDPATH. - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -+# Use a proper internal environment variable to ensure we don't fall -+ # into an infinite loop, continuously re-executing ourselves. -+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -+ _as_can_reexec=no; export _as_can_reexec; -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+as_fn_exit 255 -+ fi -+ # We don't want this to propagate to other subprocesses. -+ { _as_can_reexec=; unset _as_can_reexec;} - if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh -@@ -166,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - else - exitcode=1; echo positional parameters were not saved. - fi --test x\$exitcode = x0 || exit 1" -+test x\$exitcode = x0 || exit 1 -+test -x / || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -@@ -211,14 +236,25 @@ IFS=$as_save_IFS - - - if test "x$CONFIG_SHELL" != x; then : -- # We cannot yet assume a decent shell, so we have to provide a -- # neutralization value for shells without unset; and this also -- # works around shells that cannot unset nonexistent variables. -- BASH_ENV=/dev/null -- ENV=/dev/null -- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+ export CONFIG_SHELL -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+exit 255 - fi - - if test x$as_have_required = xno; then : -@@ -316,10 +352,18 @@ $as_echo X"$as_dir" | - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - - } # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p - # as_fn_append VAR VALUE - # ---------------------- - # Append the text in VALUE to the end of the definition contained in VAR. Take -@@ -356,19 +400,19 @@ else - fi # as_fn_arith - - --# as_fn_error ERROR [LINENO LOG_FD] --# --------------------------------- -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- - # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are - # provided, also output the error to LOG_FD, referencing LINENO. Then exit the --# script with status $?, using 1 if that was 0. -+# script with STATUS, using 1 if that was 0. - as_fn_error () - { -- as_status=$?; test $as_status -eq 0 && as_status=1 -- if test "$3"; then -- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi -- $as_echo "$as_me: error: $1" >&2 -+ $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status - } # as_fn_error - -@@ -441,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - -+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have -+ # already done that, so ensure we don't try to do so again and fall -+ # in an infinite loop. This has already happened in practice. -+ _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). -@@ -475,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -+ # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null -@@ -496,28 +544,8 @@ else - as_mkdir_p=false - fi - --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- if ls -dL / >/dev/null 2>&1; then -- as_ls_L_option=L -- else -- as_ls_L_option= -- fi -- as_test_x=' -- eval sh -c '\'' -- if test -d "$1"; then -- test -d "$1/."; -- else -- case $1 in #( -- -*)set "./$1";; -- esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -- ???[sx]*):;;*)false;;esac;fi -- '\'' sh -- ' --fi --as_executable_p=$as_test_x -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -530,7 +558,7 @@ test -n "$DJDIR" || exec 7<&0 &1 - - # Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -@@ -793,8 +821,9 @@ do - fi - - case $ac_option in -- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -- *) ac_optarg=yes ;; -+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *=) ac_optarg= ;; -+ *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. -@@ -839,7 +868,7 @@ do - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- as_fn_error "invalid feature name: $ac_useropt" -+ as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -865,7 +894,7 @@ do - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- as_fn_error "invalid feature name: $ac_useropt" -+ as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1069,7 +1098,7 @@ do - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- as_fn_error "invalid package name: $ac_useropt" -+ as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1085,7 +1114,7 @@ do - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- as_fn_error "invalid package name: $ac_useropt" -+ as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in -@@ -1115,8 +1144,8 @@ do - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) as_fn_error "unrecognized option: \`$ac_option' --Try \`$0 --help' for more information." -+ -*) as_fn_error $? "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information" - ;; - - *=*) -@@ -1124,7 +1153,7 @@ Try \`$0 --help' for more information." - # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) -- as_fn_error "invalid variable name: \`$ac_envvar'" ;; -+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; - esac - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; -@@ -1134,7 +1163,7 @@ Try \`$0 --help' for more information." - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -@@ -1142,13 +1171,13 @@ done - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- as_fn_error "missing argument to $ac_option" -+ as_fn_error $? "missing argument to $ac_option" - fi - - if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; -- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; -+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac - fi -@@ -1171,7 +1200,7 @@ do - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" -+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -1185,8 +1214,6 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -1201,9 +1228,9 @@ test "$silent" = yes && exec 6>/dev/null - ac_pwd=`pwd` && test -n "$ac_pwd" && - ac_ls_di=`ls -di .` && - ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -- as_fn_error "working directory cannot be determined" -+ as_fn_error $? "working directory cannot be determined" - test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -- as_fn_error "pwd does not report name of working directory" -+ as_fn_error $? "pwd does not report name of working directory" - - - # Find the source files, if location was not specified. -@@ -1242,11 +1269,11 @@ else - fi - if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" -+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" - fi - ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" - ac_abs_confdir=`( -- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` - # When building in place, set srcdir=. - if test "$ac_abs_confdir" = "$ac_pwd"; then -@@ -1286,7 +1313,7 @@ Configuration: - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -+ -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files -@@ -1453,9 +1480,9 @@ test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF - dosbox configure 0.74 --generated by GNU Autoconf 2.65 -+generated by GNU Autoconf 2.69 - --Copyright (C) 2009 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1499,7 +1526,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 - fi -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - - } # ac_fn_c_try_compile -@@ -1525,7 +1552,7 @@ $as_echo "$ac_try_echo"; } >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } >/dev/null && { -+ test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : -@@ -1536,7 +1563,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 - fi -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - - } # ac_fn_c_try_cpp -@@ -1574,7 +1601,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 - fi -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - - } # ac_fn_cxx_try_compile -@@ -1616,7 +1643,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=$ac_status - fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - - } # ac_fn_c_try_run -@@ -1648,7 +1675,7 @@ $as_echo "$ac_try_echo"; } >&5 - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -+ test -x conftest$ac_exeext - }; then : - ac_retval=0 - else -@@ -1662,7 +1689,7 @@ fi - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - - } # ac_fn_c_try_link -@@ -1676,7 +1703,7 @@ ac_fn_c_check_type () - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 - $as_echo_n "checking for $2... " >&6; } --if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 - else - eval "$3=no" -@@ -1717,7 +1744,7 @@ fi - eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - - } # ac_fn_c_check_type - -@@ -1730,7 +1757,7 @@ ac_fn_c_check_header_compile () - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 - $as_echo_n "checking for $2... " >&6; } --if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -1748,7 +1775,7 @@ fi - eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - - } # ac_fn_c_check_header_compile - -@@ -1769,7 +1796,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) >= 0)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -1785,7 +1813,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) <= $ac_mid)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -1811,7 +1840,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) < 0)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -1827,7 +1857,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) >= $ac_mid)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -1861,7 +1892,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) <= $ac_mid)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -1925,7 +1957,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - rm -f conftest.val - - fi -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - - } # ac_fn_c_compute_int -@@ -1938,10 +1970,10 @@ rm -f conftest.val - ac_fn_c_check_header_mongrel () - { - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 - $as_echo_n "checking for $2... " >&6; } --if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 - fi - eval ac_res=\$$3 -@@ -1977,7 +2009,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : - else - ac_header_preproc=no - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 - $as_echo "$ac_header_preproc" >&6; } - -@@ -2004,7 +2036,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 - $as_echo_n "checking for $2... " >&6; } --if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 - else - eval "$3=\$ac_header_compiler" -@@ -2013,7 +2045,7 @@ eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } - fi -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - - } # ac_fn_c_check_header_mongrel - -@@ -2025,7 +2057,7 @@ ac_fn_c_check_func () - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 - $as_echo_n "checking for $2... " >&6; } --if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -2080,7 +2112,7 @@ fi - eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } -- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - - } # ac_fn_c_check_func - cat >config.log <<_ACEOF -@@ -2088,7 +2120,7 @@ This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - - It was created by dosbox $as_me 0.74, which was --generated by GNU Autoconf 2.65. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ - -@@ -2198,11 +2230,9 @@ trap 'exit_status=$? - { - echo - -- cat <<\_ASBOX --## ---------------- ## -+ $as_echo "## ---------------- ## - ## Cache variables. ## --## ---------------- ## --_ASBOX -+## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, - ( -@@ -2236,11 +2266,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - ) - echo - -- cat <<\_ASBOX --## ----------------- ## -+ $as_echo "## ----------------- ## - ## Output variables. ## --## ----------------- ## --_ASBOX -+## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do -@@ -2253,11 +2281,9 @@ _ASBOX - echo - - if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------------- ## -+ $as_echo "## ------------------- ## - ## File substitutions. ## --## ------------------- ## --_ASBOX -+## ------------------- ##" - echo - for ac_var in $ac_subst_files - do -@@ -2271,11 +2297,9 @@ _ASBOX - fi - - if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## -+ $as_echo "## ----------- ## - ## confdefs.h. ## --## ----------- ## --_ASBOX -+## ----------- ##" - echo - cat confdefs.h - echo -@@ -2330,7 +2354,12 @@ _ACEOF - ac_site_file1=NONE - ac_site_file2=NONE - if test -n "$CONFIG_SITE"; then -- ac_site_file1=$CONFIG_SITE -+ # We do not want a PATH search for config.site. -+ case $CONFIG_SITE in #(( -+ -*) ac_site_file1=./$CONFIG_SITE;; -+ */*) ac_site_file1=$CONFIG_SITE;; -+ *) ac_site_file1=./$CONFIG_SITE;; -+ esac - elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -@@ -2345,7 +2374,11 @@ do - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 - $as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 -- . "$ac_site_file" -+ . "$ac_site_file" \ -+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "failed to load site script $ac_site_file -+See \`config.log' for more details" "$LINENO" 5; } - fi - done - -@@ -2421,7 +2454,7 @@ if $ac_cache_corrupted; then - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 - $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 - fi - ## -------------------- ## - ## Main body of script. ## -@@ -2439,16 +2472,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - ac_aux_dir= - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -- for ac_t in install-sh install.sh shtool; do -- if test -f "$ac_dir/$ac_t"; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/$ac_t -c" -- break 2 -- fi -- done -+ if test -f "$ac_dir/install-sh"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install-sh -c" -+ break -+ elif test -f "$ac_dir/install.sh"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install.sh -c" -+ break -+ elif test -f "$ac_dir/shtool"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/shtool install -c" -+ break -+ fi - done - if test -z "$ac_aux_dir"; then -- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 - fi - - # These three variables are undocumented and unsupported, -@@ -2462,27 +2501,27 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - # Make sure we can run config.sub. - $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 - $as_echo_n "checking build system type... " >&6; } --if test "${ac_cv_build+set}" = set; then : -+if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_build_alias=$build_alias - test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` - test "x$ac_build_alias" = x && -- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 -+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 - ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 - $as_echo "$ac_cv_build" >&6; } - case $ac_cv_build in - *-*-*) ;; --*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; -+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; - esac - build=$ac_cv_build - ac_save_IFS=$IFS; IFS='-' -@@ -2500,14 +2539,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 - $as_echo_n "checking host system type... " >&6; } --if test "${ac_cv_host+set}" = set; then : -+if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build - else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 - fi - - fi -@@ -2515,7 +2554,7 @@ fi - $as_echo "$ac_cv_host" >&6; } - case $ac_cv_host in - *-*-*) ;; --*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; -+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; - esac - host=$ac_cv_host - ac_save_IFS=$IFS; IFS='-' -@@ -2552,7 +2591,7 @@ am__api_version='1.11' - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 - $as_echo_n "checking for a BSD-compatible install... " >&6; } - if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then : -+if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2572,7 +2611,7 @@ case $as_dir/ in #(( - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -@@ -2639,11 +2678,11 @@ am_lf=' - ' - case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) -- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; -+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; - esac - case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) -- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; -+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; - esac - - # Do `set' in a subshell so we don't clobber the current shell's -@@ -2665,7 +2704,7 @@ if ( - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". -- as_fn_error "ls -t appears to fail. Make sure there is not a broken -+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken - alias in your environment" "$LINENO" 5 - fi - -@@ -2675,7 +2714,7 @@ then - # Ok. - : - else -- as_fn_error "newly created file is older than distributed files! -+ as_fn_error $? "newly created file is older than distributed files! - Check your system clock" "$LINENO" 5 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -@@ -2729,7 +2768,7 @@ if test "$cross_compiling" != no; then - set dummy ${ac_tool_prefix}strip; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_STRIP+set}" = set; then : -+if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$STRIP"; then -@@ -2741,7 +2780,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2769,7 +2808,7 @@ if test -z "$ac_cv_prog_STRIP"; then - set dummy strip; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : -+if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_STRIP"; then -@@ -2781,7 +2820,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2822,7 +2861,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 - $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } - if test -z "$MKDIR_P"; then -- if test "${ac_cv_path_mkdir+set}" = set; then : -+ if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2832,7 +2871,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do -- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue -+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ -@@ -2873,7 +2912,7 @@ do - set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_AWK+set}" = set; then : -+if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$AWK"; then -@@ -2885,7 +2924,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2913,7 +2952,7 @@ done - $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } - set x ${MAKE-make} - ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` --if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : -+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 - else - cat >conftest.make <<\_ACEOF -@@ -2921,7 +2960,7 @@ SHELL = /bin/sh - all: - @echo '@@@%%%=$(MAKE)=@@@%%%' - _ACEOF --# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. - case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; -@@ -2955,7 +2994,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then -- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 -+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 - fi - fi - -@@ -3018,7 +3057,7 @@ ac_config_headers="$ac_config_headers config.h" - $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } - set x ${MAKE-make} - ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` --if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : -+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 - else - cat >conftest.make <<\_ACEOF -@@ -3026,7 +3065,7 @@ SHELL = /bin/sh - all: - @echo '@@@%%%=$(MAKE)=@@@%%%' - _ACEOF --# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. - case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; -@@ -3055,7 +3094,7 @@ if test -n "$ac_tool_prefix"; then - set dummy ${ac_tool_prefix}gcc; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CC+set}" = set; then : -+if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then -@@ -3067,7 +3106,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3095,7 +3134,7 @@ if test -z "$ac_cv_prog_CC"; then - set dummy gcc; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : -+if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then -@@ -3107,7 +3146,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3148,7 +3187,7 @@ if test -z "$CC"; then - set dummy ${ac_tool_prefix}cc; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CC+set}" = set; then : -+if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then -@@ -3160,7 +3199,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3188,7 +3227,7 @@ if test -z "$CC"; then - set dummy cc; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CC+set}" = set; then : -+if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then -@@ -3201,7 +3240,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -@@ -3247,7 +3286,7 @@ if test -z "$CC"; then - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CC+set}" = set; then : -+if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then -@@ -3259,7 +3298,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3291,7 +3330,7 @@ do - set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : -+if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then -@@ -3303,7 +3342,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3345,8 +3384,8 @@ fi - - test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "no acceptable C compiler found in \$PATH --See \`config.log' for more details." "$LINENO" 5; } -+as_fn_error $? "no acceptable C compiler found in \$PATH -+See \`config.log' for more details" "$LINENO" 5; } - - # Provide some information about the compiler. - $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -@@ -3460,9 +3499,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ as_fn_set_status 77 --as_fn_error "C compiler cannot create executables --See \`config.log' for more details." "$LINENO" 5; }; } -+as_fn_error 77 "C compiler cannot create executables -+See \`config.log' for more details" "$LINENO" 5; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -@@ -3504,8 +3542,8 @@ done - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." "$LINENO" 5; } -+as_fn_error $? "cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details" "$LINENO" 5; } - fi - rm -f conftest conftest$ac_cv_exeext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -@@ -3562,9 +3600,9 @@ $as_echo "$ac_try_echo"; } >&5 - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot run C compiled programs. -+as_fn_error $? "cannot run C compiled programs. - If you meant to cross compile, use \`--host'. --See \`config.log' for more details." "$LINENO" 5; } -+See \`config.log' for more details" "$LINENO" 5; } - fi - fi - fi -@@ -3575,7 +3613,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out - ac_clean_files=$ac_clean_files_save - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 - $as_echo_n "checking for suffix of object files... " >&6; } --if test "${ac_cv_objext+set}" = set; then : -+if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -3615,8 +3653,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot compute suffix of object files: cannot compile --See \`config.log' for more details." "$LINENO" 5; } -+as_fn_error $? "cannot compute suffix of object files: cannot compile -+See \`config.log' for more details" "$LINENO" 5; } - fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi -@@ -3626,7 +3664,7 @@ OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 - $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } --if test "${ac_cv_c_compiler_gnu+set}" = set; then : -+if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -3663,7 +3701,7 @@ ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 - $as_echo_n "checking whether $CC accepts -g... " >&6; } --if test "${ac_cv_prog_cc_g+set}" = set; then : -+if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_save_c_werror_flag=$ac_c_werror_flag -@@ -3741,7 +3779,7 @@ else - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 - $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } --if test "${ac_cv_prog_cc_c89+set}" = set; then : -+if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_cv_prog_cc_c89=no -@@ -3750,8 +3788,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include --#include --#include -+struct stat; - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ - struct buf { int x; }; - FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -3902,7 +3939,7 @@ depcc="$CC" am_compiler_list= - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 - $as_echo_n "checking dependency style of $depcc... " >&6; } --if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : -+if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -4037,7 +4074,7 @@ if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then : -+ if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 - else - # Double quotes because CPP needs to be expanded -@@ -4067,7 +4104,7 @@ else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -@@ -4083,11 +4120,11 @@ else - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.i conftest.err conftest.$ac_ext - if $ac_preproc_ok; then : - break - fi -@@ -4126,7 +4163,7 @@ else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -@@ -4142,18 +4179,18 @@ else - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.i conftest.err conftest.$ac_ext - if $ac_preproc_ok; then : - - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." "$LINENO" 5; } -+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details" "$LINENO" 5; } - fi - - ac_ext=c -@@ -4178,7 +4215,7 @@ if test -z "$CXX"; then - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CXX+set}" = set; then : -+if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$CXX"; then -@@ -4190,7 +4227,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4222,7 +4259,7 @@ do - set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : -+if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CXX"; then -@@ -4234,7 +4271,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4300,7 +4337,7 @@ done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 - $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } --if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : -+if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -4337,7 +4374,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set} - ac_save_CXXFLAGS=$CXXFLAGS - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 - $as_echo_n "checking whether $CXX accepts -g... " >&6; } --if test "${ac_cv_prog_cxx_g+set}" = set; then : -+if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag -@@ -4423,7 +4460,7 @@ depcc="$CXX" am_compiler_list= - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 - $as_echo_n "checking dependency style of $depcc... " >&6; } --if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : -+if ${am_cv_CXX_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -4552,7 +4589,7 @@ if test -n "$ac_tool_prefix"; then - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_RANLIB+set}" = set; then : -+if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$RANLIB"; then -@@ -4564,7 +4601,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4592,7 +4629,7 @@ if test -z "$ac_cv_prog_RANLIB"; then - set dummy ranlib; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : -+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_RANLIB"; then -@@ -4604,7 +4641,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4689,7 +4726,7 @@ fi - set dummy sdl-config; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_SDL_CONFIG+set}" = set; then : -+if ${ac_cv_path_SDL_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 - else - case $SDL_CONFIG in -@@ -4703,7 +4740,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4882,7 +4919,7 @@ rm -f core conftest.err conftest.$ac_objext \ - fi - SDL_CFLAGS="" - SDL_LIBS="" -- as_fn_error "*** SDL version $SDL_VERSION not found!" "$LINENO" 5 -+ as_fn_error $? "*** SDL version $SDL_VERSION not found!" "$LINENO" 5 - - fi - -@@ -4913,14 +4950,14 @@ else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -- as_fn_error "Only libSDL 1.2.X supported" "$LINENO" 5 -+ as_fn_error $? "Only libSDL 1.2.X supported" "$LINENO" 5 - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 - $as_echo_n "checking for an ANSI C-conforming const... " >&6; } --if test "${ac_cv_c_const+set}" = set; then : -+if ${ac_cv_c_const+:} false; then : - $as_echo_n "(cached) " >&6 - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -4929,11 +4966,11 @@ else - int - main () - { --/* FIXME: Include the comments suggested by Paul. */ -+ - #ifndef __cplusplus -- /* Ultrix mips cc rejects this. */ -+ /* Ultrix mips cc rejects this sort of thing. */ - typedef int charset[2]; -- const charset cs; -+ const charset cs = { 0, 0 }; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; -@@ -4950,8 +4987,9 @@ main () - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; -- { /* SCO 3.2v4 cc rejects this. */ -- char *t; -+ { /* SCO 3.2v4 cc rejects this sort of thing. */ -+ char tx; -+ char *t = &tx; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; -@@ -4967,10 +5005,10 @@ main () - iptr p = 0; - ++p; - } -- { /* AIX XL C 1.02.0.0 rejects this saying -+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -- struct s { int j; const int *ap[3]; }; -- struct s *b; b->j = 5; -+ struct s { int j; const int *ap[3]; } bx; -+ struct s *b = &bx; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; -@@ -5000,7 +5038,7 @@ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 - $as_echo_n "checking for inline... " >&6; } --if test "${ac_cv_c_inline+set}" = set; then : -+if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_cv_c_inline=no -@@ -5043,7 +5081,7 @@ esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 - $as_echo_n "checking for grep that handles long lines and -e... " >&6; } --if test "${ac_cv_path_GREP+set}" = set; then : -+if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -z "$GREP"; then -@@ -5057,7 +5095,7 @@ do - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+ as_fn_executable_p "$ac_path_GREP" || continue - # Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP - case `"$ac_path_GREP" --version 2>&1` in -@@ -5092,7 +5130,7 @@ esac - done - IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then -- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi - else - ac_cv_path_GREP=$GREP -@@ -5106,7 +5144,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 - $as_echo_n "checking for egrep... " >&6; } --if test "${ac_cv_path_EGREP+set}" = set; then : -+if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 - else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -@@ -5123,7 +5161,7 @@ do - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+ as_fn_executable_p "$ac_path_EGREP" || continue - # Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP - case `"$ac_path_EGREP" --version 2>&1` in -@@ -5158,7 +5196,7 @@ esac - done - IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then -- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi - else - ac_cv_path_EGREP=$EGREP -@@ -5173,7 +5211,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 - $as_echo_n "checking for ANSI C header files... " >&6; } --if test "${ac_cv_header_stdc+set}" = set; then : -+if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -5290,8 +5328,7 @@ do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default - " --eval as_val=\$$as_ac_Header -- if test "x$as_val" = x""yes; then : -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -5302,7 +5339,7 @@ done - - - ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" --if test "x$ac_cv_type_size_t" = x""yes; then : -+if test "x$ac_cv_type_size_t" = xyes; then : - - else - -@@ -5314,7 +5351,7 @@ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 - $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } --if test "${ac_cv_struct_tm+set}" = set; then : -+if ${ac_cv_struct_tm+:} false; then : - $as_echo_n "(cached) " >&6 - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -5353,7 +5390,7 @@ fi - # This bug is HP SR number 8606223364. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned char" >&5 - $as_echo_n "checking size of unsigned char... " >&6; } --if test "${ac_cv_sizeof_unsigned_char+set}" = set; then : -+if ${ac_cv_sizeof_unsigned_char+:} false; then : - $as_echo_n "(cached) " >&6 - else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned char))" "ac_cv_sizeof_unsigned_char" "$ac_includes_default"; then : -@@ -5362,9 +5399,8 @@ else - if test "$ac_cv_type_unsigned_char" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ as_fn_set_status 77 --as_fn_error "cannot compute sizeof (unsigned char) --See \`config.log' for more details." "$LINENO" 5; }; } -+as_fn_error 77 "cannot compute sizeof (unsigned char) -+See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_unsigned_char=0 - fi -@@ -5387,7 +5423,7 @@ _ACEOF - # This bug is HP SR number 8606223364. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned short" >&5 - $as_echo_n "checking size of unsigned short... " >&6; } --if test "${ac_cv_sizeof_unsigned_short+set}" = set; then : -+if ${ac_cv_sizeof_unsigned_short+:} false; then : - $as_echo_n "(cached) " >&6 - else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned short))" "ac_cv_sizeof_unsigned_short" "$ac_includes_default"; then : -@@ -5396,9 +5432,8 @@ else - if test "$ac_cv_type_unsigned_short" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ as_fn_set_status 77 --as_fn_error "cannot compute sizeof (unsigned short) --See \`config.log' for more details." "$LINENO" 5; }; } -+as_fn_error 77 "cannot compute sizeof (unsigned short) -+See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_unsigned_short=0 - fi -@@ -5421,7 +5456,7 @@ _ACEOF - # This bug is HP SR number 8606223364. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int" >&5 - $as_echo_n "checking size of unsigned int... " >&6; } --if test "${ac_cv_sizeof_unsigned_int+set}" = set; then : -+if ${ac_cv_sizeof_unsigned_int+:} false; then : - $as_echo_n "(cached) " >&6 - else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int))" "ac_cv_sizeof_unsigned_int" "$ac_includes_default"; then : -@@ -5430,9 +5465,8 @@ else - if test "$ac_cv_type_unsigned_int" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ as_fn_set_status 77 --as_fn_error "cannot compute sizeof (unsigned int) --See \`config.log' for more details." "$LINENO" 5; }; } -+as_fn_error 77 "cannot compute sizeof (unsigned int) -+See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_unsigned_int=0 - fi -@@ -5455,7 +5489,7 @@ _ACEOF - # This bug is HP SR number 8606223364. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5 - $as_echo_n "checking size of unsigned long... " >&6; } --if test "${ac_cv_sizeof_unsigned_long+set}" = set; then : -+if ${ac_cv_sizeof_unsigned_long+:} false; then : - $as_echo_n "(cached) " >&6 - else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long" "$ac_includes_default"; then : -@@ -5464,9 +5498,8 @@ else - if test "$ac_cv_type_unsigned_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ as_fn_set_status 77 --as_fn_error "cannot compute sizeof (unsigned long) --See \`config.log' for more details." "$LINENO" 5; }; } -+as_fn_error 77 "cannot compute sizeof (unsigned long) -+See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_unsigned_long=0 - fi -@@ -5489,7 +5522,7 @@ _ACEOF - # This bug is HP SR number 8606223364. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long long" >&5 - $as_echo_n "checking size of unsigned long long... " >&6; } --if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then : -+if ${ac_cv_sizeof_unsigned_long_long+:} false; then : - $as_echo_n "(cached) " >&6 - else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long long))" "ac_cv_sizeof_unsigned_long_long" "$ac_includes_default"; then : -@@ -5498,9 +5531,8 @@ else - if test "$ac_cv_type_unsigned_long_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ as_fn_set_status 77 --as_fn_error "cannot compute sizeof (unsigned long long) --See \`config.log' for more details." "$LINENO" 5; }; } -+as_fn_error 77 "cannot compute sizeof (unsigned long long) -+See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_unsigned_long_long=0 - fi -@@ -5523,7 +5555,7 @@ _ACEOF - # This bug is HP SR number 8606223364. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 - $as_echo_n "checking size of int *... " >&6; } --if test "${ac_cv_sizeof_int_p+set}" = set; then : -+if ${ac_cv_sizeof_int_p+:} false; then : - $as_echo_n "(cached) " >&6 - else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : -@@ -5532,9 +5564,8 @@ else - if test "$ac_cv_type_int_p" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ as_fn_set_status 77 --as_fn_error "cannot compute sizeof (int *) --See \`config.log' for more details." "$LINENO" 5; }; } -+as_fn_error 77 "cannot compute sizeof (int *) -+See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_int_p=0 - fi -@@ -5556,8 +5587,7 @@ for ac_header in stdlib.h sys/types.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" --eval as_val=\$$as_ac_Header -- if test "x$as_val" = x""yes; then : -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -5583,8 +5613,7 @@ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include >confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -5698,38 +5727,6 @@ $as_echo "no" >&6; } - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for powf in libm" >&5 --$as_echo_n "checking for powf in libm... " >&6; }; +-dnl Check for powf +-AC_MSG_CHECKING(for powf in libm); -LIBS_BACKUP=$LIBS; -LIBS="$LIBS -lm"; --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include --int --main () --{ -- +-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],[[ - powf(1.0f, 1.0f); -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } --else -- --$as_echo "#define DB_HAVE_NO_POWF 1" >>confdefs.h -- --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext +-]])], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[libm doesn't include powf])]) -LIBS=$LIBS_BACKUP - - -- + dnl Checks for libraries. + #Check if the compiler support attributes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler allows __attribute__" >&5 -@@ -5993,7 +5990,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_ctl_open in -lasound" >&5 - $as_echo_n "checking for snd_ctl_open in -lasound... " >&6; } --if test "${ac_cv_lib_asound_snd_ctl_open+set}" = set; then : -+if ${ac_cv_lib_asound_snd_ctl_open+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -6027,7 +6024,7 @@ LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_ctl_open" >&5 - $as_echo "$ac_cv_lib_asound_snd_ctl_open" >&6; } --if test "x$ac_cv_lib_asound_snd_ctl_open" = x""yes; then : -+if test "x$ac_cv_lib_asound_snd_ctl_open" = xyes; then : - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBASOUND 1 - _ACEOF -@@ -6067,7 +6064,7 @@ fi - #Check for big endian machine, should #define WORDS_BIGENDIAN if so - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 - $as_echo_n "checking whether byte ordering is bigendian... " >&6; } --if test "${ac_cv_c_bigendian+set}" = set; then : -+if ${ac_cv_c_bigendian+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_cv_c_bigendian=unknown -@@ -6285,7 +6282,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - - ;; #( - *) -- as_fn_error "unknown endianness -+ as_fn_error $? "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; - esac - -@@ -6297,14 +6294,14 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; - ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" --if test "x$ac_cv_header_curses_h" = x""yes; then : -+if test "x$ac_cv_header_curses_h" = xyes; then : - have_curses_h=yes - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5 - $as_echo_n "checking for initscr in -lcurses... " >&6; } --if test "${ac_cv_lib_curses_initscr+set}" = set; then : -+if ${ac_cv_lib_curses_initscr+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -6338,13 +6335,13 @@ LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5 - $as_echo "$ac_cv_lib_curses_initscr" >&6; } --if test "x$ac_cv_lib_curses_initscr" = x""yes; then : -+if test "x$ac_cv_lib_curses_initscr" = xyes; then : - have_curses_lib=yes - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5 - $as_echo_n "checking for initscr in -lncurses... " >&6; } --if test "${ac_cv_lib_ncurses_initscr+set}" = set; then : -+if ${ac_cv_lib_ncurses_initscr+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -6378,13 +6375,13 @@ LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5 - $as_echo "$ac_cv_lib_ncurses_initscr" >&6; } --if test "x$ac_cv_lib_ncurses_initscr" = x""yes; then : -+if test "x$ac_cv_lib_ncurses_initscr" = xyes; then : - have_ncurses_lib=yes - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lpdcurses" >&5 - $as_echo_n "checking for initscr in -lpdcurses... " >&6; } --if test "${ac_cv_lib_pdcurses_initscr+set}" = set; then : -+if ${ac_cv_lib_pdcurses_initscr+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -6418,7 +6415,7 @@ LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pdcurses_initscr" >&5 - $as_echo "$ac_cv_lib_pdcurses_initscr" >&6; } --if test "x$ac_cv_lib_pdcurses_initscr" = x""yes; then : -+if test "x$ac_cv_lib_pdcurses_initscr" = xyes; then : - have_pdcurses_lib=yes - fi - -@@ -6451,7 +6448,7 @@ $as_echo "Debugger not enabled" >&6; } - - fi - else -- as_fn_error "Can't find curses, which is required for debug mode" "$LINENO" 5 -+ as_fn_error $? "Can't find curses, which is required for debug mode" "$LINENO" 5 - fi - - fi -@@ -6659,14 +6656,14 @@ fi - - - ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" --if test "x$ac_cv_header_png_h" = x""yes; then : -+if test "x$ac_cv_header_png_h" = xyes; then : - have_png_h=yes - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_io_ptr in -lpng" >&5 - $as_echo_n "checking for png_get_io_ptr in -lpng... " >&6; } --if test "${ac_cv_lib_png_png_get_io_ptr+set}" = set; then : -+if ${ac_cv_lib_png_png_get_io_ptr+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -6700,7 +6697,7 @@ LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_get_io_ptr" >&5 - $as_echo "$ac_cv_lib_png_png_get_io_ptr" >&6; } --if test "x$ac_cv_lib_png_png_get_io_ptr" = x""yes; then : -+if test "x$ac_cv_lib_png_png_get_io_ptr" = xyes; then : - have_png_lib=yes - fi - -@@ -6716,7 +6713,7 @@ fi - - - ac_fn_c_check_header_mongrel "$LINENO" "SDL_net.h" "ac_cv_header_SDL_net_h" "$ac_includes_default" --if test "x$ac_cv_header_SDL_net_h" = x""yes; then : -+if test "x$ac_cv_header_SDL_net_h" = xyes; then : - have_sdl_net_h=yes - fi - -@@ -6753,7 +6750,7 @@ rm -f core conftest.err conftest.$ac_objext \ - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDLNet_Init in -lSDL_net" >&5 - $as_echo_n "checking for SDLNet_Init in -lSDL_net... " >&6; } --if test "${ac_cv_lib_SDL_net_SDLNet_Init+set}" = set; then : -+if ${ac_cv_lib_SDL_net_SDLNet_Init+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -6787,7 +6784,7 @@ LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_net_SDLNet_Init" >&5 - $as_echo "$ac_cv_lib_SDL_net_SDLNet_Init" >&6; } --if test "x$ac_cv_lib_SDL_net_SDLNet_Init" = x""yes; then : -+if test "x$ac_cv_lib_SDL_net_SDLNet_Init" = xyes; then : - have_sdl_net_lib=yes - fi - -@@ -6806,7 +6803,7 @@ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lX11" >&5 - $as_echo_n "checking for main in -lX11... " >&6; } --if test "${ac_cv_lib_X11_main+set}" = set; then : -+if ${ac_cv_lib_X11_main+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -6834,14 +6831,14 @@ LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_main" >&5 - $as_echo "$ac_cv_lib_X11_main" >&6; } --if test "x$ac_cv_lib_X11_main" = x""yes; then : -+if test "x$ac_cv_lib_X11_main" = xyes; then : - have_x11_lib=yes - else - have_x11_lib=no - fi - - ac_fn_c_check_header_mongrel "$LINENO" "X11/XKBlib.h" "ac_cv_header_X11_XKBlib_h" "$ac_includes_default" --if test "x$ac_cv_header_X11_XKBlib_h" = x""yes; then : -+if test "x$ac_cv_header_X11_XKBlib_h" = xyes; then : - have_x11_h=yes - else - have_x11_h=no -@@ -6864,7 +6861,7 @@ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lGL" >&5 - $as_echo_n "checking for main in -lGL... " >&6; } --if test "${ac_cv_lib_GL_main+set}" = set; then : -+if ${ac_cv_lib_GL_main+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -6892,7 +6889,7 @@ LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_main" >&5 - $as_echo "$ac_cv_lib_GL_main" >&6; } --if test "x$ac_cv_lib_GL_main" = x""yes; then : -+if test "x$ac_cv_lib_GL_main" = xyes; then : - have_gl_lib=yes - else - have_gl_lib=no -@@ -6900,7 +6897,7 @@ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lopengl32" >&5 - $as_echo_n "checking for main in -lopengl32... " >&6; } --if test "${ac_cv_lib_opengl32_main+set}" = set; then : -+if ${ac_cv_lib_opengl32_main+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -6928,14 +6925,14 @@ LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opengl32_main" >&5 - $as_echo "$ac_cv_lib_opengl32_main" >&6; } --if test "x$ac_cv_lib_opengl32_main" = x""yes; then : -+if test "x$ac_cv_lib_opengl32_main" = xyes; then : - have_opengl32_lib=yes - else - have_opengl32_lib=no - fi - - ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" --if test "x$ac_cv_header_GL_gl_h" = x""yes; then : -+if test "x$ac_cv_header_GL_gl_h" = xyes; then : - have_gl_h=yes - else - have_gl_h=no -@@ -6983,14 +6980,14 @@ fi - - - ac_fn_c_check_header_mongrel "$LINENO" "SDL_sound.h" "ac_cv_header_SDL_sound_h" "$ac_includes_default" --if test "x$ac_cv_header_SDL_sound_h" = x""yes; then : -+if test "x$ac_cv_header_SDL_sound_h" = xyes; then : - have_SDL_sound_h=yes - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Sound_Init in -lSDL_sound" >&5 - $as_echo_n "checking for Sound_Init in -lSDL_sound... " >&6; } --if test "${ac_cv_lib_SDL_sound_Sound_Init+set}" = set; then : -+if ${ac_cv_lib_SDL_sound_Sound_Init+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -7024,13 +7021,13 @@ LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_sound_Sound_Init" >&5 - $as_echo "$ac_cv_lib_SDL_sound_Sound_Init" >&6; } --if test "x$ac_cv_lib_SDL_sound_Sound_Init" = x""yes; then : -+if test "x$ac_cv_lib_SDL_sound_Sound_Init" = xyes; then : - have_SDL_sound_init=yes - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Sound_Seek in -lSDL_sound" >&5 - $as_echo_n "checking for Sound_Seek in -lSDL_sound... " >&6; } --if test "${ac_cv_lib_SDL_sound_Sound_Seek+set}" = set; then : -+if ${ac_cv_lib_SDL_sound_Sound_Seek+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -7064,7 +7061,7 @@ LIBS=$ac_check_lib_save_LIBS - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_sound_Sound_Seek" >&5 - $as_echo "$ac_cv_lib_SDL_sound_Sound_Seek" >&6; } --if test "x$ac_cv_lib_SDL_sound_Sound_Seek" = x""yes; then : -+if test "x$ac_cv_lib_SDL_sound_Sound_Seek" = xyes; then : - have_SDL_sound_seek=yes - fi - -@@ -7084,10 +7081,10 @@ fi - - - ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_mman_h" = x""yes; then : -+if test "x$ac_cv_header_sys_mman_h" = xyes; then : - - ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect" --if test "x$ac_cv_func_mprotect" = x""yes; then : -+if test "x$ac_cv_func_mprotect" = xyes; then : - $as_echo "#define C_HAVE_MPROTECT 1" >>confdefs.h - - fi -@@ -7127,7 +7124,7 @@ case "$host" in - for ac_header in ddraw.h - do : - ac_fn_c_check_header_mongrel "$LINENO" "ddraw.h" "ac_cv_header_ddraw_h" "$ac_includes_default" --if test "x$ac_cv_header_ddraw_h" = x""yes; then : -+if test "x$ac_cv_header_ddraw_h" = xyes; then : - cat >>confdefs.h <<_ACEOF - #define HAVE_DDRAW_H 1 - _ACEOF -@@ -7185,7 +7182,7 @@ case "$host" in - set dummy ${ac_tool_prefix}windres; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_WINDRES+set}" = set; then : -+if ${ac_cv_prog_WINDRES+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$WINDRES"; then -@@ -7197,7 +7194,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_WINDRES="${ac_tool_prefix}windres" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7225,7 +7222,7 @@ if test -z "$ac_cv_prog_WINDRES"; then - set dummy windres; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then : -+if ${ac_cv_prog_ac_ct_WINDRES+:} false; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_WINDRES"; then -@@ -7237,7 +7234,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_WINDRES="windres" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7354,10 +7351,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - :end' >>confcache - if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then -- test "x$cache_file" != "x/dev/null" && -+ if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 - $as_echo "$as_me: updating cache $cache_file" >&6;} -- cat confcache >$cache_file -+ if test ! -f "$cache_file" || test -h "$cache_file"; then -+ cat confcache >"$cache_file" -+ else -+ case $cache_file in #( -+ */* | ?:*) -+ mv -f confcache "$cache_file"$$ && -+ mv -f "$cache_file"$$ "$cache_file" ;; #( -+ *) -+ mv -f confcache "$cache_file" ;; -+ esac -+ fi -+ fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 - $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} -@@ -7373,6 +7381,7 @@ DEFS=-DHAVE_CONFIG_H - - ac_libobjs= - ac_ltlibobjs= -+U= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -@@ -7396,24 +7405,24 @@ else - fi - - if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then -- as_fn_error "conditional \"AMDEP\" was never defined. -+ as_fn_error $? "conditional \"AMDEP\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -- as_fn_error "conditional \"am__fastdepCC\" was never defined. -+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then -- as_fn_error "conditional \"am__fastdepCXX\" was never defined. -+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - - if test -z "${HAVE_WINDRES_TRUE}" && test -z "${HAVE_WINDRES_FALSE}"; then -- as_fn_error "conditional \"HAVE_WINDRES\" was never defined. -+ as_fn_error $? "conditional \"HAVE_WINDRES\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - --: ${CONFIG_STATUS=./config.status} -+: "${CONFIG_STATUS=./config.status}" - ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" -@@ -7514,6 +7523,7 @@ fi - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. -+as_myself= - case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -7559,19 +7569,19 @@ export LANGUAGE - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - --# as_fn_error ERROR [LINENO LOG_FD] --# --------------------------------- -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- - # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are - # provided, also output the error to LOG_FD, referencing LINENO. Then exit the --# script with status $?, using 1 if that was 0. -+# script with STATUS, using 1 if that was 0. - as_fn_error () - { -- as_status=$?; test $as_status -eq 0 && as_status=1 -- if test "$3"; then -- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi -- $as_echo "$as_me: error: $1" >&2 -+ $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status - } # as_fn_error - -@@ -7709,16 +7719,16 @@ if (echo >conf$$.file) 2>/dev/null; then - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -+ # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null -@@ -7767,7 +7777,7 @@ $as_echo X"$as_dir" | - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - - } # as_fn_mkdir_p -@@ -7778,28 +7788,16 @@ else - as_mkdir_p=false - fi - --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- if ls -dL / >/dev/null 2>&1; then -- as_ls_L_option=L -- else -- as_ls_L_option= -- fi -- as_test_x=' -- eval sh -c '\'' -- if test -d "$1"; then -- test -d "$1/."; -- else -- case $1 in #( -- -*)set "./$1";; -- esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -- ???[sx]*):;;*)false;;esac;fi -- '\'' sh -- ' --fi --as_executable_p=$as_test_x -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -7821,7 +7819,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - # values after options handling. - ac_log=" - This file was extended by dosbox $as_me 0.74, which was --generated by GNU Autoconf 2.65. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -7887,10 +7885,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - dosbox config.status 0.74 --configured by $0, generated by GNU Autoconf 2.65, -+configured by $0, generated by GNU Autoconf 2.69, - with options \\"\$ac_cs_config\\" - --Copyright (C) 2009 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - -@@ -7908,11 +7906,16 @@ ac_need_defaults=: - while test $# != 0 - do - case $1 in -- --*=*) -+ --*=?*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -+ --*=) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg= -+ ac_shift=: -+ ;; - *) - ac_option=$1 - ac_optarg=$2 -@@ -7934,6 +7937,7 @@ do - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ '') as_fn_error $? "missing file argument" ;; - esac - as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; -@@ -7946,7 +7950,7 @@ do - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header -- as_fn_error "ambiguous option: \`$1' -+ as_fn_error $? "ambiguous option: \`$1' - Try \`$0 --help' for more information.";; - --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; -@@ -7955,7 +7959,7 @@ Try \`$0 --help' for more information.";; - ac_cs_silent=: ;; - - # This is an error. -- -*) as_fn_error "unrecognized option: \`$1' -+ -*) as_fn_error $? "unrecognized option: \`$1' - Try \`$0 --help' for more information." ;; - - *) as_fn_append ac_config_targets " $1" -@@ -7975,7 +7979,7 @@ fi - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' -@@ -8036,7 +8040,7 @@ do - "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; - "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; - -- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; -+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac - done - -@@ -8059,9 +8063,10 @@ fi - # after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- tmp= -+ tmp= ac_tmp= - trap 'exit_status=$? -- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -+ : "${ac_tmp:=$tmp}" -+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status - ' 0 - trap 'as_fn_exit 1' 1 2 13 15 - } -@@ -8069,12 +8074,13 @@ $debug || - - { - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -- test -n "$tmp" && test -d "$tmp" -+ test -d "$tmp" - } || - { - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") --} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 -+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -+ac_tmp=$tmp - - # Set up the scripts for CONFIG_FILES section. - # No need to generate them if there are no CONFIG_FILES. -@@ -8091,12 +8097,12 @@ if test "x$ac_cr" = x; then - fi - ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` - if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -- ac_cs_awk_cr='\r' -+ ac_cs_awk_cr='\\r' - else - ac_cs_awk_cr=$ac_cr - fi - --echo 'BEGIN {' >"$tmp/subs1.awk" && -+echo 'BEGIN {' >"$ac_tmp/subs1.awk" && - _ACEOF - - -@@ -8105,18 +8111,18 @@ _ACEOF - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" - } >conf$$subs.sh || -- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 --ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || -- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then -- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -@@ -8124,7 +8130,7 @@ done - rm -f conf$$subs.sh - - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --cat >>"\$tmp/subs1.awk" <<\\_ACAWK && -+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && - _ACEOF - sed -n ' - h -@@ -8172,7 +8178,7 @@ t delim - rm -f conf$$subs.awk - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - _ACAWK --cat >>"\$tmp/subs1.awk" <<_ACAWK && -+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -@@ -8204,21 +8210,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" - else - cat --fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -- || as_fn_error "could not setup config files machinery" "$LINENO" 5 -+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ -+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 - _ACEOF - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -+# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and - # trailing colons and then remove the whole line if VPATH becomes empty - # (actually we leave an empty line to preserve line numbers). - if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/ --s/:*\${srcdir}:*/:/ --s/:*@srcdir@:*/:/ --s/^\([^=]*=[ ]*\):*/\1/ -+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -+h -+s/// -+s/^/:/ -+s/[ ]*$/:/ -+s/:\$(srcdir):/:/g -+s/:\${srcdir}:/:/g -+s/:@srcdir@:/:/g -+s/^:*// - s/:*$// -+x -+s/\(=[ ]*\).*/\1/ -+G -+s/\n// - s/^[^=]*=[ ]*$// - }' - fi -@@ -8230,7 +8244,7 @@ fi # test -n "$CONFIG_FILES" - # No need to generate them if there are no CONFIG_HEADERS. - # This happens for instance with `./config.status Makefile'. - if test -n "$CONFIG_HEADERS"; then --cat >"$tmp/defines.awk" <<\_ACAWK || -+cat >"$ac_tmp/defines.awk" <<\_ACAWK || - BEGIN { - _ACEOF - -@@ -8242,11 +8256,11 @@ _ACEOF - # handling of long lines. - ac_delim='%!_!# ' - for ac_last_try in false false :; do -- ac_t=`sed -n "/$ac_delim/p" confdefs.h` -- if test -z "$ac_t"; then -+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h` -+ if test -z "$ac_tt"; then - break - elif $ac_last_try; then -- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 -+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -@@ -8331,7 +8345,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - _ACAWK - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -- as_fn_error "could not setup config headers machinery" "$LINENO" 5 -+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 - fi # test -n "$CONFIG_HEADERS" - - -@@ -8344,7 +8358,7 @@ do - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; -- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; -+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac -@@ -8363,7 +8377,7 @@ do - for ac_f - do - case $ac_f in -- -) ac_f="$tmp/stdin";; -+ -) ac_f="$ac_tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. -@@ -8372,7 +8386,7 @@ do - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || -- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; -+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" -@@ -8398,8 +8412,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} - esac - - case $ac_tag in -- *:-:* | *:-) cat >"$tmp/stdin" \ -- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; -+ *:-:* | *:-) cat >"$ac_tmp/stdin" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac -@@ -8535,23 +8549,24 @@ s&@INSTALL@&$ac_INSTALL&;t t - s&@MKDIR_P@&$ac_MKDIR_P&;t t - $ac_datarootdir_hack - " --eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -- || as_fn_error "could not create $ac_file" "$LINENO" 5 -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ -+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - - test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ -+ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' --which seems to be undefined. Please make sure it is defined." >&5 -+which seems to be undefined. Please make sure it is defined" >&5 - $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' --which seems to be undefined. Please make sure it is defined." >&2;} -+which seems to be undefined. Please make sure it is defined" >&2;} - -- rm -f "$tmp/stdin" -+ rm -f "$ac_tmp/stdin" - case $ac_file in -- -) cat "$tmp/out" && rm -f "$tmp/out";; -- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; -+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; -+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; - esac \ -- || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - ;; - :H) - # -@@ -8560,21 +8575,21 @@ which seems to be undefined. Please make sure it is defined." >&2;} - if test x"$ac_file" != x-; then - { - $as_echo "/* $configure_input */" \ -- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" -- } >"$tmp/config.h" \ -- || as_fn_error "could not create $ac_file" "$LINENO" 5 -- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then -+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" -+ } >"$ac_tmp/config.h" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 - $as_echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f "$ac_file" -- mv "$tmp/config.h" "$ac_file" \ -- || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ mv "$ac_tmp/config.h" "$ac_file" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - fi - else - $as_echo "/* $configure_input */" \ -- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ -- || as_fn_error "could not create -" "$LINENO" 5 -+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ -+ || as_fn_error $? "could not create -" "$LINENO" 5 - fi - # Compute "$ac_file"'s index in $config_headers. - _am_arg="$ac_file" -@@ -8724,7 +8739,7 @@ _ACEOF - ac_clean_files=$ac_clean_files_save - - test $ac_write_fail = 0 || -- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 -+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 - - - # configure is writing to config.log, and then calls config.status. -@@ -8745,7 +8760,7 @@ if test "$no_create" != yes; then - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. -- $ac_cs_success || as_fn_exit $? -+ $ac_cs_success || as_fn_exit 1 - fi - if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -diff --git a/install-sh b/install-sh -index 6781b98..377bb86 100755 ---- a/install-sh -+++ b/install-sh -@@ -1,7 +1,7 @@ - #!/bin/sh - # install - install a program, script, or datafile - --scriptversion=2009-04-28.21; # UTC -+scriptversion=2011-11-20.07; # UTC - - # This originates from X11R5 (mit/util/scripts/install.sh), which was - # later released in X11R6 (xc/config/util/install.sh) with the -@@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC - # FSF changes to this file are in the public domain. - # - # Calling this script install-sh is preferred over install.sh, to prevent --# `make' implicit rules from creating a file called install from it -+# 'make' implicit rules from creating a file called install from it - # when there is no Makefile. - # - # This script is compatible with the BSD install script, but was written -@@ -156,6 +156,10 @@ while test $# -ne 0; do - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 -+ # Protect names problematic for 'test' and other utilities. -+ case $dst_arg in -+ -* | [=\(\)!]) dst_arg=./$dst_arg;; -+ esac - shift;; - - -T) no_target_directory=true;; -@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - fi - shift # arg - dst_arg=$arg -+ # Protect names problematic for 'test' and other utilities. -+ case $dst_arg in -+ -* | [=\(\)!]) dst_arg=./$dst_arg;; -+ esac - done - fi - -@@ -194,13 +202,17 @@ if test $# -eq 0; then - echo "$0: no input file specified." >&2 - exit 1 - fi -- # It's OK to call `install-sh -d' without argument. -+ # It's OK to call 'install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 - fi - - if test -z "$dir_arg"; then -- trap '(exit $?); exit' 1 2 13 15 -+ do_exit='(exit $ret); exit $ret' -+ trap "ret=129; $do_exit" 1 -+ trap "ret=130; $do_exit" 2 -+ trap "ret=141; $do_exit" 13 -+ trap "ret=143; $do_exit" 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. -@@ -228,9 +240,9 @@ fi - - for src - do -- # Protect names starting with `-'. -+ # Protect names problematic for 'test' and other utilities. - case $src in -- -*) src=./$src;; -+ -* | [=\(\)!]) src=./$src;; - esac - - if test -n "$dir_arg"; then -@@ -252,12 +264,7 @@ do - echo "$0: no destination specified." >&2 - exit 1 - fi -- - dst=$dst_arg -- # Protect names starting with `-'. -- case $dst in -- -*) dst=./$dst;; -- esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. -@@ -347,7 +354,7 @@ do - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or -- # other-writeable bit of parent directory when it shouldn't. -+ # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in -@@ -385,7 +392,7 @@ do - - case $dstdir in - /*) prefix='/';; -- -*) prefix='./';; -+ [-=\(\)!]*) prefix='./';; - *) prefix='';; - esac - -@@ -403,7 +410,7 @@ do - - for d - do -- test -z "$d" && continue -+ test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then From de4a19b5f78136afae8ea9bb573976007d925925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 10 Dec 2013 16:47:50 +0000 Subject: [PATCH 004/116] Fixed description on DOS Box --- games-emulation/dosbox/dosbox-0.74.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe index ca588599d..deacf109f 100644 --- a/games-emulation/dosbox/dosbox-0.74.recipe +++ b/games-emulation/dosbox/dosbox-0.74.recipe @@ -9,7 +9,7 @@ FileSystem/XMS/EMS, Tandy/Hercules/CGA/EGA/VGA/VESA graphics, a SoundBlaster/Gravis Ultra Sound card for excellent sound compatibility with older games... -You can "re-live" the good old days with the help of DOSBox, it can +You can re-live the good old days with the help of DOSBox, it can run plenty of the old classics that don't run on your new computer! DOSBox is totally free of charge and OpenSource." From 06b5c5fa6b440df5c33c05f6094acc55ea320703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 10 Dec 2013 16:54:25 +0000 Subject: [PATCH 005/116] Deleted old patch --- .../dosbox/patches/dosbox-0.74_svn.patch | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 games-emulation/dosbox/patches/dosbox-0.74_svn.patch diff --git a/games-emulation/dosbox/patches/dosbox-0.74_svn.patch b/games-emulation/dosbox/patches/dosbox-0.74_svn.patch deleted file mode 100644 index 1e81c8f9e..000000000 --- a/games-emulation/dosbox/patches/dosbox-0.74_svn.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 3798) -+++ configure.in (working copy) -@@ -121,13 +121,8 @@ - - - dnl Check for powf --AC_MSG_CHECKING(for powf in libm); --LIBS_BACKUP=$LIBS; --LIBS="$LIBS -lm"; --AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],[[ -- powf(1.0f, 1.0f); --]])], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[libm doesn't include powf])]) --LIBS=$LIBS_BACKUP -+AC_SEARCH_LIBS([powf], [m], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[no powf function available])]) -+AC_SEARCH_LIBS([getpeername], [network]) - - - dnl Checks for libraries. From b0fd770d5ac41ba520d47db3be7ffb9a5dc529d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 11 Dec 2013 16:48:03 +0000 Subject: [PATCH 006/116] Added x86_gcc2 as broken --- games-emulation/dosbox/dosbox-0.74.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe index deacf109f..bfb0e7adc 100644 --- a/games-emulation/dosbox/dosbox-0.74.recipe +++ b/games-emulation/dosbox/dosbox-0.74.recipe @@ -20,8 +20,8 @@ REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2002-2013 The DosBox Team" -ARCHITECTURES="x86 x86_64" -SECONDARY_ARCHITECTURES="x86 x86_64" +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86 x86_64" PROVIDES=" dosbox$secondaryArchSuffix = $portVersion From 48429085c22e6de289456755293ad67725f8425b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 11 Dec 2013 20:04:25 +0000 Subject: [PATCH 007/116] sdl_net, sdl_sound and gcc2 --- games-emulation/dosbox/dosbox-0.74.recipe | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe index bfb0e7adc..796053362 100644 --- a/games-emulation/dosbox/dosbox-0.74.recipe +++ b/games-emulation/dosbox/dosbox-0.74.recipe @@ -20,8 +20,13 @@ REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2002-2013 The DosBox Team" -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="!x86_gcc2 x86 x86_64" +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" +fi +SECONDARY_ARCHITECTURES="x86 x86_64" PROVIDES=" dosbox$secondaryArchSuffix = $portVersion @@ -30,6 +35,8 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libsdl$secondaryArchSuffix + lib:sdl_net$secondaryArchSuffix + lib:sdl_sound$secondaryArchSuffix lib:libglu$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -39,6 +46,8 @@ BUILD_REQUIRES=" devel:libglu$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libz$secondaryArchSuffix + devel:sdl_net$secondaryArchSuffix + devel:sdl_sound$secondaryArchSuffix libsdl${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" From d748abc58d886a904fc3df17ee9751f91fa03b99 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Wed, 11 Dec 2013 22:21:55 -0500 Subject: [PATCH 008/116] Update wget script to 1.14 wget-1.14-pod-fixes.patch is from the ArchLinux project. --- net-misc/wget/patches/wget-1.13.4.patch | 71 --- net-misc/wget/patches/wget-1.14-gcc2.patch | 506 ++++++++++++++++++ .../wget/patches/wget-1.14-pod-fixes.patch | 81 +++ .../{wget-1.12.patch => wget-1.14.patch} | 76 +-- net-misc/wget/wget-1.12.recipe | 26 - net-misc/wget/wget-1.13.4.recipe | 22 - net-misc/wget/wget-1.14.recipe | 66 +++ 7 files changed, 696 insertions(+), 152 deletions(-) delete mode 100644 net-misc/wget/patches/wget-1.13.4.patch create mode 100644 net-misc/wget/patches/wget-1.14-gcc2.patch create mode 100644 net-misc/wget/patches/wget-1.14-pod-fixes.patch rename net-misc/wget/patches/{wget-1.12.patch => wget-1.14.patch} (52%) delete mode 100644 net-misc/wget/wget-1.12.recipe delete mode 100644 net-misc/wget/wget-1.13.4.recipe create mode 100644 net-misc/wget/wget-1.14.recipe diff --git a/net-misc/wget/patches/wget-1.13.4.patch b/net-misc/wget/patches/wget-1.13.4.patch deleted file mode 100644 index 3145d84af..000000000 --- a/net-misc/wget/patches/wget-1.13.4.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -urN wget-1.13.4/src/http.c wget-1.13.4-haiku/src/http.c ---- wget-1.13.4/src/http.c 2011-09-07 03:58:01.006291456 -0700 -+++ wget-1.13.4-haiku/src/http.c 2012-03-17 12:20:29.000000000 -0700 -@@ -1046,6 +1046,7 @@ - char separator) - { - const char *p = *source; -+ int param_type; - - while (c_isspace (*p)) ++p; - if (!*p) -@@ -1101,7 +1102,7 @@ - } - *source = p; - -- int param_type = modify_param_name(name); -+ param_type = modify_param_name(name); - if (NOT_RFC2231 != param_type) - { - modify_param_value(value, param_type); -diff -urN wget-1.13.4/src/main.c wget-1.13.4-haiku/src/main.c ---- wget-1.13.4/src/main.c 2011-09-06 06:50:11.004456448 -0700 -+++ wget-1.13.4-haiku/src/main.c 2012-03-17 12:23:37.000000000 -0700 -@@ -913,14 +913,16 @@ - int i, ret, longindex; - int nurl; - bool append_to_log = false; -- -- total_downloaded_bytes = 0; -- -- program_name = argv[0]; -+ int retconf; -+ bool use_userconfig = false; - - struct ptimer *timer = ptimer_new (); - double start_time = ptimer_measure (timer); - -+ total_downloaded_bytes = 0; -+ -+ program_name = argv[0]; -+ - i18n_initialize (); - - /* Construct the name of the executable, without the directory part. */ -@@ -948,8 +950,6 @@ - /* This seperate getopt_long is needed to find the user config - and parse it before the other user options. */ - longindex = -1; -- int retconf; -- bool use_userconfig = false; - - while ((retconf = getopt_long (argc, argv, - short_options, long_options, &longindex)) != -1) -@@ -1432,11 +1432,14 @@ - && - total_downloaded_bytes != 0) - { -+ char *wall_time; -+ char *download_time; - double end_time = ptimer_measure (timer); - 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/net-misc/wget/patches/wget-1.14-gcc2.patch b/net-misc/wget/patches/wget-1.14-gcc2.patch new file mode 100644 index 000000000..057eff0bf --- /dev/null +++ b/net-misc/wget/patches/wget-1.14-gcc2.patch @@ -0,0 +1,506 @@ +From 1d23e4b72c66f22da3a87ba2b14bb1b6ffe78b16 Mon Sep 17 00:00:00 2001 +From: Luke +Date: Wed, 11 Dec 2013 03:03:50 +0000 +Subject: [PATCH] Make wget gcc2-friendly + +--- + lib/regcomp.c | 2 +- + src/http.c | 9 ++++-- + src/main.c | 25 +++++++++------ + src/retr.c | 3 +- + src/utils.c | 2 ++ + src/warc.c | 99 +++++++++++++++++++++++++++++++++++++---------------------- + 6 files changed, 89 insertions(+), 51 deletions(-) + +diff --git a/lib/regcomp.c b/lib/regcomp.c +index 1d7a522..76ed566 100644 +--- a/lib/regcomp.c ++++ b/lib/regcomp.c +@@ -952,10 +952,10 @@ static void + internal_function + init_word_char (re_dfa_t *dfa) + { +- dfa->word_ops_used = 1; + int i = 0; + int j; + int ch = 0; ++ dfa->word_ops_used = 1; + if (BE (dfa->map_notascii == 0, 1)) + { + bitset_word_t bits0 = 0x00000000; +diff --git a/src/http.c b/src/http.c +index fa2d5ed..8500a93 100644 +--- a/src/http.c ++++ b/src/http.c +@@ -1076,6 +1076,7 @@ extract_param (const char **source, param_token *name, param_token *value, + char separator) + { + const char *p = *source; ++ int param_type; + + while (c_isspace (*p)) ++p; + if (!*p) +@@ -1131,7 +1132,7 @@ extract_param (const char **source, param_token *name, param_token *value, + } + *source = p; + +- int param_type = modify_param_name(name); ++ param_type = modify_param_name(name); + if (NOT_RFC2231 != param_type) + { + modify_param_value(value, param_type); +@@ -1521,6 +1522,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) + { +@@ -1557,7 +1559,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 +@@ -1668,6 +1670,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; +@@ -2136,7 +2139,7 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy, + warc_payload_offset = ftello (warc_tmp); + + /* Write a copy of the data to the WARC record. */ +- int warc_tmp_written = fwrite (opt.post_data, 1, post_data_size, warc_tmp); ++ warc_tmp_written = fwrite (opt.post_data, 1, post_data_size, warc_tmp); + if (warc_tmp_written != post_data_size) + write_error = -2; + } +diff --git a/src/main.c b/src/main.c +index b8b2869..cff4fa3 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -971,13 +971,20 @@ 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; ++ int retconf; ++ bool use_userconfig = false; ++ 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 (); + +@@ -999,10 +1006,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")); +@@ -1011,7 +1018,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++ = '"'; +@@ -1027,8 +1034,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; + + while ((retconf = getopt_long (argc, argv, + short_options, long_options, &longindex)) != -1) +@@ -1597,10 +1602,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 6204839..7947a73 100644 +--- a/src/retr.c ++++ b/src/retr.c +@@ -374,8 +374,9 @@ fd_read_body (int fd, FILE *out, wgint toread, wgint startpos, + + 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 567dc35..736f6e2 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 + #ifdef HAVE_TERMIOS_H + # include + #endif +diff --git a/src/warc.c b/src/warc.c +index 69f80be..0cf9e53 100644 +--- a/src/warc.c ++++ b/src/warc.c +@@ -154,10 +154,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; + +@@ -246,6 +247,9 @@ warc_write_block_from_file (FILE *data_in) + { + /* Add the Content-Length header. */ + char *content_length; ++ char buffer[BUFSIZ]; ++ size_t s; ++ + fseeko (data_in, 0L, SEEK_END); + if (! asprintf (&content_length, "%ld", ftello (data_in))) + { +@@ -262,8 +266,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) +@@ -288,6 +290,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; +@@ -313,17 +321,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) + { +@@ -340,7 +347,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; +@@ -649,13 +655,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)); + +@@ -667,7 +675,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); +@@ -717,6 +725,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; + +@@ -729,15 +741,15 @@ 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 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. */ +@@ -811,9 +823,9 @@ static bool + warc_parse_cdx_header (char *lineptr, int *field_num_original_url, + int *field_num_checksum, int *field_num_record_id) + { +- *field_num_original_url = -1; +- *field_num_checksum = -1; +- *field_num_record_id = -1; ++ off_t *field_num_original_url = -1; ++ off_t *field_num_checksum = -1; ++ off_t *field_num_record_id = -1; + + char *token; + char *save_ptr; +@@ -860,10 +872,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; +@@ -926,10 +940,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; +@@ -938,6 +949,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 +@@ -965,6 +980,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); +@@ -982,7 +998,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), +@@ -1002,12 +1018,14 @@ _("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) + { ++ char *key; ++ struct warc_cdx_record *rec_existing; ++ int found; ++ + if (warc_cdx_dedup_table == NULL) + return NULL; + +- char *key; +- struct warc_cdx_record *rec_existing; +- int found = hash_table_get_pair (warc_cdx_dedup_table, sha1_digest_payload, ++ found = hash_table_get_pair (warc_cdx_dedup_table, sha1_digest_payload, + &key, &rec_existing); + + if (found && strcmp (rec_existing->url, url) == 0) +@@ -1079,11 +1097,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); +@@ -1093,7 +1113,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")); +@@ -1148,10 +1168,11 @@ FILE * + warc_tempfile (void) + { + char filename[100]; ++ int fd; + if (path_search (filename, 100, opt.warc_tempdir, "wget", true) == -1) + return NULL; + +- int fd = mkstemp (filename); ++ fd = mkstemp (filename); + if (fd < 0) + return NULL; + +@@ -1210,8 +1231,10 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, + off_t offset, const char *warc_filename, + const char *response_uuid) + { +- /* Transform the timestamp. */ + 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" */ +@@ -1221,7 +1244,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 +@@ -1260,10 +1282,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); + +@@ -1314,6 +1337,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. */ +@@ -1357,11 +1383,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 + diff --git a/net-misc/wget/patches/wget-1.14-pod-fixes.patch b/net-misc/wget/patches/wget-1.14-pod-fixes.patch new file mode 100644 index 000000000..54e985624 --- /dev/null +++ b/net-misc/wget/patches/wget-1.14-pod-fixes.patch @@ -0,0 +1,81 @@ +diff -Naur wget-1.14.orig/doc/wget.texi wget-1.14.new/doc/wget.texi +--- wget-1.14.orig/doc/wget.texi 2012-08-04 02:41:52.000000000 -0600 ++++ wget-1.14.new/doc/wget.texi 2013-05-26 11:18:52.986107183 -0600 +@@ -876,7 +876,7 @@ + actions of one. + + @cindex proxy +-@itemx --no-proxy ++@item --no-proxy + Don't use proxies, even if the appropriate @code{*_proxy} environment + variable is defined. + +@@ -977,7 +977,7 @@ + whose encoding does not match the one used locally. + + @cindex IPv6 +-@itemx -4 ++@item -4 + @itemx --inet4-only + @itemx -6 + @itemx --inet6-only +@@ -2106,32 +2106,32 @@ + + + @table @asis +-@item 0 ++@item C<0> + No problems occurred. + +-@item 1 ++@item C<1> + Generic error code. + +-@item 2 ++@item C<2> + Parse error---for instance, when parsing command-line options, the + @samp{.wgetrc} or @samp{.netrc}... + +-@item 3 ++@item C<3> + File I/O error. + +-@item 4 ++@item C<4> + Network failure. + +-@item 5 ++@item C<5> + SSL verification failure. + +-@item 6 ++@item C<6> + Username/password authentication failure. + +-@item 7 ++@item C<7> + Protocol errors. + +-@item 8 ++@item C<8> + Server issued an error response. + @end table + +@@ -3094,7 +3094,7 @@ + Change setting of passive @sc{ftp}, equivalent to the + @samp{--passive-ftp} option. + +-@itemx password = @var{string} ++@item password = @var{string} + Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. + This command can be overridden using the @samp{ftp_password} and + @samp{http_password} command for @sc{ftp} and @sc{http} respectively. +@@ -3605,7 +3605,7 @@ + may be specified from within Wget itself. + + @table @samp +-@itemx --no-proxy ++@item --no-proxy + @itemx proxy = on/off + This option and the corresponding command may be used to suppress the + use of proxy, even if the appropriate environment variables are set. diff --git a/net-misc/wget/patches/wget-1.12.patch b/net-misc/wget/patches/wget-1.14.patch similarity index 52% rename from net-misc/wget/patches/wget-1.12.patch rename to net-misc/wget/patches/wget-1.14.patch index a97ad38de..73f74920d 100644 --- a/net-misc/wget/patches/wget-1.12.patch +++ b/net-misc/wget/patches/wget-1.14.patch @@ -1,7 +1,8 @@ -diff -urN wget-1.12/configure.ac wget-1.12-haiku/configure.ac ---- wget-1.12/configure.ac 2009-09-22 09:39:49.038010880 -0700 -+++ wget-1.12-haiku/configure.ac 2010-10-22 13:23:29.351797248 -0700 -@@ -163,6 +163,7 @@ +diff --git a/configure.ac b/configure.ac +index 873c3c9..45d6602 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -161,6 +161,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) @@ -9,10 +10,11 @@ diff -urN wget-1.12/configure.ac wget-1.12-haiku/configure.ac AC_CHECK_DECLS(h_errno,,,[#include ]) -diff -urN wget-1.12/m4/wget.m4 wget-1.12-haiku/m4/wget.m4 ---- wget-1.12/m4/wget.m4 2009-09-21 20:18:44.034340864 -0700 -+++ wget-1.12-haiku/m4/wget.m4 2010-10-22 13:22:01.071041024 -0700 -@@ -117,6 +117,8 @@ +diff --git a/m4/wget.m4 b/m4/wget.m4 +index 02d0cf9..8adc932 100644 +--- a/m4/wget.m4 ++++ b/m4/wget.m4 +@@ -88,6 +88,8 @@ 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. @@ -21,7 +23,7 @@ diff -urN wget-1.12/m4/wget.m4 wget-1.12-haiku/m4/wget.m4 AC_DEFUN([WGET_NSL_SOCKET], [ dnl On Solaris, -lnsl is needed to use gethostbyname. But checking -@@ -136,6 +138,9 @@ +@@ -107,6 +109,9 @@ AC_DEFUN([WGET_NSL_SOCKET], [ AC_CHECK_LIB(nsl, $wget_check_in_nsl) fi AC_CHECK_LIB(socket, socket) @@ -31,22 +33,23 @@ diff -urN wget-1.12/m4/wget.m4 wget-1.12-haiku/m4/wget.m4 ]) -diff -urN wget-1.12/src/config.h.in wget-1.12-haiku/src/config.h.in ---- wget-1.12/src/config.h.in 2009-09-22 09:40:33.008126464 -0700 -+++ wget-1.12-haiku/src/config.h.in 2010-10-22 13:14:25.000000000 -0700 -@@ -66,6 +66,9 @@ +diff --git a/src/config.h.in b/src/config.h.in +index 123560b..b4ffe16 100644 +--- a/src/config.h.in ++++ b/src/config.h.in +@@ -343,6 +343,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_BP_SYM_H +/* Define to 1 if you have the header file. */ +#undef HAVE_ARPA_INET_H + - /* Define when using built-in MD5. */ - #undef HAVE_BUILTIN_MD5 + /* Define to 1 if you have the `btowc' function. */ + #undef HAVE_BTOWC -@@ -212,12 +215,18 @@ - /* Define if you have and nl_langinfo(CODESET). */ - #undef HAVE_LANGINFO_CODESET +@@ -656,6 +659,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 @@ -54,19 +57,21 @@ diff -urN wget-1.12/src/config.h.in wget-1.12-haiku/src/config.h.in /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL - /* Define if you have the gnutls library. */ +@@ -668,6 +674,9 @@ + /* Define if you have the libgnutls library. */ #undef HAVE_LIBGNUTLS +/* 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 + /* Define to 1 if you have the `gpg-error' library (-lgpg-error). */ + #undef HAVE_LIBGPG_ERROR -diff -urN wget-1.12/src/connect.c wget-1.12-haiku/src/connect.c ---- wget-1.12/src/connect.c 2009-09-21 19:55:56.006815744 -0700 -+++ wget-1.12-haiku/src/connect.c 2010-10-22 13:14:25.000000000 -0700 -@@ -45,7 +45,7 @@ +diff --git a/src/connect.c b/src/connect.c +index 119ccb7..7237484 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 @@ -75,10 +80,11 @@ diff -urN wget-1.12/src/connect.c wget-1.12-haiku/src/connect.c # include # endif #endif /* not WINDOWS */ -diff -urN wget-1.12/src/host.c wget-1.12-haiku/src/host.c ---- wget-1.12/src/host.c 2009-09-21 20:00:05.002883584 -0700 -+++ wget-1.12-haiku/src/host.c 2010-10-22 13:14:25.000000000 -0700 -@@ -39,7 +39,7 @@ +diff --git a/src/host.c b/src/host.c +index 86bf83b..1805227 100644 +--- a/src/host.c ++++ b/src/host.c +@@ -40,7 +40,7 @@ as that of the covered work. */ # include # include # include @@ -87,10 +93,11 @@ diff -urN wget-1.12/src/host.c wget-1.12-haiku/src/host.c # include # endif # ifdef __VMS -diff -urN wget-1.12/src/host.h wget-1.12-haiku/src/host.h ---- wget-1.12/src/host.h 2009-09-04 09:31:54.006553600 -0700 -+++ wget-1.12-haiku/src/host.h 2010-10-22 13:14:25.000000000 -0700 -@@ -41,9 +41,9 @@ +diff --git a/src/host.h b/src/host.h +index 3f27ea0..3cd3ed9 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 @@ -103,3 +110,6 @@ diff -urN wget-1.12/src/host.h wget-1.12-haiku/src/host.h #endif struct url; +-- +1.8.3.4 + diff --git a/net-misc/wget/wget-1.12.recipe b/net-misc/wget/wget-1.12.recipe deleted file mode 100644 index 88030be1d..000000000 --- a/net-misc/wget/wget-1.12.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="wget" -HOMEPAGE="http://www.gnu.org/software/wget" -SRC_URI="http://ftp.gnu.org/gnu/wget/wget-1.12.tar.gz" -CHECKSUM_MD5="141461b9c04e454dc8933c9d1f2abf83" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD() -{ - cd wget-1.12 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-nls --disable-ipv6 - make -} - -INSTALL() -{ - cd wget-1.12 - make install -} - -LICENSE="GNU GPL v3" -COPYRIGHT="2009 Free Software Foundation" diff --git a/net-misc/wget/wget-1.13.4.recipe b/net-misc/wget/wget-1.13.4.recipe deleted file mode 100644 index 8b3a0e2f3..000000000 --- a/net-misc/wget/wget-1.13.4.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="wget" -HOMEPAGE="http://www.gnu.org/software/wget" -SRC_URI="http://ftp.gnu.org/gnu/wget/wget-1.13.4.tar.gz" -CHECKSUM_MD5="1df489976a118b9cbe1b03502adbfc27" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD() -{ - cd wget-1.13.4 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl=openssl - make -} - -INSTALL() -{ - cd wget-1.13.4 - make install -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1996-2011 Free Software Foundation" diff --git a/net-misc/wget/wget-1.14.recipe b/net-misc/wget/wget-1.14.recipe new file mode 100644 index 000000000..9b172237e --- /dev/null +++ b/net-misc/wget/wget-1.14.recipe @@ -0,0 +1,66 @@ +SUMMARY="wget is a tool for downloading files from the internet" +DESCRIPTION=" + wget is a tool that can download files from the internet through + protocols such as HTTP, HTTPS and FTP. wget is non-interactive, + so it can be called from scripts. + " +HOMEPAGE="http://www.gnu.org/software/wget" +SRC_URI="http://ftp.gnu.org/gnu/wget/wget-1.14.tar.gz" +CHECKSUM_MD5="12edc291dba8127f2e9696e69f36299e" +LICENSE="GNU GPL v3" +COPYRIGHT="1996-2012 Free Software Foundation" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + wget$secondaryArchSuffix = $portVersion + cmd:wget$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libcrypto$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libcrypto$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix >= 1.2.3 + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:aclocal + cmd:autoconf + cmd:libtoolize + cmd:make + cmd:makeinfo + cmd:pod2man + " + +PATCHES=" + wget-1.14.patch + wget-1.14-gcc2.patch + wget-1.14-pod-fixes.patch + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal -I m4 + autoconf + runConfigure ./configure --with-ssl=openssl + make +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check +} From e2830ee7b79960b840ecfef8211919c7c3c44c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 12 Dec 2013 15:09:52 +0000 Subject: [PATCH 009/116] SDL_Net and SDL_sound fixed --- games-emulation/dosbox/dosbox-0.74.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe index 796053362..fe2437e90 100644 --- a/games-emulation/dosbox/dosbox-0.74.recipe +++ b/games-emulation/dosbox/dosbox-0.74.recipe @@ -35,8 +35,8 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libsdl$secondaryArchSuffix - lib:sdl_net$secondaryArchSuffix - lib:sdl_sound$secondaryArchSuffix + lib:libsdl_net$secondaryArchSuffix + lib:libsdl_sound$secondaryArchSuffix lib:libglu$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -46,8 +46,8 @@ BUILD_REQUIRES=" devel:libglu$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libz$secondaryArchSuffix - devel:sdl_net$secondaryArchSuffix - devel:sdl_sound$secondaryArchSuffix + devel:libsdl_net$secondaryArchSuffix + devel:libsdl_sound$secondaryArchSuffix libsdl${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" From 84eadd114db3d4b3d6a35731847218710f3d2d0a Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Thu, 12 Dec 2013 19:08:50 +0000 Subject: [PATCH 010/116] Add recipe for BeScreenCapture 1.9.3 --- .../bescreencapture-1.9.3.recipe | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe new file mode 100644 index 000000000..b75375062 --- /dev/null +++ b/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe @@ -0,0 +1,51 @@ +SUMMARY="A screen recorder utility" +DESCRIPTION=" + BeScreenCapture, created by Stefano Ceccherini, is a screen + recorder utility for Haiku. It allows you to record what happens on your + screen, then save it to any media format that Haiku supports. + + BeScreenCapture can record either the entire screen, or just a + section you select. + " +HOMEPAGE="https://github.com/jackburton79/bescreencapture" +SRC_URI="https://github.com/jackburton79/bescreencapture/archive/v1.9.3.tar.gz" +LICENSE=" + BSD (3-clause) + MIT + " +COPYRIGHT="2013 Stefano Ceccherini" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + bescreencapture = $portVersion + app:bescreencapture = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a objects/BeScreenCapture $appsDir + addAppDeskbarSymlink $appsDir/BeScreenCapture +} From ea45b3079f62c7a8515c23b13aa680edc6b88a1a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 12 Dec 2013 20:57:14 +0100 Subject: [PATCH 011/116] pe: update to hg615 Includes the recipe language patch by Alvin Tan. --- haiku-apps/pe/pe-2.4.3_hg615.recipe | 68 +++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 haiku-apps/pe/pe-2.4.3_hg615.recipe diff --git a/haiku-apps/pe/pe-2.4.3_hg615.recipe b/haiku-apps/pe/pe-2.4.3_hg615.recipe new file mode 100644 index 000000000..ce884091d --- /dev/null +++ b/haiku-apps/pe/pe-2.4.3_hg615.recipe @@ -0,0 +1,68 @@ +SUMMARY="A programmer's editor" +DESCRIPTION="A programmer's editor" +HOMEPAGE="http://pe-editor.berlios.de/" +LICENSE=" + BSD (4-clause) + MIT + " + +COPYRIGHT=" + 1996-2002 Maarteen Hekkelman + 2003-2013 Team Pe + " + +SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#615" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + pe = $portVersion + cmd:Pe = $portVersion compat >= 2 + cmd:lpe = $portVersion compat >= 2 + " + +REQUIRES=" + haiku + lib:libpcre + lib:libpcreposix + " + +BUILD_REQUIRES=" + devel:libpcre + devel:libpcreposix + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:bison + cmd:flex + cmd:gcc + cmd:jam + cmd:ld + " + +USER_SETTINGS_FILES=" + settings/pe directory + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + jam -q + # multi-job builds don't work reliably +} + +INSTALL() +{ + peDir=$appsDir/Pe + + mkdir -p $appsDir + cp -a generated/distro $peDir + cp -a doc $peDir/Documentation + + mkdir $binDir + ln -sfn $peDir/lpe $binDir + + addAppDeskbarSymlink $peDir/Pe +} From a3bfa03cffdccb94b9d0beea4d5bf7fa4a9362c5 Mon Sep 17 00:00:00 2001 From: MrPoxipol Date: Thu, 12 Dec 2013 22:44:29 +0000 Subject: [PATCH 012/116] Rezerwar game .recipe. --- games-puzzle/rezerwar/rezerwar-0.4.2.recipe | 48 +++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 games-puzzle/rezerwar/rezerwar-0.4.2.recipe diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe new file mode 100644 index 000000000..d58c8be63 --- /dev/null +++ b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe @@ -0,0 +1,48 @@ +SUMMARY="A puzzle game that could be described as the illegitimate child of a known tetromino game an the average pipe game." +DESCRIPTION="Rezerwar is a puzzle game that could be described as the illegitimate child of a known tetromino game and the average pipe game. It runs on Linux, Windows, Nintendo Wii (homebrew), FreeBSD, Amiga OS, And Now Haiku! The whole game was created with open-source software including graphics, sounds and musics. Feel free to contribute. The goal of this game is basically to create networks of water to make them disappear, a couple tricks." +HOMEPAGE="http://tamentis.com/projects/rezerwar/" +SRC_URI="http://tamentis.com/projects/rezerwar/files/rezerwar-0.4.2.tar.gz" +CHECKSUM_MD5="42018abe251e45ab8cc30133cde61ff8" +SOURCE_DIR="rezerwar-0.4.2" +LICENSE="BSD (2-clause)" +COPYRIGHT="2008, 2009 Bertrand Janin" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + rezerwar = $portVersion + app:rezerwar = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl$secondaryArchSuffix + lib:sdl_mixer$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix + devel:sdl_mixer$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:sdl_config + " + +BUILD() +{ + configure + make +} + +INSTALL() +{ + mv data rezerwar + cp -r rezerwar $appsDir + cp src/rezerwar $appsDir/rezerwar/rezerwar + + addAppDeskbarSymlink $appsDir/rezerwar/rezerwar "Rezerwar" +} \ No newline at end of file From 5c126ba1d5c47702aeff0e3378f3dc63c7f39035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 13 Dec 2013 00:37:45 +0100 Subject: [PATCH 013/116] links: Add updated patch and recipe --- www-client/links/links-2.8.recipe | 69 ++ www-client/links/patches/links-2.8.patch | 1386 ++++++++++++++++++++++ 2 files changed, 1455 insertions(+) create mode 100644 www-client/links/links-2.8.recipe create mode 100644 www-client/links/patches/links-2.8.patch diff --git a/www-client/links/links-2.8.recipe b/www-client/links/links-2.8.recipe new file mode 100644 index 000000000..d501db8ff --- /dev/null +++ b/www-client/links/links-2.8.recipe @@ -0,0 +1,69 @@ +SUMMARY="links web browser" +DESCRIPTION="links web browser" +HOMEPAGE="http://links.twibright.com/" +SRC_URI="http://links.twibright.com/download/links-2.8.tar.gz" +REVISION="1" +CHECKSUM_MD5="34c67f980105643fc6cd63a14acc626f" +LICENSE="GNU GPL v2" +COPYRIGHT="1999 - 2011 Mikulas Patocka + 2000 - 2011 Petr Kulhavy, Karel Kulhavy, Martin Pergel" + + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + links$secondaryArchSuffix = $portVersion + cmd:links$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libpng$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix +# lib:libtiff$secondaryArchSuffix + lib:libz$secondaryArchSuffix + openssl$secondaryArchSuffix >= 1.0.0 + " + +BUILD_REQUIRES=" +# devel:libGL$secondaryArchSuffix + devel:libglu$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix +# devel:libtiff$secondaryArchSuffix + devel:libz$secondaryArchSuffix >= 1.2.8 + openssl${secondaryArchSuffix}_devel >= 1.0.0 + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " + +PATCHES="links-2.8.patch" + +BUILD() +{ + aclocal + automake --add-missing + autoheader + automake + autoconf + runConfigure ./configure \ + --without-x \ + --enable-graphics + make +} + +INSTALL() +{ + make install + addAppDeskbarSymlink $binDir/links Links +} + diff --git a/www-client/links/patches/links-2.8.patch b/www-client/links/patches/links-2.8.patch new file mode 100644 index 000000000..c548ab300 --- /dev/null +++ b/www-client/links/patches/links-2.8.patch @@ -0,0 +1,1386 @@ +diff -urN links-2.8.org/acconfig.h links-2.8/acconfig.h +--- links-2.8.org/acconfig.h 2013-08-03 18:22:59.028311552 +0200 ++++ links-2.8/acconfig.h 2013-12-12 20:39:35.528744448 +0100 +@@ -179,6 +179,9 @@ + #undef GRDRV_ATHEOS + + /* */ ++#undef GRDRV_HAIKU ++ ++/* */ + #undef GRDRV_GRX + + /* */ +diff -urN links-2.8.org/beos.c links-2.8/beos.c +--- links-2.8.org/beos.c 2013-01-23 05:52:02.030670848 +0100 ++++ links-2.8/beos.c 2013-12-12 19:10:01.005242880 +0100 +@@ -3,7 +3,7 @@ + * This file is a part of the Links program, released under GPL + */ + +-#if defined(__BEOS__) || defined(__HAIKU__) ++#if defined(__BEOS__) + + #include "com-defs.h" + +diff -urN links-2.8.org/configure.in links-2.8/configure.in +--- links-2.8.org/configure.in 2013-09-17 02:11:46.046137344 +0200 ++++ links-2.8/configure.in 2013-12-13 00:05:02.135004160 +0100 +@@ -13,7 +13,7 @@ + AUTOHEADER="./missing autoheader" + image_formats="GIF PNG XBM" + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADER(config.h) + + dnl Checks for programs. + AC_PROG_CC +@@ -577,10 +577,10 @@ + + AC_CHECK_FUNC(socket, cf_result=yes, cf_result=no) + if test "$cf_result" = no; then +- AC_CHECK_LIB(socket, socket) +- if test "$ac_cv_lib_socket_socket" = no; then +- AC_CHECK_LIB(network, socket) +- if test "$ac_cv_lib_network_socket" = no; then ++ AC_CHECK_LIB(network, socket) ++ if test "$ac_cv_lib_network_socket" = no; then ++ AC_CHECK_LIB(socket, socket) ++ if test "$ac_cv_lib_socket_socket" = no; then + AC_CHECK_LIB(watt, socket) + if test "$ac_cv_lib_watt_socket" = no; then + AC_ERROR([socket function not present]) +@@ -722,6 +722,7 @@ + AC_DEFINE(HAVE_BEGINTHREAD) + fi + AC_CHECK_HEADERS(atheos/threads.h) ++AC_CHECK_HEADERS(kernel/OS.h) + AC_HAVE_FUNCS(spawn_thread) + AC_HAVE_FUNCS(resume_thread) + +@@ -876,6 +877,7 @@ + + + cf_have_atheos=no ++cf_have_haiku=no + + if test "$cf_use_graphics" != no; then + AC_DEFINE(G) +@@ -888,6 +890,7 @@ + AC_ARG_WITH(pmshell, [ --without-pmshell compile without PMShell graphics driver],[if test "$withval" = no; then disable_pmshell=yes; else disable_pmshell=no; fi]) + AC_ARG_WITH(windows, [ --without-windows compile without Windows graphics driver],[if test "$withval" = no; then disable_windows=yes; else disable_windows=no; fi]) + AC_ARG_WITH(atheos, [ --without-atheos compile without Atheos graphics driver],[if test "$withval" = no; then disable_atheos=yes; else disable_atheos; fi]) ++AC_ARG_WITH(haiku, [ --without-haiku compile without Haiku/BeOS graphics driver],[if test "$withval" = no; then disable_haiku=yes; else disable_haiku=no; fi]) + AC_ARG_WITH(grx, [ --without-grx compile without DOS GRX graphics driver],[if test "$withval" = no; then disable_grx=yes; else disable_grx; fi]) + + drivers="" +@@ -1124,6 +1127,31 @@ + fi + fi + ++if test "$disable_haiku" != yes ; then ++ old_ext="$ac_ext" ++ ac_ext=cpp ++ AC_CHECK_HEADERS(interface/View.h) ++ AC_CHECK_HEADERS(interface/Window.h) ++ AC_CHECK_HEADERS(interface/Screen.h) ++ AC_CHECK_HEADERS(interface/Bitmap.h) ++ AC_CHECK_HEADERS(support/Locker.h) ++ AC_CHECK_HEADERS(app/Application.h) ++ ac_ext="$old_ext" ++ ++ if test "$ac_cv_header_kernel_OS_h" = yes && ++ test "$ac_cv_header_interface_View_h" = yes && ++ test "$ac_cv_header_interface_Window_h" = yes && ++ test "$ac_cv_header_interface_Screen_h" = yes && ++ test "$ac_cv_header_interface_Bitmap_h" = yes && ++ test "$ac_cv_header_support_Locker_h" = yes && ++ test "$ac_cv_header_app_Application_h" = yes; then ++ AC_PROG_CXX ++ AC_DEFINE(GRDRV_HAIKU) ++ drivers="$drivers HAIKU" ++ cf_have_haiku=yes ++ fi ++fi ++ + if test "$disable_grx" != yes -a "$ac_cv_have_djgpp" = yes; then + LIBS_X="$LIBS" + AC_CHECK_HEADERS(grx20.h) +@@ -1230,6 +1258,7 @@ + + + AM_CONDITIONAL(ATHEOS_GR, test "$cf_have_atheos" = yes) ++AM_CONDITIONAL(HAIKU_GR, test "$cf_have_haiku" = yes) + + test "$ac_cv_have_emx" = yes && LDFLAGS="$LDFLAGS -Zexe" + +diff -urN links-2.8.org/drivers.c links-2.8/drivers.c +--- links-2.8.org/drivers.c 2013-08-12 23:15:36.026214400 +0200 ++++ links-2.8/drivers.c 2013-12-12 20:42:12.595329024 +0100 +@@ -31,6 +31,9 @@ + #ifdef GRDRV_ATHEOS + extern struct graphics_driver atheos_driver; + #endif ++#ifdef GRDRV_HAIKU ++extern struct graphics_driver haiku_driver; ++#endif + #ifdef GRDRV_GRX + extern struct graphics_driver grx_driver; + #endif +@@ -51,6 +54,9 @@ + #ifdef GRDRV_ATHEOS + &atheos_driver, + #endif ++#ifdef GRDRV_HAIKU ++ &haiku_driver, ++#endif + #ifndef SPAD + #ifdef GRDRV_X + &x_driver, +diff -urN links-2.8.org/haiku.cpp links-2.8/haiku.cpp +--- links-2.8.org/haiku.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ links-2.8/haiku.cpp 2013-12-13 00:23:09.939786240 +0100 +@@ -0,0 +1,890 @@ ++/* haiku.cpp ++ * (c) 2007 François Revol ++ * This file is a part of the Links program, released under GPL ++ */ ++ ++#if defined __BEOS__ || defined __HAIKU__ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* ++ * GUI code ++ */ ++ ++/* ++ * TODO: ++ * - BeOS doesn't handle BView::DrawBitmap() with RGB24, and links doesn't seem to handle RGB32, ++ * so the colorspace is forced into 16bpp for now. ++ * - more paste handling ? ++ * - more DnD (maybe check if in menu or not and prepend "g" ?) ++ * - handle DnD of Net+ bookmarks ++ */ ++ ++extern "C" { ++#include "cfg.h" ++} ++ ++#ifdef GRDRV_HAIKU ++ ++extern "C" { ++#include "links.h" ++} ++#undef B_ENTER ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++//#define DBG(l...) fprintf(stderr, l); ++#define DBG(l...) {} ++ ++/* ++#ifdef debug ++#undef debug ++#endif ++#define debug(x) ++#define fprintf(x, y) ++*/ ++ ++extern "C" struct graphics_driver haiku_driver; ++ ++class LinksApplication : public BApplication { ++ public: ++ LinksApplication():BApplication("application/x-vnd.links"){} ++ virtual void RefsReceived(BMessage *message); ++ virtual bool QuitRequested(); ++}; ++ ++class LinksView; ++ ++class LinksWindow : public BWindow { ++ public: ++ LinksWindow(BRect r); ++ ~LinksWindow(); ++ virtual void FrameResized(float width, float height); ++ virtual bool QuitRequested(); ++ int resized; ++ LinksView *view; ++}; ++ ++class LinksView : public BView { ++ public: ++ LinksView(LinksWindow *w); ++ ~LinksView(); ++ virtual void Draw(BRect r); ++ virtual void MouseDown(BPoint p); ++ virtual void MouseUp(BPoint p); ++ virtual void MouseMoved(BPoint p, uint32 transit, const BMessage *dragmsg); ++ virtual void KeyDown(const char *s, int32 numBytes); ++ virtual void MessageReceived(BMessage *msg); ++ LinksWindow *win; ++ struct graphics_device *dev; ++ void d_flush(); ++ int flushing; ++ int last_x, last_y; ++}; ++ ++#define lv(dev) ((LinksView *)(dev)->driver_data) ++ ++#define lock_dev(dev) do { if (!lv(dev)->win->Lock()) return; } while (0) ++#define lock_dev0(dev) do { if (!lv(dev)->win->Lock()) return 0; } while (0) ++#define unlock_dev(dev) do { lv(dev)->win->Unlock(); } while (0) ++ ++void be_get_size(struct graphics_device *dev); ++ ++#define detach_message(dev) \ ++ BMessage *current = Looper()->DetachCurrentMessage(); \ ++ if (current) { \ ++ current->AddPointer("linksdev", dev); \ ++ } ++ ++#define pipe_message(dev) \ ++ if (current) { \ ++ write(wpipe, ¤t, sizeof(current)); \ ++ } ++ ++#define detach_and_pipe_message(dev) do { \ ++ BMessage *current = Looper()->DetachCurrentMessage(); \ ++ if (current) { \ ++ current->AddPointer("linksdev", dev); \ ++ write(wpipe, ¤t, sizeof(current)); \ ++ } \ ++} while (0) ++ ++LinksApplication *be_links_app; ++BLocker *be_lock = NULL; ++ ++int msg_pipe[2]; ++ ++thread_id be_app_thread_id; ++ ++#define rpipe (msg_pipe[0]) ++#define wpipe (msg_pipe[1]) ++ ++#define small_color (sizeof(rgb_color) <= sizeof(long)) ++#define get_color32(c, rgb) rgb_color c((rgb_color){(rgb >> 16) & 255, (rgb >> 8) & 255, rgb & 255, 255}) ++ ++color_space be_cs_desktop, be_cs_bmp; ++ ++int be_x_size, be_y_size; ++ ++int be_win_x_size, be_win_y_size; ++int be_win_x_pos, be_win_y_pos; ++ ++static BMessage *initial_refs_msg; ++ ++void LinksApplication::RefsReceived(BMessage *message) ++{ ++ entry_ref ref; ++ //if (!IsLaunching()) ++ // return; ++ BMessenger msgr(WindowAt(0)); ++ BMessage *m = new BMessage(*message); ++ m->AddSpecifier("View", (long)0); ++ //m->what = B_SIMPLE_DATA; ++ if (msgr.IsValid()) { ++ msgr.SendMessage(m); ++ } else ++ initial_refs_msg = m; ++} ++ ++bool LinksApplication::QuitRequested() ++{ ++ BApplication::QuitRequested(); ++ //printf("qc: %ld\n", CountWindows()); ++ return true; ++} ++ ++LinksWindow::LinksWindow(BRect r):BWindow(r, "Links", B_DOCUMENT_WINDOW, 0) ++{ ++ DBG("LINKSWINDOW\n"); ++ resized = 0; ++ view = NULL; ++} ++ ++LinksWindow::~LinksWindow() ++{ ++ view = NULL; ++ DBG("~LINKSWINDOW\n"); ++} ++ ++void LinksWindow::FrameResized(float width, float height) ++{ ++ resized = 1; ++} ++ ++bool LinksWindow::QuitRequested() ++{ ++ detach_and_pipe_message(view->dev); ++ return false; ++} ++ ++void do_flush(void *p_dev) ++{ ++ struct graphics_device *dev = (struct graphics_device *)p_dev; ++ LinksView *v = lv(dev); ++ v->win->Lock(); ++ v->win->Flush(); ++ v->win->Unlock(); ++ v->flushing = 0; ++} ++ ++LinksView::LinksView(LinksWindow *w):BView(w->Bounds(), "Links", B_FOLLOW_ALL, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE) ++{ ++ DBG("LINKSVIEW\n"); ++ (win = w)->AddChild(this); ++ SetViewColor(B_TRANSPARENT_32_BIT); ++ MakeFocus(); ++ w->view = this; ++ flushing = 0; ++ last_x = last_y = 0; ++} ++ ++LinksView::~LinksView() ++{ ++ win->view = NULL; ++ DBG("~LINKSVIEW\n"); ++} ++ ++void LinksView::d_flush() ++{ ++ if (flushing) return; ++ register_bottom_half(do_flush, this->dev); ++ flushing = 1; ++} ++ ++#undef select ++ ++int be_loop_select(int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t) ++{ ++ int v; ++ v = select(n, r, w, e, t); ++ check_bottom_halves(); ++ return v; ++} ++ ++void be_paste_string(struct graphics_device *dev, const char *str) ++{ ++ unsigned char *s = (unsigned char *)str; ++ int c, i; ++ while (s && *s) { ++ GET_UTF_8(s, c); ++ if (dev) dev->keyboard_handler(dev, c, 0); ++ } ++} ++ ++void be_get_event(void *dummy) ++{ ++ BMessage *msg; ++ LinksView *view = NULL; ++ LinksWindow *win = NULL; ++ struct graphics_device *dev; ++ read(rpipe, &msg, sizeof(msg)); ++ DBG("GETE\n"); ++ if (!msg) ++ return; ++ if (msg->FindPointer("linksdev", (void **)&dev) < B_OK) ++ return; ++ if (dev) { ++ view = lv(dev); ++ if (view) ++ win = dynamic_cast(view->Window()); ++ } ++ switch (msg->what) { ++ case B_QUIT_REQUESTED: ++ if (dev) ++ dev->keyboard_handler(dev, KBD_CTRL_C, 0); ++ break; ++ case _UPDATE_: ++ { ++ BRect r; ++ if (msg->FindRect("updateRect", &r) < B_OK) ++ return; ++ struct rect rr; ++ rr.x1 = (int)r.left; ++ rr.x2 = (int)r.right + 1; ++ rr.y1 = (int)r.top; ++ rr.y2 = (int)r.bottom + 1; ++ /*DBG("paint: %d %d %d %d\n", rr.x1, rr.x2, rr.y1, rr.y2);*/ ++ if (dev) { ++ if (!win->resized) dev->redraw_handler(dev, &rr); ++ else { ++ be_get_size(dev); ++ win->resized = 0; ++ dev->resize_handler(dev); ++ } ++ } ++ check_bottom_halves(); ++ } ++ break; ++ case B_MOUSE_DOWN: ++ { ++ BPoint where; ++ int32 buttons; ++ int btn = B_LEFT; ++ if (msg->FindInt32("buttons", &buttons) != B_OK) ++ return; ++ if (msg->FindPoint("where", &where) != B_OK) ++ return; ++ if (buttons & B_PRIMARY_MOUSE_BUTTON) ++ btn = B_LEFT; ++ else if (buttons & B_SECONDARY_MOUSE_BUTTON) ++ btn = B_RIGHT; ++ else if (buttons & B_TERTIARY_MOUSE_BUTTON) ++ btn = B_MIDDLE; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 1)) ++ btn = B_FOURTH; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 2)) ++ btn = B_FIFTH; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 3)) ++ btn = B_SIXTH; ++ if (dev) dev->mouse_handler(dev, view->last_x = (int)where.x, view->last_y = (int)where.y, B_DOWN | btn); ++ } ++ break; ++ case B_MOUSE_UP: ++ { ++ BPoint where; ++ int32 buttons; ++ int btn = B_LEFT; ++ if (msg->FindInt32("buttons", &buttons) != B_OK) ++ return; ++ if (msg->FindPoint("where", &where) != B_OK) ++ return; ++ if (buttons & ~B_PRIMARY_MOUSE_BUTTON == 0) ++ btn = B_LEFT; ++ else if (buttons & ~B_SECONDARY_MOUSE_BUTTON == 0) ++ btn = B_RIGHT; ++ else if (buttons & ~B_TERTIARY_MOUSE_BUTTON == 0) ++ btn = B_MIDDLE; ++ else if (buttons & ~(B_TERTIARY_MOUSE_BUTTON << 1) == 0) ++ btn = B_FOURTH; ++ else if (buttons & ~(B_TERTIARY_MOUSE_BUTTON << 2) == 0) ++ btn = B_FIFTH; ++ else if (buttons & ~(B_TERTIARY_MOUSE_BUTTON << 3) == 0) ++ btn = B_SIXTH; ++ if (dev) dev->mouse_handler(dev, view->last_x = (int)where.x, view->last_y = (int)where.y, B_UP | btn); ++ } ++ break; ++ case B_MOUSE_MOVED: ++ { ++ BPoint where; ++ int32 buttons; ++ int btn = B_LEFT; ++ if (msg->FindInt32("buttons", &buttons) != B_OK) ++ return; ++ if (msg->FindPoint("where", &where) != B_OK) ++ return; ++ if (buttons & B_PRIMARY_MOUSE_BUTTON) ++ btn = B_LEFT; ++ else if (buttons & B_SECONDARY_MOUSE_BUTTON) ++ btn = B_RIGHT; ++ else if (buttons & B_TERTIARY_MOUSE_BUTTON) ++ btn = B_MIDDLE; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 1)) ++ btn = B_FOURTH; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 2)) ++ btn = B_FIFTH; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 3)) ++ btn = B_SIXTH; ++ if (dev) dev->mouse_handler(dev, view->last_x = (int)where.x, view->last_y = (int)where.y, !buttons ? B_MOVE : B_DRAG | btn); ++ } ++ break; ++ case B_KEY_DOWN: ++ { ++ int32 modifiers; ++ int32 numBytes; ++ const char *bytes; ++ int c; ++ int mods = 0; ++ if (msg->FindInt32("modifiers", &modifiers) != B_OK) ++ return; ++ if (msg->FindString("bytes", &bytes) != B_OK) ++ return; ++ unsigned char buf[4] = { 0, 0, 0, 0 }; ++ unsigned char *ss; ++ if (modifiers & (B_LEFT_CONTROL_KEY | B_RIGHT_CONTROL_KEY | B_LEFT_COMMAND_KEY | B_RIGHT_COMMAND_KEY)) { ++ int32 raw; ++ if (msg->FindInt32("raw_char", &raw) != B_OK) ++ return; ++ buf[0] = (unsigned char)raw; ++ ss = buf; ++ } else ++ ss = (unsigned char *)bytes; ++ ++ GET_UTF_8(ss, c); ++ switch (c) { ++ case B_BACKSPACE: c = KBD_BS; break; ++ case B_ENTER: c = KBD_ENTER; break; ++ case B_SPACE: c = ' '; break; ++ case B_TAB: c = KBD_TAB; break; ++ case B_ESCAPE: c = KBD_ESC; break; ++ case B_LEFT_ARROW: c = KBD_LEFT; break; ++ case B_RIGHT_ARROW: c = KBD_RIGHT; break; ++ case B_UP_ARROW: c = KBD_UP; break; ++ case B_DOWN_ARROW: c = KBD_DOWN; break; ++ case B_INSERT: c = KBD_INS; break; ++ case B_DELETE: c = KBD_DEL; break; ++ case B_HOME: c = KBD_HOME; break; ++ case B_END: c = KBD_END; break; ++ case B_PAGE_UP: c = KBD_PAGE_UP; break; ++ case B_PAGE_DOWN: c = KBD_PAGE_DOWN; break; ++ default: if (c < 32) c = 0; ++ else modifiers &= ~(B_LEFT_SHIFT_KEY|B_RIGHT_SHIFT_KEY); ++ break; ++ } ++ if (modifiers & (B_LEFT_SHIFT_KEY|B_RIGHT_SHIFT_KEY)) ++ mods |= KBD_SHIFT; ++ if (modifiers & (B_LEFT_CONTROL_KEY|B_RIGHT_CONTROL_KEY)) ++ mods |= KBD_CTRL; ++ if (modifiers & (B_LEFT_COMMAND_KEY|B_RIGHT_COMMAND_KEY)) ++ mods |= KBD_ALT; ++ if (c) if (dev) dev->keyboard_handler(dev, c, mods); ++ } ++ break; ++ case B_MOUSE_WHEEL_CHANGED: ++ { ++ float delta_x, delta_y; ++ if (msg->FindFloat("be:wheel_delta_x", &delta_x) != B_OK) ++ delta_x = 0; ++ if (msg->FindFloat("be:wheel_delta_y", &delta_y) != B_OK) ++ delta_y = 0; ++ if (delta_y) if (dev) dev->mouse_handler(dev, view->last_x, view->last_y, B_MOVE | (delta_y > 0 ? B_WHEELDOWN : B_WHEELUP)); ++ if (delta_x) if (dev) dev->mouse_handler(dev, view->last_x, view->last_y, B_MOVE | (delta_x < 0 ? B_WHEELLEFT : B_WHEELRIGHT)); ++ } ++ break; ++ case B_PASTE: ++ if (be_clipboard->Lock()) { ++ BMessage *data = be_clipboard->Data(); ++ if (data) { ++ const char *text_plain; ++ ssize_t len; ++ //data->PrintToStream(); ++ if (data->FindData("text/plain", B_MIME_TYPE, (const void **)&text_plain, &len) == B_OK) { ++ be_paste_string(dev, text_plain); ++ } ++ } ++ be_clipboard->Unlock(); ++ } ++ break; ++ case B_REFS_RECEIVED: ++ if (dev) ++ be_paste_string(dev, "\033\ng"); ++ /* FALLTHROUGH */ ++ case B_SIMPLE_DATA: ++ { ++ /* something got dropped */ ++ entry_ref ref; ++ const char *text_plain; ++ ssize_t len; ++ //msg->PrintToStream(); ++ /* try find a file path to paste */ ++ if (msg->FindRef("refs", &ref) == B_OK) { ++ BPath path(&ref); ++ if (path.InitCheck() == B_OK) { ++ BFile f(path.Path(), B_READ_ONLY); ++ BString url; ++ if (f.InitCheck() == B_OK && f.ReadAttrString("META:url", &url) >= B_OK) { ++ be_paste_string(dev, url.String()); ++ } else ++ be_paste_string(dev, path.Path()); ++ } ++ } else if (msg->FindData("text/plain", B_MIME_TYPE, (const void **)&text_plain, &len) == B_OK) { ++ be_paste_string(dev, text_plain); ++ } ++ } ++ break; ++ default: ++ msg->PrintToStream(); ++ break; ++ } ++ delete msg; ++} ++ ++void be_get_size(struct graphics_device *dev) ++{ ++ BRect r; ++ lock_dev(dev); ++ r = lv(dev)->Bounds(); ++ unlock_dev(dev); ++ dev->size.x1 = dev->size.y1 = 0; ++ dev->size.x2 = (int)r.Width() + 1; ++ dev->size.y2 = (int)r.Height() + 1; ++} ++ ++void LinksView::Draw(BRect r) ++{ ++ detach_message(dev); ++ current->AddRect("updateRect", r); ++ pipe_message(dev); ++} ++ ++ ++void LinksView::MouseDown(BPoint p) ++{ ++ detach_and_pipe_message(dev); ++} ++ ++void LinksView::MouseUp(BPoint p) ++{ ++ detach_and_pipe_message(dev); ++} ++ ++void LinksView::MouseMoved(BPoint p, uint32 transit, const BMessage *dragmsg) ++{ ++ detach_and_pipe_message(dev); ++} ++ ++void LinksView::MessageReceived(BMessage *msg) ++{ ++ switch (msg->what) { ++ case B_REFS_RECEIVED: ++ case B_MOUSE_WHEEL_CHANGED: ++ case B_PASTE: ++ case B_SIMPLE_DATA: ++ detach_and_pipe_message(dev); ++ break; ++ default: ++ BView::MessageReceived(msg); ++ } ++} ++ ++void LinksView::KeyDown(const char *s, int32 numBytes) ++{ ++ detach_and_pipe_message(dev); ++} ++ ++unsigned char *be_get_driver_param(void) ++{ ++ return NULL; ++} ++ ++int32 be_app_thread(void *p) ++{ ++ be_links_app->Lock(); ++ be_links_app->Run(); ++ delete be_links_app; ++ return 0; ++} ++ ++unsigned char *be_init_driver(unsigned char *param, unsigned char *display) ++{ ++ be_links_app = new LinksApplication(); ++ if (!be_links_app) { ++ return stracpy((unsigned char *)"Unable to allocate Application object.\n"); ++ } ++ if (c_pipe(msg_pipe)) { ++ delete be_links_app; ++ return stracpy((unsigned char *)"Could not create pipe.\n"); ++ } ++ fcntl(rpipe, F_SETFL, O_NONBLOCK); ++ fcntl(wpipe, F_SETFL, O_NONBLOCK); ++ set_handlers(rpipe, be_get_event, NULL, NULL, NULL); ++ be_app_thread_id = spawn_thread(be_app_thread, "links_app", B_NORMAL_PRIORITY, NULL); ++ resume_thread(be_app_thread_id); ++ be_links_app->Unlock(); ++ be_cs_desktop = B_NO_COLOR_SPACE; ++ be_x_size = 640; ++ be_y_size = 480; ++ BScreen d; ++ if (d.IsValid()) { ++ be_cs_desktop = d.ColorSpace(); ++ be_x_size = (int)d.Frame().Width() + 1; ++ be_y_size = (int)d.Frame().Height() + 1; ++ } ++ be_win_y_size = be_y_size * 9 / 10; ++ be_win_x_size = be_win_y_size; ++ /* ++ DBG("%d %d\n", be_x_size, be_y_size); ++ DBG("%d %d\n", be_win_x_size, be_win_y_size); ++ */ ++ be_win_y_pos = (be_y_size - be_win_y_size) / 2; ++ be_win_x_pos = be_x_size - be_win_x_size - be_win_y_pos; ++ if (/*be_cs_desktop == B_RGB32 ||*/ be_cs_desktop == B_RGB24 || be_cs_desktop == B_RGB16 || be_cs_desktop == B_RGB15) ++ be_cs_bmp = be_cs_desktop; ++ else if (be_cs_desktop == B_RGB32 || be_cs_desktop == B_RGBA32) be_cs_bmp = B_RGB24; ++ else be_cs_bmp = B_RGB15; ++ be_cs_bmp = B_RGB16; // XXX: DEBUG ++ switch (be_cs_bmp) { ++ case B_RGB24: ++ haiku_driver.depth = 0xc3; ++ break; ++ case B_RGB16: ++ haiku_driver.depth = 0x82; ++ break; ++ case B_RGB15: ++ haiku_driver.depth = 0x7a; ++ break; ++ default: ++ internal("unknown depth"); ++ } ++ return NULL; ++} ++ ++void be_shutdown_driver() ++{ ++ status_t ret; ++ //debug((unsigned char *)"D"); ++ close(rpipe); ++ close(wpipe); ++ set_handlers(rpipe, NULL, NULL, NULL, NULL); ++ //debug((unsigned char *)"DD"); ++ be_links_app->PostMessage(B_QUIT_REQUESTED); ++ //debug((unsigned char *)"E"); ++ wait_for_thread(be_app_thread_id, &ret); ++ //debug((unsigned char *)"F"); ++} ++ ++struct graphics_device *be_init_device() ++{ ++ LinksView *view; ++ LinksWindow *win; ++ struct graphics_device *dev = (struct graphics_device *)mem_calloc(sizeof(struct graphics_device)); ++ if (!dev) return NULL; ++ //dev->drv = &haiku_driver; ++ //debug((unsigned char *)"1"); ++ win = new LinksWindow(BRect(be_win_x_pos, be_win_y_pos, be_win_x_pos + be_win_x_size, be_win_y_pos + be_win_y_size)); ++ //debug((unsigned char *)"2"); ++ if (!win) { ++ mem_free(dev); ++ return NULL; ++ } ++ //debug((unsigned char *)"3"); ++ view = new LinksView(win); ++ if (!view) { ++ delete win; ++ mem_free(dev); ++ return NULL; ++ } ++ view->dev = dev; ++ dev->driver_data = view; ++ be_get_size(dev); ++ memcpy(&dev->clip, &dev->size, sizeof(struct rect)); ++ //debug((unsigned char *)"4"); ++ win->Show(); ++ win->Lock(); ++ view->MakeFocus(); ++ win->Unlock(); ++ //debug((unsigned char *)"5"); ++ if (initial_refs_msg) { ++ BMessenger msgr(win); ++ if (msgr.IsValid()) { ++ msgr.SendMessage(initial_refs_msg); ++ initial_refs_msg = NULL; ++ } ++ } ++ return dev; ++} ++ ++void be_shutdown_device(struct graphics_device *dev) ++{ ++ LinksWindow *win = lv(dev)->win; ++ unregister_bottom_half(do_flush, dev); ++ lv(dev)->dev = NULL; ++ win->PostMessage(B_QUIT_REQUESTED); ++ mem_free(dev); ++} ++ ++void be_set_title(struct graphics_device *dev, unsigned char *title) ++{ ++ LinksWindow *win = lv(dev)->win; ++ lock_dev(dev); ++ win->SetTitle((const char *)title); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++/* ++int be_get_filled_bitmap(struct bitmap *bmp, long color) ++{ ++ internal((unsigned char *)"nedopsano"); ++ return 0; ++} ++*/ ++ ++int be_get_empty_bitmap(struct bitmap *bmp) ++{ ++ DBG("bmp\n"); ++//DBG("bmp (%d, %d) cs %08x\n", bmp->x, bmp->y, be_cs_bmp); ++ BRect r(0, 0, bmp->x - 1, bmp->y - 1); ++ BBitmap *b = new BBitmap(r, /*B_RGB32*/be_cs_bmp); ++ if (!b) { ++ bmp->data = NULL; ++DBG("%s: error 1\n", __FUNCTION__); ++ return 0; ++ } ++ if (!b->IsValid()) { ++ bmp->data = NULL; ++ delete b; ++DBG("%s: error 2\n", __FUNCTION__); ++ return 0; ++ } ++ if (b->LockBits() < B_OK) { ++ bmp->data = NULL; ++ delete b; ++DBG("%s: error 3\n", __FUNCTION__); ++ return 0; ++ } ++ bmp->data = b->Bits(); ++ bmp->skip = b->BytesPerRow(); ++ bmp->flags = b; ++//DBG("bmp: data %p, skip %d, flags %p\n", bmp->data, bmp->skip, bmp->flags); ++ return 0; ++} ++ ++void be_register_bitmap(struct bitmap *bmp) ++{ ++ BBitmap *b = (BBitmap *)bmp->flags; ++ b->UnlockBits(); ++} ++ ++void *be_prepare_strip(struct bitmap *bmp, int top, int lines) ++{ ++ DBG("preps\n"); ++ BBitmap *b = (BBitmap *)bmp->flags; ++ if (b->LockBits() < B_OK) ++ return NULL; ++ bmp->data = b->Bits(); ++ bmp->skip = b->BytesPerRow(); ++ return ((char *)bmp->data) + bmp->skip * top; ++} ++ ++void be_commit_strip(struct bitmap *bmp, int top, int lines) ++{ ++ BBitmap *b = (BBitmap *)bmp->flags; ++ b->UnlockBits(); ++} ++ ++void be_unregister_bitmap(struct bitmap *bmp) ++{ ++ DBG("unb\n"); ++ BBitmap *b = (BBitmap *)bmp->flags; ++ delete b; ++} ++ ++void be_draw_bitmap(struct graphics_device *dev, struct bitmap *bmp, int x, int y) ++{ ++ DBG("drawb\n"); ++ BBitmap *b = (BBitmap *)bmp->flags; ++ lock_dev(dev); ++ lv(dev)->DrawBitmap(b, b->Bounds(), BRect(x, y, x + bmp->x - 1, y + bmp->y - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++/* ++void be_draw_bitmaps(struct graphics_device *dev, struct bitmap **bmp, int n, int x, int y) ++{ ++ LinksView *lvv = lv(dev); ++ lock_dev(dev); ++ while (n--) { ++ BBitmap *b = (BBitmap *)(*bmp)->flags; ++ lvv->DrawBitmap(b, b->Bounds(), BRect(x, y, x + (*bmp)->x, y + (*bmp)->y)); ++ x += (*bmp)->x; ++ bmp++; ++ } ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++*/ ++ ++long be_get_color(int rgb) ++{ ++ if (small_color) { ++ get_color32(c, rgb); ++ return *(long *)(void *)&c; ++ } else return rgb & 0xffffff; ++} ++ ++void be_fill_area(struct graphics_device *dev, int x1, int y1, int x2, int y2, long color) ++{ ++ DBG("fill\n"); ++ if (x1 >= x2 || y1 >= y2) return; ++ lock_dev(dev); ++ if (small_color) ++ lv(dev)->SetHighColor(*(rgb_color *)(void *)&color); ++ else ++ lv(dev)->SetHighColor(get_color32(, color)); ++ lv(dev)->FillRect(BRect(x1, y1, x2 - 1, y2 - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++void be_draw_hline(struct graphics_device *dev, int x1, int y, int x2, long color) ++{ ++ DBG("hline\n"); ++ if (x1 >= x2) return; ++ lock_dev(dev); ++ if (small_color) ++ lv(dev)->SetHighColor(*(rgb_color *)(void *)&color); ++ else ++ lv(dev)->SetHighColor(get_color32(, color)); ++ lv(dev)->StrokeLine(BPoint(x1, y), BPoint(x2 - 1, y)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++void be_draw_vline(struct graphics_device *dev, int x, int y1, int y2, long color) ++{ ++ DBG("vline\n"); ++ if (y1 >= y2) return; ++ lock_dev(dev); ++ if (small_color) ++ lv(dev)->SetHighColor(*(rgb_color *)(void *)&color); ++ else ++ lv(dev)->SetHighColor(get_color32(, color)); ++ lv(dev)->StrokeLine(BPoint(x, y1), BPoint(x, y2 - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++int be_hscroll(struct graphics_device *dev, struct rect_set **ignore, int sc) ++{ ++ DBG("hscroll\n"); ++ if (dev->clip.x1 >= dev->clip.x2 || dev->clip.y1 >= dev->clip.y2) return 0; ++ if (sc <= dev->clip.x1 - dev->clip.x2) return 1; ++ if (sc >= dev->clip.x2 - dev->clip.x1) return 1; ++ lock_dev0(dev); ++ if (sc > 0) lv(dev)->CopyBits(BRect(dev->clip.x1, dev->clip.y1, dev->clip.x2 - sc - 1, dev->clip.y2 - 1), BRect(dev->clip.x1 + sc, dev->clip.y1, dev->clip.x2 - 1, dev->clip.y2 - 1)); ++ else lv(dev)->CopyBits(BRect(dev->clip.x1 - sc, dev->clip.y1, dev->clip.x2 - 1, dev->clip.y2 - 1), BRect(dev->clip.x1, dev->clip.y1, dev->clip.x2 + sc - 1, dev->clip.y2 - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++ return 1; ++} ++ ++int be_vscroll(struct graphics_device *dev, struct rect_set **ignore, int sc) ++{ ++ DBG("vscroll\n"); ++ if (!sc || dev->clip.x1 >= dev->clip.x2 || dev->clip.y1 >= dev->clip.y2) return 0; ++ if (sc <= dev->clip.y1 - dev->clip.y2) return 1; ++ if (sc >= dev->clip.y2 - dev->clip.y1) return 1; ++ lock_dev0(dev); ++ if (sc > 0) lv(dev)->CopyBits(BRect(dev->clip.x1, dev->clip.y1, dev->clip.x2 - 1, dev->clip.y2 - sc - 1), BRect(dev->clip.x1, dev->clip.y1 + sc, dev->clip.x2 - 1, dev->clip.y2 - 1)); ++ else lv(dev)->CopyBits(BRect(dev->clip.x1, dev->clip.y1 - sc, dev->clip.x2 - 1, dev->clip.y2 - 1), BRect(dev->clip.x1, dev->clip.y1, dev->clip.x2 - 1, dev->clip.y2 + sc - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++ return 1; ++} ++ ++void be_set_clip_area(struct graphics_device *dev, struct rect *r) ++{ ++ DBG("setc\n"); ++ memcpy(&dev->clip, r, sizeof(struct rect)); ++ lock_dev(dev); ++ BRegion clip(BRect(r->x1, r->y1, r->x2 - 1, r->y2 - 1)); ++ lv(dev)->ConstrainClippingRegion(&clip); ++ unlock_dev(dev); ++} ++ ++struct graphics_driver haiku_driver = { ++ (unsigned char *)"haiku", ++ be_init_driver, ++ be_init_device, ++ be_shutdown_device, ++ be_shutdown_driver, ++ dummy_emergency_shutdown, ++ be_get_driver_param, ++ be_get_empty_bitmap, ++ be_register_bitmap, ++ be_prepare_strip, ++ be_commit_strip, ++ be_unregister_bitmap, ++ be_draw_bitmap, ++ be_get_color, ++ be_fill_area, ++ be_draw_hline, ++ be_draw_vline, ++ be_hscroll, ++ be_vscroll, ++ be_set_clip_area, ++ dummy_block, ++ dummy_unblock, ++ be_set_title, ++ NULL, /* exec */ ++ NULL, /* set_clipboard_text */ ++ NULL, /* get_clipboard_text */ ++ 0, /* depth */ ++ 0, 0, /* size */ ++ 0, /* flags */ ++ 0, /* codepage */ ++ NULL, /* shell */ ++}; ++ ++#endif /* GRDRV_HAIKU */ ++ ++#endif +diff -urN links-2.8.org/links-haiku.rdef links-2.8/links-haiku.rdef +--- links-2.8.org/links-haiku.rdef 1970-01-01 01:00:00.000000000 +0100 ++++ links-2.8/links-haiku.rdef 2013-12-13 00:23:34.395313152 +0100 +@@ -0,0 +1,125 @@ ++/* ++** links-haiku.rdef ++** ++** Automatically generated by BResourceParser on ++** Thursday, December 13, 2007 at 23:46:45. ++** ++*/ ++ ++resource(1, "BEOS:APP_FLAGS") (#'APPF') $"01000000"; ++ ++resource(1, "BEOS:APP_VERSION") #'APPV' array { ++ $"02000000010000000000000000000000210000006C696E6B7320322E31707265" ++ $"3333000000000000000000000000000000000000000000000000000000000000" ++ $"00000000000000000000000000000000000000004C696E6B732062726F777365" ++ $"7220322E31707265333300000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000" ++}; ++ ++resource(101, "BEOS:L:STD_ICON") #'ICON' array { ++ $"2A2A2A2A2A2A2A2A2A2A2A2A2A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2A2A2A2A2A2A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2B2B2B2B2B2B2B2B2B2B2B2C0000363434343434343434343434343434" ++ $"2A2A2A3200000000000000000000000000363434343434343434343434343434" ++ $"2A2A2A2FF1313200000000000131310000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A30000000002B2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2C2C2C2C2C2C2C30000000002C2C2D0000373636363636363636363636363636" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"2222222222222226000000002222230000151A1A1A1A1A1A1A1A1A1A1A1A1A1A" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F3F3F3F3F3F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F3F1501113F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F3F0E00133F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F3F0500163F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F1A0000193F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F0C00001B3F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F190000001E3F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F1A030000013F3F3F3F3F" ++ $"20202020202020270000000023202200001A3F1E170C00000000043F3F3F3F3F" ++ $"2020202628292900000000000029290000040300000000000000063F3F3F3F3F" ++ $"20202027292929292929292929292900000203030303030303030B3F3F3F3F3F" ++ $"20202020202020202020202020202200001A3F3F3F3F3F3F3F3F3F3F3F3F3F3F" ++ $"20202020202020202020202020202200001A3F3F3F3F3F3F3F3F3F3F3F3F3F3F" ++ $"20202020202020202020202020202200001A3F3F3F3F3F3F3F3F3F3F3F3F3F3F" ++}; ++ ++resource(101, "BEOS:M:STD_ICON") #'MICN' array { ++ $"2A2A2A2A2A2A2A303A34343434343434" ++ $"2A2C3030303030F73A34343434343434" ++ $"2A2B2D300000EB323A34343434343434" ++ $"2A2A2A2C00002A303A34343434343434" ++ $"2A2A2A2C00002A303A34343434343434" ++ $"2A2A2A2C00002A303A34343434343434" ++ $"2A2A2A2C00002A303A34343434343434" ++ $"303030310000F1333D3A3A3A3A3A3A3A" ++ $"2626262700002629050D0D0D0D0D0D0D" ++ $"20202022000020260D3F3F3F1D143F3F" ++ $"20202022000020260D3F3F3F140A3F3F" ++ $"20202022000020260D3F3F3F090D3F3F" ++ $"20202022000020260D3F3F16000F3F3F" ++ $"20222427000026280710090000123F3F" ++ $"202225252525252807111111111A3F3F" ++ $"20202020202020260D3F3F3F3F3F3F3F" ++}; ++ ++resource(101, "BEOS:ICON") #'VICN' array { ++ $"6E6369661305000200060237E670B8880E39469D39AE144A52234B0D2500C6D7" ++ $"F5FF6B94DD03EC6666020006023B2B47BB18653D0FA53D225148297046CA1900" ++ $"00FF00FFA9FF00020016023B2B47BB18653D0FA53D225148297046CA1900FFFF" ++ $"8A020006023B3049396B0ABA90833C646E4A101543299500FFFFFFFF52FF5202" ++ $"0016023B3049396B0ABA90833C646E4A101543299500FFFFC9020006023C71E3" ++ $"3A0C78BA15E43C7D2149055549455700E3EDFFFF9EC2FF020006023CD8653068" ++ $"26B065D13CD5A34A6E4A46E21900FFDCDCFFDA5858020006023A1DA6393F04BB" ++ $"B5BC3C6B074AEA364809110087CA05FF026802020016023C00913B1266BB9E06" ++ $"3C5B934A01F04914EC00FFFF4E03003CB00200060230B31E3A09B9BB024238A1" ++ $"2F4BAB534AFF0B00A3043CFFFFDCE603CD4D4D030D296402000602BD498B3E11" ++ $"59BF219BBE7D2F4BE71F4AB31300C13E3EFFE27A7A040174020016023F2938BB" ++ $"F60A3BA9823EEC25C40E6348C15D0099FF00020016023E8FA33A7B71BA9D783E" ++ $"B2C049F7BAC28CE500C8FF00130A06322E323E42464C3C4C2C3D260A04322E32" ++ $"3E424642350A04322E42354C2C3D260A04423542464C3C4C2C0A0338423C4D3C" ++ $"440A08335C395C41544F5C555C6051594D3E510A0422422252325A32490A0422" ++ $"4232493C402D3A0A043249325A3C503C400A043E424E495840493A0A043E524E" ++ $"5A4E493E420A1243C97243C375BF66C2A93F503C5133C4F03330342F3830382D" ++ $"2927292A2C2C2D2E2DC2F2B7B1C3BEB5E1C358B5E1C4AA0A042C252927382D3B" ++ $"2B0A04364B334D3E5241500A0442463F48434A46480A042A4727492B4B2E490A" ++ $"04382D38303B2E3B2B0A04434A4358465646480A04332F334D364B362D160A10" ++ $"01052020230A1001052022120A00010030103701178400040A0101012010370A" ++ $"0B01032010370A0E0104201D250A0101072020230A00010030101C0117840004" ++ $"0A02010A2004080A0C010320101C0A0801092004080A00010030283901178400" ++ $"040A0401012028390A0601022028390A0A01032028390A000100302A20011784" ++ $"00040A030101202A200A050102202A200A090103202A200A12040C0D0E0F000A" ++ $"0003101211000A11010B00" ++}; ++ ++resource(1, "BEOS:APP_SIG") (#'MIMS') "application/x-vnd.links"; ++ ++resource(1, "BEOS:FILE_TYPES") message { ++ "types" = "text/html", ++ "types" = "application/x-vnd.Be-bookmark", ++ "types" = "application/x-vnd.Be.URL.http" ++}; +diff -urN links-2.8.org/Makefile.am links-2.8/Makefile.am +--- links-2.8.org/Makefile.am 2013-09-20 22:37:39.031457280 +0200 ++++ links-2.8/Makefile.am 2013-12-12 23:23:13.554172416 +0100 +@@ -4,7 +4,7 @@ + + man_MANS=links.1 + +-EXTRA_DIST=$(man_MANS) atheos.cpp BRAILLE_HOWTO KEYS SITES descrip.mms *.opt PATCH-gpm-1.20.0-smooth-cursor PATCH-libpng-1.2.18 mailcap.pl rebuild Links_logo.png Unicode/*.cp Unicode/[!C]* intl/[!C]* graphics/*.c graphics/arrow.png graphics/gen graphics/system_font/*.png graphics/font/century_extensions-medium-roman-serif-vari/*.png graphics/font/century_school-bold-roman-serif-vari/*.png graphics/font/century_school-medium-roman-serif-vari/*.png graphics/font/courier-medium-roman-serif-mono/*.png graphics/font/japanese-medium-roman-sans-mono/*.png graphics/font/symbol-medium-roman-sans-vari/*.png graphics/font/century_school-bold-roman-serif-vari/aliases graphics/font/century_school-medium-roman-serif-vari/aliases graphics/font/japanese-medium-roman-sans-mono/aliases graphics/font/symbol-medium-roman-sans-vari/aliases doc/links_cal/*.png doc/links_cal/*.html graphics/Makefile graphics/Fontmap graphics/clip.c graphics/links.xpm graphics/makefont graphics/pdf2html graphics/spacer.png pkg-config.m4 *.xpm *.ico *.rc mk-release-os2 mk-release-win mk-dos links.wis *.nsi ++EXTRA_DIST=$(man_MANS) atheos.cpp haiku.cpp BRAILLE_HOWTO KEYS SITES descrip.mms *.opt PATCH-gpm-1.20.0-smooth-cursor PATCH-libpng-1.2.18 mailcap.pl rebuild Links_logo.png Unicode/*.cp Unicode/[!C]* intl/[!C]* graphics/*.c graphics/arrow.png graphics/gen graphics/system_font/*.png graphics/font/century_extensions-medium-roman-serif-vari/*.png graphics/font/century_school-bold-roman-serif-vari/*.png graphics/font/century_school-medium-roman-serif-vari/*.png graphics/font/courier-medium-roman-serif-mono/*.png graphics/font/japanese-medium-roman-sans-mono/*.png graphics/font/symbol-medium-roman-sans-vari/*.png graphics/font/century_school-bold-roman-serif-vari/aliases graphics/font/century_school-medium-roman-serif-vari/aliases graphics/font/japanese-medium-roman-sans-mono/aliases graphics/font/symbol-medium-roman-sans-vari/aliases doc/links_cal/*.png doc/links_cal/*.html graphics/Makefile graphics/Fontmap graphics/clip.c graphics/links.xpm graphics/makefont graphics/pdf2html graphics/spacer.png pkg-config.m4 *.xpm *.ico *.rc mk-release-os2 mk-release-win mk-dos links.wis *.nsi links-haiku.rdef + + bin_PROGRAMS=links + +@@ -13,6 +13,17 @@ + else + endif + ++if HAIKU_GR ++links_LDADD=haiku.o -lbe ++EXTRA_links_DEPENDENCIES=links-haiku.rsrc ++# automake will not let us touch the binary after link ++# and install will not copy the attributes anyway... so do it after install ++install-exec-hook: ++ xres -o $(DESTDIR)$(bindir)/links$(EXEEXT) links-haiku.rsrc ++ mimeset $(DESTDIR)$(bindir)/links$(EXEEXT) ++else ++endif ++ + links_SOURCES=af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c dos.c drivers.c error.c file.c finger.c fn_impl.c font_inc.c framebuf.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c links_ic.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc codepage.inc entity.inc fbcommon.inc language.inc uni_7b.inc upcase.inc vpipe.inc + + dist-hook: +@@ -33,6 +44,12 @@ + atheos.o: atheos.cpp + $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c atheos.cpp + ++haiku.o: haiku.cpp ++ $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -o $@ -c $< ++ ++links-haiku.rsrc: links-haiku.rdef ++ rc -o $@ $< ++ + datadir = $(prefix)/@DATADIRNAME@ + LIBS = @LIBS@ + +diff -urN links-2.8.org/os_dep.c links-2.8/os_dep.c +--- links-2.8.org/os_dep.c 2013-09-20 23:16:38.037748736 +0200 ++++ links-2.8/os_dep.c 2013-12-12 21:48:36.256638976 +0100 +@@ -307,7 +307,7 @@ + + #endif + +-#if defined(UNIX) || defined(WIN32) || defined(INTERIX) || defined(BEOS) || defined(RISCOS) || defined(ATHEOS) || defined(SPAD) || defined(OPENVMS) ++#if defined(UNIX) || defined(WIN32) || defined(INTERIX) || defined(BEOS) || defined(RISCOS) || defined(ATHEOS) || defined(SPAD) || defined(OPENVMS) || defined(HAIKU) + + #ifdef SIGWINCH + static void sigwinch(void *s) +@@ -573,7 +573,7 @@ + return xt; + } + +-#elif defined(BEOS) || defined(ATHEOS) || defined(DOS) ++#elif defined(BEOS) || defined(ATHEOS) || defined(DOS) || defined(HAIKU) + + int is_xterm(void) + { +@@ -656,6 +656,12 @@ + if (!GetConsoleCP()) + force_g = 1; + #endif ++#ifdef HAIKU ++ if (getenv("TERM") == NULL) { ++ /* probably launched from Tracker or Deskbar, force graphics mode */ ++ force_g = 1; ++ } ++#endif + } + #endif + +@@ -958,7 +964,7 @@ + #endif + + +-#if defined(UNIX) || defined(INTERIX) || defined(BEOS) || defined(RISCOS) || defined(ATHEOS) || defined(SPAD) || defined(OPENVMS) || defined(DOS) ++#if defined(UNIX) || defined(INTERIX) || defined(BEOS) || defined(RISCOS) || defined(ATHEOS) || defined(SPAD) || defined(OPENVMS) || defined(DOS) || defined(HAIKU) + + #if defined(BEOS) && defined(HAVE_SETPGID) + +@@ -1710,7 +1716,7 @@ + + #endif + +-#if defined(UNIX) || defined(OS2) || defined(WIN32) || defined(INTERIX) || defined(RISCOS) || defined(ATHEOS) || defined(SPAD) ++#if defined(UNIX) || defined(OS2) || defined(WIN32) || defined(INTERIX) || defined(RISCOS) || defined(ATHEOS) || defined(SPAD) || defined(HAIKU) + + void terminate_osdep(void) + { +@@ -1727,7 +1733,7 @@ + + #if defined(BEOS) + +-#include ++#include + + static int thr_sem_init = 0; + static sem_id thr_sem; +@@ -2466,6 +2472,13 @@ + return 0; + } + ++#elif defined(HAIKU) ++ ++int get_system_env(void) ++{ ++ return ENV_BE; ++} ++ + #elif defined(WIN32) + + int get_system_env(void) +@@ -2588,6 +2601,14 @@ + } + #endif + ++#ifdef HAIKU ++static int open_in_new_haiku(struct terminal *term, unsigned char *exe, unsigned char *param) ++{ ++ exec_new_links(term, cast_uchar "Terminal", exe, param); ++ return 0; ++} ++#endif ++ + #ifdef G + static int open_in_new_g(struct terminal *term, unsigned char *exe, unsigned char *param) + { +@@ -2637,6 +2658,9 @@ + #ifdef BEOS + {ENV_BE, open_in_new_be, TEXT_(T_BEOS_TERMINAL), TEXT_(T_HK_BEOS_TERMINAL)}, + #endif ++#ifdef HAIKU ++ {ENV_BE, open_in_new_haiku, TEXT_(T_BEOS_TERMINAL), TEXT_(T_HK_BEOS_TERMINAL)}, ++#endif + #ifdef G + {ENV_G, open_in_new_g, TEXT_(T_WINDOW), TEXT_(T_HK_WINDOW)}, + #endif +@@ -2685,6 +2709,9 @@ + #ifdef BEOS + if (!(environment & ENV_BE)) return 0; + #endif ++#ifdef HAIKU ++ if (!(environment & ENV_BE)) return 0; ++#endif + #ifdef G + if (F && drv->flags & GD_NO_OS_SHELL) return 0; + #endif +diff -urN links-2.8.org/os_dep.h links-2.8/os_dep.h +--- links-2.8.org/os_dep.h 2013-09-17 02:11:47.030932992 +0200 ++++ links-2.8/os_dep.h 2013-12-12 21:29:28.176685056 +0100 +@@ -29,7 +29,7 @@ + #define WIN32 + #elif defined(__INTERIX) + #define INTERIX +-#elif defined(__BEOS__) || defined(__HAIKU__) ++#elif defined(__BEOS__) + #define BEOS + #elif defined(__riscos__) + #define RISCOS +@@ -41,6 +41,8 @@ + #define OPENVMS + #elif defined(__DJGPP) + #define DOS ++#elif defined(__HAIKU__) ++#define HAIKU + #else + #define UNIX + #endif +@@ -158,6 +160,25 @@ + + #include "beos.h" + ++#elif defined(HAIKU) ++ ++static inline int dir_sep(unsigned char x) { return x == '/'; } ++#define NEWLINE "\n" ++#define NO_ASYNC_LOOKUP /* async lookup works on BeOS but crashes the Haiku kernel */ ++#define FS_UNIX_RIGHTS ++#define FS_UNIX_SOFTLINKS ++#define FS_UNIX_USERS ++/* TODO: allocate new SYS_* or replace SYS_BEOS */ ++#define SYSTEM_ID SYS_BEOS ++#define SYSTEM_NAME "Haiku" ++#define DEFAULT_SHELL "/bin/sh" ++#define GETSHELL getenv("SHELL") ++#define NO_CTRL_Z ++#define SET_WINDOW_TITLE_UTF_8 ++#define SHARED_CONFIG_DIR "/etc/" ++#define NO_FORK_ON_EXIT ++#define ASSOC_BLOCK ++ + #elif defined(RISCOS) + + static inline int dir_sep(unsigned char x) { return x == '/' || x == '\\'; } +diff -urN links-2.8.org/os_depx.h links-2.8/os_depx.h +--- links-2.8.org/os_depx.h 2013-08-25 13:07:50.033030144 +0200 ++++ links-2.8/os_depx.h 2013-12-12 21:35:09.725614592 +0100 +@@ -184,6 +184,10 @@ + #endif + #endif + ++#ifdef HAIKU ++/* nothing so far */ ++#endif ++ + #ifdef OPENVMS + #if defined(__INITIAL_POINTER_SIZE) + #if __INITIAL_POINTER_SIZE == 64 +@@ -340,6 +344,9 @@ + #elif defined(GRDRV_ATHEOS) + #define loop_select ath_select + int ath_select(int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t); ++#elif defined(GRDRV_HAIKU) ++#define loop_select be_loop_select ++int be_loop_select(int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t); + #else + #define loop_select select + #endif From bc4c346e67c081d1746e9a408c0a1daf588c8906 Mon Sep 17 00:00:00 2001 From: MrPoxipol Date: Thu, 12 Dec 2013 23:59:57 +0000 Subject: [PATCH 014/116] Corrected recipe for rezerwar. --- games-puzzle/rezerwar/rezerwar-0.4.2.recipe | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe index d58c8be63..d11756a96 100644 --- a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe +++ b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe @@ -1,9 +1,11 @@ -SUMMARY="A puzzle game that could be described as the illegitimate child of a known tetromino game an the average pipe game." -DESCRIPTION="Rezerwar is a puzzle game that could be described as the illegitimate child of a known tetromino game and the average pipe game. It runs on Linux, Windows, Nintendo Wii (homebrew), FreeBSD, Amiga OS, And Now Haiku! The whole game was created with open-source software including graphics, sounds and musics. Feel free to contribute. The goal of this game is basically to create networks of water to make them disappear, a couple tricks." +SUMMARY="A puzzle game." +DESCRIPTION="Rezerwar is a puzzle game that could be described as the illegitimate child of a known tetromino game and the average pipe game. +It runs on Linux, Windows, Nintendo Wii (homebrew), FreeBSD, Amiga OS, And Now Haiku! +The whole game was created with open-source software including graphics, sounds and musics. Feel free to contribute. The goal of this game is basically to create networks of water to make them disappear, a couple tricks and techniques will help you achieve this goal faster. +" HOMEPAGE="http://tamentis.com/projects/rezerwar/" SRC_URI="http://tamentis.com/projects/rezerwar/files/rezerwar-0.4.2.tar.gz" CHECKSUM_MD5="42018abe251e45ab8cc30133cde61ff8" -SOURCE_DIR="rezerwar-0.4.2" LICENSE="BSD (2-clause)" COPYRIGHT="2008, 2009 Bertrand Janin" REVISION="1" @@ -29,7 +31,8 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:make - cmd:sdl_config + cmd:which + cmd:sdl_config$secondaryArchSuffix " BUILD() @@ -40,8 +43,8 @@ BUILD() INSTALL() { - mv data rezerwar - cp -r rezerwar $appsDir + mkdir -p $appsDir/rezerwar + cp -r --copy-contents rezerwar $appsDir/rezerwar cp src/rezerwar $appsDir/rezerwar/rezerwar addAppDeskbarSymlink $appsDir/rezerwar/rezerwar "Rezerwar" From fdb9df7542f90906eb69ae7ffcb2669900d2d929 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Thu, 12 Dec 2013 19:25:12 -0500 Subject: [PATCH 015/116] Fix checkout paths for recipes pointing to... no longer existing BuildToolsPM repository. --- sys-devel/binutils/binutils-2.17_2013_04_21.recipe | 2 +- sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe | 2 +- sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe | 4 ++-- sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe | 4 ++-- sys-devel/jam/jam-2.5_2012_10_12.recipe | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe index b2db590e1..384391eaa 100644 --- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe +++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe @@ -1,6 +1,6 @@ SUMMARY="The GNU assembler, linker and binary utilities" HOMEPAGE="http://www.gnu.org/software/binutils" -SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#ab0f66e" +SRC_URI="git+git://github.com/haiku/buildtools.git#ab0f66e" REVISION="2" LICENSE=" GNU GPL v2 diff --git a/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe b/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe index 3db357b10..42a3d32d1 100644 --- a/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe +++ b/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe @@ -2,7 +2,7 @@ SUMMARY="Assembler, linker and binary tools for target ${targetMachineTriple}" HOMEPAGE="http://www.gnu.org/software/binutils" SRC_URI=" - git+git://github.com/haiku/BuildtoolsPM.git#db2a6d28f6c6a92cfb1c619b0828dfbf6b87ca30" + git+git://github.com/haiku/buildtools.git#db2a6d28f6c6a92cfb1c619b0828dfbf6b87ca30" REVISION="2" LICENSE=" GNU GPL v2 diff --git a/sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe b/sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe index 79349b7c1..ddb717d77 100644 --- a/sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe +++ b/sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe @@ -7,8 +7,8 @@ LICENSE=" " COPYRIGHT="1988-2000 Free Software Foundation, Inc." SRC_URI=" - git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c - git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + git+file://$portBaseDir/../binutils/download/buildtools.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + git+git://github.com/haiku/buildtools.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c " REVISION="1" ARCHITECTURES="x86_gcc2" diff --git a/sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe b/sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe index e8a2c5797..0e134cf65 100644 --- a/sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe +++ b/sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe @@ -7,8 +7,8 @@ LICENSE=" " COPYRIGHT="1988-2013 Free Software Foundation, Inc." SRC_URI=" - git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c - git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + git+file://$portBaseDir/../binutils/download/buildtools.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + git+git://github.com/haiku/buildtools.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c " REVISION="4" ARCHITECTURES="x86 x86_64" diff --git a/sys-devel/jam/jam-2.5_2012_10_12.recipe b/sys-devel/jam/jam-2.5_2012_10_12.recipe index 7479d30b2..713fa098f 100644 --- a/sys-devel/jam/jam-2.5_2012_10_12.recipe +++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe @@ -19,8 +19,8 @@ HOMEPAGE="http://www.perforce.com/jam/jam.html" LICENSE="Jam" COPYRIGHT="1993-2003 Christopher Seiwald" SRC_URI=" - git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462 - git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462 + git+file://$portBaseDir/../binutils/download/buildtools.git#278de7bc9243876c2e08f8d6a243d510c5000462 + git+git://github.com/haiku/buildtools.git#278de7bc9243876c2e08f8d6a243d510c5000462 " REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" From 79852ab1d5f80a9596a45a2a0212876e2d2318fc Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Thu, 12 Dec 2013 21:34:37 -0500 Subject: [PATCH 016/116] which: Add x86_64 target architecture. --- sys-apps/which/which-2.20.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/which/which-2.20.recipe b/sys-apps/which/which-2.20.recipe index acbdd52e3..8df104316 100644 --- a/sys-apps/which/which-2.20.recipe +++ b/sys-apps/which/which-2.20.recipe @@ -5,7 +5,7 @@ LICENSE="GNU GPL v2" SRC_URI="http://ftp.gnu.org/gnu/which/which-2.20.tar.gz" CHECKSUM_MD5="95be0501a466e515422cde4af46b2744" REVISION="2" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="which-2.20.patch" From 74fa946881b2e6aa84c80bcea02a9e3c206f6e9b Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 10 Dec 2013 18:54:31 +0000 Subject: [PATCH 017/116] Update libsanta recipe --- haiku-libs/libsanta/libsanta-0.0.1.recipe | 39 ++++++++++++++++++----- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/haiku-libs/libsanta/libsanta-0.0.1.recipe b/haiku-libs/libsanta/libsanta-0.0.1.recipe index 347c3bea7..c7753f89c 100644 --- a/haiku-libs/libsanta/libsanta-0.0.1.recipe +++ b/haiku-libs/libsanta/libsanta-0.0.1.recipe @@ -1,5 +1,5 @@ SUMMARY="Custom widget library" -DESCRIPTION="libsanta has some useful custom widgets." +DESCRIPTION="libsanta has some useful custom widgets (color picker, column list view, scroll view etc.)" HOMEPAGE="https://github.com/HaikuArchives/SantasGiftBag" COPYRIGHT="briant@timelinevista.com" LICENSE="libsanta" @@ -25,38 +25,61 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make + cmd:mkdepend " BUILD() { make TYPE=STATIC \ - OBJ_DIR=build \ + OBJ_DIR=obj-static \ BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` make TYPE=SHARED \ - OBJ_DIR=build \ + OBJ_DIR=obj-shared \ BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { - mkdir -p $developLibDir $libDir + mkdir -p $developLibDir $developDocDir $includeDir/santa $libDir - cp -R Documentation $developLibDir + cp -R Documentation/* $developDocDir - cd build + cd obj-static cp libsanta.a $developLibDir + + cd ../obj-shared cp libsanta $libDir/libsanta.so + cd .. + + # Copy header files to $includeDir + + cp ./BetterScrollView/BetterScrollView.h \ + ./Colors.h \ + ./ColumnListView/CLVColumn.h \ + ./ColumnListView/CLVColumnLabelView.h \ + ./ColumnListView/CLVEasyItem.h \ + ./ColumnListView/CLVListItem.h \ + ./ColumnListView/ColumnListView.h \ + ./Cursors/Cursors.h \ + ./NewStrings/NewStrings.h \ + ./PrefilledBitmap/PrefilledBitmap.h \ + ./ScrollViewCorner/ScrollViewCorner.h $includeDir/santa + + symlinkRelative -s $libDir/libsanta.so $developLibDir + packageEntries devel \ - $developLibDir + $developLibDir \ + $developDocDir \ + $includeDir } # ----- devel package ------------------------------------------------------- PROVIDES_devel=" libsanta${secondaryArchSuffix}_devel = $portVersion - libsanta$secondaryArchSuffix = $portVersion + devel:libsanta$secondaryArchSuffix = $portVersion " REQUIRES_devel=" libsanta$secondaryArchSuffix == $portVersion base From 6113177a05c5e158337f8a211eaeab1b765a7999 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Fri, 13 Dec 2013 00:08:51 -0700 Subject: [PATCH 018/116] Fix libsanta stdc++ linking on gcc4 --- haiku-libs/libsanta/libsanta-0.0.1.recipe | 8 ++++--- .../libsanta/patches/libsanta-0.0.1.patchset | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 haiku-libs/libsanta/patches/libsanta-0.0.1.patchset diff --git a/haiku-libs/libsanta/libsanta-0.0.1.recipe b/haiku-libs/libsanta/libsanta-0.0.1.recipe index c7753f89c..ad72ff1f9 100644 --- a/haiku-libs/libsanta/libsanta-0.0.1.recipe +++ b/haiku-libs/libsanta/libsanta-0.0.1.recipe @@ -4,9 +4,9 @@ HOMEPAGE="https://github.com/HaikuArchives/SantasGiftBag" COPYRIGHT="briant@timelinevista.com" LICENSE="libsanta" SRC_URI="git+https://github.com/HaikuArchives/SantasGiftBag#4b62541" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libsanta$secondaryArchSuffix = $portVersion @@ -28,6 +28,8 @@ BUILD_PREREQUIRES=" cmd:mkdepend " +PATCHES="libsanta-0.0.1.patchset" + BUILD() { make TYPE=STATIC \ diff --git a/haiku-libs/libsanta/patches/libsanta-0.0.1.patchset b/haiku-libs/libsanta/patches/libsanta-0.0.1.patchset new file mode 100644 index 000000000..baaab658e --- /dev/null +++ b/haiku-libs/libsanta/patches/libsanta-0.0.1.patchset @@ -0,0 +1,22 @@ +From 459e758be3720ec93b1029eea0db2af14db38121 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Fri, 13 Dec 2013 00:03:52 -0700 +Subject: Fix stdc++ libs on gcc4 + + +diff --git a/Makefile b/Makefile +index 57c3914..2719e8d 100644 +--- a/Makefile ++++ b/Makefile +@@ -51,7 +51,7 @@ RSRCS= + # naming scheme you need to specify the path to the library + # and it's name + # library: my_lib.a entry: my_lib.a or path/my_lib.a +-LIBS= be root stdc++.r4 ++LIBS= be root $(STDCPPLIBS) + + # specify additional paths to directories following the standard + # libXXX.so or libXXX.a naming scheme. You can specify full paths +-- +1.8.3.4 + From aaf85ed5902beaef180f6cee11629fdc90abd2df Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Thu, 12 Dec 2013 22:16:10 +0000 Subject: [PATCH 019/116] Add BeLife recipe --- haiku-apps/belife/belife-1.0.0.recipe | 54 +++++++++++++++++++++++ haiku-apps/belife/licenses/BeLife License | 1 + 2 files changed, 55 insertions(+) create mode 100644 haiku-apps/belife/belife-1.0.0.recipe create mode 100644 haiku-apps/belife/licenses/BeLife License diff --git a/haiku-apps/belife/belife-1.0.0.recipe b/haiku-apps/belife/belife-1.0.0.recipe new file mode 100644 index 000000000..63eea3155 --- /dev/null +++ b/haiku-apps/belife/belife-1.0.0.recipe @@ -0,0 +1,54 @@ +SUMMARY="An app to play the game of life" + +DESCRIPTION=" + The Game of Life is not a game in the conventional sense. + There are no players, and no winning or losing. + Once the "pieces" are placed in the starting position, + the rules determine everything that happens later. + Nevertheless, Life is full of surprises! + In most cases, it is impossible to look at a starting position + (or pattern) and see what will happen in the future. + The only way to find out is to follow the rules of the game. + " +HOMEPAGE="https://github.com/HaikuArchives/BeLife" +SRC_URI="git://github.com/HaikuArchives/BeLife.git#aa35a935e55e9ee17fbb9d414534ba79798a95a1" +REVISION="1" + +LICENSE="BeLife License" +COPYRIGHT="2006 Studio-33" + +ARCHITECTURES="x86 x86_gcc2" + + +PROVIDES=" + belife = $portVersion + app:belife = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:g++ + cmd:make + cmd:mkdepend + cmd:xres + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD() +{ + cd src + make +} + +INSTALL() +{ + cd src + make install INSTALL_DIR=$appsDir + addAppDeskbarSymlink $appsDir/BeLife +} diff --git a/haiku-apps/belife/licenses/BeLife License b/haiku-apps/belife/licenses/BeLife License new file mode 100644 index 000000000..3389defc2 --- /dev/null +++ b/haiku-apps/belife/licenses/BeLife License @@ -0,0 +1 @@ +Copyright 2006 Studio-33, All Rights Reserved. From 7d35579228fdf805874d83af1025ed798a5a364e Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Fri, 13 Dec 2013 14:17:31 +0000 Subject: [PATCH 020/116] BeAE v1.2 recipe --- haiku-apps/beae/beae-1.2.recipe | 45 +++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 haiku-apps/beae/beae-1.2.recipe diff --git a/haiku-apps/beae/beae-1.2.recipe b/haiku-apps/beae/beae-1.2.recipe new file mode 100644 index 000000000..044ff2426 --- /dev/null +++ b/haiku-apps/beae/beae-1.2.recipe @@ -0,0 +1,45 @@ +DESCRIPTION="BeAE is an audio editor for Haiku, with features like silencing, fading in/out, analyzing etc." +SUMMARY="Well featured audio editor for Haiku" +HOMEPAGE="http://developer.berlios.de/projects/beae" +SRC_URI="svn://svn.berlios.de/beae/trunk#25" +REVISION="1" +COPYRIGHT="2003 Xentronix" +LICENSE="BSD (3-clause)" + +ARCHITECTURES="x86_gcc2 !x86 ?x86_64" +SECONDARY_ARCHITECTURES="!x86" + +PROVIDES=" + beae = $portVersion + app:beae = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:cmake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + cmake . + make +} + +INSTALL() +{ + mkdir -p $appsDir/BeAE + + cd build + mv * $appsDir/BeAE + addAppDeskbarSymlink $appsDir/BeAE/BeAE +} From 6507d4fc77f4ae8506cb69170ba8dad4582d0f82 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 13 Dec 2013 15:30:33 +0100 Subject: [PATCH 021/116] Update pe recipe * Add somewhat more useful description. * PROVIDES: cmd:Pe -> app:Pe * Move haiku_devel from BUILD_PREREQUIRES to BUILD_REQUIRES. --- haiku-apps/pe/pe-2.4.3_hg615.recipe | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/haiku-apps/pe/pe-2.4.3_hg615.recipe b/haiku-apps/pe/pe-2.4.3_hg615.recipe index ce884091d..07ebbf5b8 100644 --- a/haiku-apps/pe/pe-2.4.3_hg615.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg615.recipe @@ -1,5 +1,7 @@ SUMMARY="A programmer's editor" -DESCRIPTION="A programmer's editor" +DESCRIPTION="Pe is a native programmer's editor for Haiku. It features syntax +highlighting and a structural view for several programming language, as well +as basic support for Makefile and Jamfile project management." HOMEPAGE="http://pe-editor.berlios.de/" LICENSE=" BSD (4-clause) @@ -12,12 +14,12 @@ COPYRIGHT=" " SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#615" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" pe = $portVersion - cmd:Pe = $portVersion compat >= 2 + app:Pe = $portVersion compat >= 2 cmd:lpe = $portVersion compat >= 2 " @@ -28,12 +30,12 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku_devel devel:libpcre devel:libpcreposix " BUILD_PREREQUIRES=" - haiku_devel cmd:bison cmd:flex cmd:gcc @@ -45,8 +47,6 @@ USER_SETTINGS_FILES=" settings/pe directory " -SOURCE_DIR="$portVersionedName" - BUILD() { jam -q From 886f0073429fd3150ee11d02c14247d928cb8846 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 13 Dec 2013 14:36:35 +0000 Subject: [PATCH 022/116] Fixes for BeLife --- haiku-apps/belife/belife-1.0.0.recipe | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/haiku-apps/belife/belife-1.0.0.recipe b/haiku-apps/belife/belife-1.0.0.recipe index 63eea3155..a1c4192a0 100644 --- a/haiku-apps/belife/belife-1.0.0.recipe +++ b/haiku-apps/belife/belife-1.0.0.recipe @@ -1,9 +1,8 @@ SUMMARY="An app to play the game of life" - DESCRIPTION=" The Game of Life is not a game in the conventional sense. There are no players, and no winning or losing. - Once the "pieces" are placed in the starting position, + Once the \"pieces\" are placed in the starting position, the rules determine everything that happens later. Nevertheless, Life is full of surprises! In most cases, it is impossible to look at a starting position @@ -13,13 +12,11 @@ DESCRIPTION=" HOMEPAGE="https://github.com/HaikuArchives/BeLife" SRC_URI="git://github.com/HaikuArchives/BeLife.git#aa35a935e55e9ee17fbb9d414534ba79798a95a1" REVISION="1" - LICENSE="BeLife License" COPYRIGHT="2006 Studio-33" ARCHITECTURES="x86 x86_gcc2" - PROVIDES=" belife = $portVersion app:belife = $portVersion @@ -49,6 +46,7 @@ BUILD() INSTALL() { cd src - make install INSTALL_DIR=$appsDir - addAppDeskbarSymlink $appsDir/BeLife + make install INSTALL_DIR=$appsDir/BeLife + addAppDeskbarSymlink $appsDir/BeLife/BeLife + cp ../readme $appsDir/BeLife } From acd2c16f0bf87a063b200d37f6df62005f6b42fe Mon Sep 17 00:00:00 2001 From: puckipedia Date: Fri, 13 Dec 2013 14:39:20 +0000 Subject: [PATCH 023/116] BeLife: Removed newlines --- haiku-apps/belife/belife-1.0.0.recipe | 2 -- 1 file changed, 2 deletions(-) diff --git a/haiku-apps/belife/belife-1.0.0.recipe b/haiku-apps/belife/belife-1.0.0.recipe index a1c4192a0..dbd3a60ef 100644 --- a/haiku-apps/belife/belife-1.0.0.recipe +++ b/haiku-apps/belife/belife-1.0.0.recipe @@ -21,11 +21,9 @@ PROVIDES=" belife = $portVersion app:belife = $portVersion " - REQUIRES=" haiku >= $haikuVersion " - BUILD_PREREQUIRES=" makefile_engine cmd:g++ From 70060912448b07b05c1f192b5e91909fcbb8e1a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 13 Dec 2013 16:59:56 +0100 Subject: [PATCH 024/116] behappy: Add deskbar entry --- haiku-apps/behappy/behappy-1.06e_git.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/haiku-apps/behappy/behappy-1.06e_git.recipe b/haiku-apps/behappy/behappy-1.06e_git.recipe index f3ea35ab7..511d9c711 100644 --- a/haiku-apps/behappy/behappy-1.06e_git.recipe +++ b/haiku-apps/behappy/behappy-1.06e_git.recipe @@ -40,5 +40,6 @@ INSTALL() { cd trunk make install BUILDHOME=/system/develop + addAppDeskbarSymlink $appsDir/BeHappy/BeHappy } From 5940458461de8a0c2bd180ea6eaab461bdb7b925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 13 Dec 2013 17:00:34 +0100 Subject: [PATCH 025/116] libxau: update recipe and patch --- x11-libs/libxau/libxau-1.0.5.recipe | 47 +++++++++++++++++++--- x11-libs/libxau/patches/libxau-1.0.5.patch | 18 +++++++-- 2 files changed, 55 insertions(+), 10 deletions(-) diff --git a/x11-libs/libxau/libxau-1.0.5.recipe b/x11-libs/libxau/libxau-1.0.5.recipe index 262bf426b..405de17e6 100644 --- a/x11-libs/libxau/libxau-1.0.5.recipe +++ b/x11-libs/libxau/libxau-1.0.5.recipe @@ -1,22 +1,57 @@ +SUMMARY="libxau" DESCRIPTION="libxau" HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/" SRC_URI="http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.5.tar.gz" CHECKSUM_MD5="1a421d9376f43596fe068ce209a70b84" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.23 - x11-misc/util-macros >= 1.7.0" +COPYRIGHT="1988, 1993, 1994, 1998 The Open Group" +LICENSE="MIT (no promotion)" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libxau$secondaryArchSuffix = $portVersion + lib:libxau$secondaryArchSuffix = $portVersion + lib:libXau$secondaryArchSuffix = $portVersion + devel:libxau$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + xproto$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + devel:xproto$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:util_macros$secondaryArchSuffix + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " + +SOURCE_DIR="libXau-$portVersion" + +PATCHES="libxau-1.0.5.patch" + BUILD() { - cd libXau-1.0.5 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=`finddir B_COMMON_DIRECTORY` + runConfigure ./configure make } INSTALL() { - cd libXau-1.0.5 make install + prepareInstalledDevelLibs libXau } diff --git a/x11-libs/libxau/patches/libxau-1.0.5.patch b/x11-libs/libxau/patches/libxau-1.0.5.patch index b131ea47e..7779a6f82 100644 --- a/x11-libs/libxau/patches/libxau-1.0.5.patch +++ b/x11-libs/libxau/patches/libxau-1.0.5.patch @@ -1,7 +1,17 @@ -diff -Naur libXau-1.0.5/configure.ac libXau-1.0.5-haiku/configure.ac ---- libXau-1.0.5/configure.ac 2009-08-28 04:34:23.023855104 +0000 -+++ libXau-1.0.5-haiku/configure.ac 2010-04-26 23:21:53.573308928 +0000 -@@ -58,6 +58,9 @@ +diff --git a/configure.ac b/configure.ac +index c63adcb..0d981c6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -28,7 +28,7 @@ AC_INIT(libXau, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADER(config.h) + + # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT + m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +@@ -58,6 +58,9 @@ if test "x$xthreads" = "xyes" ; then if test "x$mtsafe" = "x" ; then AC_CHECK_LIB(nsl, gethostbyname_r, [mtsafe=yes]) fi From de3688e783a1e314dce0b5fdb681257f66a3af74 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 13 Dec 2013 16:01:36 +0000 Subject: [PATCH 026/116] Add FontBoy recipe --- haiku-apps/fontboy/fontboy-0.9.7.recipe | 48 +++++++++++++++++++++++++ haiku-apps/fontboy/licenses/FontBoy | 1 + 2 files changed, 49 insertions(+) create mode 100644 haiku-apps/fontboy/fontboy-0.9.7.recipe create mode 100644 haiku-apps/fontboy/licenses/FontBoy diff --git a/haiku-apps/fontboy/fontboy-0.9.7.recipe b/haiku-apps/fontboy/fontboy-0.9.7.recipe new file mode 100644 index 000000000..575d9cf2c --- /dev/null +++ b/haiku-apps/fontboy/fontboy-0.9.7.recipe @@ -0,0 +1,48 @@ +SUMMARY="A small application to show your installed fonts in Haiku." +DESCRIPTION=" + Fontboy is a small application to show your installed fonts in Haiku. You can get + additional information of the selected font and a preview of the complete Unicode + charset. Fontboy allows you to adjust the appearence to your desired needs + and it's fast because Haiku is. + " +HOMEPAGE="https://github.com/puckipedia/FontBoy" +SRC_URI="git://github.com/puckipedia/FontBoy.git#2195924e69096a5e7a9774cfaec8fdc277045ecf" +REVISION="1" +LICENSE="FontBoy" +COPYRIGHT="1999-2003 Oliver 'Madison' Kohl" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + fontboy = $portVersion + app:fontboy = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:g++ + cmd:xres + cmd:mkdepend + cmd:make + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +USER_SETTINGS_FILES=" + settings/Fontboy_prefs + " + +BUILD() +{ + cd src + make +} + +INSTALL() +{ + cd src + make install INSTALL_DIR=$appsDir/ + addAppDeskbarSymlink $appsDir/FontBoy +} diff --git a/haiku-apps/fontboy/licenses/FontBoy b/haiku-apps/fontboy/licenses/FontBoy new file mode 100644 index 000000000..db7d4cc26 --- /dev/null +++ b/haiku-apps/fontboy/licenses/FontBoy @@ -0,0 +1 @@ +Feel free to copy and distribute this version of Fontboy as you want, as long as the original archive remains unchanged. In no event shall I be held liable for any damages arising from the use of this software. Be and BeOS are registered trademarks of Palm Inc. All other trademarks mentioned belong to their respective owners. From 7cd377ec559ed6e6a863d132dfe5b5e7ac556d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 13 Dec 2013 20:40:47 +0100 Subject: [PATCH 027/116] xcb_proto: Pass / as DESTDIR This works around py-compile complaining about an empty DESTDIR. Note however some python files end up in non-packaged/... FIXME --- x11-proto/xcb_proto/xcb_proto-1.6.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-proto/xcb_proto/xcb_proto-1.6.recipe b/x11-proto/xcb_proto/xcb_proto-1.6.recipe index 190bd056d..7daaf4544 100644 --- a/x11-proto/xcb_proto/xcb_proto-1.6.recipe +++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe @@ -46,5 +46,5 @@ BUILD() INSTALL() { - make install + make install DESTDIR=/ } From 46aa06e9ea20d3e98be3f48544cc024ff0e4f969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 13 Dec 2013 20:47:21 +0100 Subject: [PATCH 028/116] xcb_proto: Fix pkg-config files --- x11-proto/xcb_proto/xcb_proto-1.6.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-proto/xcb_proto/xcb_proto-1.6.recipe b/x11-proto/xcb_proto/xcb_proto-1.6.recipe index 7daaf4544..20b514c45 100644 --- a/x11-proto/xcb_proto/xcb_proto-1.6.recipe +++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe @@ -47,4 +47,5 @@ BUILD() INSTALL() { make install DESTDIR=/ + fixPkgconfig } From 49790265ef55c57b204a9c83b00fde7e0bdbe80d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 13 Dec 2013 20:51:32 +0100 Subject: [PATCH 029/116] libpthread_stubs: Fix pkg-config files --- dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe index 5df1e235d..73951280e 100644 --- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe +++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe @@ -47,4 +47,5 @@ BUILD() INSTALL() { make install + fixPkgconfig } From 3d29bd10cadc654fd823935c417d9642159e1a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 13 Dec 2013 20:51:53 +0100 Subject: [PATCH 030/116] libxau: Fix pkg-config files --- x11-libs/libxau/libxau-1.0.5.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/x11-libs/libxau/libxau-1.0.5.recipe b/x11-libs/libxau/libxau-1.0.5.recipe index 405de17e6..d3848bf41 100644 --- a/x11-libs/libxau/libxau-1.0.5.recipe +++ b/x11-libs/libxau/libxau-1.0.5.recipe @@ -54,4 +54,5 @@ INSTALL() { make install prepareInstalledDevelLibs libXau + fixPkgconfig } From 01cc06eab127352de846c2c6f41259189af7921c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 13 Dec 2013 21:08:35 +0100 Subject: [PATCH 031/116] xcb_proto: Add site-packages to global writable files --- x11-proto/xcb_proto/xcb_proto-1.6.recipe | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/x11-proto/xcb_proto/xcb_proto-1.6.recipe b/x11-proto/xcb_proto/xcb_proto-1.6.recipe index 20b514c45..3127598b5 100644 --- a/x11-proto/xcb_proto/xcb_proto-1.6.recipe +++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe @@ -36,6 +36,10 @@ BUILD_PREREQUIRES=" SOURCE_DIR="xcb-proto-$portVersion" +GLOBAL_WRITABLE_FILES=" + non-packaged/lib/python2.6/site-packages directory keep-old + " + BUILD() { libtoolize --force --copy --install From 3a91d7c999a8955c0045109c06d16cea7c0024a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 14 Dec 2013 00:15:07 +0100 Subject: [PATCH 032/116] xemacs: Work-in-progress recipe It compiles but somehow ASRL+chroot breaks pdump... --- app-editors/xemacs/xemacs-21.5_hg.recipe | 99 ++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 app-editors/xemacs/xemacs-21.5_hg.recipe diff --git a/app-editors/xemacs/xemacs-21.5_hg.recipe b/app-editors/xemacs/xemacs-21.5_hg.recipe new file mode 100644 index 000000000..342f7fcd7 --- /dev/null +++ b/app-editors/xemacs/xemacs-21.5_hg.recipe @@ -0,0 +1,99 @@ +SUMMARY="XEmacs editor" +DESCRIPTION="highly customizable open source text editor and application development system" +HOMEPAGE="http://xemacs.org/" +SRC_URI="hg+https://bitbucket.org/mmu_man/xemacs#24b993054953" +REVISION="1" +LICENSE="GNU GPL v3" +COPYRIGHT="1998-2000 Hrvoje Niksic + 2000-2001 Michael Sperber + 2001 Ben Wing + 2001 Didier Verna + 2004 Stephen Turnbull + 2005-2006 Aidan Kehoe" +# TODO: FIXME: +#Bootstrapping from temacs... +#Warning: +# XEmacs was unable to determine a good value for the user's $HOME +# directory, and will be using the value: +# / +# This is probably incorrect. + + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +#POLICY WARNING: no matching provides "cmd:b2m" for "bin/b2m" +#POLICY WARNING: no matching provides "cmd:ctags" for "bin/ctags" +#POLICY WARNING: no matching provides "cmd:ellcc" for "bin/ellcc" +#POLICY WARNING: no matching provides "cmd:etags" for "bin/etags" +#POLICY WARNING: no matching provides "cmd:gnuattach" for "bin/gnuattach" +#POLICY WARNING: no matching provides "cmd:gnuclient" for "bin/gnuclient" +#POLICY WARNING: no matching provides "cmd:gnudoit" for "bin/gnudoit" +#POLICY WARNING: no matching provides "cmd:ootags" for "bin/ootags" +#POLICY WARNING: no matching provides "cmd:xemacs_21.5_b34" for "bin/xemacs-21.5-b34" +#POLICY WARNING: no matching provides "cmd:xemacs_script" for "bin/xemacs-script +PROVIDES=" + xemacs$secondaryArchSuffix = $portVersion + app:xemacs = $portVersion + cmd:xemacs = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix +# lib:libtiff$secondaryArchSuffix +# lib:libxpm$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libiconv$secondaryArchSuffix + devel:libncurses$secondaryArchSuffix + devel:libz$secondaryArchSuffix >= 1.2.8 + devel:libpng$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix +# devel:libtiff$secondaryArchSuffix +# devel:libxpm$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:tar + cmd:which + cmd:makeinfo + " + +# TODO: fix lispdir to not use $HOME +BUILD() +{ + export DISABLEASLR=1 + autoconf + export HOME=/boot/home + runConfigure ./configure \ + --with-tty=yes --with-pop --with-x11=no --with-ipv6-cname=no \ + --with-mule --with-wnn=no \ + -with-beos=yes \ + --with-toolbars=yes \ + --with-scrollbars=no \ + --with-menubars=no \ + --with-dialogs=no \ + --with-widgets=no \ + --with-dragndrop=yes \ + --with-system-malloc --disable-mc-alloc --with-mc-alloc=no \ + --with-postgresql=no \ + --disable-kkcc \ + --with-png + make clean + make +} + +INSTALL() +{ + export DISABLEASLR=1 + make install + addattr SYS:ENV DISABLEASLR=1 $binDir/xemacs-21* + addAppDeskbarSymlink $binDir/xemacs XEmacs +} From 8cbb56d2095b65665cd0f3d17af17c82a33f671e Mon Sep 17 00:00:00 2001 From: noryb009 Date: Fri, 13 Dec 2013 19:37:04 -0500 Subject: [PATCH 033/116] Update wget to build using gcc4 --- ...gcc2.patch => wget-1.14-build-fixes.patch} | 85 +++++++++++-------- net-misc/wget/wget-1.14.recipe | 3 +- 2 files changed, 52 insertions(+), 36 deletions(-) rename net-misc/wget/patches/{wget-1.14-gcc2.patch => wget-1.14-build-fixes.patch} (87%) diff --git a/net-misc/wget/patches/wget-1.14-gcc2.patch b/net-misc/wget/patches/wget-1.14-build-fixes.patch similarity index 87% rename from net-misc/wget/patches/wget-1.14-gcc2.patch rename to net-misc/wget/patches/wget-1.14-build-fixes.patch index 057eff0bf..4737e4a37 100644 --- a/net-misc/wget/patches/wget-1.14-gcc2.patch +++ b/net-misc/wget/patches/wget-1.14-build-fixes.patch @@ -1,16 +1,16 @@ -From 1d23e4b72c66f22da3a87ba2b14bb1b6ffe78b16 Mon Sep 17 00:00:00 2001 +From 106dffb05519f44684f5f9dc09b0970b8c68a2d9 Mon Sep 17 00:00:00 2001 From: Luke Date: Wed, 11 Dec 2013 03:03:50 +0000 -Subject: [PATCH] Make wget gcc2-friendly +Subject: [PATCH] Fix build errors --- - lib/regcomp.c | 2 +- - src/http.c | 9 ++++-- - src/main.c | 25 +++++++++------ - src/retr.c | 3 +- - src/utils.c | 2 ++ - src/warc.c | 99 +++++++++++++++++++++++++++++++++++++---------------------- - 6 files changed, 89 insertions(+), 51 deletions(-) + lib/regcomp.c | 2 +- + src/http.c | 9 ++++-- + src/main.c | 25 ++++++++------ + src/retr.c | 3 +- + src/utils.c | 2 ++ + src/warc.c | 102 ++++++++++++++++++++++++++++++++++++---------------------- + 6 files changed, 91 insertions(+), 52 deletions(-) diff --git a/lib/regcomp.c b/lib/regcomp.c index 1d7a522..76ed566 100644 @@ -186,7 +186,7 @@ index 567dc35..736f6e2 100644 # include #endif diff --git a/src/warc.c b/src/warc.c -index 69f80be..0cf9e53 100644 +index 69f80be..17a48aa 100644 --- a/src/warc.c +++ b/src/warc.c @@ -154,10 +154,11 @@ warc_write_buffer (const char *buffer, size_t size) @@ -202,7 +202,7 @@ index 69f80be..0cf9e53 100644 if (n != warc_write_buffer (str, n)) warc_write_ok = false; -@@ -246,6 +247,9 @@ warc_write_block_from_file (FILE *data_in) +@@ -246,8 +247,11 @@ warc_write_block_from_file (FILE *data_in) { /* Add the Content-Length header. */ char *content_length; @@ -210,8 +210,11 @@ index 69f80be..0cf9e53 100644 + size_t s; + fseeko (data_in, 0L, SEEK_END); - if (! asprintf (&content_length, "%ld", ftello (data_in))) +- if (! asprintf (&content_length, "%ld", ftello (data_in))) ++ if (! asprintf (&content_length, "%ld", (long int)ftello (data_in))) { + warc_write_ok = false; + return false; @@ -262,8 +266,6 @@ warc_write_block_from_file (FILE *data_in) warc_write_ok = false; @@ -322,20 +325,23 @@ index 69f80be..0cf9e53 100644 #endif /* If max size is enabled, we add a serial number to the file names. */ -@@ -811,9 +823,9 @@ static bool +@@ -811,12 +823,13 @@ static bool warc_parse_cdx_header (char *lineptr, int *field_num_original_url, int *field_num_checksum, int *field_num_record_id) { -- *field_num_original_url = -1; -- *field_num_checksum = -1; -- *field_num_record_id = -1; -+ off_t *field_num_original_url = -1; -+ off_t *field_num_checksum = -1; -+ off_t *field_num_record_id = -1; ++ char *token; ++ char *save_ptr; ++ + *field_num_original_url = -1; + *field_num_checksum = -1; + *field_num_record_id = -1; - char *token; - char *save_ptr; -@@ -860,10 +872,12 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, +- char *token; +- char *save_ptr; + token = strtok_r (lineptr, CDX_FIELDSEP, &save_ptr); + + if (token != NULL && strcmp (token, "CDX") == 0) +@@ -860,10 +873,12 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, char *token; char *save_ptr; @@ -349,7 +355,7 @@ index 69f80be..0cf9e53 100644 while (token != NULL) { char **val; -@@ -926,10 +940,7 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, +@@ -926,10 +941,7 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, static bool warc_load_cdx_dedup_file (void) { @@ -361,7 +367,7 @@ index 69f80be..0cf9e53 100644 int field_num_original_url = -1; int field_num_checksum = -1; int field_num_record_id = -1; -@@ -938,6 +949,10 @@ warc_load_cdx_dedup_file (void) +@@ -938,6 +950,10 @@ warc_load_cdx_dedup_file (void) size_t n = 0; ssize_t line_length; @@ -372,7 +378,7 @@ index 69f80be..0cf9e53 100644 /* 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 -@@ -965,6 +980,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); +@@ -965,6 +981,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); } else { @@ -380,7 +386,7 @@ index 69f80be..0cf9e53 100644 /* Initialize the table. */ warc_cdx_dedup_table = hash_table_new (1000, warc_hash_sha1_digest, warc_cmp_sha1_digest); -@@ -982,7 +998,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); +@@ -982,7 +999,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); while (line_length != -1); /* Print results. */ @@ -389,7 +395,7 @@ index 69f80be..0cf9e53 100644 logprintf (LOG_VERBOSE, ngettext ("Loaded %d record from CDX.\n\n", "Loaded %d records from CDX.\n\n", nrecords), -@@ -1002,12 +1018,14 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); +@@ -1002,12 +1019,14 @@ _("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) { @@ -407,7 +413,7 @@ index 69f80be..0cf9e53 100644 &key, &rec_existing); if (found && strcmp (rec_existing->url, url) == 0) -@@ -1079,11 +1097,13 @@ warc_init (void) +@@ -1079,11 +1098,13 @@ warc_init (void) static void warc_write_metadata (void) { @@ -422,7 +428,7 @@ index 69f80be..0cf9e53 100644 warc_uuid_str (manifest_uuid); fflush (warc_manifest_fp); -@@ -1093,7 +1113,7 @@ warc_write_metadata (void) +@@ -1093,7 +1114,7 @@ warc_write_metadata (void) warc_manifest_fp, -1); /* warc_write_resource_record has closed warc_manifest_fp. */ @@ -431,7 +437,7 @@ index 69f80be..0cf9e53 100644 if (warc_tmp_fp == NULL) { logprintf (LOG_NOTQUIET, _("Could not open temporary WARC file.\n")); -@@ -1148,10 +1168,11 @@ FILE * +@@ -1148,10 +1169,11 @@ FILE * warc_tempfile (void) { char filename[100]; @@ -444,7 +450,7 @@ index 69f80be..0cf9e53 100644 if (fd < 0) return NULL; -@@ -1210,8 +1231,10 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, +@@ -1210,8 +1232,10 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, off_t offset, const char *warc_filename, const char *response_uuid) { @@ -456,7 +462,7 @@ index 69f80be..0cf9e53 100644 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" */ -@@ -1221,7 +1244,6 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, +@@ -1221,7 +1245,6 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, timestamp_str_cdx[14] = '\0'; /* Rewrite the checksum. */ @@ -464,7 +470,16 @@ index 69f80be..0cf9e53 100644 if (payload_digest != NULL) checksum = payload_digest + 5; /* Skip the "sha1:" */ else -@@ -1260,10 +1282,11 @@ warc_write_revisit_record (char *url, char *timestamp_str, +@@ -1235,7 +1258,7 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, + /* Print the CDX line. */ + fprintf (warc_current_cdx_file, "%s %s %s %s %d %s %s - %ld %s %s\n", url, + timestamp_str_cdx, url, mime_type, response_code, checksum, +- redirect_location, offset, warc_current_filename, response_uuid); ++ redirect_location, (long int)offset, warc_current_filename, response_uuid); + fflush (warc_current_cdx_file); + + return true; +@@ -1260,10 +1283,11 @@ warc_write_revisit_record (char *url, char *timestamp_str, char *refers_to, ip_address *ip, FILE *body) { char revisit_uuid [48]; @@ -478,7 +493,7 @@ index 69f80be..0cf9e53 100644 sha1_stream (body, sha1_res_block); block_digest = warc_base32_sha1_digest (sha1_res_block); -@@ -1314,6 +1337,9 @@ warc_write_response_record (char *url, char *timestamp_str, +@@ -1314,6 +1338,9 @@ warc_write_response_record (char *url, char *timestamp_str, char sha1_res_block[SHA1_DIGEST_SIZE]; char sha1_res_payload[SHA1_DIGEST_SIZE]; @@ -488,7 +503,7 @@ index 69f80be..0cf9e53 100644 if (opt.warc_digests_enabled) { /* Calculate the block and payload digests. */ -@@ -1357,11 +1383,10 @@ warc_write_response_record (char *url, char *timestamp_str, +@@ -1357,11 +1384,10 @@ warc_write_response_record (char *url, char *timestamp_str, /* Not a revisit, just store the record. */ diff --git a/net-misc/wget/wget-1.14.recipe b/net-misc/wget/wget-1.14.recipe index 9b172237e..5a1f51073 100644 --- a/net-misc/wget/wget-1.14.recipe +++ b/net-misc/wget/wget-1.14.recipe @@ -11,6 +11,7 @@ LICENSE="GNU GPL v3" COPYRIGHT="1996-2012 Free Software Foundation" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" wget$secondaryArchSuffix = $portVersion @@ -42,7 +43,7 @@ BUILD_PREREQUIRES=" PATCHES=" wget-1.14.patch - wget-1.14-gcc2.patch + wget-1.14-build-fixes.patch wget-1.14-pod-fixes.patch " From 642f7d396fca0e9df1e5c26c7432bdc350b83ac1 Mon Sep 17 00:00:00 2001 From: MrPoxipol Date: Sat, 14 Dec 2013 00:49:01 +0000 Subject: [PATCH 034/116] Fixed recipe for rezerwar game. All working. --- .../rezerwar/patches/rezerwar-0.4.2.patch | 33 +++++++++++++++++++ games-puzzle/rezerwar/rezerwar-0.4.2.recipe | 9 +++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch diff --git a/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch b/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch new file mode 100644 index 000000000..18254aacf --- /dev/null +++ b/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch @@ -0,0 +1,33 @@ +--- ../configure 2010-05-09 16:25:03.000524288 +0000 ++++ configure-new 2013-12-14 00:36:47.137887744 +0000 +@@ -232,7 +232,7 @@ + Haiku|BeOS) + check_sdl + check_sdl_mixer +- [ -z "$PREFIX" ] && PREFIX="/boot/apps/rezerwar" ++ [ -z "$PREFIX" ] && PREFIX="data" + [ -z "$TARGET" ] && TARGET="$PREFIX" + TARGET_BIN="$TARGET" + TARGET_DOC="$TARGET" +--- ../src/main.c 2010-05-09 16:25:03.002097152 +0000 ++++ main-new.c 2013-12-13 23:59:59.994312192 +0000 +@@ -32,7 +32,8 @@ + #endif + + #include "SDL.h" +- ++#include ++#include + #include "rezerwar.h" + #include "config.h" + +@@ -231,7 +232,8 @@ + bool loop = true; + char *path; + SDL_Joystick *js; +- ++ // For tracker ++ chdir(dirname(av[0])); + /* Version number only */ + if (has_flag(ac, av, "-v")) { + printf("%s\n", VERSION); diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe index d11756a96..340dd354f 100644 --- a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe +++ b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe @@ -19,7 +19,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libsdl$secondaryArchSuffix - lib:sdl_mixer$secondaryArchSuffix + lib:libsdl_mixer$secondaryArchSuffix " BUILD_REQUIRES=" @@ -35,6 +35,10 @@ BUILD_PREREQUIRES=" cmd:sdl_config$secondaryArchSuffix " +PATCHES=" + rezerwar-0.4.2.patch + " + BUILD() { configure @@ -44,7 +48,8 @@ BUILD() INSTALL() { mkdir -p $appsDir/rezerwar - cp -r --copy-contents rezerwar $appsDir/rezerwar + cp -r data $appsDir/rezerwar + #cp -r rezerwar $appsDir/rezerwar cp src/rezerwar $appsDir/rezerwar/rezerwar addAppDeskbarSymlink $appsDir/rezerwar/rezerwar "Rezerwar" From 7a514decf8ee27e21882785ad73a123329f6efc8 Mon Sep 17 00:00:00 2001 From: MrPoxipol Date: Sat, 14 Dec 2013 01:08:21 +0000 Subject: [PATCH 035/116] Gemz recipe created. --- games-puzzle/gemz/gemz-0.97.0.recipe | 51 +++++++++++++++++++++ games-puzzle/gemz/patches/gemz-0.97.0.patch | 37 +++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 games-puzzle/gemz/gemz-0.97.0.recipe create mode 100644 games-puzzle/gemz/patches/gemz-0.97.0.patch diff --git a/games-puzzle/gemz/gemz-0.97.0.recipe b/games-puzzle/gemz/gemz-0.97.0.recipe new file mode 100644 index 000000000..6e4568ccd --- /dev/null +++ b/games-puzzle/gemz/gemz-0.97.0.recipe @@ -0,0 +1,51 @@ +SUMMARY="Gemz is an SDL implementation of the popular puzzle game 'Bejeweled'." +DESCRIPTION="Gemz is an SDL implementation of the popular puzzle game 'Bejeweled'." +HOMEPAGE="http://sourceforge.net/projects/gemz/" +SRC_URI="http://sourceforge.net/projects/gemz/files/gemz/Source/gemz-0.97.0.tgz/download" +CHECKSUM_MD5="ea71e3cf9ee7f3b7f6d0a7f4cbe0af58" +LICENSE="GNU GPL v2" +COPYRIGHT="2003-2013 Jonathan Bilodeau" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + gemz = $portVersion + app:gemz = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl$secondaryArchSuffix + lib:libsdl_image$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix + devel:libsdl_image$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:which + cmd:sdl_config$secondaryArchSuffix + " + +PATCHES=" + gemz-0.97.0.patch + " + +BUILD() +{ + make +} + +INSTALL() +{ + mkdir -p $appsDir/gemz + cp -r fonts gfx tilesets $appsDir/gemz + cp gemz $appsDir/gemz/gemz + + addAppDeskbarSymlink $appsDir/gemz/gemz "Gemz" +} diff --git a/games-puzzle/gemz/patches/gemz-0.97.0.patch b/games-puzzle/gemz/patches/gemz-0.97.0.patch new file mode 100644 index 000000000..6cf8f0355 --- /dev/null +++ b/games-puzzle/gemz/patches/gemz-0.97.0.patch @@ -0,0 +1,37 @@ +--- ../Makefile 2004-05-07 05:39:47.034340864 +0000 ++++ Makefile-new 2013-12-13 22:51:00.000000000 +0000 +@@ -2,7 +2,7 @@ + CFLAGS+=-O2 -Wall -W -g + #CFLAGS+=-O2 -Wall -W -g -fprofile-arcs -ftest-coverage -pg + CFLAGS+=`sdl-config --cflags` +-LFLAGS=`sdl-config --libs` -lSDL_image -L/usr/X11R6/lib -lX11 ++LFLAGS=`sdl-config --libs` -lSDL_image + SRCS= \ + SFont.c \ + board.c \ +--- ../main.c 2004-05-07 05:36:26.035389440 +0000 ++++ main-new.c 2013-12-13 23:41:06.150994944 +0000 +@@ -2,6 +2,8 @@ + #include + #include + #include ++#include ++#include + + #include "board.h" + #include "graphics.h" +@@ -27,11 +29,12 @@ + /* 3. Start the game loop */ + /* 4. Clean up before the program exits */ + /* ************************************************************************ */ +-int main() ++int main(int argc, char *argv[]) + { + game_t game; + screen_t screen; +- ++ // For tracker ++ chdir(dirname(argv[0])); + /* initialize various systems (sounds, graphics, input, etc) */ + if (init(&screen)) + { From eb884bd438fa1beed037b97ac4122b4f67aa1369 Mon Sep 17 00:00:00 2001 From: MrPoxipol Date: Sat, 14 Dec 2013 01:17:34 +0000 Subject: [PATCH 036/116] Created gemz game recipe. --- games-puzzle/gemz/gemz-0.97.0.recipe | 2 +- games-puzzle/gemz/patches/gemz-0.97.0.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/games-puzzle/gemz/gemz-0.97.0.recipe b/games-puzzle/gemz/gemz-0.97.0.recipe index 6e4568ccd..9985c1d3d 100644 --- a/games-puzzle/gemz/gemz-0.97.0.recipe +++ b/games-puzzle/gemz/gemz-0.97.0.recipe @@ -7,7 +7,7 @@ LICENSE="GNU GPL v2" COPYRIGHT="2003-2013 Jonathan Bilodeau" REVISION="1" ARCHITECTURES="x86_gcc2 x86" - +# PROVIDES=" gemz = $portVersion app:gemz = $portVersion diff --git a/games-puzzle/gemz/patches/gemz-0.97.0.patch b/games-puzzle/gemz/patches/gemz-0.97.0.patch index 6cf8f0355..cf66258f5 100644 --- a/games-puzzle/gemz/patches/gemz-0.97.0.patch +++ b/games-puzzle/gemz/patches/gemz-0.97.0.patch @@ -7,7 +7,7 @@ -LFLAGS=`sdl-config --libs` -lSDL_image -L/usr/X11R6/lib -lX11 +LFLAGS=`sdl-config --libs` -lSDL_image SRCS= \ - SFont.c \ + # SFont.c \ board.c \ --- ../main.c 2004-05-07 05:36:26.035389440 +0000 +++ main-new.c 2013-12-13 23:41:06.150994944 +0000 From 8cb3947236898cb918edf5f76a5ecf0940da6c77 Mon Sep 17 00:00:00 2001 From: MrPoxipol Date: Sat, 14 Dec 2013 01:19:04 +0000 Subject: [PATCH 037/116] Created gemz game recipe. --- games-puzzle/gemz/gemz-0.97.0.recipe | 2 +- games-puzzle/gemz/patches/gemz-0.97.0.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/games-puzzle/gemz/gemz-0.97.0.recipe b/games-puzzle/gemz/gemz-0.97.0.recipe index 9985c1d3d..6e4568ccd 100644 --- a/games-puzzle/gemz/gemz-0.97.0.recipe +++ b/games-puzzle/gemz/gemz-0.97.0.recipe @@ -7,7 +7,7 @@ LICENSE="GNU GPL v2" COPYRIGHT="2003-2013 Jonathan Bilodeau" REVISION="1" ARCHITECTURES="x86_gcc2 x86" -# + PROVIDES=" gemz = $portVersion app:gemz = $portVersion diff --git a/games-puzzle/gemz/patches/gemz-0.97.0.patch b/games-puzzle/gemz/patches/gemz-0.97.0.patch index cf66258f5..6cf8f0355 100644 --- a/games-puzzle/gemz/patches/gemz-0.97.0.patch +++ b/games-puzzle/gemz/patches/gemz-0.97.0.patch @@ -7,7 +7,7 @@ -LFLAGS=`sdl-config --libs` -lSDL_image -L/usr/X11R6/lib -lX11 +LFLAGS=`sdl-config --libs` -lSDL_image SRCS= \ - # SFont.c \ + SFont.c \ board.c \ --- ../main.c 2004-05-07 05:36:26.035389440 +0000 +++ main-new.c 2013-12-13 23:41:06.150994944 +0000 From 21b1bcd69fcee075cc0c936d491e2e0d28e84de9 Mon Sep 17 00:00:00 2001 From: MrPoxipol Date: Sat, 14 Dec 2013 01:58:17 +0000 Subject: [PATCH 038/116] Corrected recipes. --- games-puzzle/gemz/gemz-0.97.0.recipe | 4 +++- games-puzzle/rezerwar/rezerwar-0.4.2.recipe | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/games-puzzle/gemz/gemz-0.97.0.recipe b/games-puzzle/gemz/gemz-0.97.0.recipe index 6e4568ccd..012b8e9e4 100644 --- a/games-puzzle/gemz/gemz-0.97.0.recipe +++ b/games-puzzle/gemz/gemz-0.97.0.recipe @@ -1,5 +1,7 @@ SUMMARY="Gemz is an SDL implementation of the popular puzzle game 'Bejeweled'." -DESCRIPTION="Gemz is an SDL implementation of the popular puzzle game 'Bejeweled'." +DESCRIPTION="Gemz is an SDL implementation of the popular puzzle game 'Bejeweled'. +The objective of this game is to swap one gem with an adjacent gem to form a horizontal or vertical chain of three or more gems. Bonus points are given when chains of more than three identical gems are formed and when two chains are formed in one swap. Gems disappear when chains are formed and gems fall from the top to fill in gaps. Sometimes chain reactions, called cascades, are triggered, where chains are formed by the falling gems. +" HOMEPAGE="http://sourceforge.net/projects/gemz/" SRC_URI="http://sourceforge.net/projects/gemz/files/gemz/Source/gemz-0.97.0.tgz/download" CHECKSUM_MD5="ea71e3cf9ee7f3b7f6d0a7f4cbe0af58" diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe index 340dd354f..8443aefe7 100644 --- a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe +++ b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe @@ -25,7 +25,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libsdl$secondaryArchSuffix - devel:sdl_mixer$secondaryArchSuffix + devel:libsdl_mixer$secondaryArchSuffix " BUILD_PREREQUIRES=" From b44b238d95ab58dc88f5fc0c431c6128ee2eb158 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 14 Dec 2013 10:35:10 +0000 Subject: [PATCH 039/116] Added more requires to yab, but still not building. --- haiku-apps/yab/patches/yab-1.6.patch | 20 --------------- haiku-apps/yab/patches/yab-1.7.patch | 27 -------------------- haiku-apps/yab/yab-1.7.recipe | 38 +++++++++++++--------------- 3 files changed, 18 insertions(+), 67 deletions(-) delete mode 100644 haiku-apps/yab/patches/yab-1.6.patch delete mode 100644 haiku-apps/yab/patches/yab-1.7.patch diff --git a/haiku-apps/yab/patches/yab-1.6.patch b/haiku-apps/yab/patches/yab-1.6.patch deleted file mode 100644 index e3b3ee9e5..000000000 --- a/haiku-apps/yab/patches/yab-1.6.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urN yab-1.6/src/Makefile yab-1.6-haiku/src/Makefile ---- yab-1.6/src/Makefile 2009-10-23 21:02:10.031195136 +0000 -+++ yab-1.6-haiku/src/Makefile 2011-06-01 16:17:53.000000000 +0000 -@@ -45,7 +45,7 @@ - ## - ## Libraries - ## --LIBPATH = -L/boot/home/config/lib -+LIBPATH = -L/$(shell finddir B_COMMON_LIB_DIRECTORY) - #-L/boot/home/yab/CalendarControl.a - LIB = -lncurses -lbe -lroot -ltranslation -ltracker -lmedia $(ZETALIB) - -@@ -98,6 +98,7 @@ - main.o: main.c yabasic.h config.h - $(GCC) $(GCC_OPT) -c main.c -o main.o - flex.c: yabasic.flex -+ chmod 755 ./flex - ./flex $(FLEXFLAGS) -t yabasic.flex >flex.c - bison.c: yabasic.bison - bison $(BISONFLAGS) --output-file bison.c yabasic.bison diff --git a/haiku-apps/yab/patches/yab-1.7.patch b/haiku-apps/yab/patches/yab-1.7.patch deleted file mode 100644 index 47dc5d7cd..000000000 --- a/haiku-apps/yab/patches/yab-1.7.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- apps/yab-1.7/src/Makefile 2012-01-24 07:55:38.018087936 -0800 -+++ /boot/home/Makefile 2013-10-21 14:17:35.131334144 -0700 -@@ -38,14 +38,14 @@ - ## GCC Options - ## - GCC = gcc --GCC_OPT = $(DBG) $(OPT) -I. -I/boot/home/config/include/ -I/boot/home/config/include/ncurses/ -DHAVE_CONFIG -DUNIX $(HAIKUOPT) -+GCC_OPT = $(DBG) $(OPT) -I. -I/$(shell finddir B_SYSTEM_HEADERS_DIRECTORY) -DHAVE_CONFIG -DUNIX $(HAIKUOPT) - GPP = g++ - GPP_OPT = $(DBG) $(OPT) -I. -DHAVE_CONFIG -DUNIX $(HAIKUOPT) - - ## - ## Libraries - ## --LIBPATH = -L/boot/home/config/lib -+LIBPATH = -L/$(shell finddir B_SYSTEM_LIB_DIRECTORY) - LIB = -lncurses -lbe -lroot -ltranslation -ltracker -lmedia -llocale - - ## flags for flex (-d for debugging) -@@ -97,6 +97,7 @@ - main.o: main.c yabasic.h config.h - $(GCC) $(GCC_OPT) -c main.c -o main.o - flex.c: yabasic.flex -+ chmod 755 ./flex - ./flex $(FLEXFLAGS) -t yabasic.flex >flex.c - bison.c: yabasic.bison - bison $(BISONFLAGS) --output-file bison.c yabasic.bison diff --git a/haiku-apps/yab/yab-1.7.recipe b/haiku-apps/yab/yab-1.7.recipe index 30b286d03..f2a6efff2 100644 --- a/haiku-apps/yab/yab-1.7.recipe +++ b/haiku-apps/yab/yab-1.7.recipe @@ -1,17 +1,17 @@ SUMMARY="yab is an extended version of yabsic, a BASIC programming language" -DESCRIPTION="yab is an extended version of yabasic, a BASIC programming language, with special commands designed for BeOS, Haiku and Zeta." -HOMEPAGE="http://sourceforge.net/projects/yab-interpreter" -SRC_URI="http://ports-space.haiku-files.org/source/yab-1.7.zip" +DESCRIPTION="yab is an extended version of yabasic, a BASIC programming language, with special commands designed for BeOS, Haiku and Zeta." +HOMEPAGE="http://sourceforge.net/projects/yab-interpreter" +SRC_URI="git+https://github.com/HaikuArchives/Yab.git" REVISION="2" -CHECKSUM_MD5="2b465895d9eb2e8383f035dd67b88a20" +#CHECKSUM_MD5="2b465895d9eb2e8383f035dd67b88a20" LICENSE="Artistic GNU GPL v2" COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic) 2006-2009 Jan Bungeroth (yab improvements)" - -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SOURCE_DIR="yab-$portVersion" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" + +#SOURCE_DIR="yab-$portVersion" PROVIDES=" cmd:yab @@ -20,32 +20,30 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion " - + BUILD_REQUIRES=" - haiku_devel + haiku_devel >= $haikuVersion " - + BUILD_PREREQUIRES=" - haiku + cmd:bison + cmd:flex cmd:gcc cmd:make + cmd:mkdepend + cmd:perl + makefile_engine " BUILD() { - ls - ls apps - ls apps/yab-${portVersion} - - cd apps/yab-${portVersion}/src - make clean - make + cd src + make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { - ls -r - $YABDIR=`FINDDIR(B_APPS_DIRECTORY`/yab + $YABDIR=$appsDir/yab mkdir -p ${YABDIR} cp -a ${YABDIR}apps/yab cp -a Documentation ${YABDIR} From b628669fd52fa7b2f1ff395dfdea4043f2b8ea10 Mon Sep 17 00:00:00 2001 From: puckipedia Date: Sat, 14 Dec 2013 11:00:09 +0000 Subject: [PATCH 040/116] FontBoy: Repo moved from my own to HaikuArchives --- haiku-apps/fontboy/fontboy-0.9.7.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/fontboy/fontboy-0.9.7.recipe b/haiku-apps/fontboy/fontboy-0.9.7.recipe index 575d9cf2c..dea22c075 100644 --- a/haiku-apps/fontboy/fontboy-0.9.7.recipe +++ b/haiku-apps/fontboy/fontboy-0.9.7.recipe @@ -5,8 +5,8 @@ DESCRIPTION=" charset. Fontboy allows you to adjust the appearence to your desired needs and it's fast because Haiku is. " -HOMEPAGE="https://github.com/puckipedia/FontBoy" -SRC_URI="git://github.com/puckipedia/FontBoy.git#2195924e69096a5e7a9774cfaec8fdc277045ecf" +HOMEPAGE="https://github.com/HaikuArchives/FontBoy" +SRC_URI="git://github.com/HaikuArchives/FontBoy.git#2195924e69096a5e7a9774cfaec8fdc277045ecf" REVISION="1" LICENSE="FontBoy" COPYRIGHT="1999-2003 Oliver 'Madison' Kohl" From 5d73691fb9df64d8cfe8a75ecfdb2f35006507ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 14 Dec 2013 07:55:46 +0100 Subject: [PATCH 041/116] xemacs: s/DISABLEASLR/DISABLE_ASLR/ What a difference an underscore makes... --- app-editors/xemacs/xemacs-21.5_hg.recipe | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app-editors/xemacs/xemacs-21.5_hg.recipe b/app-editors/xemacs/xemacs-21.5_hg.recipe index 342f7fcd7..5cab78c05 100644 --- a/app-editors/xemacs/xemacs-21.5_hg.recipe +++ b/app-editors/xemacs/xemacs-21.5_hg.recipe @@ -69,7 +69,6 @@ BUILD_PREREQUIRES=" # TODO: fix lispdir to not use $HOME BUILD() { - export DISABLEASLR=1 autoconf export HOME=/boot/home runConfigure ./configure \ @@ -92,8 +91,7 @@ BUILD() INSTALL() { - export DISABLEASLR=1 make install - addattr SYS:ENV DISABLEASLR=1 $binDir/xemacs-21* + addattr SYS:ENV DISABLE_ASLR=1 $binDir/xemacs-21* addAppDeskbarSymlink $binDir/xemacs XEmacs } From b353d269c887fa020003f26440a2282c4fdeccfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Sat, 14 Dec 2013 12:47:16 +0000 Subject: [PATCH 042/116] Powf patch --- games-emulation/dosbox/patches/powf.patch | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/games-emulation/dosbox/patches/powf.patch b/games-emulation/dosbox/patches/powf.patch index 5f3f309ae..ac3732b23 100644 --- a/games-emulation/dosbox/patches/powf.patch +++ b/games-emulation/dosbox/patches/powf.patch @@ -1,12 +1,11 @@ diff --git a/configure.in b/configure.in -index 016ea95..b114016 100644 +index 016ea95..f222548 100644 --- a/configure.in +++ b/configure.in -@@ -120,16 +120,6 @@ d_test.d_type = 0; - }],[AC_MSG_RESULT(yes);AC_DEFINE(DIRENT_HAS_D_TYPE,1,[struct dirent has d_type])],AC_MSG_RESULT(no)) +@@ -121,13 +121,7 @@ d_test.d_type = 0; --dnl Check for powf + dnl Check for powf -AC_MSG_CHECKING(for powf in libm); -LIBS_BACKUP=$LIBS; -LIBS="$LIBS -lm"; @@ -14,8 +13,7 @@ index 016ea95..b114016 100644 - powf(1.0f, 1.0f); -]])], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[libm doesn't include powf])]) -LIBS=$LIBS_BACKUP -- -- - dnl Checks for libraries. ++AC_SEARCH_LIBS([powf],[m], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[no powf function avalible])]) - #Check if the compiler support attributes + + dnl Checks for libraries. From 1a1d2585ccad477bb70975ae3d6b1544e5733870 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sat, 14 Dec 2013 13:15:04 +0000 Subject: [PATCH 043/116] Add new version of Dos2Unix --- app-text/dos2unix/dos2unix-1.0.1.recipe | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 app-text/dos2unix/dos2unix-1.0.1.recipe diff --git a/app-text/dos2unix/dos2unix-1.0.1.recipe b/app-text/dos2unix/dos2unix-1.0.1.recipe new file mode 100644 index 000000000..d54c2c788 --- /dev/null +++ b/app-text/dos2unix/dos2unix-1.0.1.recipe @@ -0,0 +1,38 @@ +SUMMARY="dos2unix and unix2dos end of line file convertors." +DESCRIPTION="DOS/Windows like to put CR/LF at the end of lines whereas UNIX like to have just LF. Dos2unix and unix2dos are simple parser/converter command line programs to convert between the two formats." +HOMEPAGE="http://github.com/puckipedia/dos2unix" +SRC_URI="git://github.com/puckipedia/dos2unix.git#553720356be18ca60cae3d970a575520aef5a4f4" +REVISION="1" +COPYRIGHT="Public Domain" +LICENSE="Public Domain" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +PROVIDES=" + dos2unix = 1.0.1 compat >= 1 + cmd:dos2unix + cmd:unix2dos + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:g++ + " + +BUILD() +{ + cd src + g++ -O -o ../dos2unix dos2unix.c + g++ -O -o ../unix2dos unix2dos.c +} + +INSTALL() +{ + mkdir -p $binDir + cp dos2unix $binDir/dos2unix + cp unix2dos $binDir/unix2dos +} From a38bf1c00b7c05901f0fc1957794220c18945f13 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sat, 14 Dec 2013 09:23:05 -0500 Subject: [PATCH 044/116] Clean up wget recipe --- net-misc/wget/patches/wget-1.14.patch | 37 +++++---------------------- net-misc/wget/wget-1.14.recipe | 8 +++++- 2 files changed, 13 insertions(+), 32 deletions(-) diff --git a/net-misc/wget/patches/wget-1.14.patch b/net-misc/wget/patches/wget-1.14.patch index 73f74920d..2ec0a3aef 100644 --- a/net-misc/wget/patches/wget-1.14.patch +++ b/net-misc/wget/patches/wget-1.14.patch @@ -11,43 +11,31 @@ index 873c3c9..45d6602 100644 AC_CHECK_DECLS(h_errno,,,[#include ]) diff --git a/m4/wget.m4 b/m4/wget.m4 -index 02d0cf9..8adc932 100644 +index 02d0cf9..33825e2 100644 --- a/m4/wget.m4 +++ b/m4/wget.m4 -@@ -88,6 +88,8 @@ AC_DEFUN([WGET_POSIX_CLOCK], [ +@@ -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 BeOS (BONE) needs libbind as well +dnl Haiku needs libnetwork AC_DEFUN([WGET_NSL_SOCKET], [ dnl On Solaris, -lnsl is needed to use gethostbyname. But checking -@@ -107,6 +109,9 @@ AC_DEFUN([WGET_NSL_SOCKET], [ +@@ -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(bind, gethostbyname) + AC_CHECK_LIB(network, gethostbyname) + AC_CHECK_LIB(network, socket) ]) diff --git a/src/config.h.in b/src/config.h.in -index 123560b..b4ffe16 100644 +index 123560b..30a98f9 100644 --- a/src/config.h.in +++ b/src/config.h.in -@@ -343,6 +343,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_BP_SYM_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_ARPA_INET_H -+ - /* Define to 1 if you have the `btowc' function. */ - #undef HAVE_BTOWC - -@@ -656,6 +659,9 @@ +@@ -656,6 +656,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LANGINFO_H @@ -57,7 +45,7 @@ index 123560b..b4ffe16 100644 /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL -@@ -668,6 +674,9 @@ +@@ -668,6 +671,9 @@ /* Define if you have the libgnutls library. */ #undef HAVE_LIBGNUTLS @@ -80,19 +68,6 @@ index 119ccb7..7237484 100644 # include # endif #endif /* not WINDOWS */ -diff --git a/src/host.c b/src/host.c -index 86bf83b..1805227 100644 ---- a/src/host.c -+++ b/src/host.c -@@ -40,7 +40,7 @@ as that of the covered work. */ - # include - # include - # include --# ifndef __BEOS__ -+# ifdef HAVE_ARPA_INET_H - # include - # endif - # ifdef __VMS diff --git a/src/host.h b/src/host.h index 3f27ea0..3cd3ed9 100644 --- a/src/host.h diff --git a/net-misc/wget/wget-1.14.recipe b/net-misc/wget/wget-1.14.recipe index 5a1f51073..473a1f779 100644 --- a/net-misc/wget/wget-1.14.recipe +++ b/net-misc/wget/wget-1.14.recipe @@ -41,6 +41,10 @@ BUILD_PREREQUIRES=" cmd:pod2man " +USER_SETTINGS_FILES=" + settings/wgetrc + " + PATCHES=" wget-1.14.patch wget-1.14-build-fixes.patch @@ -63,5 +67,7 @@ INSTALL() TEST() { - make check + [ -d .git ] && mv .git .git-temp + make check || true + [ -d .git-temp ] && mv .git-temp .git } From 3eea07750277c9a6ad40acb9bcaa12857485efeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 14 Dec 2013 15:57:06 +0100 Subject: [PATCH 045/116] fish: Remove duplicated patch --- app-shells/fish/patches/fish-1.23.1-git.patch | 152 ------------------ 1 file changed, 152 deletions(-) delete mode 100644 app-shells/fish/patches/fish-1.23.1-git.patch diff --git a/app-shells/fish/patches/fish-1.23.1-git.patch b/app-shells/fish/patches/fish-1.23.1-git.patch deleted file mode 100644 index 4548969ba..000000000 --- a/app-shells/fish/patches/fish-1.23.1-git.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff --git a/configure.ac fish-1.23.1-git/configure.ac -index 377ab5e..672d34b 100644 ---- a/configure.ac -+++ fish-1.23.1-git/configure.ac -@@ -105,7 +105,7 @@ fi - # tree and doesn't update CFLAGS. - # - --for i in /usr/pkg /sw /opt /opt/local; do -+for i in /usr/pkg /sw /opt /opt/local /boot/common; do - - AC_MSG_CHECKING([for $i/include include directory]) - if test -d $i/include; then -@@ -119,7 +119,8 @@ for i in /usr/pkg /sw /opt /opt/local; do - AC_MSG_CHECKING([for $i/lib library directory]) - if test -d $i/lib; then - AC_MSG_RESULT(yes) -- LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/" -+ LDFLAGS="$LDFLAGS -L$i/lib/" -+ #LDFLAGS="$LDFLAGS -R$i/lib/" - else - AC_MSG_RESULT(no) - fi -@@ -142,6 +143,12 @@ AC_CONFIG_HEADERS(config.h) - - - # -+# Ask autoconf to detect the platform type -+# -+AC_CANONICAL_TARGET -+ -+ -+# - # This adds markup to the code that results in a few extra compile - # time checks on recent GCC versions. It helps stop a few common bugs. - # -@@ -306,7 +313,13 @@ if test "$GCC" = yes; then - # bug has been verified to not exist on Linux using GCC 3.3.3. - # - -- CFLAGS="$CFLAGS -fno-optimize-sibling-calls" -+ case $target_os in -+ beos*|haiku*) -+ ;; -+ *) -+ CFLAGS="$CFLAGS -fno-optimize-sibling-calls" -+ ;; -+ esac - - - # -@@ -319,7 +332,13 @@ if test "$GCC" = yes; then - # This is needed in order to get the really cool backtraces - # - -- LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic" -+ case $target_os in -+ beos*|haiku*) -+ ;; -+ *) -+ LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic" -+ ;; -+ esac - - fi - -@@ -378,8 +397,6 @@ fi - # seems that tputs is never really needed. - # - --AC_CANONICAL_TARGET -- - if test $target_cpu = powerpc; then - AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work]) - fi -@@ -510,7 +527,7 @@ AC_DEFINE( - # Check for os dependant libraries for all binaries. - LIBS_COMMON=$LIBS - LIBS="" --AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] ) -+AC_SEARCH_LIBS( connect, network socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] ) - AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] ) - AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] ) - AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] ) -@@ -555,7 +572,7 @@ LIBS="$LIBS_SHARED" - if test x$local_gettext != xno; then - AC_SEARCH_LIBS( gettext, intl,,) - fi --AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] ) -+AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] ) - LIBS_FISH_PAGER=$LIBS - LIBS=$LIBS_COMMON - -@@ -568,7 +585,7 @@ LIBS="$LIBS_SHARED" - if test x$local_gettext != xno; then - AC_SEARCH_LIBS( gettext, intl,,) - fi --AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] ) -+AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] ) - LIBS_FISHD=$LIBS - LIBS=$LIBS_COMMON - -diff --git a/proc.c fish-1.23.1-git/proc.c -index edcc7c6..30dd96f 100644 ---- a/proc.c -+++ fish-1.23.1-git/proc.c -@@ -482,8 +482,11 @@ static void handle_child_status( pid_t pid, int status ) - return; - } - -- -+#ifdef SA_SIGINFO - void job_handle_signal ( int signal, siginfo_t *info, void *con ) -+#else -+void job_handle_signal ( int signal ) -+#endif - { - - int status; -diff --git a/proc.h fish-1.23.1-git/proc.h -index dd46bc0..3618956 100644 ---- a/proc.h -+++ fish-1.23.1-git/proc.h -@@ -427,7 +427,9 @@ int job_reap( int interactive ); - Signal handler for SIGCHLD. Mark any processes with relevant - information. - */ -+#ifdef SA_SIGINFO - void job_handle_signal( int signal, siginfo_t *info, void *con ); -+#endif - - /** - Send the specified signal to all processes in the specified job. -diff --git a/signal.c fish-1.23.1-git/signal.c -index 2ac38aa..3ff1d38 100644 ---- a/signal.c -+++ fish-1.23.1-git/signal.c -@@ -29,6 +29,14 @@ The library for various signal related issues - #include "reader.h" - #include "proc.h" - -+#ifdef __HAIKU__ -+#ifndef SA_SIGINFO -+#define SA_SIGINFO 0 -+typedef struct { -+} siginfo_t; -+#define sa_sigaction sa_handler -+#endif -+#endif - - /** - Struct describing an entry for the lookup table used to convert From c1353595225aa07b5d63fc735ed1b995485d5bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 14 Dec 2013 15:57:26 +0100 Subject: [PATCH 046/116] fish: Simplify patch --- app-shells/fish/patches/fish-1.23.1_git.patch | 106 ++---------------- 1 file changed, 11 insertions(+), 95 deletions(-) diff --git a/app-shells/fish/patches/fish-1.23.1_git.patch b/app-shells/fish/patches/fish-1.23.1_git.patch index 4548969ba..5c0472936 100644 --- a/app-shells/fish/patches/fish-1.23.1_git.patch +++ b/app-shells/fish/patches/fish-1.23.1_git.patch @@ -1,27 +1,8 @@ -diff --git a/configure.ac fish-1.23.1-git/configure.ac -index 377ab5e..672d34b 100644 +diff --git a/configure.ac b/configure.ac +index 377ab5e..9f2e5e9 100644 --- a/configure.ac -+++ fish-1.23.1-git/configure.ac -@@ -105,7 +105,7 @@ fi - # tree and doesn't update CFLAGS. - # - --for i in /usr/pkg /sw /opt /opt/local; do -+for i in /usr/pkg /sw /opt /opt/local /boot/common; do - - AC_MSG_CHECKING([for $i/include include directory]) - if test -d $i/include; then -@@ -119,7 +119,8 @@ for i in /usr/pkg /sw /opt /opt/local; do - AC_MSG_CHECKING([for $i/lib library directory]) - if test -d $i/lib; then - AC_MSG_RESULT(yes) -- LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/" -+ LDFLAGS="$LDFLAGS -L$i/lib/" -+ #LDFLAGS="$LDFLAGS -R$i/lib/" - else - AC_MSG_RESULT(no) - fi -@@ -142,6 +143,12 @@ AC_CONFIG_HEADERS(config.h) ++++ b/configure.ac +@@ -142,6 +142,12 @@ AC_CONFIG_HEADERS(config.h) # @@ -34,37 +15,22 @@ index 377ab5e..672d34b 100644 # This adds markup to the code that results in a few extra compile # time checks on recent GCC versions. It helps stop a few common bugs. # -@@ -306,7 +313,13 @@ if test "$GCC" = yes; then - # bug has been verified to not exist on Linux using GCC 3.3.3. - # - -- CFLAGS="$CFLAGS -fno-optimize-sibling-calls" -+ case $target_os in -+ beos*|haiku*) -+ ;; -+ *) -+ CFLAGS="$CFLAGS -fno-optimize-sibling-calls" -+ ;; -+ esac - - - # -@@ -319,7 +332,13 @@ if test "$GCC" = yes; then +@@ -319,7 +325,13 @@ if test "$GCC" = yes; then # This is needed in order to get the really cool backtraces # - LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic" + case $target_os in -+ beos*|haiku*) ++ haiku*) + ;; -+ *) ++ *) + LDFLAGS_FISH="$LDFLAGS_FISH -rdynamic" + ;; + esac fi -@@ -378,8 +397,6 @@ fi +@@ -378,8 +390,6 @@ fi # seems that tputs is never really needed. # @@ -73,7 +39,7 @@ index 377ab5e..672d34b 100644 if test $target_cpu = powerpc; then AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work]) fi -@@ -510,7 +527,7 @@ AC_DEFINE( +@@ -510,7 +520,7 @@ AC_DEFINE( # Check for os dependant libraries for all binaries. LIBS_COMMON=$LIBS LIBS="" @@ -82,7 +48,7 @@ index 377ab5e..672d34b 100644 AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] ) AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] ) AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] ) -@@ -555,7 +572,7 @@ LIBS="$LIBS_SHARED" +@@ -555,7 +565,7 @@ LIBS="$LIBS_SHARED" if test x$local_gettext != xno; then AC_SEARCH_LIBS( gettext, intl,,) fi @@ -91,7 +57,7 @@ index 377ab5e..672d34b 100644 LIBS_FISH_PAGER=$LIBS LIBS=$LIBS_COMMON -@@ -568,7 +585,7 @@ LIBS="$LIBS_SHARED" +@@ -568,7 +578,7 @@ LIBS="$LIBS_SHARED" if test x$local_gettext != xno; then AC_SEARCH_LIBS( gettext, intl,,) fi @@ -100,53 +66,3 @@ index 377ab5e..672d34b 100644 LIBS_FISHD=$LIBS LIBS=$LIBS_COMMON -diff --git a/proc.c fish-1.23.1-git/proc.c -index edcc7c6..30dd96f 100644 ---- a/proc.c -+++ fish-1.23.1-git/proc.c -@@ -482,8 +482,11 @@ static void handle_child_status( pid_t pid, int status ) - return; - } - -- -+#ifdef SA_SIGINFO - void job_handle_signal ( int signal, siginfo_t *info, void *con ) -+#else -+void job_handle_signal ( int signal ) -+#endif - { - - int status; -diff --git a/proc.h fish-1.23.1-git/proc.h -index dd46bc0..3618956 100644 ---- a/proc.h -+++ fish-1.23.1-git/proc.h -@@ -427,7 +427,9 @@ int job_reap( int interactive ); - Signal handler for SIGCHLD. Mark any processes with relevant - information. - */ -+#ifdef SA_SIGINFO - void job_handle_signal( int signal, siginfo_t *info, void *con ); -+#endif - - /** - Send the specified signal to all processes in the specified job. -diff --git a/signal.c fish-1.23.1-git/signal.c -index 2ac38aa..3ff1d38 100644 ---- a/signal.c -+++ fish-1.23.1-git/signal.c -@@ -29,6 +29,14 @@ The library for various signal related issues - #include "reader.h" - #include "proc.h" - -+#ifdef __HAIKU__ -+#ifndef SA_SIGINFO -+#define SA_SIGINFO 0 -+typedef struct { -+} siginfo_t; -+#define sa_sigaction sa_handler -+#endif -+#endif - - /** - Struct describing an entry for the lookup table used to convert From 70ddcdd69b47b5eb435430eeec328110bc1c3e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 14 Dec 2013 15:58:24 +0100 Subject: [PATCH 047/116] fish: Fix recipe It builds but doesn't like being suffixed -x86... however there are too many C99 lines to use gcc2. --- app-shells/fish/fish-1.23.1_git.recipe | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app-shells/fish/fish-1.23.1_git.recipe b/app-shells/fish/fish-1.23.1_git.recipe index 9a9a2b1c7..7729c9a4f 100644 --- a/app-shells/fish/fish-1.23.1_git.recipe +++ b/app-shells/fish/fish-1.23.1_git.recipe @@ -7,7 +7,7 @@ REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2005-2009 Axel Liljencrantz" -ARCHITECTURES="?x86 ?x86_64" +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. @@ -15,7 +15,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then else ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi -SECONDARY_ARCHITECTURES="?x86" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" fish$secondaryArchSuffix = $portVersion @@ -32,7 +32,6 @@ BUILD_REQUIRES=" devel:libiconv$secondaryArchSuffix devel:libncurses$secondaryArchSuffix >= 5.9 devel:libgettextlib$secondaryArchSuffix - doxygen >= 1.6.3 " BUILD_PREREQUIRES=" cmd:autoconf @@ -40,20 +39,22 @@ BUILD_PREREQUIRES=" cmd:make cmd:gcc$secondaryArchSuffix cmd:which + cmd:doxygen >= 1.6.3 " +PATCHES="fish-1.23.1_git.patch" BUILD() { libtoolize --force --copy --install autoconf - ./configure --without-xsel --prefix=$prefix + runConfigure ./configure --without-xsel make } INSTALL() { - make install DESTDIR=${DESTDIR} + make install } TEST() From 9ec129480951a34335dc9313327a3ec15bb1f01b Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sat, 14 Dec 2013 12:57:52 -0700 Subject: [PATCH 048/116] Update python dulwich to 0.9.4 --- dev-python/dulwich/dulwich-0.9.4.recipe | 46 +++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 dev-python/dulwich/dulwich-0.9.4.recipe diff --git a/dev-python/dulwich/dulwich-0.9.4.recipe b/dev-python/dulwich/dulwich-0.9.4.recipe new file mode 100644 index 000000000..f67c89d39 --- /dev/null +++ b/dev-python/dulwich/dulwich-0.9.4.recipe @@ -0,0 +1,46 @@ +SUMMARY="Simple Python implementation of the Git file formats and protocols." +DESCRIPTION=" +Dulwich is a simple Python implementation of the Git file formats and +protocols. All functionality is available in pure Python. Optional C +extensions can be built for improved performance." +HOMEPAGE="http://www.samba.org/~jelmer/dulwich/" +SRC_URI="https://pypi.python.org/packages/source/d/dulwich/dulwich-0.9.4.tar.gz" +CHECKSUM_MD5="35209870f231cafe3f5a6c7c1daa3d20" +LICENSE="GNU GPL v2" +COPYRIGHT="2008-2013 Jelmer Vernooij" +REVISION="1" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + dulwich = $portVersion + cmd:dul_daemon = $portVersion + cmd:dul_receive_pack = $portVersion + cmd:dul_upload_pack = $portVersion + cmd:dul_web = $portVersion + cmd:dulwich = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:python + " + +BUILD_REQUIRES="" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:python + cmd:gcc + " + +BUILD() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py build +} + +INSTALL() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py install \ + --prefix=$prefix +} From 832d9ff8e4cb33b18f43c525463efc4f65328711 Mon Sep 17 00:00:00 2001 From: Mrowqa Date: Sat, 14 Dec 2013 23:39:38 +0100 Subject: [PATCH 049/116] Added WIP version of boost 1.55.0 recipe file. It requires gcc4 --- dev-libs/boost/boost-1.55.0.recipe | 88 ++++++ dev-libs/boost/patches/boost-1.55.0.patch | 352 ++++++++++++++++++++++ 2 files changed, 440 insertions(+) create mode 100644 dev-libs/boost/boost-1.55.0.recipe create mode 100644 dev-libs/boost/patches/boost-1.55.0.patch diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe new file mode 100644 index 000000000..5db2c1ab7 --- /dev/null +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -0,0 +1,88 @@ +DESCRIPTION=" + Boost is a set of libraries for the C++ programming language that + provide support for tasks and structures such as linear algebra, + pseudorandom number generation, multithreading, image processing, + regular expressions, and unit testing. It contains over eighty + individual libraries. + " +SUMMARY="Boost is a set of libraries for the C++ programming language." +HOMEPAGE="http://www.boost.org/" +SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download" +CHECKSUM_MD5="d6eef4b4cacb2183f2bf265a5a03a354" +REVISION="1" +LICENSE="Boost v1.0" +COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al." +ARCHITECTURES="?x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="x86" +SOURCE_DIR="boost_1_55_0" +PATCHES="boost-1.55.0.patch" + +PROVIDES=" + lib:boost = 1.55.0 + " + +BUILD_PREREQUIRES=" + boehm_gc + libiconv + libiconv_devel + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:jam + cmd:iconv + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libiconv + " + +REQUIRES=" + lib:libiconv + " + +BUILD() +{ + ./bootstrap.sh \ + --without-icu \ + --prefix=`finddir B_COMMON_DIRECTORY` \ + --exec-prefix=`finddir B_COMMON_BIN_DIRECTORY` \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + #--includedir=`finddir B_COMMON_HEADERS_DIRECTORY` + ./bjam \ + -sICU_PATH=`finddir B_COMMON_DIRECTORY` \ + -sICONV_PATH=`finddir B_COMMON_DIRECTORY` \ + -d2 \ + --without-mpi \ + --prefix=`finddir B_COMMON_DIRECTORY` \ + --exec-prefix=`finddir B_COMMON_BIN_DIRECTORY` \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + #--includedir=`finddir B_COMMON_HEADERS_DIRECTORY` \ + --enable-threads=posix \ + --enable-thread-local-alloc \ + --enable-parallel-mark \ + inlining=on \ + linkflags=-L`finddir B_COMMON_LIB_DIRECTORY` \ + threading=multi \ + variant=release \ + link=shared \ + runtime-link=shared +} + +INSTALL() +{ + ./bjam install \ + -d2 \ + --prefix=$prefix \ + #--exec-prefix=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` \ + #--libdir=${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` \ + #--includedir=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` \ + inlining=on \ + --without-mpi +} + +PROVIDES_devel=" + boost${secondaryArchSuffix} = $portVersion + " + +REQUIRES_devel=" + boost${secondaryArchSuffix} == $portVersion base + " diff --git a/dev-libs/boost/patches/boost-1.55.0.patch b/dev-libs/boost/patches/boost-1.55.0.patch new file mode 100644 index 000000000..c2c63d404 --- /dev/null +++ b/dev-libs/boost/patches/boost-1.55.0.patch @@ -0,0 +1,352 @@ +diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp +new file mode 100644 +index 0000000..1b15c7e +--- /dev/null ++++ b/boost/config/platform/haiku.hpp +@@ -0,0 +1,27 @@ ++//  (C) Copyright John Maddock 2001. ++//  Use, modification and distribution are subject to the ++//  Boost Software License, Version 1.0. (See accompanying file ++//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ++ ++//  See http://www.boost.org for most recent version. ++ ++//  Haiku specific config options: ++ ++#define BOOST_PLATFORM "Haiku" ++ ++#define BOOST_NO_INTRINSIC_WCHAR_T ++#define BOOST_HAS_UNISTD_H ++ ++#define BOOST_HAS_BETHREADS ++ ++#ifndef BOOST_DISABLE_THREADS ++# define BOOST_HAS_THREADS ++#endif ++ ++// ++// thread API's not auto detected: ++// ++#define BOOST_HAS_GETTIMEOFDAY ++ ++// boilerplate code: ++#include +diff --git a/boost/config/select_platform_config.hpp b/boost/config/select_platform_config.hpp +index 2af61d2..5052d85 100644 +--- a/boost/config/select_platform_config.hpp ++++ b/boost/config/select_platform_config.hpp +@@ -41,6 +41,10 @@ + // win32: + # define BOOST_PLATFORM_CONFIG "boost/config/platform/win32.hpp" + ++#elif defined(__HAIKU__) ++// Haiku ++# define BOOST_PLATFORM_CONFIG "boost/config/platform/haiku.hpp" ++ + #elif defined(__BEOS__) + // BeOS + # define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp" +diff --git a/boost/config/stdlib/libstdcpp3.hpp b/boost/config/stdlib/libstdcpp3.hpp +index 976ab76..66bc96d 100644 +--- a/boost/config/stdlib/libstdcpp3.hpp ++++ b/boost/config/stdlib/libstdcpp3.hpp +@@ -36,7 +36,8 @@ + || defined(_GLIBCXX__PTHREADS) \ + || defined(_GLIBCXX_HAS_GTHREADS) \ + || defined(_WIN32) \ +- || defined(_AIX) ++ || defined(_AIX) \ ++ || defined(__HAIKU__) + // + // If the std lib has thread support turned on, then turn it on in Boost + // as well. We do this because some gcc-3.4 std lib headers define _REENTANT +diff --git a/boost/thread/detail/platform.hpp b/boost/thread/detail/platform.hpp +index 1f33b1a..1b8917c 100644 +--- a/boost/thread/detail/platform.hpp ++++ b/boost/thread/detail/platform.hpp +@@ -34,6 +34,8 @@ + # define BOOST_THREAD_WIN32 + #elif defined(__BEOS__) + # define BOOST_THREAD_BEOS ++#elif defined(__HAIKU__) ++# define BOOST_THREAD_BEOS + #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) + # define BOOST_THREAD_MACOS + //# define BOOST_THREAD_WAIT_BUG boost::posix_time::microseconds(1000) +diff --git a/tools/build/v2/engine/boehm_gc/dyn_load.c b/tools/build/v2/engine/boehm_gc/dyn_load.c +index 36968ba..e725bdc 100644 +--- a/tools/build/v2/engine/boehm_gc/dyn_load.c ++++ b/tools/build/v2/engine/boehm_gc/dyn_load.c +@@ -64,7 +64,7 @@ static int (*GC_has_static_roots)(const char *, void *, size_t); + !defined(AIX) && !defined(SCO_ELF) && !defined(DGUX) && \ + !(defined(FREEBSD) && defined(__ELF__)) && \ + !(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \ +- !defined(DARWIN) && !defined(CYGWIN32) ++ !defined(DARWIN) && !defined(CYGWIN32) !(defined(HAIKU) + --> We only know how to find data segments of dynamic libraries for the + --> above. Additional SVR4 variants might not be too + --> hard to add. +@@ -82,6 +82,10 @@ static int (*GC_has_static_roots)(const char *, void *, size_t); + # define ELFSIZE ARCH_ELFSIZE + #endif + ++#if defined(HAIKU) ++ ++#endif ++ + #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \ + (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \ + (defined(NETBSD) && defined(__ELF__)) || defined(HURD) +@@ -216,7 +220,8 @@ void GC_register_dynamic_libraries() + + #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \ + (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \ +- (defined(NETBSD) && defined(__ELF__)) || defined(HURD) ++ (defined(NETBSD) && defined(__ELF__)) || defined(HURD) || \ ++ defined(HAIKU) + + + #ifdef USE_PROC_FOR_LIBRARIES +diff --git a/tools/build/v2/engine/boehm_gc/include/gc.h b/tools/build/v2/engine/boehm_gc/include/gc.h +index cc95088..590a868 100644 +--- a/tools/build/v2/engine/boehm_gc/include/gc.h ++++ b/tools/build/v2/engine/boehm_gc/include/gc.h +@@ -494,7 +494,7 @@ GC_API void * GC_malloc_atomic_ignore_off_page(size_t lb); + /* of compilers. */ + /* This may also be desirable if it is possible but expensive to */ + /* retrieve the call chain. */ +-#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) \ ++#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) \ + || defined(__FreeBSD__) || defined(__DragonFly__)) & !defined(GC_CAN_SAVE_CALL_STACKS) + # define GC_ADD_CALLER + # if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +diff --git a/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h b/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h +index 66abf0b..797eddd 100644 +--- a/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h ++++ b/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h +@@ -45,7 +45,8 @@ + || defined(GC_AIX_THREADS) \ + || defined(GC_LINUX_THREADS) \ + || defined(GC_NETBSD_THREADS) \ +- || defined(GC_GNU_THREADS)) ++ || defined(GC_GNU_THREADS)) \ ++ || defined(GC_HAIKU_THREADS) + # define _REENTRANT + /* Better late than never. This fails if system headers that */ + /* depend on this were previously included. */ +@@ -62,6 +63,7 @@ + # if defined(GC_SOLARIS_THREADS) || defined(GC_FREEBSD_THREADS) || \ + defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) || \ + defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \ ++ defined(GC_HAIKU_THREADS) || \ + defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \ + defined(GC_AIX_THREADS) || defined(GC_NETBSD_THREADS) || \ + (defined(GC_WIN32_THREADS) && defined(__CYGWIN32__)) || \ +diff --git a/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h b/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h +index 20f35bc..7e798a7 100644 +--- a/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h ++++ b/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h +@@ -215,6 +215,11 @@ + # define BEOS + # define mach_type_known + # endif ++# if defined(__HAIKU__) && defined(_X86_) ++# define I386 ++# define HAIKU ++# define mach_type_known ++# endif + # if defined(LINUX) && (defined(i386) || defined(__i386__)) + # define I386 + # define mach_type_known +@@ -1014,6 +1019,13 @@ + extern int etext[]; + # define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) + # endif ++# ifdef HAIKU ++# define OS_TYPE "HAIKU" ++# include ++# define GETPAGESIZE() B_PAGE_SIZE ++ extern int etext[]; ++# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) ++# endif + # ifdef SOLARIS + # define OS_TYPE "SOLARIS" + extern int _etext[], _end[]; +diff --git a/tools/build/v2/engine/boehm_gc/os_dep.c b/tools/build/v2/engine/boehm_gc/os_dep.c +index bb8fa08..a7edf72 100644 +--- a/tools/build/v2/engine/boehm_gc/os_dep.c ++++ b/tools/build/v2/engine/boehm_gc/os_dep.c +@@ -777,6 +777,16 @@ ptr_t GC_get_main_stack_base(void){ + # endif /* BEOS */ + + ++# ifdef HAIKU ++# include ++ptr_t GC_get_main_stack_base(void){ ++ thread_info th; ++ get_thread_info(find_thread(NULL),&th); ++ return th.stack_end; ++} ++# endif /* HAIKU */ ++ ++ + # ifdef OS2 + + ptr_t GC_get_main_stack_base(void) +@@ -1095,7 +1105,7 @@ ptr_t GC_get_main_stack_base(void) + + #endif /* FREEBSD_STACKBOTTOM */ + +-#if !defined(BEOS) && !defined(AMIGA) && !defined(MSWIN32) \ ++#if !defined(BEOS) && !defined(HAIKU) && !defined(AMIGA) && !defined(MSWIN32) \ + && !defined(MSWINCE) && !defined(OS2) && !defined(NOSYS) && !defined(ECOS) \ + && !defined(CYGWIN32) + +@@ -1154,7 +1164,7 @@ ptr_t GC_get_main_stack_base(void) + # endif /* STACKBOTTOM */ + } + +-# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !NOSYS, !ECOS */ ++# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !HAIKU, !NOSYS, !ECOS */ + + #if defined(GC_LINUX_THREADS) && !defined(HAVE_GET_STACK_BASE) + +diff --git a/tools/build/v2/engine/fileunix.c b/tools/build/v2/engine/fileunix.c +index bff3a42..1f60be2 100644 +--- a/tools/build/v2/engine/fileunix.c ++++ b/tools/build/v2/engine/fileunix.c +@@ -80,7 +80,10 @@ struct ar_hdr /* archive file member header - printable ascii */ + }; + #endif + +-#if defined( OS_QNX ) || defined( OS_BEOS ) || defined( OS_MPEIX ) ++# if defined( OS_QNX ) || \ ++ defined( OS_BEOS ) || \ ++ defined( OS_HAIKU ) || \ ++ defined( OS_MPEIX ) + # define NO_AR + # define HAVE_AR + #endif +diff --git a/tools/build/v2/engine/jam.h b/tools/build/v2/engine/jam.h +index 86ad0e8..7c0bb69 100644 +--- a/tools/build/v2/engine/jam.h ++++ b/tools/build/v2/engine/jam.h +@@ -125,6 +125,11 @@ + #define OS_BEOS + #define NO_VFORK + #endif ++#ifdef __HAIKU__ ++ #define unix ++ #define OSMINOR "OS=HAIKU" ++ #define OS_HAIKU ++#endif + #ifdef __bsdi__ + #define OSMINOR "OS=BSDI" + #define OS_BSDI +diff --git a/tools/build/v2/engine/jambase.c b/tools/build/v2/engine/jambase.c +index b15282b..5a127a1 100644 +--- a/tools/build/v2/engine/jambase.c ++++ b/tools/build/v2/engine/jambase.c +@@ -548,6 +548,18 @@ char *jambase[] = { + "NOARSCAN ?= true ;\n", + "STDHDRS ?= /boot/develop/headers/posix ;\n", + "}\n", ++"else if $(OS) = HAIKU\n", ++"{\n", ++"BINDIR ?= /boot/common/bin ;\n", ++"CC ?= gcc ;\n", ++"C++ ?= $(CC) ;\n", ++"FORTRAN ?= \"\" ;\n", ++"LIBDIR ?= /boot/common/lib ;\n", ++"LINK ?= gcc ;\n", ++"LINKLIBS ?= -lnetwork ;\n", ++"NOARSCAN ?= true ;\n", ++"STDHDRS ?= /boot/develop/headers/posix ;\n", ++"}\n", + "else if $(OS) = BEOS\n", + "{\n", + "BINDIR ?= /boot/apps ;\n", +diff --git a/tools/build/v2/tools/builtin.jam b/tools/build/v2/tools/builtin.jam +index 176de13..1c3466f 100644 +--- a/tools/build/v2/tools/builtin.jam ++++ b/tools/build/v2/tools/builtin.jam +@@ -41,7 +41,7 @@ import generate ; + + + .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd openbsd osf +- qnx qnxnto sgi solaris unix unixware windows ++ qnx qnxnto sgi solaris unix unixware windows haiku + elf # Not actually an OS -- used for targeting bare metal where object + # format is ELF. This catches both -elf and -eabi gcc targets and well + # as other compilers targeting ELF. It is not clear how often we need +@@ -76,6 +76,7 @@ local rule default-host-os ( ) + case COHERENT : host-os = unix ; + case DRAGONFLYBSD : host-os = bsd ; + case IRIX : host-os = sgi ; ++ case HAIKU : host-os = haiku ; + case MACOSX : host-os = darwin ; + case KFREEBSD : host-os = freebsd ; + case LINUX : host-os = linux ; +diff --git a/tools/build/v2/tools/builtin.py b/tools/build/v2/tools/builtin.py +index 35c1a40..c430fad 100644 +--- a/tools/build/v2/tools/builtin.py ++++ b/tools/build/v2/tools/builtin.py +@@ -103,6 +103,7 @@ def default_host_os(): + elif host_os == 'MACOSX': host_os = 'darwin' + elif host_os == 'KFREEBSD': host_os = 'freebsd' + elif host_os == 'LINUX': host_os = 'linux' ++ elif host_os == 'HAIKU': host_os = 'haiku' + else: host_os = 'unix' + return host_os.lower() + +diff --git a/tools/build/v2/tools/gcc.jam b/tools/build/v2/tools/gcc.jam +index ef90f05..2de76cf 100644 +--- a/tools/build/v2/tools/gcc.jam ++++ b/tools/build/v2/tools/gcc.jam +@@ -1029,10 +1029,11 @@ rule setup-threading ( targets * : sources * : properties * ) + case cygwin : option = -mthreads ; + case solaris : option = -pthreads ; libs = rt ; + case beos : # No threading options. ++ case haiku : option = ; + case *bsd : option = -pthread ; # There is no -lrt on BSD. + case sgi : # gcc on IRIX does not support multi-threading. + case darwin : # No threading options. +- case * : option = -pthread ; libs = rt ; ++ case * : option = -pthreads ; libs = rt ; + } + + if $(option) +diff --git a/tools/build/v2/tools/gcc.py b/tools/build/v2/tools/gcc.py +index c2f3b02..4f60d22 100644 +--- a/tools/build/v2/tools/gcc.py ++++ b/tools/build/v2/tools/gcc.py +@@ -677,6 +677,9 @@ elif bjam.variable('UNIX'): + elif host_os_name == 'BeOS': + # BeOS has no threading options, don't set anything here. + pass ++ elif host_os_name == 'Haiku': ++ flags('gcc', 'OPTIONS', ['multi'], ['-lroot']) ++ # there is no -lrt on HAIKU + elif host_os_name.endswith('BSD'): + flags('gcc', 'OPTIONS', ['multi'], ['-pthread']) + # there is no -lrt on BSD +diff --git a/tools/build/v2/tools/python.jam b/tools/build/v2/tools/python.jam +index d48bb78..070f5d2 100644 +--- a/tools/build/v2/tools/python.jam ++++ b/tools/build/v2/tools/python.jam +@@ -639,13 +639,14 @@ local rule system-library-dependencies ( target-os ) + case qnx* : return ; + case darwin : return ; + case windows : return ; ++ case haiku : return ; + + case hpux : return rt ; + case *bsd : return pthread gcc:util ; + + case aix : return pthread dl ; + +- case * : return pthread dl ++ case * : return ; pthread dl + gcc:util linux:util ; + } + } From d99327a4b4d13f350599099c18f6a56dfd02265f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 15 Dec 2013 00:21:16 +0000 Subject: [PATCH 050/116] Remove old BeAE recipes --- haiku-apps/beae/beae-20.recipe | 29 ----------------------------- haiku-apps/beae/beae-22.recipe | 29 ----------------------------- haiku-apps/beae/beae-25.recipe | 29 ----------------------------- 3 files changed, 87 deletions(-) delete mode 100644 haiku-apps/beae/beae-20.recipe delete mode 100644 haiku-apps/beae/beae-22.recipe delete mode 100644 haiku-apps/beae/beae-25.recipe diff --git a/haiku-apps/beae/beae-20.recipe b/haiku-apps/beae/beae-20.recipe deleted file mode 100644 index e8e81f9f3..000000000 --- a/haiku-apps/beae/beae-20.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="BeAE - Audio Editor" -HOMEPAGE="http://beae.berlios.de/" -SRC_URI="svn+http://svn.berlios.de/svnroot/repos/beae/trunk#20" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/cmake >= 2.8.0" -#CHECKSUM_MD5="" -BUILD() -{ - cd beae-20 - cmake . - make -} - -INSTALL() -{ - cd beae-20 - mkdir -p ${DESTDIR}/boot/apps - cp -a BeAE ${DESTDIR}/boot/apps - cp -a build/BeAE ${DESTDIR}/boot/apps/BeAE - mkdir -p ${DESTDIR}/boot/common/data/licenses - cp -a license.txt ${DESTDIR}/boot/common/data/licenses/BeAE - rm -f ${DESTDIR}/boot/apps/BeAE/.OptionalPackageDescription - if [ -z ${DESTDIR} ];then - find /boot/apps/BeAE -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="BeAE" -COPYRIGHT="2003 Xentronix" diff --git a/haiku-apps/beae/beae-22.recipe b/haiku-apps/beae/beae-22.recipe deleted file mode 100644 index 925c91399..000000000 --- a/haiku-apps/beae/beae-22.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="BeAE - Audio Editor" -HOMEPAGE="http://beae.berlios.de/" -SRC_URI="svn+http://svn.berlios.de/svnroot/repos/beae/trunk#22" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/cmake >= 2.8.0" -#CHECKSUM_MD5="" -BUILD() -{ - cd beae-22 - cmake . - make -} - -INSTALL() -{ - cd beae-22 - mkdir -p ${DESTDIR}/boot/apps - cp -a BeAE ${DESTDIR}/boot/apps - cp -a build/BeAE ${DESTDIR}/boot/apps/BeAE - mkdir -p ${DESTDIR}/boot/common/data/licenses - cp -a license.txt ${DESTDIR}/boot/common/data/licenses/BeAE - rm -f ${DESTDIR}/boot/apps/BeAE/.OptionalPackageDescription - if [ -z ${DESTDIR} ];then - find /boot/apps/BeAE -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="BSD (3-clause)" -COPYRIGHT="2003 Xentronix" diff --git a/haiku-apps/beae/beae-25.recipe b/haiku-apps/beae/beae-25.recipe deleted file mode 100644 index 6eed421f7..000000000 --- a/haiku-apps/beae/beae-25.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="BeAE - Audio Editor" -HOMEPAGE="http://dev.osdrawer.net/projects/beae/" -SRC_URI="svn+http://svn.osdrawer.net/beae/trunk#25" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/cmake >= 2.8.0" -#CHECKSUM_MD5="" -BUILD() -{ - cd beae-25 - cmake . - make -} - -INSTALL() -{ - cd beae-25 - mkdir -p ${DESTDIR}/boot/apps - cp -a BeAE ${DESTDIR}/boot/apps - cp -a build/BeAE ${DESTDIR}/boot/apps/BeAE - mkdir -p ${DESTDIR}/boot/common/data/licenses - cp -a license.txt ${DESTDIR}/boot/common/data/licenses/BeAE - rm -f ${DESTDIR}/boot/apps/BeAE/.OptionalPackageDescription - if [ -z ${DESTDIR} ];then - find /boot/apps/BeAE -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="BSD (3-clause)" -COPYRIGHT="2003 Xentronix" From 172ab570e9bb2f7baa7af66f2fe1718c38140cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Sun, 15 Dec 2013 02:06:13 +0000 Subject: [PATCH 051/116] VisualBoyAdvance 1.8 --- .../patches/Makefile.am.patch | 91 +++++++++++++++++++ .../visualboyadvance/patches/Util.patch | 26 ++++++ .../patches/configure.in.patch | 12 +++ .../patches/visualboyadvance-1.7.2.patch | 11 --- .../visualboyadvance-1.7.2.recipe | 33 ------- .../visualboyadvance-1.8.recipe | 70 ++++++++++++++ 6 files changed, 199 insertions(+), 44 deletions(-) create mode 100644 games-emulation/visualboyadvance/patches/Makefile.am.patch create mode 100644 games-emulation/visualboyadvance/patches/Util.patch create mode 100644 games-emulation/visualboyadvance/patches/configure.in.patch delete mode 100644 games-emulation/visualboyadvance/patches/visualboyadvance-1.7.2.patch delete mode 100644 games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe create mode 100644 games-emulation/visualboyadvance/visualboyadvance-1.8.recipe diff --git a/games-emulation/visualboyadvance/patches/Makefile.am.patch b/games-emulation/visualboyadvance/patches/Makefile.am.patch new file mode 100644 index 000000000..9aef1e939 --- /dev/null +++ b/games-emulation/visualboyadvance/patches/Makefile.am.patch @@ -0,0 +1,91 @@ +diff --git a/src/sdl/Makefile.am b/src/sdl/Makefile.am +index bcc9f92..ba6db7a 100644 +--- a/src/sdl/Makefile.am ++++ b/src/sdl/Makefile.am +@@ -1,7 +1,5 @@ + bin_PROGRAMS = VisualBoyAdvance + +-noinst_PROGRAMS = TestEmu +- + VisualBoyAdvance_SOURCES = \ + SDL.cpp \ + debugger.cpp \ +@@ -79,78 +77,6 @@ VisualBoyAdvance_LDADD = @VBA_LIBS@ @SDL_LIBS@ + + VisualBoyAdvance_DEPENDENCIES = @VBA_LIBS@ + +-TestEmu_SOURCES = \ +- TestEmu.cpp \ +- debugger.cpp \ +- debugger.h \ +- ../2xSaI.cpp \ +- ../AutoBuild.h \ +- ../Cheats.cpp \ +- ../Cheats.h \ +- ../EEprom.cpp \ +- ../EEprom.h \ +- ../Flash.cpp \ +- ../Flash.h \ +- ../GBA.cpp \ +- ../GBA.h \ +- ../GBAinline.h \ +- ../Gfx.cpp \ +- ../Gfx.h \ +- ../Globals.cpp \ +- ../Globals.h \ +- ../Mode0.cpp \ +- ../Mode1.cpp \ +- ../Mode2.cpp \ +- ../Mode3.cpp \ +- ../Mode4.cpp \ +- ../Mode5.cpp \ +- ../NLS.h \ +- ../Port.h \ +- ../RTC.cpp \ +- ../RTC.h \ +- ../Sound.cpp \ +- ../Sound.h \ +- ../Sram.cpp \ +- ../Sram.h \ +- ../System.h \ +- ../Text.cpp \ +- ../Text.h \ +- ../Util.cpp \ +- ../Util.h \ +- ../admame.cpp \ +- ../agbprint.cpp \ +- ../agbprint.h \ +- ../arm-new.h \ +- ../armdis.cpp \ +- ../armdis.h \ +- ../bios.cpp \ +- ../bios.h \ +- ../elf.cpp \ +- ../elf.h \ +- ../expr-lex.cpp \ +- ../expr.cpp \ +- ../expr.cpp.h \ +- ../exprNode.cpp \ +- ../exprNode.h \ +- ../hq2x.cpp \ +- ../hq2x.h \ +- ../interp.h \ +- ../lq2x.h \ +- ../memgzio.c \ +- ../memgzio.h \ +- ../motionblur.cpp \ +- ../pixel.cpp \ +- ../remote.cpp \ +- ../scanline.cpp \ +- ../simple2x.cpp \ +- ../thumb.h \ +- ../unzip.cpp \ +- ../unzip.h +- +-TestEmu_LDADD = @VBA_LIBS@ @SDL_LIBS@ +- +-TestEmu_DEPENDENCIES = @VBA_LIBS@ +- + AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -DSDL \ diff --git a/games-emulation/visualboyadvance/patches/Util.patch b/games-emulation/visualboyadvance/patches/Util.patch new file mode 100644 index 000000000..891ac1d84 --- /dev/null +++ b/games-emulation/visualboyadvance/patches/Util.patch @@ -0,0 +1,26 @@ +diff --git a/src/Util.cpp b/src/Util.cpp +index 9e3b7d9..6ab1614 100644 +--- a/src/Util.cpp ++++ b/src/Util.cpp +@@ -86,8 +86,12 @@ bool utilWritePNGFile(const char *fileName, int w, int h, u8 *pix) + fclose(fp); + return false; + } ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 + ++#else + if(setjmp(png_ptr->jmpbuf)) { ++#endif ++ if(setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr,NULL); + fclose(fp); + return false; +@@ -992,7 +996,7 @@ void utilWriteData(gzFile gzFile, variable_desc *data) + + gzFile utilGzOpen(const char *file, const char *mode) + { +- utilGzWriteFunc = (int (ZEXPORT *)(void *,void * const, unsigned int))gzwrite; ++ utilGzWriteFunc = (int (ZEXPORT *)(gzFile,const voidp, unsigned int))gzwrite; + utilGzReadFunc = gzread; + utilGzCloseFunc = gzclose; + diff --git a/games-emulation/visualboyadvance/patches/configure.in.patch b/games-emulation/visualboyadvance/patches/configure.in.patch new file mode 100644 index 000000000..0ff81324a --- /dev/null +++ b/games-emulation/visualboyadvance/patches/configure.in.patch @@ -0,0 +1,12 @@ +diff --git a/configure.in b/configure.in +index 159bf87..1ad2fac 100644 +--- a/configure.in ++++ b/configure.in +@@ -64,6 +64,7 @@ dnl Checks for libraries. + AC_CHECK_LIB(z, gzopen, + , AC_MSG_ERROR([*** Cannot compile without zlib.])) + AC_CHECK_LIB(pthread, pthread_yield) ++AC_CHECK_LIB(network, socket) + + PKG_CHECK_MODULES(LIBPNG, libpng) + CPPFLAGS="$CPPFLAGS $LIBPNG_CFLAGS" diff --git a/games-emulation/visualboyadvance/patches/visualboyadvance-1.7.2.patch b/games-emulation/visualboyadvance/patches/visualboyadvance-1.7.2.patch deleted file mode 100644 index 1f45d7d7b..000000000 --- a/games-emulation/visualboyadvance/patches/visualboyadvance-1.7.2.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur VisualBoyAdvance-1.7.2/configure.in VisualBoyAdvance-1.7.2-haiku/configure.in ---- VisualBoyAdvance-1.7.2/configure.in 2004-05-13 21:38:35.039583744 +0000 -+++ VisualBoyAdvance-1.7.2-haiku/configure.in 2010-05-01 03:37:15.941621248 +0000 -@@ -66,6 +66,7 @@ - AC_CHECK_LIB(png, png_create_write_struct, - , AC_MSG_ERROR([*** Cannot compile without libpng.]), [-lz]) - AC_CHECK_LIB(pthread, pthread_yield) -+AC_CHECK_LIB(network, socket) - - dnl Checks for header files. - AC_PATH_X diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe b/games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe deleted file mode 100644 index 2cfddb434..000000000 --- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="VisualBoyAdvance" -HOMEPAGE="http://vba.ngemu.com" -SRC_URI="http://sourceforge.net/projects/vba/files/VisualBoyAdvance/1.7.2/VisualBoyAdvance-src-1.7.2.tar.gz" -CHECKSUM_MD5="cc02339e3fd8efd9f23121b0a2f81fd8" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-lang/nasm >= 2.03.01 - media-libs/libsdl >= 1.2.14 - media-libs/sdl-mixer >= 1.2.11" - -BUILD() -{ - cd VisualBoyAdvance-1.7.2 - libtoolize --force --copy --install - autoreconf -i - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-c-core --disable-profiling --without-mmx - make -} - -INSTALL() -{ - cd VisualBoyAdvance-1.7.2/src - GAMEDIR=`finddir B_APPS_DIRECTORY`/Visualboyadvance - mkdir -p ${DESTDIR}/${GAMEDIR} - cp -af VisualBoyAdvance.cfg ${DESTDIR}/${GAMEDIR} - cd sdl - cp -af TestEmu ${DESTDIR}/${GAMEDIR} - cp -af VisualBoyAdvance ${DESTDIR}/${GAMEDIR} -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2002 Forgotten" diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe new file mode 100644 index 000000000..65440f416 --- /dev/null +++ b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe @@ -0,0 +1,70 @@ +SUMMARY="VisualBoyAdvance, a GBA Emulator" +DESCRIPTION="VisualBoyAdvance is a Game Boy Advance emulator which runs your prefered ROMS" +HOMEPAGE="http://vba.ngemu.com" +SRC_URI="git://git.debian.org/git/pkg-games/visualboyadvance" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2004 Forgotten" + +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 ?x86_64" + +PROVIDES=" + visualboyadvance$secondaryArchSuffix = $portVersion + app:visualboyadvance$secondaryArchSuffix = $portVersion +" + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl$secondaryArchSuffix + lib:libsdl_mixer$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libpng$secondaryArchSuffix +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libsdl$secondaryArchSuffix + devel:libsdl_mixer$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libpng$secondaryArchSuffix +" +BUILD_PREREQUIRES=" + cmd:nasm$secondaryArchSuffix + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:autoconf + cmd:aclocal + cmd:pkg_config +" + +SOURCE_DIR="VisualBoyAdvance-1.8" + +PATCHES=" + Util.patch + Makefile.am.patch + configure.in.patch +" + +BUILD() +{ + libtoolize --force --copy --install + autoreconf -i + runConfigure ./configure --enable-c-core --disable-profilling --without-mmx + make +} + +INSTALL() +{ + cd src + GAMEDIR=$appsDir/Visualboyadvance + mkdir -p ${GAMEDIR} + cp VisualBoyAdvance.cfg ${GAMEDIR} + cp sdl/VisualBoyAdvance ${GAMEDIR} + + addAppDeskbarSymlink ${GAMEDIR}/VisualBoyAdvance +} From e03f12c3557834c625fa2e2ea0e9e994cc20e553 Mon Sep 17 00:00:00 2001 From: Mrowqa Date: Sun, 15 Dec 2013 15:19:38 +0100 Subject: [PATCH 052/116] Replaced B_COMMON with B_SYSTEM. --- dev-libs/boost/boost-1.55.0.recipe | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 5db2c1ab7..3269e6f00 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -43,24 +43,24 @@ BUILD() { ./bootstrap.sh \ --without-icu \ - --prefix=`finddir B_COMMON_DIRECTORY` \ - --exec-prefix=`finddir B_COMMON_BIN_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - #--includedir=`finddir B_COMMON_HEADERS_DIRECTORY` + --prefix=`finddir B_SYSTEM_DIRECTORY` \ + --exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \ + --libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \ + #--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` ./bjam \ - -sICU_PATH=`finddir B_COMMON_DIRECTORY` \ - -sICONV_PATH=`finddir B_COMMON_DIRECTORY` \ + -sICU_PATH=`finddir B_SYSTEM_DIRECTORY` \ + -sICONV_PATH=`finddir B_SYSTEM_DIRECTORY` \ -d2 \ --without-mpi \ - --prefix=`finddir B_COMMON_DIRECTORY` \ - --exec-prefix=`finddir B_COMMON_BIN_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - #--includedir=`finddir B_COMMON_HEADERS_DIRECTORY` \ + --prefix=`finddir B_SYSTEM_DIRECTORY` \ + --exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \ + --libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \ + #--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` \ --enable-threads=posix \ --enable-thread-local-alloc \ --enable-parallel-mark \ inlining=on \ - linkflags=-L`finddir B_COMMON_LIB_DIRECTORY` \ + linkflags=-L`finddir B_SYSTEM_LIB_DIRECTORY` \ threading=multi \ variant=release \ link=shared \ @@ -72,9 +72,9 @@ INSTALL() ./bjam install \ -d2 \ --prefix=$prefix \ - #--exec-prefix=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` \ - #--libdir=${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` \ - #--includedir=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` \ + #--exec-prefix=${DESTDIR}/`finddir B_SYSTEM_BIN_DIRECTORY` \ + #--libdir=${DESTDIR}/`finddir B_SYSTEM_LIB_DIRECTORY` \ + #--includedir=${DESTDIR}/`finddir B_SYSTEM_HEADERS_DIRECTORY` \ inlining=on \ --without-mpi } From 0f8bbbdf68c697b022680c4775fe7b5f927b4861 Mon Sep 17 00:00:00 2001 From: Mrowqa Date: Sun, 15 Dec 2013 23:35:15 +0100 Subject: [PATCH 053/116] Added recipe file for tinyxml2 lib. It requires gcc4. --- dev-libs/tinyxml2/tinyxml2-2.recipe | 68 +++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 dev-libs/tinyxml2/tinyxml2-2.recipe diff --git a/dev-libs/tinyxml2/tinyxml2-2.recipe b/dev-libs/tinyxml2/tinyxml2-2.recipe new file mode 100644 index 000000000..7caa2b027 --- /dev/null +++ b/dev-libs/tinyxml2/tinyxml2-2.recipe @@ -0,0 +1,68 @@ +DESCRIPTION=" + TinyXML-2 is a simple, small, efficient, C++ XML parser that can be + easily integrating into other programs. + " +SUMMARY="TinyXML-2 is a simple C++ XML parser." +HOMEPAGE="http://www.grinninglizard.com/tinyxml2/" +LICENSE="Zlib" +COPYRIGHT="2011-2013 Lee Thomason" +SRC_URI="git+https://github.com/leethomason/tinyxml2.git#343a5ff3bdd7336644db4080f001759e062c359e" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + + +PROVIDES=" + tinyxml2$secondaryArchSuffix = $portVersion + lib:libtinyxml2$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + +BUILD() +{ + g++ -fpic -c tinyxml2.cpp + g++ -shared -Wl,-soname,libtinyxml2.so -o libtinyxml2.so tinyxml2.o +} + +INSTALL() +{ + mkdir -p $libDir + # also install shared lib + cp -a libtinyxml2.so $libDir + + # move headers + mkdir -p $includeDir + mv tinyxml2.h $includeDir + + # prepare development lib links + prepareInstalledDevelLib libtinyxml2 .so + + # devel package + packageEntries devel $developDir +} + +TEST() +{ + make test +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + tinyxml2${secondaryArchSuffix}_devel = $portVersion + devel:libtinyxml2$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + tinyxml2$secondaryArchSuffix == $portVersion base + " From be7d9f35d77916f77b7187bd6c427e51c7901bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 15 Dec 2013 20:12:13 +0100 Subject: [PATCH 054/116] qemacs: Update recipe Somehow it doesn't detect libpng correctly yet though. --- app-editors/qemacs/qemacs-0.3.3.recipe | 47 ++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/app-editors/qemacs/qemacs-0.3.3.recipe b/app-editors/qemacs/qemacs-0.3.3.recipe index 250da5505..c6b989af0 100644 --- a/app-editors/qemacs/qemacs-0.3.3.recipe +++ b/app-editors/qemacs/qemacs-0.3.3.recipe @@ -1,22 +1,57 @@ +SUMMARY="QEmacs editor" DESCRIPTION="QEmacs (for Quick Emacs), a very small but powerful UNIX editor" HOMEPAGE="http://bellard.org/qemacs/" SRC_URI="http://bellard.org/qemacs/qemacs-0.3.3.tar.gz" CHECKSUM_MD5="42fe8cc431bb9cbbeb898a2c18335990" REVISION="1" -STATUS_HAIKU="broken" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2000-2003 Fabrice Bellard" + DEPEND="app-text/texi2html >= 1.82" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + qemacs$secondaryArchSuffix = $portVersion + app:qemacs$secondaryArchSuffix = $portVersion + cmd:qemacs$secondaryArchSuffix = $portVersion + cmd:qe$secondaryArchSuffix = $portVersion + cmd:html2png$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libpng$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix +# lib:libavcodec$secondaryArchSuffix +# lib:libavformat$secondaryArchSuffix + " + +BUILD_REQUIRES=" + devel:libpng$secondaryArchSuffix +# devel:libavcodec$secondaryArchSuffix +# devel:libavformat$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:texi2html + " + +PATCHES="qemacs-0.3.3.patch" + BUILD() { - cd qemacs-0.3.3 - ./configure + runConfigure ./configure make } INSTALL() { - cd qemacs-0.3.3 make install + addAppDeskbarSymlink $binDir/qe QEmacs } -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2000-2003 Fabrice Bellard" From 879e3c3d358ca4e865cbb4899f9dfb56ab025943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 15 Dec 2013 20:14:09 +0100 Subject: [PATCH 055/116] libxcb: Update recipe Not working yet, as it doesn't find xcb_proto python files... --- x11-libs/libxcb/libxcb-1.6.recipe | 54 +++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/x11-libs/libxcb/libxcb-1.6.recipe b/x11-libs/libxcb/libxcb-1.6.recipe index 8d316acf2..6fc9d23b5 100644 --- a/x11-libs/libxcb/libxcb-1.6.recipe +++ b/x11-libs/libxcb/libxcb-1.6.recipe @@ -1,25 +1,61 @@ +SUMMARY="libxcb" DESCRIPTION="libxcb" HOMEPAGE="http://xcb.freedesktop.org/" SRC_URI="http://xcb.freedesktop.org/dist/libxcb-1.6.tar.gz" CHECKSUM_MD5="f824cc4cb4b43f5bbc84c0e17fbd80d0" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.23 - x11-misc/util-macros >= 1.7.0 - dev-libs/libxslt >= 1.1.26 - x11-proto/xcb-proto >= 1.6 - x11-libs/libXau >= 1.0.5" +COPYRIGHT="2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett. +All Rights Reserved." +LICENSE="MIT (no promotion)" + +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + libxcb$secondaryArchSuffix = $portVersion + lib:libxcb$secondaryArchSuffix = $portVersion + devel:libxcb$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libxslt >= 1.1.26 + " + +BUILD_REQUIRES=" + devel:libxslt >= 1.1.26 + devel:xcb_proto >= 1.6 + devel:libpthread_stubs$secondaryArchSuffix >= 0.3 + devel:libxau$secondaryArchSuffix >= 1.0.5 + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:util_macros$secondaryArchSuffix + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:python + " + + +#DEPEND="pkgconfig >= 0.23 +# x11-misc/util-macros >= 1.7.0 +# dev-libs/libxslt >= 1.1.26 +# x11-proto/xcb-proto >= 1.6 +# x11-libs/libXau >= 1.0.5" BUILD() { - cd libxcb-1.6 libtoolize --force --copy --install ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` + runConfigure ./configure } INSTALL() { - cd libxcb-1.6 make install } From 209bd39b61c68e9cb18556909f9b22ea8f0e34eb Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 15 Dec 2013 19:42:12 -0800 Subject: [PATCH 056/116] Remove sdl_mixer patch as it's no longer needed --- .../sdl_mixer/patches/sdl_mixer-1.2.12.patch | 50 ------------------- 1 file changed, 50 deletions(-) delete mode 100644 media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch diff --git a/media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch b/media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch deleted file mode 100644 index 0640f3a47..000000000 --- a/media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 1468e92..367fd69 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -39,7 +39,7 @@ VERSION_OBJECTS = @VERSION_OBJECTS@ - PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@ - PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@ - --DIST = Android.mk CHANGES COPYING CWProjects.sea.bin MPWmake.sea.bin Makefile.in SDL_mixer.pc.in README SDL_mixer.h SDL_mixer.qpg.in SDL_mixer.spec SDL_mixer.spec.in VisualC Watcom-OS2.zip Xcode Xcode-iOS acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi playmus.c timidity wavestream.c wavestream.h version.rc -+DIST = Android.mk CHANGES COPYING CWProjects.sea.bin MPWmake.sea.bin Makefile.in SDL_mixer.pc.in README SDL_mixer.h SDL_mixer.qpg.in SDL_mixer.spec SDL_mixer.spec.in VisualC Watcom-OS2.zip Xcode Xcode-iOS acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi timidity wavestream.c wavestream.h version.rc - - LT_AGE = @LT_AGE@ - LT_CURRENT = @LT_CURRENT@ -@@ -47,7 +47,7 @@ LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ - LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - --all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playmus$(EXE) -+all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) - - $(srcdir)/configure: $(srcdir)/configure.in - @echo "Warning, configure.in is out of date" -@@ -65,9 +65,6 @@ $(objects): - $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) - $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) - --$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) -- - install: all install-hdrs install-lib #install-bin - install-hdrs: - $(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL -@@ -82,7 +79,6 @@ install-lib: $(objects) $(objects)/$(TARGET) - $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET) - install-bin: - $(SHELL) $(auxdir)/mkinstalldirs $(bindir) -- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playmus$(EXE) $(bindir)/playmus$(EXE) - - uninstall: uninstall-hdrs uninstall-lib uninstall-bin - uninstall-hdrs: -@@ -96,7 +92,8 @@ uninstall-hdrs: - uninstall-lib: - $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET) - uninstall-bin: -- rm -f $(bindir)/playmus$(EXE) -+ touch playmus -+ rm -f playmus - - clean: - rm -rf $(objects) From a5bf08c3b017de42477ec2ed300ca64844ce3fe5 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 15 Dec 2013 19:43:28 -0800 Subject: [PATCH 057/116] Remove sdl_mixer patch as it's no longer needed --- media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 2 -- 1 file changed, 2 deletions(-) diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe index e91763b9c..61f6fb7b3 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -57,8 +57,6 @@ BUILD_PREREQUIRES=" SOURCE_DIR="SDL_mixer-$portVersion" -PATCHES="sdl_mixer-1.2.12.patch" - BUILD() { libtoolize --force --copy --install From 6f7420b318636eedaf84213487b983655b5e35e1 Mon Sep 17 00:00:00 2001 From: Mrowqa Date: Mon, 16 Dec 2013 06:20:05 +0100 Subject: [PATCH 058/116] Corrected recipe file according to the comments. --- dev-libs/tinyxml2/tinyxml2-2.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-libs/tinyxml2/tinyxml2-2.recipe b/dev-libs/tinyxml2/tinyxml2-2.recipe index 7caa2b027..55a7d77a6 100644 --- a/dev-libs/tinyxml2/tinyxml2-2.recipe +++ b/dev-libs/tinyxml2/tinyxml2-2.recipe @@ -1,6 +1,6 @@ DESCRIPTION=" TinyXML-2 is a simple, small, efficient, C++ XML parser that can be - easily integrating into other programs. + easily integrated into other programs. " SUMMARY="TinyXML-2 is a simple C++ XML parser." HOMEPAGE="http://www.grinninglizard.com/tinyxml2/" @@ -8,7 +8,7 @@ LICENSE="Zlib" COPYRIGHT="2011-2013 Lee Thomason" SRC_URI="git+https://github.com/leethomason/tinyxml2.git#343a5ff3bdd7336644db4080f001759e062c359e" REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64" +ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -21,9 +21,9 @@ REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make @@ -46,7 +46,7 @@ INSTALL() mv tinyxml2.h $includeDir # prepare development lib links - prepareInstalledDevelLib libtinyxml2 .so + prepareInstalledDevelLib libtinyxml2 # devel package packageEntries devel $developDir From 42b84ff5399cea3178005ea1cff13aa75e5c2daa Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 15 Dec 2013 21:23:45 -0800 Subject: [PATCH 059/116] Fixed source location for BeAE. --- haiku-apps/beae/beae-1.2.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/beae/beae-1.2.recipe b/haiku-apps/beae/beae-1.2.recipe index 044ff2426..b96c1d93c 100644 --- a/haiku-apps/beae/beae-1.2.recipe +++ b/haiku-apps/beae/beae-1.2.recipe @@ -1,7 +1,7 @@ DESCRIPTION="BeAE is an audio editor for Haiku, with features like silencing, fading in/out, analyzing etc." SUMMARY="Well featured audio editor for Haiku" HOMEPAGE="http://developer.berlios.de/projects/beae" -SRC_URI="svn://svn.berlios.de/beae/trunk#25" +SRC_URI="git+https://github.com/HaikuArchives/BeAE.git#b4e8a39e0d" REVISION="1" COPYRIGHT="2003 Xentronix" LICENSE="BSD (3-clause)" From 5d2152bbb48aa72881ab879ab95c80e5c19f525d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 16 Dec 2013 09:02:15 +0100 Subject: [PATCH 060/116] oricutron: do add the deskbar symlink --- app-emulation/oricutron/oricutron-1.1_svn.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/oricutron/oricutron-1.1_svn.recipe b/app-emulation/oricutron/oricutron-1.1_svn.recipe index b029ea0d5..15d219af1 100644 --- a/app-emulation/oricutron/oricutron-1.1_svn.recipe +++ b/app-emulation/oricutron/oricutron-1.1_svn.recipe @@ -43,6 +43,6 @@ INSTALL() { make install INSTALLDIR=$prefix/apps/Oricutron mimeset $prefix/apps/Oricutron/oricutron - #addAppDeskbarSymlink $prefix/apps/Oricutron/oricutron Oricutron + addAppDeskbarSymlink $prefix/apps/Oricutron/oricutron Oricutron } From b5981a79ab6e5fe4056a23c455de43d65655246e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 16 Dec 2013 15:05:50 +0100 Subject: [PATCH 061/116] parted: Add recipe For now it's broken, it needs libuuid. --- sys-block/parted/parted-3.1.53_git.recipe | 51 +++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 sys-block/parted/parted-3.1.53_git.recipe diff --git a/sys-block/parted/parted-3.1.53_git.recipe b/sys-block/parted/parted-3.1.53_git.recipe new file mode 100644 index 000000000..1b699ef66 --- /dev/null +++ b/sys-block/parted/parted-3.1.53_git.recipe @@ -0,0 +1,51 @@ +SUMMARY="parted" +DESCRIPTION="parted partition editor" +HOMEPAGE="http://www.gnu.org/software/parted" +SRC_URI="git://git.debian.org/git/parted/parted.git" +#CHECKSUM_MD5="" +REVISION="1" +LICENSE="GNU GPL v3" +COPYRIGHT="" + +ARCHITECTURES="!x86_gcc2 !x86 !x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" + +PROVIDES=" + parted$secondaryArchSuffix = $portVersion + cmd:parted$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:git + cmd:autoconf + cmd:libtool + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:gperf + cmd:rsync + cmd:gettext + " + +#PATCHES="parted.patch" + +# TODO: Fix libdl test in configure.ac +BUILD() +{ + ./bootstrap + runConfigure ./configure --disable-dynamic-loading + make +} + +INSTALL() +{ + make install +} + From 1ebc3cfd441748d551f68a8220790a367b6a33cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 16 Dec 2013 15:07:42 +0100 Subject: [PATCH 062/116] qemacs: cleanup --- app-editors/qemacs/qemacs-0.3.3.recipe | 2 -- 1 file changed, 2 deletions(-) diff --git a/app-editors/qemacs/qemacs-0.3.3.recipe b/app-editors/qemacs/qemacs-0.3.3.recipe index c6b989af0..ac6a932f6 100644 --- a/app-editors/qemacs/qemacs-0.3.3.recipe +++ b/app-editors/qemacs/qemacs-0.3.3.recipe @@ -7,8 +7,6 @@ REVISION="1" LICENSE="GNU LGPL v2.1" COPYRIGHT="2000-2003 Fabrice Bellard" -DEPEND="app-text/texi2html >= 1.82" - ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" From b8308ce3d1dda065d37b3378690bc662b2e9f1a5 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 18:22:11 +0000 Subject: [PATCH 063/116] Fixed ODE 0.12 recipe and patch --- dev-games/ode/ode-0.12.recipe | 61 ++++++++++++++++++++++++---- dev-games/ode/patches/ode-0.12.patch | 30 +++++++------- 2 files changed, 68 insertions(+), 23 deletions(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index 06df78601..d23c264ac 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -1,19 +1,64 @@ -DESCRIPTION="ODE is an open source, high performance library for simulating rigid body dynamics." +DESCRIPTION="ODE is an open source, high performance library for simulating rigid body dynamics. It is fully featured, stable, mature and platform independent with an easy to use C/C++ API. It has advanced joint types and integrated collision detection with friction. ODE is useful for simulating vehicles, objects in virtual reality environments and virtual creatures." +SUMMARY="Library for simulating rigid body dynamics" HOMEPAGE="http://www.ode.org/" SRC_URI="http://downloads.sourceforge.net/project/opende/ODE/0.12/ode-0.12.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fopende%2Ffiles%2F&ts=1356377654&use_mirror=freefr" +CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599" REVISION="1" COPYRIGHT="2001-2004 Russell L. Smith" -LICENSE="GNU LGPL v3 - BSD (3-clause)" -CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599" +LICENSE=" + GNU LGPL v3 + BSD (3-clause) + " +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + ode$secondaryArchSuffix = $portVersion + cmd:ode_config = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:mkdepend + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +SOURCE_DIR="$portVersionedName" + +PATCHES="ode-0.12.patch" + BUILD() { - cd ode-0.12 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + runConfigure ./configure --prefix=$prefix + make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { - cd ode-0.12 make install + + prepareInstalledDevelLib libode + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir } + +PROVIDES_devel=" + ode${secondaryArchSuffix}_devel = $portVersion + devel:ode$secondaryArchSuffix = $portVersion + devel:libode$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + ode$secondaryArchSuffix == $portVersion base + " diff --git a/dev-games/ode/patches/ode-0.12.patch b/dev-games/ode/patches/ode-0.12.patch index 131dddd87..1e00efd8e 100644 --- a/dev-games/ode/patches/ode-0.12.patch +++ b/dev-games/ode/patches/ode-0.12.patch @@ -1,18 +1,6 @@ -diff -u ode-0.12/ode/src/joints/Makefile.in ode-0.12-haiku/ode/src/joints/Makefile.in ---- ode-0.12/ode/src/joints/Makefile.in 2012-05-28 23:26:01.017825792 +0000 -+++ ode-0.12-haiku/ode/src/joints/Makefile.in 2012-12-27 19:39:57.854327296 +0000 -@@ -53,7 +53,7 @@ - contact.lo universal.lo hinge2.lo fixed.lo null.lo amotor.lo \ - lmotor.lo plane2d.lo pu.lo pr.lo piston.lo - libjoints_la_OBJECTS = $(am_libjoints_la_OBJECTS) --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/ode/src -+DEFAULT_INCLUDES = -I.@am__isrc@ -I- -I$(top_builddir)/ode/src - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -diff -u ode-0.12/include/ode/collision.h ode-0.12-haiku/include/ode/collision.h ---- ode-0.12/include/ode/collision.h 2012-12-27 19:39:13.484704256 +0000 -+++ ode-0.12-haiku/include/ode/collision.h 2012-12-27 19:39:01.685244416 +0000 +diff -ur ode-0.12/include/ode/collision.h ode-0.12-patch/include/ode/collision.h +--- ode-0.12/include/ode/collision.h 2010-11-08 12:00:18.044564480 +0000 ++++ ode-0.12-patch/include/ode/collision.h 2013-12-16 16:47:37.561774592 +0000 @@ -1081,7 +1081,7 @@ ODE_API void dGeomRaySetClosestHit (dGeomID g, int closestHit); ODE_API int dGeomRayGetClosestHit (dGeomID g); @@ -22,3 +10,15 @@ diff -u ode-0.12/include/ode/collision.h ode-0.12-haiku/include/ode/collision.h ODE_API dGeomID dCreateGeomTransform (dSpaceID space); ODE_API void dGeomTransformSetGeom (dGeomID g, dGeomID obj); +diff -ur ode-0.12/ode/src/joints/Makefile.in ode-0.12-patch/ode/src/joints/Makefile.in +--- ode-0.12/ode/src/joints/Makefile.in 2012-05-28 23:26:01.004980736 +0000 ++++ ode-0.12-patch/ode/src/joints/Makefile.in 2013-12-16 16:35:09.259784704 +0000 +@@ -53,7 +53,7 @@ + contact.lo universal.lo hinge2.lo fixed.lo null.lo amotor.lo \ + lmotor.lo plane2d.lo pu.lo pr.lo piston.lo + libjoints_la_OBJECTS = $(am_libjoints_la_OBJECTS) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/ode/src ++DEFAULT_INCLUDES = -I.@am__isrc@ -I- -I$(top_builddir)/ode/src + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f From f1ec4b3e8c6c6587122878ab314fc3c9d9019914 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 30 Nov 2013 11:23:48 +0100 Subject: [PATCH 064/116] Allegro: fix for new CMake, and remove old non-recipes and patches. --- media-libs/allegro/allegro-4.4.0.recipe | 21 --- media-libs/allegro/allegro-4.4.1.1.recipe | 27 ++- media-libs/allegro/allegro-4.4.x_svn.recipe | 27 --- .../allegro/patches/allegro-4.4.0.patch | 67 -------- .../allegro/patches/allegro-4.4.1.1.patch | 62 ------- .../allegro/patches/allegro-4.4.1.1.patchset | 156 ++++++++++++++++++ .../allegro/patches/allegro-4.4.x-svn.patch | 51 ------ .../allegro/patches/allegro-4.4.x_svn.patch | 51 ------ 8 files changed, 179 insertions(+), 283 deletions(-) delete mode 100644 media-libs/allegro/allegro-4.4.0.recipe delete mode 100644 media-libs/allegro/allegro-4.4.x_svn.recipe delete mode 100644 media-libs/allegro/patches/allegro-4.4.0.patch delete mode 100644 media-libs/allegro/patches/allegro-4.4.1.1.patch create mode 100644 media-libs/allegro/patches/allegro-4.4.1.1.patchset delete mode 100644 media-libs/allegro/patches/allegro-4.4.x-svn.patch delete mode 100644 media-libs/allegro/patches/allegro-4.4.x_svn.patch diff --git a/media-libs/allegro/allegro-4.4.0.recipe b/media-libs/allegro/allegro-4.4.0.recipe deleted file mode 100644 index 7a3ff42b1..000000000 --- a/media-libs/allegro/allegro-4.4.0.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Allegro game programming library" -HOMEPAGE="http://alleg.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/alleg/allegro/4.4.0/allegro-4.4.0.tar.gz" -CHECKSUM_MD5="8a0bd73f5225ba8961211a5c440ff45d" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libvorbis >= 1.2.3" -BUILD() -{ - cd allegro-4.4.0 - cmake . - make -} - -INSTALL() -{ - cd allegro-4.4.0 - make install -} -LICENSE="Allegro" -COPYRIGHT="1998-2010 Shawn Hargreaves et al." diff --git a/media-libs/allegro/allegro-4.4.1.1.recipe b/media-libs/allegro/allegro-4.4.1.1.recipe index 24868e816..ed1972baf 100644 --- a/media-libs/allegro/allegro-4.4.1.1.recipe +++ b/media-libs/allegro/allegro-4.4.1.1.recipe @@ -13,7 +13,7 @@ SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" PROVIDES=" allegro$secondaryArchSuffix = $portVersion - lib:allegro$secondaryArchSuffix = $portVersion + lib:liballeg$secondaryArchSuffix = $portVersion " REQUIRES=" @@ -40,25 +40,44 @@ BUILD_PREREQUIRES=" cmd:pkg_config " -PATCHES="allegro-4.4.1.1.patch" +PATCHES="allegro-4.4.1.1.patchset" BUILD() { - cmake . + cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DDOCDIR=$docDir -DMANDIR=$manDir make $jobArgs } INSTALL() { make install + + prepareInstalledDevelLibs liballeg libjpgalleg libloadpng liblogg + + packageEntries devel $developDir $binDir } PROVIDES_devel=" allegro${secondaryArchSuffix}_devel = $portVersion compat >= 4.4 - devel:allegro$secondaryArchSuffix = $portVersion compat >= 4.4 + devel:liballeg$secondaryArchSuffix = $portVersion compat >= 4.4 + cmd:allegro_config = $portVersion compat >= 4.4 + cmd:colormap = $portVersion compat >= 4.4 + cmd:dat = $portVersion compat >= 4.4 + cmd:dat2c = $portVersion compat >= 4.4 + cmd:dat2s = $portVersion compat >= 4.4 + cmd:exedat = $portVersion compat >= 4.4 + cmd:grabber = $portVersion compat >= 4.4 + cmd:pack = $portVersion compat >= 4.4 + cmd:pat2dat = $portVersion compat >= 4.4 + cmd:rgbmap = $portVersion compat >= 4.4 + cmd:textconv = $portVersion compat >= 4.4 + devel:libjpgalleg = $portVersion compat >= 4.4 + devel:liblogg = $portVersion compat >= 4.4 + devel:libloadpng = $portVersion compat >= 4.4 " REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion allegro$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/allegro/allegro-4.4.x_svn.recipe b/media-libs/allegro/allegro-4.4.x_svn.recipe deleted file mode 100644 index e114b9ab5..000000000 --- a/media-libs/allegro/allegro-4.4.x_svn.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="Allegro game programming library" -HOMEPAGE="http://alleg.sourceforge.net/" -SRC_URI="svn+https://alleg.svn.sourceforge.net/svnroot/alleg/allegro/branches/4.4" -#CHECKSUM_MD5="0f1cfff8f2cf88e5c91a667d9fd386ec" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/cmake >= 2.6.0 - media-libs/libvorbis >= 1.2.3 - media-libs/libogg >= 1.1.4" -BUILD() -{ - cd allegro-4.4.x-svn - mkdir -p `finddir B_COMMON_DIRECTORY`/share/info - mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - cmake . -DINFODIR:=`finddir B_COMMON_DIRECTORY`/share/info \ - -DMANDIR:=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd allegro-4.4.x-svn - make install -} - -LICENSE="Allegro" -COPYRIGHT="1998-2011 Shawn Hargreaves et al." diff --git a/media-libs/allegro/patches/allegro-4.4.0.patch b/media-libs/allegro/patches/allegro-4.4.0.patch deleted file mode 100644 index 16ce69664..000000000 --- a/media-libs/allegro/patches/allegro-4.4.0.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -ur allegro-4.4.0/CMakeLists.txt allegro-4.4.0-haiku/CMakeLists.txt ---- allegro-4.4.0/CMakeLists.txt 2009-12-20 15:47:59.000000000 -0700 -+++ allegro-4.4.0-haiku/CMakeLists.txt 2009-12-21 20:43:57.000000000 -0700 -@@ -270,7 +270,17 @@ - endif(COMPILER_GCC) - endif(APPLE) - --if(UNIX AND NOT APPLE) -+if(BEOS) -+ if(CMAKE_SYSTEM_NAME STREQUAL Haiku) -+ set(ALLEGRO_HAIKU 1) -+ else(CMAKE_SYSTEM_NAME STREQUAL Haiku) -+ set(ALLEGRO_BEOS 1) -+ endif(CMAKE_SYSTEM_NAME STREQUAL Haiku) -+ set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar -Wno-ctor-dtor-privacy") -+ set(WFLAGS_C_ONLY "") -+endif(BEOS) -+ -+if(UNIX AND NOT APPLE AND NOT BEOS) - set(ALLEGRO_UNIX 1) - endif() - -@@ -560,6 +570,13 @@ - ) - endif(WIN32) - -+# -- Haiku/BeOS -- -+ -+if(BEOS) -+ list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) -+ list(APPEND PLATFORM_LIBS game midi device) -+endif(BEOS) -+ - # -- Mac OS X -- - - if(ALLEGRO_MACOSX) -@@ -644,6 +661,9 @@ - if(ALLEGRO_WITH_XWINDOWS) - add_headers("" include/xalleg.h) - endif(ALLEGRO_WITH_XWINDOWS) -+if(BEOS) -+ add_headers("" include/bealleg.h) -+endif(BEOS) - - #-----------------------------------------------------------------------------# - # -diff -ur allegro-4.4.0/cmake/FileList.cmake allegro-4.4.0-haiku/cmake/FileList.cmake ---- allegro-4.4.0/cmake/FileList.cmake 2009-11-08 19:24:05.000000000 -0700 -+++ allegro-4.4.0-haiku/cmake/FileList.cmake 2009-12-21 20:43:06.000000000 -0700 -@@ -207,7 +207,7 @@ - src/beos/bmousapi.cpp - src/beos/bmousdrv.c - src/beos/bmouse.c -- src/beos/boverlay.c -+ src/beos/boverlay.cpp - src/beos/bsnd.c - src/beos/bsndapi.cpp - src/beos/bsnddrv.c -@@ -218,7 +218,7 @@ - src/beos/btimeapi.cpp - src/beos/btimedrv.c - src/beos/btimer.c -- src/beos/bwindow.c -+ src/beos/bwindow.cpp - src/beos/bwscreen.cpp - src/unix/ufile.c - src/misc/colconv.c diff --git a/media-libs/allegro/patches/allegro-4.4.1.1.patch b/media-libs/allegro/patches/allegro-4.4.1.1.patch deleted file mode 100644 index cd809ec5b..000000000 --- a/media-libs/allegro/patches/allegro-4.4.1.1.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -urN allegro-4.4.1.1/src/beos/bdwindow.cpp allegro-4.4.1.1-haiku/src/beos/bdwindow.cpp ---- allegro-4.4.1.1/src/beos/bdwindow.cpp 2008-10-21 01:03:43.061865984 +0000 -+++ allegro-4.4.1.1-haiku/src/beos/bdwindow.cpp 2010-10-30 22:40:51.000000000 +0000 -@@ -413,9 +413,9 @@ - } - - #ifdef ALLEGRO_NO_ASM -- bmp->read_bank = _be_gfx_bwindow_read_write_bank; -- bmp->write_bank = _be_gfx_bwindow_read_write_bank; -- _screen_vtable.unwrite_bank = _be_gfx_bwindow_unwrite_bank; -+ bmp->read_bank = (void *)_be_gfx_bwindow_read_write_bank; -+ bmp->write_bank = (void *)_be_gfx_bwindow_read_write_bank; -+ _screen_vtable.unwrite_bank = (void *)_be_gfx_bwindow_unwrite_bank; - #else - bmp->read_bank = _be_gfx_bwindow_read_write_bank_asm; - bmp->write_bank = _be_gfx_bwindow_read_write_bank_asm; -diff -urN allegro-4.4.1.1/src/beos/bwindow.cpp allegro-4.4.1.1-haiku/src/beos/bwindow.cpp ---- allegro-4.4.1.1/src/beos/bwindow.cpp 2008-10-20 08:27:27.061603840 +0000 -+++ allegro-4.4.1.1-haiku/src/beos/bwindow.cpp 2010-10-30 22:40:51.000000000 +0000 -@@ -347,9 +347,9 @@ - } - - #ifdef ALLEGRO_NO_ASM -- bmp->read_bank = _be_gfx_bwindow_read_write_bank; -- bmp->write_bank = _be_gfx_bwindow_read_write_bank; -- _screen_vtable.unwrite_bank = _be_gfx_bwindow_unwrite_bank; -+ bmp->read_bank = (void *)_be_gfx_bwindow_read_write_bank; -+ bmp->write_bank = (void *)_be_gfx_bwindow_read_write_bank; -+ _screen_vtable.unwrite_bank = (void *)_be_gfx_bwindow_unwrite_bank; - #else - bmp->read_bank = _be_gfx_bwindow_read_write_bank_asm; - bmp->write_bank = _be_gfx_bwindow_read_write_bank_asm; -diff -urN allegro-4.4.1.1/src/beos/bwscreen.cpp allegro-4.4.1.1-haiku/src/beos/bwscreen.cpp ---- allegro-4.4.1.1/src/beos/bwscreen.cpp 2008-10-20 08:27:27.061865984 +0000 -+++ allegro-4.4.1.1-haiku/src/beos/bwscreen.cpp 2010-10-30 22:40:51.000000000 +0000 -@@ -363,9 +363,9 @@ - - #ifdef ALLEGRO_NO_ASM - if (gfx_capabilities) { -- bmp->write_bank = be_gfx_bwindowscreen_read_write_bank; -- bmp->read_bank = be_gfx_bwindowscreen_read_write_bank; -- _screen_vtable.unwrite_bank = be_gfx_bwindowscreen_unwrite_bank; -+ bmp->write_bank = (void *)be_gfx_bwindowscreen_read_write_bank; -+ bmp->read_bank = (void *)be_gfx_bwindowscreen_read_write_bank; -+ _screen_vtable.unwrite_bank = (void *)be_gfx_bwindowscreen_unwrite_bank; - } - #else - if (gfx_capabilities) { -diff -urN allegro-4.4.1.1/src/file.c allegro-4.4.1.1-haiku/src/file.c ---- allegro-4.4.1.1/src/file.c 2008-10-23 13:38:21.006815744 +0000 -+++ allegro-4.4.1.1-haiku/src/file.c 2010-10-30 22:46:02.595853312 +0000 -@@ -31,6 +31,10 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - -+#ifdef ALLEGRO_HAIKU -+ #define O_BINARY 0 -+#endif -+ - #ifndef ALLEGRO_MPW - #include - #endif diff --git a/media-libs/allegro/patches/allegro-4.4.1.1.patchset b/media-libs/allegro/patches/allegro-4.4.1.1.patchset new file mode 100644 index 000000000..a1169f083 --- /dev/null +++ b/media-libs/allegro/patches/allegro-4.4.1.1.patchset @@ -0,0 +1,156 @@ +From cbe10814911be2ea285d73d455065e430bf6c92a Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Fri, 29 Nov 2013 21:27:01 +0100 +Subject: applying patch allegro-4.4.1.1.patch + + +diff --git a/src/beos/bdwindow.cpp b/src/beos/bdwindow.cpp +index 2ef8460..28c9678 100644 +--- a/src/beos/bdwindow.cpp ++++ b/src/beos/bdwindow.cpp +@@ -413,9 +413,9 @@ static struct BITMAP *_be_gfx_bdirectwindow_init(GFX_DRIVER *drv, int w, int h, + } + + #ifdef ALLEGRO_NO_ASM +- bmp->read_bank = _be_gfx_bwindow_read_write_bank; +- bmp->write_bank = _be_gfx_bwindow_read_write_bank; +- _screen_vtable.unwrite_bank = _be_gfx_bwindow_unwrite_bank; ++ bmp->read_bank = (void *)_be_gfx_bwindow_read_write_bank; ++ bmp->write_bank = (void *)_be_gfx_bwindow_read_write_bank; ++ _screen_vtable.unwrite_bank = (void *)_be_gfx_bwindow_unwrite_bank; + #else + bmp->read_bank = _be_gfx_bwindow_read_write_bank_asm; + bmp->write_bank = _be_gfx_bwindow_read_write_bank_asm; +diff --git a/src/beos/bwindow.cpp b/src/beos/bwindow.cpp +index d89e1d4..61a1885 100644 +--- a/src/beos/bwindow.cpp ++++ b/src/beos/bwindow.cpp +@@ -347,9 +347,9 @@ extern "C" struct BITMAP *be_gfx_bwindow_init(int w, int h, int v_w, int v_h, in + } + + #ifdef ALLEGRO_NO_ASM +- bmp->read_bank = _be_gfx_bwindow_read_write_bank; +- bmp->write_bank = _be_gfx_bwindow_read_write_bank; +- _screen_vtable.unwrite_bank = _be_gfx_bwindow_unwrite_bank; ++ bmp->read_bank = (void *)_be_gfx_bwindow_read_write_bank; ++ bmp->write_bank = (void *)_be_gfx_bwindow_read_write_bank; ++ _screen_vtable.unwrite_bank = (void *)_be_gfx_bwindow_unwrite_bank; + #else + bmp->read_bank = _be_gfx_bwindow_read_write_bank_asm; + bmp->write_bank = _be_gfx_bwindow_read_write_bank_asm; +diff --git a/src/beos/bwscreen.cpp b/src/beos/bwscreen.cpp +index af22981..4aeda05 100644 +--- a/src/beos/bwscreen.cpp ++++ b/src/beos/bwscreen.cpp +@@ -363,9 +363,9 @@ static struct BITMAP *_be_gfx_bwindowscreen_init(GFX_DRIVER *drv, int w, int h, + + #ifdef ALLEGRO_NO_ASM + if (gfx_capabilities) { +- bmp->write_bank = be_gfx_bwindowscreen_read_write_bank; +- bmp->read_bank = be_gfx_bwindowscreen_read_write_bank; +- _screen_vtable.unwrite_bank = be_gfx_bwindowscreen_unwrite_bank; ++ bmp->write_bank = (void *)be_gfx_bwindowscreen_read_write_bank; ++ bmp->read_bank = (void *)be_gfx_bwindowscreen_read_write_bank; ++ _screen_vtable.unwrite_bank = (void *)be_gfx_bwindowscreen_unwrite_bank; + } + #else + if (gfx_capabilities) { +diff --git a/src/file.c b/src/file.c +index 654e632..7d56d8f 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -31,6 +31,10 @@ + #include "allegro.h" + #include "allegro/internal/aintern.h" + ++#ifdef ALLEGRO_HAIKU ++ #define O_BINARY 0 ++#endif ++ + #ifndef ALLEGRO_MPW + #include + #endif +-- +1.8.3.4 + + +From e3cc30c9d162fff9e1b74985da390969eea932e8 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 30 Nov 2013 11:16:32 +0100 +Subject: Allegro: fix recipe following CMake changes + +* Our CMake doesn't define BEOS anymore, so have Allegro build accept +HAIKU as well. +* Fix some hardcoded installation paths. +* Add a missing zlib include, I guess because of a newer libpng. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 103d012..7e83070 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -280,7 +280,7 @@ if(APPLE) + endif(COMPILER_GCC) + endif(APPLE) + +-if(BEOS) ++if(BEOS OR HAIKU) + if(CMAKE_SYSTEM_NAME STREQUAL Haiku) + set(ALLEGRO_HAIKU 1) + else(CMAKE_SYSTEM_NAME STREQUAL Haiku) +@@ -288,9 +288,9 @@ if(BEOS) + endif(CMAKE_SYSTEM_NAME STREQUAL Haiku) + set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar -Wno-ctor-dtor-privacy") + set(WFLAGS_C_ONLY "") +-endif(BEOS) ++endif() + +-if(UNIX AND NOT APPLE AND NOT BEOS) ++if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + set(ALLEGRO_UNIX 1) + endif() + +@@ -582,10 +582,10 @@ endif(WIN32) + + # -- Haiku/BeOS -- + +-if(BEOS) ++if(BEOS OR HAIKU) + list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) + list(APPEND PLATFORM_LIBS game midi device) +-endif(BEOS) ++endif() + + # -- Mac OS X -- + +diff --git a/addons/loadpng/loadpng.c b/addons/loadpng/loadpng.c +index 33f5527..9253260 100644 +--- a/addons/loadpng/loadpng.c ++++ b/addons/loadpng/loadpng.c +@@ -9,6 +9,7 @@ + #include + #include + #include "loadpng.h" ++#include + + /* We need internals _color_load_depth and _fixup_loaded_bitmap. The + * first can be replaced by the new get_color_depth() function which +diff --git a/cmake/Common.cmake b/cmake/Common.cmake +index 654c01c..2a9b171 100644 +--- a/cmake/Common.cmake ++++ b/cmake/Common.cmake +@@ -43,7 +43,11 @@ endfunction(install_our_library) + function(install_our_headers) + foreach(hdr ${ARGN}) + get_source_file_property(LOC ${hdr} MACOSX_PACKAGE_LOCATION) +- string(REGEX REPLACE "^Headers" "include" LOC ${LOC}) ++ if(HAIKU) ++ string(REGEX REPLACE "^Headers" "develop/headers" LOC ${LOC}) ++ else() ++ string(REGEX REPLACE "^Headers" "include" LOC ${LOC}) ++ endif() + install(FILES ${hdr} DESTINATION ${LOC}) + endforeach() + endfunction(install_our_headers) +-- +1.8.3.4 + diff --git a/media-libs/allegro/patches/allegro-4.4.x-svn.patch b/media-libs/allegro/patches/allegro-4.4.x-svn.patch deleted file mode 100644 index 2e81e77f1..000000000 --- a/media-libs/allegro/patches/allegro-4.4.x-svn.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -urN allegro-4.4.x-svn/CMakeLists.txt allegro-4.4.x-svn-haiku/CMakeLists.txt ---- allegro-4.4.x-svn/CMakeLists.txt 2012-11-18 01:16:37.000000000 -0800 -+++ allegro-4.4.x-svn-haiku/CMakeLists.txt 2012-11-18 01:06:24.541065216 -0800 -@@ -291,18 +291,18 @@ - endif(COMPILER_GCC) - endif(APPLE) - --if(BEOS) -+if(HAIKU) - if(CMAKE_SYSTEM_NAME STREQUAL Haiku) - set(ALLEGRO_HAIKU 1) -- else(CMAKE_SYSTEM_NAME STREQUAL Haiku) -+ else(CMAKE_SYSTEM_NAME STREQUAL BeOS) - set(ALLEGRO_BEOS 1) - endif(CMAKE_SYSTEM_NAME STREQUAL Haiku) - set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar") - set(WFLAGS_C_ONLY "") - set(WFLAGS_CXX_ONLY "-Wno-ctor-dtor-privacy") --endif(BEOS) -+endif(HAIKU) - --if(UNIX AND NOT APPLE AND NOT BEOS) -+if(UNIX AND NOT APPLE AND NOT HAIKU) - set(ALLEGRO_UNIX 1) - endif() - -@@ -628,10 +628,10 @@ - - # -- Haiku/BeOS -- - --if(BEOS) -+if(HAIKU) - list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) - list(APPEND PLATFORM_LIBS game midi device) --endif(BEOS) -+endif(HAIKU) - - # -- Mac OS X -- - -@@ -727,9 +727,9 @@ - if(ALLEGRO_WITH_XWINDOWS) - add_headers("" include/xalleg.h) - endif(ALLEGRO_WITH_XWINDOWS) --if(BEOS) -+if(HAIKU) - add_headers("" include/bealleg.h) --endif(BEOS) -+endif(HAIKU) - - #-----------------------------------------------------------------------------# - # diff --git a/media-libs/allegro/patches/allegro-4.4.x_svn.patch b/media-libs/allegro/patches/allegro-4.4.x_svn.patch deleted file mode 100644 index 2e81e77f1..000000000 --- a/media-libs/allegro/patches/allegro-4.4.x_svn.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -urN allegro-4.4.x-svn/CMakeLists.txt allegro-4.4.x-svn-haiku/CMakeLists.txt ---- allegro-4.4.x-svn/CMakeLists.txt 2012-11-18 01:16:37.000000000 -0800 -+++ allegro-4.4.x-svn-haiku/CMakeLists.txt 2012-11-18 01:06:24.541065216 -0800 -@@ -291,18 +291,18 @@ - endif(COMPILER_GCC) - endif(APPLE) - --if(BEOS) -+if(HAIKU) - if(CMAKE_SYSTEM_NAME STREQUAL Haiku) - set(ALLEGRO_HAIKU 1) -- else(CMAKE_SYSTEM_NAME STREQUAL Haiku) -+ else(CMAKE_SYSTEM_NAME STREQUAL BeOS) - set(ALLEGRO_BEOS 1) - endif(CMAKE_SYSTEM_NAME STREQUAL Haiku) - set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar") - set(WFLAGS_C_ONLY "") - set(WFLAGS_CXX_ONLY "-Wno-ctor-dtor-privacy") --endif(BEOS) -+endif(HAIKU) - --if(UNIX AND NOT APPLE AND NOT BEOS) -+if(UNIX AND NOT APPLE AND NOT HAIKU) - set(ALLEGRO_UNIX 1) - endif() - -@@ -628,10 +628,10 @@ - - # -- Haiku/BeOS -- - --if(BEOS) -+if(HAIKU) - list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) - list(APPEND PLATFORM_LIBS game midi device) --endif(BEOS) -+endif(HAIKU) - - # -- Mac OS X -- - -@@ -727,9 +727,9 @@ - if(ALLEGRO_WITH_XWINDOWS) - add_headers("" include/xalleg.h) - endif(ALLEGRO_WITH_XWINDOWS) --if(BEOS) -+if(HAIKU) - add_headers("" include/bealleg.h) --endif(BEOS) -+endif(HAIKU) - - #-----------------------------------------------------------------------------# - # From 32bfd01d12904a16181a6e1b3a66489029ab67ae Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 30 Nov 2013 12:15:56 +0100 Subject: [PATCH 065/116] Recipe for Allegro 4.4.2. --- media-libs/allegro/allegro-4.4.2.recipe | 96 +++++++++++++++++++ .../allegro/patches/allegro-4.4.2.patchset | 77 +++++++++++++++ 2 files changed, 173 insertions(+) create mode 100644 media-libs/allegro/allegro-4.4.2.recipe create mode 100644 media-libs/allegro/patches/allegro-4.4.2.patchset diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe new file mode 100644 index 000000000..246807cef --- /dev/null +++ b/media-libs/allegro/allegro-4.4.2.recipe @@ -0,0 +1,96 @@ +SUMMARY="Allegro game programming library" +DESCRIPTION=" +Allegro 4 and Allegro 5 are cross-platform, libraries mainly aimed at video +game and multimedia programming. They handle common, low-level tasks such as +creating windows, accepting user input, loading data, drawing images, playing +sounds, etc. and generally abstracting away the underlying platform. However, +Allegro is not a game engine: you are free to design and structure your program +as you like. + +According to the Oxford Companion to Music, Allegro is the Italian for «quick, +lively, bright». It is also a recursive acronym which stands for «Allegro Low +LEvel Game ROutines». Allegro was started by Shawn Hargreaves in the mid-90's +but has since received contributions from hundreds of people over the net. +" + +HOMEPAGE="http://alleg.sourceforge.net/" +SRC_URI="http://sourceforge.net/projects/alleg/files/allegro/4.4.2/allegro-4.4.2.tar.gz/download" +CHECKSUM_MD5="4db71b0460fc99926ae91d223199c2e6" +LICENSE="Allegro" +COPYRIGHT="1998-2010 Shawn Hargreaves et al." + +REVISION="1" + +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + allegro$secondaryArchSuffix = $portVersion + lib:liballeg$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libpng + lib:libz + lib:libogg + lib:libvorbis + " + +BUILD_REQUIRES=" + devel:libpng$secondaryArchSuffix + devel:libz + devel:libogg + devel:libvorbis + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:cmake + cmd:make + cmd:pkg_config + " + +#PATCHES="allegro-4.4.1.1.patchset" + +BUILD() +{ + cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DDOCDIR=$docDir -DMANDIR=$manDir + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs liballeg libjpgalleg libloadpng liblogg + + packageEntries devel $developDir $binDir +} + +PROVIDES_devel=" + allegro${secondaryArchSuffix}_devel = $portVersion compat >= 4.4 + devel:liballeg$secondaryArchSuffix = $portVersion compat >= 4.4 + cmd:allegro_config = $portVersion compat >= 4.4 + cmd:colormap = $portVersion compat >= 4.4 + cmd:dat = $portVersion compat >= 4.4 + cmd:dat2c = $portVersion compat >= 4.4 + cmd:dat2s = $portVersion compat >= 4.4 + cmd:exedat = $portVersion compat >= 4.4 + cmd:grabber = $portVersion compat >= 4.4 + cmd:pack = $portVersion compat >= 4.4 + cmd:pat2dat = $portVersion compat >= 4.4 + cmd:rgbmap = $portVersion compat >= 4.4 + cmd:textconv = $portVersion compat >= 4.4 + devel:libjpgalleg = $portVersion compat >= 4.4 + devel:liblogg = $portVersion compat >= 4.4 + devel:libloadpng = $portVersion compat >= 4.4 + " + +REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion + allegro$secondaryArchSuffix == $portVersion base + " + diff --git a/media-libs/allegro/patches/allegro-4.4.2.patchset b/media-libs/allegro/patches/allegro-4.4.2.patchset new file mode 100644 index 000000000..80780b740 --- /dev/null +++ b/media-libs/allegro/patches/allegro-4.4.2.patchset @@ -0,0 +1,77 @@ +From 3f9d50e146abb2e937adf2d6e0fc7dad9634b20e Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 30 Nov 2013 12:14:54 +0100 +Subject: Import Allegro 4.4.1.1 fixes that were not upstreamed. + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 245be10..08a2a32 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -291,7 +291,7 @@ if(APPLE) + endif(COMPILER_GCC) + endif(APPLE) + +-if(BEOS) ++if(BEOS OR HAIKU) + if(CMAKE_SYSTEM_NAME STREQUAL Haiku) + set(ALLEGRO_HAIKU 1) + else(CMAKE_SYSTEM_NAME STREQUAL Haiku) +@@ -300,9 +300,9 @@ if(BEOS) + set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar") + set(WFLAGS_C_ONLY "") + set(WFLAGS_CXX_ONLY "-Wno-ctor-dtor-privacy") +-endif(BEOS) ++endif() + +-if(UNIX AND NOT APPLE AND NOT BEOS) ++if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + set(ALLEGRO_UNIX 1) + endif() + +@@ -628,10 +628,10 @@ endif(WIN32) + + # -- Haiku/BeOS -- + +-if(BEOS) ++if(BEOS OR HAIKU) + list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) + list(APPEND PLATFORM_LIBS game midi device) +-endif(BEOS) ++endif() + + # -- Mac OS X -- + +diff --git a/cmake/Common.cmake b/cmake/Common.cmake +index 41822dd..1b56e1b 100644 +--- a/cmake/Common.cmake ++++ b/cmake/Common.cmake +@@ -43,7 +43,11 @@ endfunction(install_our_library) + function(install_our_headers) + foreach(hdr ${ARGN}) + get_source_file_property(LOC ${hdr} MACOSX_PACKAGE_LOCATION) +- string(REGEX REPLACE "^Headers" "include" LOC ${LOC}) ++ if(HAIKU) ++ string(REGEX REPLACE "^Headers" "develop/headers" LOC ${LOC}) ++ else() ++ string(REGEX REPLACE "^Headers" "include" LOC ${LOC}) ++ endif() + install(FILES ${hdr} DESTINATION ${LOC}) + endforeach() + endfunction(install_our_headers) +diff --git a/src/beos/bsysapi.cpp b/src/beos/bsysapi.cpp +index c6e4dad..a7c9d46 100644 +--- a/src/beos/bsysapi.cpp ++++ b/src/beos/bsysapi.cpp +@@ -128,7 +128,7 @@ static int32 system_thread(void *data) + using_custom_allegro_app = false; + + term = getenv("TERM"); +- if (!strcmp(term, "dumb")) { ++ if (!term || !strcmp(term, "dumb")) { + /* The TERM environmental variable is set to "dumb" if the app was + * not started from a terminal. + */ +-- +1.8.3.4 + From aefa19123da4b2212b955cfdff0f75e7eb0f9f47 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 16 Dec 2013 19:31:23 +0100 Subject: [PATCH 066/116] Forgot to commit the recipe for HaikuWebkit 1.2.1. --- .../haikuwebkit/haikuwebkit-1.2.1.recipe | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe new file mode 100644 index 000000000..33e4d9979 --- /dev/null +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe @@ -0,0 +1,95 @@ +SUMMARY="Open source web browser engine" +DESCRIPTION="WebKit is an open source web browser engine. WebKit is also the name of the Mac OS X system framework version of the engine that's used by Safari, Dashboard, Mail, and many other OS X applications. WebKit's HTML and JavaScript code began as a branch of the KHTML and KJS libraries from KDE." +HOMEPAGE="http://www.webkit.org/" +COPYRIGHT="1998-2012 Apple Inc., Google Inc., et al" +LICENSE=" + GNU LGPL v2 + GNU LGPL v2.1 + MIT + " +SRC_URI="http://pulkomandy.tk/drop/haikuwebkit_x86-1.2.1-Source.tar.bz2" +CHECKSUM_MD5="9b5624345b633693ec90a95a1e9e52bf" +REVISION="1" +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" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + haikuwebkit$secondaryArchSuffix = $portVersion + lib:libWebKit$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + icu$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libsqlite3$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libxslt$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel >= $haikuVersion + icu${secondaryArchSuffix}_devel + cmd:pkg_config + devel:libruby$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libsqlite3$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libxslt$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:flex + cmd:bison + cmd:gcc$secondaryArchSuffix + cmd:gperf + cmd:ld$secondaryArchSuffix + cmd:m4 + cmd:make + cmd:perl + cmd:python + cmd:cmake + cmd:ruby + " + +SOURCE_DIR="haikuwebkit_x86-$portVersion-Source" + +BUILD() +{ + Tools/Scripts/build-webkit --haiku --no-webkit2 \ + --cmakearg="-DCMAKE_LIBRARY_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib -DCMAKE_INSTALL_PREFIX=$prefix" +} + +INSTALL() +{ + cd WebKitBuild/Release + make install + + rm $developLibDir/* + prepareInstalledDevelLibs libWebKit + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + haikuwebkit${secondaryArchSuffix}_devel = $portVersion + devel:libjavascriptcore$secondaryArchSuffix = $portVersion + devel:libwebcore$secondaryArchSuffix = $portVersion + devel:libWebKit$secondaryArchSuffix = $portVersion + devel:libwtf$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + haikuwebkit$secondaryArchSuffix == $portVersion base + " From dd988ba92a95c18ec6f6174832608693794f83da Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 18:37:48 +0000 Subject: [PATCH 067/116] Modifications on the ODE recipe --- dev-games/ode/ode-0.12.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index d23c264ac..6bec79857 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -14,7 +14,6 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" ode$secondaryArchSuffix = $portVersion - cmd:ode_config = $portVersion " REQUIRES=" @@ -38,8 +37,8 @@ PATCHES="ode-0.12.patch" BUILD() { - runConfigure ./configure --prefix=$prefix - make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + runConfigure ./configure + make $jobArgs } INSTALL() { @@ -50,13 +49,14 @@ INSTALL() # devel package packageEntries devel \ - $developDir + $developDir \ + $binDir # ode_config binary here } PROVIDES_devel=" ode${secondaryArchSuffix}_devel = $portVersion - devel:ode$secondaryArchSuffix = $portVersion devel:libode$secondaryArchSuffix = $portVersion + cmd:ode_config = $portVersion " REQUIRES_devel=" From 08cd2aa270ce66ce963c5fd79a50324b242e3200 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 19:18:12 +0000 Subject: [PATCH 068/116] Removed SOURCE_DIR --- dev-games/ode/ode-0.12.recipe | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index 6bec79857..bce78da7c 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -31,8 +31,6 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix " -SOURCE_DIR="$portVersionedName" - PATCHES="ode-0.12.patch" BUILD() From 86cb7ed16cf3629d7df5969ce9e8a1b63a006789 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 20:03:51 +0000 Subject: [PATCH 069/116] Enable shared building for ODE --- dev-games/ode/ode-0.12.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index bce78da7c..d59e033d3 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -35,7 +35,7 @@ PATCHES="ode-0.12.patch" BUILD() { - runConfigure ./configure + runConfigure ./configure --enable-shared make $jobArgs } INSTALL() From 4ab43be501b19035537f7166174cb18da212a153 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 21:18:42 +0000 Subject: [PATCH 070/116] New PROVIDEs, fixed references for ode-config, require haiku for devel package --- dev-games/ode/ode-0.12.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index d59e033d3..2c32a8fac 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -14,6 +14,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" ode$secondaryArchSuffix = $portVersion + lib:libode$secondaryArchSuffix = $portVersion " REQUIRES=" @@ -40,6 +41,8 @@ BUILD() } INSTALL() { + fixDevelopLibDirReferences ode-config + make install prepareInstalledDevelLib libode @@ -54,9 +57,10 @@ INSTALL() PROVIDES_devel=" ode${secondaryArchSuffix}_devel = $portVersion devel:libode$secondaryArchSuffix = $portVersion - cmd:ode_config = $portVersion + cmd:ode_config$secondaryArchSuffix = $portVersion " REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion ode$secondaryArchSuffix == $portVersion base " From 8e44fea6e1813cb1c2af1245689f9d874502d258 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 17 Dec 2013 09:24:40 +0100 Subject: [PATCH 071/116] Fix ruby dependency * We don't need the lib, only the executable. * Helps with building on gcc2 since the ruby package isn't hybrid aware. --- haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe index 33e4d9979..18d25876d 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe @@ -37,8 +37,6 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion haiku_devel >= $haikuVersion icu${secondaryArchSuffix}_devel - cmd:pkg_config - devel:libruby$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix @@ -47,6 +45,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:pkg_config cmd:flex cmd:bison cmd:gcc$secondaryArchSuffix From f6e9b0c672decf2d6bf1059496de951b9263f7fd Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 17 Dec 2013 22:00:28 +0000 Subject: [PATCH 072/116] Add BlogPositive recipe --- .../blogpositive/blogpositive-0.1.0.recipe | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 haiku-apps/blogpositive/blogpositive-0.1.0.recipe diff --git a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe new file mode 100644 index 000000000..65b4d9515 --- /dev/null +++ b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe @@ -0,0 +1,52 @@ +SUMMARY="The one blog app to rule them all!" +DESCRIPTION=" + Want to blog, but WebPositive isn't quick enough + Now you can use the new blog app: BlogPositive + It can only connect to your Wordpress blogs for now + " +HOMEPAGE="http://blogpositive.puckipedia.com" +SRC_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.1.0" +REVISION="1" + +LICENSE="MIT" +COPYRIGHT="2013 :Puck Meerburg" + +ARCHITECTURES="!x86 x86_gcc2" + +PROVIDES=" + blogpositive = $portVersion + app:blogpositive = $portVersion + " + +REQUIRES=" + lib:libcurl + lib:libz + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:g++ + cmd:xres + cmd:mkdepend + " +BUILD_REQUIRES=" + devel:libcurl + devel:libz + haiku_devel >= $haikuVersion + " + +USER_SETTINGS_FILES=" + settings/BlogPositive directory + " + +BUILD() +{ + make + make bindcatalogs +} + +INSTALL() +{ + make install INSTALL_DIR=$appsDir + addAppDeskbarSymlink $appsDir/BlogPositive +} From 6dd883fffb54db4beb7280e07d27380e870209dd Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 17 Dec 2013 22:53:10 +0000 Subject: [PATCH 073/116] Fix recipe for x86 and x86_64 --- haiku-apps/blogpositive/blogpositive-0.1.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe index 65b4d9515..e5a35c0d8 100644 --- a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe @@ -11,7 +11,7 @@ REVISION="1" LICENSE="MIT" COPYRIGHT="2013 :Puck Meerburg" -ARCHITECTURES="!x86 x86_gcc2" +ARCHITECTURES="x86 x86_gcc2 ?x86_64" PROVIDES=" blogpositive = $portVersion From 51384b8280b60054f5d6ce980d3c1fe81568a0b8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 01:25:44 +0000 Subject: [PATCH 074/116] Changed BEOS cases in CMakeLists.txt to HAIKU, this fixes the Allegro build --- media-libs/allegro/allegro-4.4.2.recipe | 6 +-- media-libs/allegro/patches/Haiku.patch | 50 +++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 media-libs/allegro/patches/Haiku.patch diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe index 246807cef..84360f83b 100644 --- a/media-libs/allegro/allegro-4.4.2.recipe +++ b/media-libs/allegro/allegro-4.4.2.recipe @@ -21,8 +21,8 @@ COPYRIGHT="1998-2010 Shawn Hargreaves et al." REVISION="1" -ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" allegro$secondaryArchSuffix = $portVersion @@ -53,7 +53,7 @@ BUILD_PREREQUIRES=" cmd:pkg_config " -#PATCHES="allegro-4.4.1.1.patchset" +PATCHES="Haiku.patch" BUILD() { diff --git a/media-libs/allegro/patches/Haiku.patch b/media-libs/allegro/patches/Haiku.patch new file mode 100644 index 000000000..bb6633253 --- /dev/null +++ b/media-libs/allegro/patches/Haiku.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 245be10..6ab68c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -291,7 +291,7 @@ if(APPLE) + endif(COMPILER_GCC) + endif(APPLE) + +-if(BEOS) ++if(HAIKU) + if(CMAKE_SYSTEM_NAME STREQUAL Haiku) + set(ALLEGRO_HAIKU 1) + else(CMAKE_SYSTEM_NAME STREQUAL Haiku) +@@ -300,9 +300,9 @@ if(BEOS) + set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar") + set(WFLAGS_C_ONLY "") + set(WFLAGS_CXX_ONLY "-Wno-ctor-dtor-privacy") +-endif(BEOS) ++endif(HAIKU) + +-if(UNIX AND NOT APPLE AND NOT BEOS) ++if(UNIX AND NOT APPLE AND NOT HAIKU) + set(ALLEGRO_UNIX 1) + endif() + +@@ -628,10 +628,10 @@ endif(WIN32) + + # -- Haiku/BeOS -- + +-if(BEOS) ++if(HAIKU) + list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) + list(APPEND PLATFORM_LIBS game midi device) +-endif(BEOS) ++endif(HAIKU) + + # -- Mac OS X -- + +@@ -727,9 +727,9 @@ endif(WIN32) + if(ALLEGRO_WITH_XWINDOWS) + add_headers("" include/xalleg.h) + endif(ALLEGRO_WITH_XWINDOWS) +-if(BEOS) ++if(HAIKU) + add_headers("" include/bealleg.h) +-endif(BEOS) ++endif(HAIKU) + + #-----------------------------------------------------------------------------# + # From 3bad1b61f38c9d2437144fdc8da078945c23dbc9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 17 Dec 2013 18:16:03 -0800 Subject: [PATCH 075/116] Fixed giflib secondaryArchSuffix support. --- media-libs/giflib/giflib-5.0.5.recipe | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/media-libs/giflib/giflib-5.0.5.recipe b/media-libs/giflib/giflib-5.0.5.recipe index f25521594..30752e828 100644 --- a/media-libs/giflib/giflib-5.0.5.recipe +++ b/media-libs/giflib/giflib-5.0.5.recipe @@ -5,23 +5,23 @@ SRC_URI="http://sourceforge.net/projects/giflib/files/giflib-5.x/giflib-5.0.5.ta CHECKSUM_MD5="c3262ba0a3dad31ba876fb5ba1d71a02" LICENSE="MIT" COPYRIGHT="1997-2007 Eric S. Raymond and Toshio Kuratomi" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" giflib$secondaryArchSuffix = $portVersion - lib:libgif = 6.0.1 compat >= 5 - cmd:gif2raw - cmd:gif2rgb - cmd:gifbuild - cmd:gifclrmp - cmd:gifecho - cmd:giffix - cmd:gifinto - cmd:giftext - cmd:giftool + lib:libgif$secondaryArchSuffix = 6.0.1 compat >= 6 + cmd:gif2raw$secondaryArchSuffix + cmd:gif2rgb$secondaryArchSuffix + cmd:gifbuild$secondaryArchSuffix + cmd:gifclrmp$secondaryArchSuffix + cmd:gifecho$secondaryArchSuffix + cmd:giffix$secondaryArchSuffix + cmd:gifinto$secondaryArchSuffix + cmd:giftext$secondaryArchSuffix + cmd:giftool$secondaryArchSuffix " REQUIRES=" @@ -29,10 +29,10 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtool From 3b79bda65729a77d4778d06a3a6af331a470c8d8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 17 Dec 2013 18:35:29 -0800 Subject: [PATCH 076/116] ReAdd earlier better Allegro-4.4.2 patch. --- media-libs/allegro/allegro-4.4.2.recipe | 2 +- media-libs/allegro/patches/Haiku.patch | 50 ------------------------- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 media-libs/allegro/patches/Haiku.patch diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe index 84360f83b..535f5b0e1 100644 --- a/media-libs/allegro/allegro-4.4.2.recipe +++ b/media-libs/allegro/allegro-4.4.2.recipe @@ -53,7 +53,7 @@ BUILD_PREREQUIRES=" cmd:pkg_config " -PATCHES="Haiku.patch" +PATCHES="allegro-4.4.2.patchset" BUILD() { diff --git a/media-libs/allegro/patches/Haiku.patch b/media-libs/allegro/patches/Haiku.patch deleted file mode 100644 index bb6633253..000000000 --- a/media-libs/allegro/patches/Haiku.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 245be10..6ab68c8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -291,7 +291,7 @@ if(APPLE) - endif(COMPILER_GCC) - endif(APPLE) - --if(BEOS) -+if(HAIKU) - if(CMAKE_SYSTEM_NAME STREQUAL Haiku) - set(ALLEGRO_HAIKU 1) - else(CMAKE_SYSTEM_NAME STREQUAL Haiku) -@@ -300,9 +300,9 @@ if(BEOS) - set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar") - set(WFLAGS_C_ONLY "") - set(WFLAGS_CXX_ONLY "-Wno-ctor-dtor-privacy") --endif(BEOS) -+endif(HAIKU) - --if(UNIX AND NOT APPLE AND NOT BEOS) -+if(UNIX AND NOT APPLE AND NOT HAIKU) - set(ALLEGRO_UNIX 1) - endif() - -@@ -628,10 +628,10 @@ endif(WIN32) - - # -- Haiku/BeOS -- - --if(BEOS) -+if(HAIKU) - list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) - list(APPEND PLATFORM_LIBS game midi device) --endif(BEOS) -+endif(HAIKU) - - # -- Mac OS X -- - -@@ -727,9 +727,9 @@ endif(WIN32) - if(ALLEGRO_WITH_XWINDOWS) - add_headers("" include/xalleg.h) - endif(ALLEGRO_WITH_XWINDOWS) --if(BEOS) -+if(HAIKU) - add_headers("" include/bealleg.h) --endif(BEOS) -+endif(HAIKU) - - #-----------------------------------------------------------------------------# - # From 9776c3e80c76e596485927b4080f6e46a859a25e Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 17 Dec 2013 22:12:26 -0600 Subject: [PATCH 077/116] mesa: Add Mesa 7.9.2 recipe * This will make up the Haiku gcc2 OpenGL kit * Untested! May need some tweaking still. --- sys-libs/mesa/mesa-7.9.2.recipe | 116 ++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 sys-libs/mesa/mesa-7.9.2.recipe diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe new file mode 100644 index 000000000..6ab75cdb1 --- /dev/null +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -0,0 +1,116 @@ +SUMMARY="Multi-platform GL implementation" +DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification. + The OpenGL specification documents a system for rendering interactive 3D graphics. + + Mesa fills the role of the Haiku OpenGL kit providing 3D rendering to Haiku applications. + " +HOMEPAGE="http://www.mesa3d.org/" +COPYRIGHT="1999-2013 Brian Paul All Rights Reserved." +LICENSE="MIT" +# remember to update SOURCE_DIR as well for the -X revision +SRC_URI="https://github.com/kallisti5/mesa/archive/7.9.2-3.tar.gz" +CHECKSUM_MD5="1f7d846ea2982ffa175c906443aaabd3" +REVISION="1" +ARCHITECTURES="?x86_gcc2" +if [ $effectiveTargetArchitecture != x86 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="?x86_gcc2" + +PROVIDES=" + mesa$secondaryArchSuffix = $portVersion compat >= 7.9 + lib:libGL$secondaryArchSuffix = $portVersion compat >= 1.0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:bison + cmd:find + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:python + cmd:make + cmd:sed + " + +SOURCE_DIR="mesa-7.9.2-3" + +BUILD() +{ + if [ -n "$secondaryArchSuffix" ]; then + export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture" + fi + #make DEBUG=1 haiku $jobArgs + make haiku $jobArgs +} + +INSTALL() +{ + # libGL.so makes up the core of our OpenGL kit + mkdir -p $libDir + cp $(find ./lib/ -name 'libGL.so') $libDir + + # Our rendering add-on + mkdir -p $addOnsDir/opengl + cp $(find ./lib/ -name 'libswrast.so') \ + "$addOnsDir/opengl/Legacy Software Rasterizer" + + # OpenGL Kit + mkdir -p $includeDir/os/opengl/GL + cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ + cp ./include/HaikuGL/BGLView.h $includeDir/os/opengl/ + cp ./include/HaikuGL/BGLRenderer.h $includeDir/os/opengl/ + + # Standard GL headers + cp ./include/GL/gl.h $includeDir/os/opengl/GL/ + cp ./include/GL/gl_mangle.h $includeDir/os/opengl/GL/ + cp ./include/GL/glext.h $includeDir/os/opengl/GL/ + + # Symlink GL in kit to system GL directory + cd $includeDir + ln -snf os/opengl/GL GL + + # devel package + packageEntries devel \ + $developDir + + # swrast renderer package + packageEntries swrast \ + "$addOnsDir/opengl/Legacy Software Rasterizer" +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + mesa${secondaryArchSuffix}_devel = $portVersion + devel:libGL${secondaryArchSuffix} = $portVersion + " + +REQUIRES_devel=" + mesa${secondaryArchSuffix} == $portVersion base + " + +# ===== Mesa OpenGL Add-ons ================================================== +# ----- swrast package ------------------------------------------------------- + +SUMMARY_swrast="Mesa legacy software rasterization renderer" +DESCRIPTION_swrast="This 3D BGLRenderer add-on provides Mesa software + rasterization on Haiku systems. Software rasterization performs all + 3D rendering on the systems CPU and doesn't require any specialized + hardware. Software rasterization is generally considered a fallback + 3D rendering method as performance is limited. + " +PROVIDES_swrast=" + mesa${secondaryArchSuffix}_swrast = $portVersion + " +REQUIRED_swrast=" + mesa$secondaryArchSuffix == $portVersion base + " From fe77860961ca9c2bda07f4357405971183b09a9f Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 18 Dec 2013 10:02:42 +0100 Subject: [PATCH 078/116] Fix haikuwebkit recipe not finding sqlite and ICU ... on gcc2hybrid only. --- haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe index 18d25876d..dad4f7182 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe @@ -24,7 +24,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - icu$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libsqlite3$secondaryArchSuffix @@ -36,7 +36,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion haiku_devel >= $haikuVersion - icu${secondaryArchSuffix}_devel + devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix @@ -63,8 +63,9 @@ SOURCE_DIR="haikuwebkit_x86-$portVersion-Source" BUILD() { + export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig" Tools/Scripts/build-webkit --haiku --no-webkit2 \ - --cmakearg="-DCMAKE_LIBRARY_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib -DCMAKE_INSTALL_PREFIX=$prefix" + --cmakearg="-DCMAKE_LIBRARY_PATH=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir -DCMAKE_INCLUDE_PATH=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir -DCMAKE_INSTALL_PREFIX=$prefix" } INSTALL() From 5e8ae232a86078e21c8e799969cda14437f2f614 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 00:00:21 -0800 Subject: [PATCH 079/116] Fixed libpaper secondaryArchSuffix support. --- app-text/libpaper/libpaper-1.1.24.recipe | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app-text/libpaper/libpaper-1.1.24.recipe b/app-text/libpaper/libpaper-1.1.24.recipe index 6cf45a760..77b2fe758 100644 --- a/app-text/libpaper/libpaper-1.1.24.recipe +++ b/app-text/libpaper/libpaper-1.1.24.recipe @@ -14,20 +14,21 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libpaper$secondaryArchSuffix = $portVersion - cmd:paperconf - cmd:paperconfig lib:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1 + cmd:paper_config$secondaryArchSuffix + cmd:paperconf$secondaryArchSuffix + cmd:paperconfig$secondaryArchSuffix " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtool @@ -72,5 +73,6 @@ PROVIDES_devel=" " REQUIRES_devel=" +# haiku${secondaryArchSuffix}_devel >= $haikuVersion libpaper$secondaryArchSuffix == $portVersion base " From 999a56597c800c20ad44c1b5a2537bb4af8c32a5 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 01:46:06 -0800 Subject: [PATCH 080/116] WIP sdl_sound getting all the REQUIRES in place --- media-libs/sdl_sound/sdl_sound-1.0.3.recipe | 24 +++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe index 8b5b670e6..d64404ae9 100644 --- a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe +++ b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe @@ -11,24 +11,40 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" sdl_sound$secondaryArchSuffix = $portVersion - cmd:playsound = $portVersion compat >= 2 - cmd:playsound_simple = $portVersion compat >= 2 + cmd:playsound$secondaryArchSuffix = $portVersion compat >= 2 + cmd:playsound_simple$secondaryArchSuffix = $portVersion compat >= 2 lib:libSDL_sound$secondaryArchSuffix = 1.0_0.8.0 compat >= 1.0_0 lib:libSDL_sound_1.0$secondaryArchSuffix = 0.8.0 compat >= 1.0 " REQUIRES=" haiku$secondaryArchSuffix - libsdl$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libspeex$secondaryArchSuffix + +# lib:libFlac$secondaryArchSuffix + lib:libmikmod$secondaryArchSuffix + lib:libmodplug$secondaryArchSuffix +# lib:smpeg$secondaryArchSuffix + lib:physfs$secondaryArchSuffix " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libsdl$secondaryArchSuffix devel:libogg$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libspeex$secondaryArchSuffix +# devel:libFlac$secondaryArchSuffix + devel:libmikmod$secondaryArchSuffix + devel:libmodplug$secondaryArchSuffix +# devel:smpeg$secondaryArchSuffix + devel:physfs$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc$secondaryArchSuffix From 6d2e09ad9fe5be0ebb073454c62897385e0e71f3 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 01:47:13 -0800 Subject: [PATCH 081/116] Fixed physfs, now builds with gcc2 and gcc4. --- dev-games/physfs/physfs-2.0.3.recipe | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dev-games/physfs/physfs-2.0.3.recipe b/dev-games/physfs/physfs-2.0.3.recipe index 9cd871976..9168ccd53 100644 --- a/dev-games/physfs/physfs-2.0.3.recipe +++ b/dev-games/physfs/physfs-2.0.3.recipe @@ -6,14 +6,15 @@ CHECKSUM_MD5="c2c727a8a8deb623b521b52d0080f613" LICENSE="PHYSFS" COPYRIGHT="2001-2012 Ryan C. Gordon" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" REVISION="1" PROVIDES=" physfs$secondaryArchSuffix = $portVersion lib:libphysfs$secondaryArchSuffix = $portVersion + cmd:test_physfs " REQUIRES=" @@ -22,11 +23,11 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libz$secondaryArchSuffix >= 1.0.4 " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:cmake cmd:make cmd:gcc$secondaryArchSuffix @@ -34,7 +35,7 @@ BUILD_PREREQUIRES=" BUILD() { - cmake . -DLIBRARY_OUTPUT_PATH:=$libDir + cmake . -DCMAKE_INSTALL_PREFIX=$prefix make $jobArgs } @@ -45,6 +46,10 @@ INSTALL() prepareInstalledDevelLib libphysfs fixPkgconfig + mkdir -p $includeDir + mv $prefix/include/*.h $includeDir + rm -rf $prefix/include + # devel package packageEntries devel \ $developDir From 0db07437abf088611265585f150b00bd20f0862e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 08:18:29 -0800 Subject: [PATCH 082/116] Mark ode as working on x86 --- dev-games/ode/ode-0.12.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index 2c32a8fac..6486eb00b 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -9,8 +9,8 @@ LICENSE=" GNU LGPL v3 BSD (3-clause) " -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" ode$secondaryArchSuffix = $portVersion From 8e981e2166b4131224c0cf198d6f92f10a12907d Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 08:55:01 -0800 Subject: [PATCH 083/116] Commented out physfs in sdl_sound so that sdl_sound builds now --- media-libs/sdl_sound/sdl_sound-1.0.3.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe index d64404ae9..49f8bd882 100644 --- a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe +++ b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe @@ -25,10 +25,10 @@ REQUIRES=" lib:libspeex$secondaryArchSuffix # lib:libFlac$secondaryArchSuffix - lib:libmikmod$secondaryArchSuffix +# lib:libmikmod$secondaryArchSuffix lib:libmodplug$secondaryArchSuffix # lib:smpeg$secondaryArchSuffix - lib:physfs$secondaryArchSuffix +# lib:physfs$secondaryArchSuffix " BUILD_REQUIRES=" @@ -38,10 +38,10 @@ BUILD_REQUIRES=" devel:libvorbis$secondaryArchSuffix devel:libspeex$secondaryArchSuffix # devel:libFlac$secondaryArchSuffix - devel:libmikmod$secondaryArchSuffix +# devel:libmikmod$secondaryArchSuffix devel:libmodplug$secondaryArchSuffix # devel:smpeg$secondaryArchSuffix - devel:physfs$secondaryArchSuffix +# devel:physfs$secondaryArchSuffix " BUILD_PREREQUIRES=" From 03bcd41e3d02d5000de72e4243137c5f63e49474 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Wed, 18 Dec 2013 20:56:13 -0500 Subject: [PATCH 084/116] Fix Vision recipe for x86_64. --- haiku-apps/vision/vision-0.9.7.r947.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/vision/vision-0.9.7.r947.recipe b/haiku-apps/vision/vision-0.9.7.r947.recipe index d9b00a677..4a899e921 100644 --- a/haiku-apps/vision/vision-0.9.7.r947.recipe +++ b/haiku-apps/vision/vision-0.9.7.r947.recipe @@ -4,10 +4,10 @@ HOMEPAGE="http://vision.sourceforge.net/" SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#947" LICENSE="MPL v1.1" COPYRIGHT="1999-2010 The Vision Team" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" -if [ $targetArchitecture == x86 ]; then +if [ $targetArchitecture != x86_gcc2 ]; then PATCHES="vision-0.9.7-gcc4.patch" fi From 4de90a85c748c14549a807a18d86d1682d6d427f Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Wed, 18 Dec 2013 21:07:23 -0500 Subject: [PATCH 085/116] libxslt: Add x86_64 as working target architecture. --- dev-libs/libxslt/libxslt-1.1.28.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libxslt/libxslt-1.1.28.recipe b/dev-libs/libxslt/libxslt-1.1.28.recipe index 3af348ce2..43a54f230 100644 --- a/dev-libs/libxslt/libxslt-1.1.28.recipe +++ b/dev-libs/libxslt/libxslt-1.1.28.recipe @@ -5,8 +5,8 @@ COPYRIGHT="2001-2002 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxslt-1.1.28.tar.gz" CHECKSUM_MD5="9667bf6f9310b957254fdcf6596600b7" REVISION="2" -ARCHITECTURES="x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" libxslt$secondaryArchSuffix = $portVersion From bc706f4dcf7c11e5ae9035a4d2bab68a1e830df6 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Wed, 18 Dec 2013 21:58:16 -0500 Subject: [PATCH 086/116] Get Ruby building on x86-64. --- dev-lang/ruby/patches/ruby-1.9.1.patchset | 29 ++++++++++++++++++++--- dev-lang/ruby/ruby-1.9.1.recipe | 2 +- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dev-lang/ruby/patches/ruby-1.9.1.patchset b/dev-lang/ruby/patches/ruby-1.9.1.patchset index 9ae38e313..d382648d4 100644 --- a/dev-lang/ruby/patches/ruby-1.9.1.patchset +++ b/dev-lang/ruby/patches/ruby-1.9.1.patchset @@ -1,4 +1,4 @@ -From 8905e56a8092d502b54c26a753bb7920eae149ba Mon Sep 17 00:00:00 2001 +From 7bab20a22b69de3239de475cbc72a5c39864f43c Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 11 Nov 2013 19:00:01 -0700 Subject: applying patch ruby-1.9.1.patch @@ -470,7 +470,7 @@ index 5da1769..74072d2 100644 1.8.3.4 -From 623782bf181c3f15a276316c69839bf774fe8658 Mon Sep 17 00:00:00 2001 +From b5cf064c70f3212fb0a44dd4eaa4298e881b333f Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 11 Nov 2013 20:00:13 -0700 Subject: Use gcc for linking modules @@ -496,7 +496,7 @@ index 113d4e5..9bfbfb3 100644 1.8.3.4 -From cc3d90149f715a93b962b4eab1b186acae22c23c Mon Sep 17 00:00:00 2001 +From c43e8e49d47f7778314d9a723f9430fa4686f7ba Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 11 Nov 2013 23:13:59 -0700 Subject: Add soname flags for libruby.so @@ -520,3 +520,26 @@ index 9bfbfb3..611b586 100644 -- 1.8.3.4 + +From c6983e184282d3ffbb88c095ff13d1913c18a3f8 Mon Sep 17 00:00:00 2001 +From: Rene Gollent +Date: Wed, 18 Dec 2013 21:52:24 -0500 +Subject: Add case for x86_64. + + +diff --git a/configure.in b/configure.in +index 611b586..01f0bb0 100644 +--- a/configure.in ++++ b/configure.in +@@ -1464,7 +1464,7 @@ if test "$with_dln_a_out" != yes; then + : ${LDSHARED="ld -xms"} + DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' + ;; +- i586*) ++ i586*|x86_64*) + : ${LDSHARED="${CC} -shared"} + if test "$rb_cv_binary_elf" = yes; then + LDFLAGS="$LDFLAGS -Wl,-export-dynamic" +-- +1.8.3.4 + diff --git a/dev-lang/ruby/ruby-1.9.1.recipe b/dev-lang/ruby/ruby-1.9.1.recipe index aecdaede9..c2e2be6dd 100644 --- a/dev-lang/ruby/ruby-1.9.1.recipe +++ b/dev-lang/ruby/ruby-1.9.1.recipe @@ -22,7 +22,7 @@ COPYRIGHT="1993-2009 Yukihiro Matsumoto" REVISION="2" -ARCHITECTURES="?x86_gcc2 ?x86 !x86_64" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" PROVIDES=" ruby = $portVersion compat >= 1.9 From 9f9cdb2f832ec382c01cd66e839650951549cd87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 19 Dec 2013 10:31:02 +0100 Subject: [PATCH 087/116] libpcre: Change download uri for 8.21 to SF.net mirror The original file is gone... --- dev-libs/libpcre/libpcre-8.21.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index 6d1a52f71..dd3e76d4e 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -13,7 +13,7 @@ COPYRIGHT=" 1997-2011 University of Cambridge 2007-2011, Google Inc. All rights reserved. " -SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2" +SRC_URI="http://sourceforge.net/projects/pcre/files/pcre/8.21/pcre-8.21.tar.bz2/download" CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" REVISION="5" ARCHITECTURES="x86_gcc2 x86 x86_64" From 7451a3cdb204784c074c9e36f38eb82f4f07a704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 19 Dec 2013 11:10:26 +0100 Subject: [PATCH 088/116] libpcre: Better download link --- dev-libs/libpcre/libpcre-8.21.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index dd3e76d4e..c062f62a0 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -13,7 +13,7 @@ COPYRIGHT=" 1997-2011 University of Cambridge 2007-2011, Google Inc. All rights reserved. " -SRC_URI="http://sourceforge.net/projects/pcre/files/pcre/8.21/pcre-8.21.tar.bz2/download" +SRC_URI="http://sourceforge.net/projects/pcre/files/pcre/8.21/pcre-8.21.tar.bz2" CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" REVISION="5" ARCHITECTURES="x86_gcc2 x86 x86_64" From d927e138fd45647b1b20c0ec59d8560a7550dc7a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 00:36:04 -0800 Subject: [PATCH 089/116] Fixed secondaryArchSuffix errors in smpeg --- media-libs/smpeg/smpeg-0.4.5.recipe | 39 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 918b4c4e5..9229a4fb0 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -10,36 +10,36 @@ ARCHITECTURES="x86 x86_gcc2" SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" - smpeg$secondaryArchSupport = 0.4.5 compat >= 0 + smpeg$secondaryArchSuffix = 0.4.5 compat >= 0 cmd:smpeg = 0.4.5 compat >= 0 - cmd:plaympeg = 0.4.5 compat >= 0 - cmd:glmovie = 0.4.5 compat >= 0 - lib:libsmpeg$secondaryArchSupport = 0.4_0.1.4 compat >= 0.4_0 - lib:libsmpeg_0.4$secondaryArchSupport = 0.1.4 compat >= 0 + cmd:plaympeg$secondaryArchSuffix = 0.4.5 compat >= 0 + cmd:glmovie$secondaryArchSuffix = 0.4.5 compat >= 0 + lib:libsmpeg$secondaryArchSuffix = 0.4_0.1.4 compat >= 0.4_0 + lib:libsmpeg_0.4$secondaryArchSuffix = 0.1.4 compat >= 0 " REQUIRES=" - haiku$secondaryArchSupport - lib:libglu$secondaryArchSupport - lib:libsdl$secondaryArchSupport + haiku$secondaryArchSuffix + lib:libglu$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libsdl$secondaryArchSupport - devel:libglu$secondaryArchSupport + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix + devel:libglu$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSupport}_devel >= $haikuVersion - cmd:gcc$secondaryArchSupport + cmd:gcc$secondaryArchSuffix cmd:libtoolize cmd:aclocal cmd:autoconf cmd:automake - cmd:ld$secondaryArchSupport + cmd:ld$secondaryArchSuffix cmd:make cmd:pkg_config - lib:libsdl$secondaryArchSupport + lib:libsdl$secondaryArchSuffix " BUILD() @@ -61,6 +61,7 @@ INSTALL() make install prepareInstalledDevelLibs libsmpeg + fixDevelopLibDirReferences $binDir/smpeg-config fixPkgconfig # devel package @@ -73,12 +74,12 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - smpeg${secondaryArchSupport}_devel = $portVersion - cmd:smpeg_config - devel:libsmpeg$secondaryArchSupport = 0.4_0.1.4 compat >= 0.4_0 - devel:libsmpeg_0.4$secondaryArchSupport = 0.4.5 compat >= 0 + smpeg${secondaryArchSuffix}_devel = $portVersion + cmd:smpeg_config$secondaryArchSuffix + devel:libsmpeg$secondaryArchSuffix = 0.4_0.1.4 compat >= 0.4_0 + devel:libsmpeg_0.4$secondaryArchSuffix = 0.4.5 compat >= 0 " REQUIRES_devel=" - smpeg$secondaryArchSupport == $portVersion base + smpeg$secondaryArchSuffix == $portVersion base " From 8575152ed8e2d7a643076586e3fc0f104089d92c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 02:15:08 -0800 Subject: [PATCH 090/116] Cleaned up sdl_ttf recipe, but still not building on x86 --- media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe index 8117e605b..b7af958b3 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -26,20 +26,25 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - libsdl >= 1.2 + lib:libsdl$secondaryArchSuffix lib:libfreetype - lib:libz + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:libtoolize cmd:aclocal cmd:automake cmd:autoconf cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:sdl_config + cmd:sdl_config$secondaryArchSuffix cmd:make cmd:freetype_config devel:libz @@ -52,7 +57,7 @@ BUILD() libtoolize --copy --force --install aclocal --install -I acinclude autoconf - runConfigure ./configure + runConfigure ./configure --with-x=no make } From 5b4f986501d135df9e4e9ea83709cf37c85a9823 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 02:17:17 -0800 Subject: [PATCH 091/116] Fixed secondaryArchSuffix suport for smjpeg --- media-libs/smjpeg/smjpeg-0.2.1.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media-libs/smjpeg/smjpeg-0.2.1.recipe b/media-libs/smjpeg/smjpeg-0.2.1.recipe index 9952d7d1a..09aa66b8e 100644 --- a/media-libs/smjpeg/smjpeg-0.2.1.recipe +++ b/media-libs/smjpeg/smjpeg-0.2.1.recipe @@ -14,8 +14,8 @@ PROVIDES=" smjpeg$secondaryArchSuffix = $portVersion compat >= 0 lib:libsmjpeg$secondaryArchSuffix = 0.2_0.0.2 compat >= 0.2_0 lib:libsmjpeg_0.2$secondaryArchSuffix = 0.0.2 compat >= 0 - cmd:smjpeg_encode = $portVersion compat >= 0 - cmd:smjpeg_decode = $portVersion compat >= 0 + cmd:smjpeg_encode$secondaryArchSuffix = $portVersion compat >= 0 + cmd:smjpeg_decode$secondaryArchSuffix = $portVersion compat >= 0 " REQUIRES=" @@ -24,11 +24,11 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:libtoolize cmd:aclocal From 56144e693249f6668c2ac943e845334377bad348 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 02:34:35 -0800 Subject: [PATCH 092/116] Fixed libmikmod build on x86 --- media-libs/libmikmod/libmikmod-3.3.3.recipe | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/media-libs/libmikmod/libmikmod-3.3.3.recipe b/media-libs/libmikmod/libmikmod-3.3.3.recipe index dc089be98..86867168d 100644 --- a/media-libs/libmikmod/libmikmod-3.3.3.recipe +++ b/media-libs/libmikmod/libmikmod-3.3.3.recipe @@ -17,11 +17,11 @@ PROVIDES=" REQUIRES=" haiku${secondaryArchSuffix} - lib:libsdl + lib:libsdl$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libsdl + devel:libsdl$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -52,6 +52,7 @@ INSTALL() prepareInstalledDevelLibs libmikmod fixPkgconfig + fixDevelopLibDirReferences $binDir/libmikmod-config # devel package packageEntries devel \ @@ -63,7 +64,7 @@ INSTALL() PROVIDES_devel=" libmikmod${secondaryArchSuffix}_devel = $portVersion - cmd:libmikmod_config + cmd:libmikmod_config$secondaryArchSuffix devel:libmikmod$secondaryArchSuffix = 3.2.0 compat >= 3 " From a096d2d6507182a16983eccce0a3420231ec8ad8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 02:49:04 -0800 Subject: [PATCH 093/116] Added secondaryArchSuffix to freetype in sdl_ttf and it now works. Thanks Adrien. --- media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe index b7af958b3..ac128bf4e 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -27,13 +27,14 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libsdl$secondaryArchSuffix - lib:libfreetype + lib:libfreetype$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libsdl$secondaryArchSuffix + devel:libfreetype$secondaryArchSuffix devel:libz$secondaryArchSuffix " @@ -46,7 +47,7 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:sdl_config$secondaryArchSuffix cmd:make - cmd:freetype_config + cmd:freetype_config$secondaryArchSuffix devel:libz " From 64797684df210eb3cfbc2f5c375a22ffbb126dbc Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 03:25:40 -0800 Subject: [PATCH 094/116] Added secondaryArchSuffix support to vorbis-tools --- .../vorbis_tools/vorbis_tools-1.4.0.recipe | 63 ++++++++++--------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe index 1f289b92a..cb78c7dc7 100644 --- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe +++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe @@ -7,59 +7,62 @@ REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2000-2005 Michael Smith, Stan Seibert and other contributers" -ARCHITECTURES="x86 x86_gcc2" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - vorbis_tools = 1.4.0 compat >= 1 - cmd:oggenc - cmd:oggdec - cmd:ogginfo - cmd:vcut - cmd:vorbiscomment + vorbis_tools = $portVersion compat >= 1 + cmd:oggenc$secondaryArchSuffix + cmd:oggdec$secondaryArchSuffix + cmd:ogginfo$secondaryArchSuffix + cmd:vcut$secondaryArchSuffix + cmd:vorbiscomment$secondaryArchSuffix " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion - lib:libvorbis - lib:libflac - lib:speex - lib:libao - lib:libogg - lib:libvorbis - lib:libcurl - lib:libvorbisfile - lib:libvorbisenc - lib:libFLAC + haiku$secondaryArchSuffix >= $haikuVersion + lib:libvorbis$secondaryArchSuffix + lib:libflac$secondaryArchSuffix + lib:libspeex$secondaryArchSuffix + lib:libao$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libvorbisfile$secondaryArchSuffix + lib:libvorbisenc$secondaryArchSuffix " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libvorbis$secondaryArchSuffix +# devel:libflac$secondaryArchSuffix + devel:libspeex$secondaryArchSuffix +# devel:libao$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libvorbisfile$secondaryArchSuffix + devel:libvorbisenc$secondaryArchSuffix " -SOURCE_DIR="vorbis-tools-$portVersion" - BUILD_PREREQUIRES=" - cmd:gcc${secondaryArchSuffix} - cmd:ld${secondaryArchSuffix} + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:aclocal cmd:autoconf cmd:automake cmd:make cmd:pkg_config - devel:libogg - devel:libvorbis - devel:libflac " -PATCH="vorbis_tools-1.4.0.patch" +PATCHES="vorbis_tools-1.4.0.patch" -PATCH() -{ - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac -} +SOURCE_DIR="vorbis-tools-$portVersion" BUILD() { + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac libtoolize --force --copy --install aclocal -I m4 automake From d7fdcb0292fd93fe9b88cf472b4959b581591c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 19 Dec 2013 12:51:30 +0100 Subject: [PATCH 095/116] cyassl: Add updated recipe for 2.8.0 Not working yet (redefines _POSIX_THREADS + Werror). --- dev-libs/cyassl/cyassl-2.8.0.recipe | 62 +++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 dev-libs/cyassl/cyassl-2.8.0.recipe diff --git a/dev-libs/cyassl/cyassl-2.8.0.recipe b/dev-libs/cyassl/cyassl-2.8.0.recipe new file mode 100644 index 000000000..d192dea27 --- /dev/null +++ b/dev-libs/cyassl/cyassl-2.8.0.recipe @@ -0,0 +1,62 @@ +SUMMARY="CyaSSL embedded SSL implementation" +DESCRIPTION="lightweight yet fully functional embedded SSL implementation" +HOMEPAGE="http://yassl.com" +SRC_URI="http://yassl.com/cyassl-2.8.0.zip" +REVISION="1" +CHECKSUM_MD5="7465d4815af90eff01095fa1b031ce09" +LICENSE="GNU GPL v2" +COPYRIGHT="2006-2013 Sawtooth Consulting Ltd." + +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + cyassl$secondaryArchSuffix = $portVersion + lib:libcyassl$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:dos2unix + " + + +DEPEND="app-text/dos2unix >= 1.0" +BUILD() +{ + dos2unix * + dos2unix include/* + dos2unix ctaocrypt/include/* + dos2unix ctaocrypt/src/* + libtoolize --force --copy --install + aclocal -I m4 + autoconf + chmod 755 configure + automake + runConfigure ./configure --enable-shared + make +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check + cd testsuite + testsuite +} From baae74d49c40a5e05d6fa03551cc58212d6cfc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 19 Dec 2013 15:53:26 +0100 Subject: [PATCH 096/116] xml_parser: rename to lowercase --- .../XML_Parser-2.36.recipe => xml_parser/xml_parser-2.36.recipe} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dev-perl/{XML_Parser/XML_Parser-2.36.recipe => xml_parser/xml_parser-2.36.recipe} (100%) diff --git a/dev-perl/XML_Parser/XML_Parser-2.36.recipe b/dev-perl/xml_parser/xml_parser-2.36.recipe similarity index 100% rename from dev-perl/XML_Parser/XML_Parser-2.36.recipe rename to dev-perl/xml_parser/xml_parser-2.36.recipe From 0db915b9f21ea4534e88283a9d5eecd93e7a5896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 19 Dec 2013 16:01:10 +0100 Subject: [PATCH 097/116] xml_parser: Update recipe --- dev-perl/xml_parser/xml_parser-2.36.recipe | 31 +++++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/dev-perl/xml_parser/xml_parser-2.36.recipe b/dev-perl/xml_parser/xml_parser-2.36.recipe index 4bb691719..9c02605e4 100644 --- a/dev-perl/xml_parser/xml_parser-2.36.recipe +++ b/dev-perl/xml_parser/xml_parser-2.36.recipe @@ -1,25 +1,42 @@ -#dev-perl/XML-Parser +SUMMARY="XML-Parser - A perl module for parsing XML documents" DESCRIPTION="XML-Parser - A perl module for parsing XML documents" HOMEPAGE="http://search.cpan.org/~msergeant/XML-Parser-2.36/" SRC_URI="http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz" REVISION="1" -# only tested on gcc4 -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="1b868962b658bd87e1563ecd56498ded" +COPYRIGHT="1998-2000 Larry Wall and Clark Cooper. All rights reserved." +LICENSE="Artistic (Perl)" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + xml_parser = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + lib:libexpat + perl + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libexpat + cmd:gcc + cmd:make + cmd:perl" + +SOURCE_DIR="XML-Parser-2.36" # TODO: Remove hardcoded paths. The following shows how to get the the file path: #find /boot/common/lib/perl5 -type f -name unixish.h | grep -FzZ BePC-haiku/CORE/unixish.h BUILD() { - cd XML-Parser-2.36 - perl Makefile.PL + perl Makefile.PL PREFIX=$prefix make } INSTALL() { - cd XML-Parser-2.36 make install DESTDIR="${DESTDIR}" } From bac17fb92383f4598247bb4fa27aa0f98a7ec421 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 08:21:27 -0800 Subject: [PATCH 098/116] Added better DESCRIPTION entires for smpeg, smjpeg and libsdl --- media-libs/libsdl/libsdl-1.2.15.recipe | 4 ++-- media-libs/smjpeg/smjpeg-0.2.1.recipe | 4 ++-- media-libs/smpeg/smpeg-0.4.5.recipe | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index dc4a603f6..dee7ebf21 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -1,5 +1,5 @@ -SUMMARY="Simple Direct Media Layer" -DESCRIPTION="Simple Direct Media Layer" +SUMMARY="Simple Direct Media Layer is a cross-platform media development library" +DESCRIPTION="Simple Direct Media Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics via OpenGL." HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz" CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85" diff --git a/media-libs/smjpeg/smjpeg-0.2.1.recipe b/media-libs/smjpeg/smjpeg-0.2.1.recipe index 09aa66b8e..d9c671645 100644 --- a/media-libs/smjpeg/smjpeg-0.2.1.recipe +++ b/media-libs/smjpeg/smjpeg-0.2.1.recipe @@ -1,5 +1,5 @@ -SUMMARY="smjpeg" -DESCRIPTION="smjpeg" +SUMMARY="smjpeg is an implementation of the smjpeg decoding library." +DESCRIPTION="smjpeg is an implementation of the smjpeg decoding library, which runs on just about any platform. It comes with one sample deoder, smjpeg_decode (console, no UI)." HOMEPAGE="http://www.icculus.org/smjpeg" SRC_URI="svn://svn.icculus.org/smjpeg/trunk/" LICENSE="GNU LGPL v2" diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 9229a4fb0..8c758a6eb 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -1,5 +1,5 @@ SUMMARY="smpeg is an mpeg decoing library." -DESCRIPTION="smpeg is an mpeg decoding library, which runs on just about any platform. It comes with a sample decoder, plaympeg." +DESCRIPTION="SMPEG is short for the SDL MPEG library originally developed by Loki Software. SMPEG uses MPEG-1 standard as a video display library, rather than MPEG-2, since only the MPEG-1 standard is unencumbered with software patents in the United States." HOMEPAGE="http://www.icculus.org/smpeg" SRC_URI="svn://svn.icculus.org/smpeg/tags/release_0_4_5" LICENSE="GNU LGPL v2" @@ -68,7 +68,6 @@ INSTALL() packageEntries devel \ $developDir $binDir/smpeg-config \ $dataDir - } # ----- devel package ------------------------------------------------------- From f2382511c4994741b067a0700b771dcb848174b9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 08:32:11 -0800 Subject: [PATCH 099/116] Fixed typo in smpeg summary. --- media-libs/smpeg/smpeg-0.4.5.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 8c758a6eb..68b6628c2 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -1,4 +1,4 @@ -SUMMARY="smpeg is an mpeg decoing library." +SUMMARY="smpeg is an mpeg decoding library." DESCRIPTION="SMPEG is short for the SDL MPEG library originally developed by Loki Software. SMPEG uses MPEG-1 standard as a video display library, rather than MPEG-2, since only the MPEG-1 standard is unencumbered with software patents in the United States." HOMEPAGE="http://www.icculus.org/smpeg" SRC_URI="svn://svn.icculus.org/smpeg/tags/release_0_4_5" From 7265709bcfcbfdfc6d1f67e5e80c2cae183dca39 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 08:42:05 -0800 Subject: [PATCH 100/116] Fix x86 build of libao --- media-libs/libao/libao-1.0.0.recipe | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/media-libs/libao/libao-1.0.0.recipe b/media-libs/libao/libao-1.0.0.recipe index 2ee94f010..0606c79d4 100644 --- a/media-libs/libao/libao-1.0.0.recipe +++ b/media-libs/libao/libao-1.0.0.recipe @@ -29,9 +29,9 @@ REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -39,11 +39,9 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make + cmd:pkg_config$secondaryArchSuffix " - - - BUILD() { # sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* @@ -74,11 +72,9 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - libao_devel = $portVersion - devel:libao = 0.0.0 compat >= 0 + libao${secondaryArchSuffix}_devel = $portVersion + devel:libao$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES_devel=" - libao == $portVersion base + libao$secondaryArchSuffix == $portVersion base " - - From 4b58fd2a0387d23f54c1a20abba1495629e58ba9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 08:51:16 -0800 Subject: [PATCH 101/116] Enable libao in vorbis-tools --- media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe index cb78c7dc7..edb1192ab 100644 --- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe +++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe @@ -37,7 +37,7 @@ BUILD_REQUIRES=" devel:libvorbis$secondaryArchSuffix # devel:libflac$secondaryArchSuffix devel:libspeex$secondaryArchSuffix -# devel:libao$secondaryArchSuffix + devel:libao$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libcurl$secondaryArchSuffix From 931636f0267ed109eef2e80b895f5922c1d4e474 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 17:58:37 -0800 Subject: [PATCH 102/116] Removed stray devel:libz from sdl_ttf recipe --- media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe | 1 - 1 file changed, 1 deletion(-) diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe index ac128bf4e..13c77e3ab 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -48,7 +48,6 @@ BUILD_PREREQUIRES=" cmd:sdl_config$secondaryArchSuffix cmd:make cmd:freetype_config$secondaryArchSuffix - devel:libz " SOURCE_DIR="SDL_ttf-$portVersion" From a225f624a0b8ae4f11b8a594bae0f0dd43019aa3 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 17:59:26 -0800 Subject: [PATCH 103/116] Add secondaryArchSupport for pkg_config in vorbis_tools recipe --- media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe index edb1192ab..997414636 100644 --- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe +++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe @@ -53,7 +53,7 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:automake cmd:make - cmd:pkg_config + cmd:pkg_config$secondaryArchSuffix " PATCHES="vorbis_tools-1.4.0.patch" From 4410b9b2e262ce3e9cbbe192790c75879df9e56f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 18:39:31 -0800 Subject: [PATCH 104/116] fixed libflac and probably sdl_mixer on x86. --- media-libs/flac/flac-1.3.0.recipe | 12 ++++++------ media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.0.recipe index d2d100a5e..310ba93dc 100644 --- a/media-libs/flac/flac-1.3.0.recipe +++ b/media-libs/flac/flac-1.3.0.recipe @@ -12,13 +12,14 @@ LICENSE="GNU LGPL v2.1 COPYRIGHT="2000-2007 Josh Coalson" -ARCHITECTURES="x86 x86_gcc2" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" flac$secondaryArchSuffix = $portVersion compat >= 1 libFLAC$secondaryArchSuffix = 1.3.0 compat >= 1 - cmd:flac - cmd:metaflac + cmd:flac$secondaryArchSuffix + cmd:metaflac$secondaryArchSuffix lib:libFLAC++$secondaryArchSuffix lib:libFLAC$secondaryArchSuffix " @@ -30,10 +31,10 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " - + BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel cmd:nasm cmd:gcc$secondaryArchSuffix cmd:libtoolize @@ -67,7 +68,6 @@ INSTALL() # devel package packageEntries devel \ $developDir - } TEST() diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe index 61f6fb7b3..af302a881 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -49,10 +49,10 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtool cmd:make - cmd:pkg_config - cmd:sdl_config - cmd:smpeg_config - cmd:libmikmod_config + cmd:pkg_config$secondaryArchSuffix + cmd:sdl_config$secondaryArchSuffix + cmd:smpeg_config$secondaryArchSuffix + cmd:libmikmod_config$secondaryArchSuffix " SOURCE_DIR="SDL_mixer-$portVersion" From bcac4571ee281464802031963f635693c0bf3132 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 19 Dec 2013 16:27:14 -0600 Subject: [PATCH 105/116] mesa: Fix 7.9.2 recipe * libGL compat version is the latest version of OpenGL that version of Mesa supports. * Add missing libxml2_python requirement * Not raising revision as this recipe never built until now. * Thanks Urias for being the guinea pig! --- sys-libs/mesa/mesa-7.9.2.recipe | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index 6ab75cdb1..f3e4f08e7 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -11,7 +11,7 @@ LICENSE="MIT" SRC_URI="https://github.com/kallisti5/mesa/archive/7.9.2-3.tar.gz" CHECKSUM_MD5="1f7d846ea2982ffa175c906443aaabd3" REVISION="1" -ARCHITECTURES="?x86_gcc2" +ARCHITECTURES="x86_gcc2" if [ $effectiveTargetArchitecture != x86 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. @@ -21,7 +21,7 @@ SECONDARY_ARCHITECTURES="?x86_gcc2" PROVIDES=" mesa$secondaryArchSuffix = $portVersion compat >= 7.9 - lib:libGL$secondaryArchSuffix = $portVersion compat >= 1.0 + lib:libGL$secondaryArchSuffix = $portVersion compat <= 2.1 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion @@ -31,6 +31,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion + libxml2_python cmd:bison cmd:find cmd:flex @@ -66,8 +67,8 @@ INSTALL() # OpenGL Kit mkdir -p $includeDir/os/opengl/GL cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ - cp ./include/HaikuGL/BGLView.h $includeDir/os/opengl/ - cp ./include/HaikuGL/BGLRenderer.h $includeDir/os/opengl/ + cp ./include/HaikuGL/GLView.h $includeDir/os/opengl/ + cp ./include/HaikuGL/GLRenderer.h $includeDir/os/opengl/ # Standard GL headers cp ./include/GL/gl.h $includeDir/os/opengl/GL/ From 11303ceac74dc3f28258f4395f7a88f1bf0eefe8 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 19 Dec 2013 16:34:40 -0600 Subject: [PATCH 106/116] mesa: Add libGL compat version matching latest OpenGL ver * This pacakage will likely be replaced by 10.0.1 at some point + a patch to introduce include/HaikuGL --- sys-libs/mesa/mesa-10.0.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-libs/mesa/mesa-10.0.0.recipe b/sys-libs/mesa/mesa-10.0.0.recipe index cf62a9dc2..27a7a03ef 100644 --- a/sys-libs/mesa/mesa-10.0.0.recipe +++ b/sys-libs/mesa/mesa-10.0.0.recipe @@ -9,7 +9,7 @@ COPYRIGHT="1999-2013 Brian Paul All Rights Reserved." LICENSE="MIT" SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0/MesaLib-10.0.0.tar.bz2" CHECKSUM_MD5="f3fe55d9735bea158bbe97ed9a0da819" -REVISION="1" +REVISION="2" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -20,7 +20,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" mesa$secondaryArchSuffix = $portVersion compat >= 10.0 - lib:libGL$secondaryArchSuffix = $portVersion compat >= 10.0 + lib:libGL$secondaryArchSuffix = $portVersion compat <= 3.3 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion From 431d0c94e1f8a46707022c45d811019b37aaa65e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 19:51:08 -0800 Subject: [PATCH 107/116] added secondaryArchSuffix to pkg_config in smpeg recipe, should fix building on x86. --- media-libs/smpeg/smpeg-0.4.5.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 68b6628c2..931784c7b 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -38,7 +38,7 @@ BUILD_PREREQUIRES=" cmd:automake cmd:ld$secondaryArchSuffix cmd:make - cmd:pkg_config + cmd:pkg_config$secondaryArchSuffix lib:libsdl$secondaryArchSuffix " From 8c6f1734a47256cf23e4de84fd56be031c97c5b8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 19:59:21 -0800 Subject: [PATCH 108/116] Removed for libGL provides, this should be the library version not the --- sys-libs/mesa/mesa-10.0.0.recipe | 4 ++-- sys-libs/mesa/mesa-7.9.2.recipe | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys-libs/mesa/mesa-10.0.0.recipe b/sys-libs/mesa/mesa-10.0.0.recipe index 27a7a03ef..493995545 100644 --- a/sys-libs/mesa/mesa-10.0.0.recipe +++ b/sys-libs/mesa/mesa-10.0.0.recipe @@ -20,12 +20,13 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" mesa$secondaryArchSuffix = $portVersion compat >= 10.0 - lib:libGL$secondaryArchSuffix = $portVersion compat <= 3.3 + lib:libGL$secondaryArchSuffix " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " # We're locked to LLVM 3.2 as 3.3 is broken at the moment on Haiku. @@ -33,7 +34,6 @@ BUILD_REQUIRES=" # As LLVM is only linked into the swpipe renderer (and not libGL) # changing LLVM versions shouldn't introduce any abi issues. BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion libxml2_python llvm == 3.2 cmd:bison diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index f3e4f08e7..ae5a26b99 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -21,16 +21,17 @@ SECONDARY_ARCHITECTURES="?x86_gcc2" PROVIDES=" mesa$secondaryArchSuffix = $portVersion compat >= 7.9 - lib:libGL$secondaryArchSuffix = $portVersion compat <= 2.1 + lib:libGL$secondaryArchSuffix " + REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion libxml2_python cmd:bison cmd:find From f37a1491f9a2955a51c5e1c444d65e1914ee7b85 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Thu, 19 Dec 2013 21:35:46 -0700 Subject: [PATCH 109/116] Quick fixes for physfs on primary and secondary --- dev-games/physfs/physfs-2.0.3.recipe | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-games/physfs/physfs-2.0.3.recipe b/dev-games/physfs/physfs-2.0.3.recipe index 9168ccd53..c6908c94e 100644 --- a/dev-games/physfs/physfs-2.0.3.recipe +++ b/dev-games/physfs/physfs-2.0.3.recipe @@ -12,19 +12,17 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" REVISION="1" PROVIDES=" - physfs$secondaryArchSuffix = $portVersion - lib:libphysfs$secondaryArchSuffix = $portVersion - cmd:test_physfs + physfs$secondaryArchSuffix = $portVersion compat >= 2.0 + lib:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0 + cmd:test_physfs$secondaryArchSuffix = $portVersion compat >= 2.0 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion - devel:libz$secondaryArchSuffix >= 1.0.4 " BUILD_PREREQUIRES=" @@ -33,9 +31,16 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix " +PATCH() +{ + sed -i "s,DESTINATION include,DESTINATION $relativeIncludeDir," CMakeLists.txt + sed -i "s,DESTINATION bin,DESTINATION $relativeBinDir," CMakeLists.txt +} + BUILD() { - cmake . -DCMAKE_INSTALL_PREFIX=$prefix + cmake . -DCMAKE_INSTALL_PREFIX=$prefix \ + -DLIB_SUFFIX="/${secondaryArchSuffix/_/}" make $jobArgs } @@ -46,10 +51,6 @@ INSTALL() prepareInstalledDevelLib libphysfs fixPkgconfig - mkdir -p $includeDir - mv $prefix/include/*.h $includeDir - rm -rf $prefix/include - # devel package packageEntries devel \ $developDir @@ -57,8 +58,7 @@ INSTALL() PROVIDES_devel=" physfs$secondaryArchSuffix_devel = $portVersion compat >= 2.0 - devel:physfs$secondaryArchSuffix = $portVersion compat >= 2.0 - devel:libphysfs$secondaryArchSuffix = 2.0.3 compat >= 2.0 + devel:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0 " REQUIRES_devel=" From ca74900cc11aa0855fe9501b2642cb102102db4e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 20 Dec 2013 00:44:49 -0800 Subject: [PATCH 110/116] Fixed sge build on x86 --- media-libs/sge/sge-030809.recipe | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/media-libs/sge/sge-030809.recipe b/media-libs/sge/sge-030809.recipe index ccd270f4f..b74e3d520 100644 --- a/media-libs/sge/sge-030809.recipe +++ b/media-libs/sge/sge-030809.recipe @@ -36,7 +36,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make - cmd:sdl_config + cmd:sdl_config$secondaryArchSuffix " SOURCE_DIR="sge030809" @@ -50,10 +50,8 @@ BUILD() INSTALL() { - make install PREFIX_H=$relativeIncludeDir PREFIX=$prefix - + make install PREFIX_H=$includeDir PREFIX=$prefix LIBDIR=$libDir prepareInstalledDevelLibs libSGE - #devel package packageEntries devel \ $developDir From 5b1695873bc253350485ca2394604c28e4f4f292 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 20 Dec 2013 02:52:45 -0800 Subject: [PATCH 111/116] Fixed openal build on x86 --- media-libs/openal/openal-1.13.0.recipe | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/media-libs/openal/openal-1.13.0.recipe b/media-libs/openal/openal-1.13.0.recipe index e6549ee6b..22422c081 100644 --- a/media-libs/openal/openal-1.13.0.recipe +++ b/media-libs/openal/openal-1.13.0.recipe @@ -21,10 +21,10 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:cmake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -35,8 +35,10 @@ SOURCE_DIR="openal-soft-1.13" BUILD() { - cmake . - make + sed -i "s,RUNTIME DESTINATION bin,RUNTIME DESTINATION $relativeBinDir," CMakeLists.txt + cmake . -DCMAKE_INSTALL_PREFIX=$prefix \ + -DLIB_SUFFIX="/${secondaryArchSuffix/_/}" + make $jobArgs } INSTALL() @@ -45,9 +47,7 @@ INSTALL() mkdir -p $developDir/headers mkdir -p $binDir - mv /boot/common/lib $libDir - mv /boot/common/include/AL $developDir/headers - mv /boot/common/bin/openal-info $binDir + mv $prefix/include $developDir/headers prepareInstalledDevelLibs libopenal fixPkgconfig @@ -61,11 +61,10 @@ INSTALL() PROVIDES_devel=" openal${secondaryArchSuffix}_devel = $portVersion compat >= 1 devel:libopenal$secondaryArchSuffix = 1.13.0 compat >= 0 - cmd:openal_info + cmd:openal_info$secondaryArchSuffix " REQUIRES_devel=" haiku$secondaryArchSuffix >= $haikuVersion lib:libopenal$secondaryArchSuffix == $portVersion base " - From 9fca4531c594c8ce1ca6ba300b097f849c8191c2 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 20 Dec 2013 08:43:22 -0800 Subject: [PATCH 112/116] Fixed flac on x86 --- media-libs/flac/flac-1.3.0.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.0.recipe index 310ba93dc..2248eaf26 100644 --- a/media-libs/flac/flac-1.3.0.recipe +++ b/media-libs/flac/flac-1.3.0.recipe @@ -25,13 +25,15 @@ PROVIDES=" " REQUIRES=" - haiku - lib:libiconv - lib:libogg + haiku$secondaryArchSuffix >= $haikuVersion + lib:libiconv$secondaryArchSuffix + lib:libogg$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libiconv$secondaryArchSuffix + devel:libogg$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -45,8 +47,6 @@ BUILD_PREREQUIRES=" cmd:make cmd:gawk cmd:perl - devel:libiconv - devel:libogg " BUILD() From e8eda364fb39857a96f72a9ed4b0f025e983e879 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 20 Dec 2013 08:43:52 -0800 Subject: [PATCH 113/116] Cleanup allegro recipe, still broken on x86 --- media-libs/allegro/allegro-4.4.2.recipe | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe index 535f5b0e1..3394bc282 100644 --- a/media-libs/allegro/allegro-4.4.2.recipe +++ b/media-libs/allegro/allegro-4.4.2.recipe @@ -31,26 +31,26 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libpng - lib:libz - lib:libogg - lib:libvorbis + lib:libpng$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libpng$secondaryArchSuffix - devel:libz - devel:libogg - devel:libvorbis + devel:libz$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:cmake cmd:make - cmd:pkg_config + cmd:pkg_config$secondaryArchSuffix " PATCHES="allegro-4.4.2.patchset" @@ -93,4 +93,3 @@ REQUIRES_devel=" haiku$secondaryArchSuffix >= $haikuVersion allegro$secondaryArchSuffix == $portVersion base " - From 18af4133c71d1cf1d088569b7da216c6bf83510f Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 20 Dec 2013 18:02:58 +0000 Subject: [PATCH 114/116] Add PPViewer recipe --- haiku-apps/ppviewer/ppviewer-1.0.0.recipe | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 haiku-apps/ppviewer/ppviewer-1.0.0.recipe diff --git a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe new file mode 100644 index 000000000..22fb0b6a4 --- /dev/null +++ b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe @@ -0,0 +1,37 @@ +SUMMARY="Decrypts your PowerPacker encrypted files" +DESCRIPTION=" + Decrypts PowerPacker encrypted files using Stuart Caie\'s + ppcrack 0.1 decrypting routines. + " +HOMEPAGE="https://github.com/HaikuArchives/PPViewer" +SRC_URI="git+https://github.com/puckipedia/PPViewer#ce572506ca6e69c888898abf5b958701e068122b" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2002 Maurice Michalski" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + ppviewer = $portVersion + app:ppviewer = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:g++ + " + +BUILD() +{ + g++ -lbe -ltracker -o PPViewer *.cpp +} + +INSTALL() +{ + mkdir -p $appsDir + cp PPViewer $appsDir + addAppDeskbarSymlink $appsDir/PPViewer +} From 15f12ab3425f6ddc0dcc99068298f0527bb40531 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 20 Dec 2013 18:06:51 +0000 Subject: [PATCH 115/116] Remove superfluous ' --- haiku-apps/ppviewer/ppviewer-1.0.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe index 22fb0b6a4..17ca8bbc0 100644 --- a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe +++ b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe @@ -1,6 +1,6 @@ SUMMARY="Decrypts your PowerPacker encrypted files" DESCRIPTION=" - Decrypts PowerPacker encrypted files using Stuart Caie\'s + Decrypts PowerPacker encrypted files using Stuart Caie's ppcrack 0.1 decrypting routines. " HOMEPAGE="https://github.com/HaikuArchives/PPViewer" From 37d9c3d42ea34f505c82f1e2131baadea2e97110 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 20 Dec 2013 18:47:00 +0000 Subject: [PATCH 116/116] Move repo to HaikuArchives --- haiku-apps/ppviewer/ppviewer-1.0.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe index 17ca8bbc0..73d33f369 100644 --- a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe +++ b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe @@ -4,7 +4,7 @@ DESCRIPTION=" ppcrack 0.1 decrypting routines. " HOMEPAGE="https://github.com/HaikuArchives/PPViewer" -SRC_URI="git+https://github.com/puckipedia/PPViewer#ce572506ca6e69c888898abf5b958701e068122b" +SRC_URI="git+https://github.com/HaikuArchives/PPViewer#ce572506ca6e69c888898abf5b958701e068122b" REVISION="1" LICENSE="MIT" COPYRIGHT="2002 Maurice Michalski"