From e7de333bb512ac6af8081d7c70e84972fbe917ba Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Wed, 4 Dec 2013 21:02:07 +0100 Subject: [PATCH 001/306] Add MinimizeAll recipe --- .../minimizeall/minimizeall-1.0.0.recipe | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 haiku-apps/minimizeall/minimizeall-1.0.0.recipe diff --git a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe new file mode 100644 index 000000000..58bb1f9d8 --- /dev/null +++ b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe @@ -0,0 +1,71 @@ +SUMMARY="Minimize all your apps with the press of a button!" +DESCRIPTION=" + MinimizeAll is a small app that minimizes all your apps with + the press of a button on the Deskbar, or with a keypress. + The app contains two parts: A standalone app that minimizes the whole app, + and a replicant for your Deskbar. Both do the same: Minimize all your apps! + " + +HOMEPAGE="https://github.com/HaikuArchives/MinimizeAll/" +SRC_URI="git://github.com/HaikuArchives/MinimizeAll.git#12fefdf26131375f695693a680bf01edb35d57a9" + +REVISION="1" + +COPYRIGHT=" + 2001-2008 Werner Freytag + 2009 Haiku + " + +LICENSE="MIT" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + MinimizeAll = $portVersion + app:MinimizeAll = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:xres + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD() +{ + cd trunk + mkdir bin || true + + # Step 1 - Building the app + cd app + gcc -o ../bin/MinimizeAll -lbe main.cpp ../minimize.cpp + rc -o ../bin/MinimizeAll.rsrc Application.rdef + xres -o ../bin/MinimizeAll ../bin/MinimizeAll.rsrc + mimeset -f ../bin/MinimizeAll + cd .. + + # Step 2 - The DeskBar AddOn! + cd "deskbar add-on" + gcc -o ../bin/DeskbarAddOn -lbe DeskbarView.cpp ../minimize.cpp + rc -o ../bin/DeskbarAddOn.rsrc DeskbarAddOn.rdef + xres -o ../bin/DeskbarAddOn ../bin/DeskbarAddOn.rsrc + mimeset -f ../bin/DeskbarAddOn + cd .. + +} + +INSTALL() +{ + mkdir -p $appsDir/MinimizeAll + cp trunk/bin/MinimizeAll $appsDir/MinimizeAll/MinimizeAll + cp trunk/bin/DeskbarAddOn $appsDir/MinimizeAll/DeskbarAddOn + addAppDeskbarSymlink $appsDir/MinimizeAll/MinimizeAll + mkdir -p "$dataDir/deskbar/menu/Desktop applets" + ln -s $appsDir/MinimizeAll/DeskbarAddOn "$dataDir/deskbar/menu/Desktop applets/MinimizeAll" +} From 2e73f49b66f31b0bf891595f37b4e57a26a16408 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Fri, 6 Dec 2013 17:44:16 -0500 Subject: [PATCH 002/306] Create Randomizer recipe Work done by GCI student Luke --- .../patches/randomizer-1.0.0b1.patch | 145 ++++++++++++++++++ .../randomizer/randomizer-1.0.0b1.recipe | 54 +++++++ 2 files changed, 199 insertions(+) create mode 100644 haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch create mode 100644 haiku-apps/randomizer/randomizer-1.0.0b1.recipe diff --git a/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch b/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch new file mode 100644 index 000000000..5c939d24a --- /dev/null +++ b/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch @@ -0,0 +1,145 @@ +From f826308b984f415dce6680aad5e15e6a1795f7f3 Mon Sep 17 00:00:00 2001 +From: Luke +Date: Fri, 6 Dec 2013 00:19:26 +0000 +Subject: [PATCH] Add makefile + +--- + src/makefile | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 126 insertions(+) + create mode 100644 src/makefile + +diff --git a/src/makefile b/src/makefile +new file mode 100644 +index 0000000..18dfc48 +--- /dev/null ++++ b/src/makefile +@@ -0,0 +1,126 @@ ++## BeOS Generic Makefile v2.3 ## ++ ++## Fill in this file to specify the project being created, and the referenced ++## makefile-engine will do all of the hard work for you. This handles both ++## Intel and PowerPC builds of the BeOS and Haiku. ++ ++## Application Specific Settings --------------------------------------------- ++ ++# specify the name of the binary ++NAME=Randomizer ++ ++# specify the type of binary ++# APP: Application ++# SHARED: Shared library or add-on ++# STATIC: Static library archive ++# DRIVER: Kernel Driver ++TYPE=APP ++ ++# add support for new Pe and Eddie features ++# to fill in generic makefile ++ ++#%{ ++# @src->@ ++ ++# specify the source files to use ++# full paths or paths relative to the makefile can be included ++# all files, regardless of directory, will have their object ++# files created in the common object directory. ++# Note that this means this makefile will not work correctly ++# if two source files with the same name (source.c or source.cpp) ++# are included from different directories. Also note that spaces ++# in folder names do not work well with this makefile. ++SRCS=App.cpp AppView.cpp AppWindow.cpp Generator.cpp main.cpp \ ++RandoBox.cpp RandoMenuBar.cpp RandoTextView.cpp ++ ++# specify the resource definition files to use ++# full path or a relative path to the resource file can be used. ++RDEFS= ++ ++# specify the resource files to use. ++# full path or a relative path to the resource file can be used. ++# both RDEFS and RSRCS can be defined in the same makefile. ++RSRCS=Randomizer.rsrc ++ ++# @<-src@ ++#%} ++ ++# end support for Pe and Eddie ++ ++# specify additional libraries to link against ++# there are two acceptable forms of library specifications ++# - if your library follows the naming pattern of: ++# libXXX.so or libXXX.a you can simply specify XXX ++# library: libbe.so entry: be ++# ++# - if your library does not follow the standard library ++# 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 $(STDCPPLIBS) ++ ++# specify additional paths to directories following the standard ++# libXXX.so or libXXX.a naming scheme. You can specify full paths ++# or paths relative to the makefile. The paths included may not ++# be recursive, so include all of the paths where libraries can ++# be found. Directories where source files are found are ++# automatically included. ++LIBPATHS= ++ ++# additional paths to look for system headers ++# thes use the form: #include
++# source file directories are NOT auto-included here ++SYSTEM_INCLUDE_PATHS = ++ ++# additional paths to look for local headers ++# thes use the form: #include "header" ++# source file directories are automatically included ++LOCAL_INCLUDE_PATHS = ++ ++# specify the level of optimization that you desire ++# NONE, SOME, FULL ++OPTIMIZE= ++ ++# specify any preprocessor symbols to be defined. The symbols will not ++# have their values set automatically; you must supply the value (if any) ++# to use. For example, setting DEFINES to "DEBUG=1" will cause the ++# compiler option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" ++# would pass "-DDEBUG" on the compiler's command line. ++DEFINES= ++ ++# specify special warning levels ++# if unspecified default warnings will be used ++# NONE = supress all warnings ++# ALL = enable all warnings ++WARNINGS = ++ ++# specify whether image symbols will be created ++# so that stack crawls in the debugger are meaningful ++# if TRUE symbols will be created ++SYMBOLS = ++ ++# specify debug settings ++# if TRUE will allow application to be run from a source-level ++# debugger. Note that this will disable all optimzation. ++DEBUGGER = ++ ++# specify additional compiler flags for all files ++COMPILER_FLAGS = ++ ++# specify additional linker flags ++LINKER_FLAGS = ++ ++# specify the version of this particular item ++# (for example, -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL") ++# This may also be specified in a resource. ++APP_VERSION = ++ ++# (for TYPE == DRIVER only) Specify desired location of driver in the /dev ++# hierarchy. Used by the driverinstall rule. E.g., DRIVER_PATH = video/usb will ++# instruct the driverinstall rule to place a symlink to your driver's binary in ++# ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will appear at ++# /dev/video/usb when loaded. Default is "misc". ++DRIVER_PATH = ++ ++## include the makefile-engine ++include $(BUILDHOME)/etc/makefile-engine +-- +1.8.3.4 + diff --git a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe new file mode 100644 index 000000000..5a0e80f7e --- /dev/null +++ b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe @@ -0,0 +1,54 @@ +SUMMARY="A random symbol sequence generator" +DESCRIPTION=" + Randomizer is a random symbol sequence generator. You can create + sequences of any given length, and control what characters are used. + + This program can be used for many purposes, such as for generating + random passwords or random numbers. + " +HOMEPAGE="https://code.google.com/p/randomizer/" +SRC_URI="svn+http://randomizer.googlecode.com/svn/trunk/@r12" +LICENSE="MIT" +COPYRIGHT="2005-2009 Sergey S. Kazenyuk" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + randomizer = $portVersion + app:randomizer = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:gcc + makefile_engine + cmd:make + cmd:mkdepend + " + +PATCHES=" + randomizer-1.0.0b1.patch + " + +SRC_FILENAME="download" + +BUILD() +{ + cd src + make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + cd src + architecture=${buildArchitecture/_/-} + mkdir -p $appsDir + cp objects.$architecture-release/Randomizer $appsDir + addAppDeskbarSymlink $appsDir/Randomizer +} From 677d745877ae503bffceee8c090d52ffb41c0066 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sat, 7 Dec 2013 08:10:53 -0500 Subject: [PATCH 003/306] Build Randomizer in current directory --- .../randomizer/patches/randomizer-1.0.0b1.patch | 14 ++++++++------ haiku-apps/randomizer/randomizer-1.0.0b1.recipe | 4 +--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch b/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch index 5c939d24a..0951e990f 100644 --- a/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch +++ b/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch @@ -1,19 +1,19 @@ -From f826308b984f415dce6680aad5e15e6a1795f7f3 Mon Sep 17 00:00:00 2001 +From 24da7eed9c8cd793d4f873100584b70ea11d4458 Mon Sep 17 00:00:00 2001 From: Luke -Date: Fri, 6 Dec 2013 00:19:26 +0000 +Date: Sat, 7 Dec 2013 13:04:48 +0000 Subject: [PATCH] Add makefile --- - src/makefile | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 126 insertions(+) + src/makefile | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 128 insertions(+) create mode 100644 src/makefile diff --git a/src/makefile b/src/makefile new file mode 100644 -index 0000000..18dfc48 +index 0000000..c6df5ad --- /dev/null +++ b/src/makefile -@@ -0,0 +1,126 @@ +@@ -0,0 +1,128 @@ +## BeOS Generic Makefile v2.3 ## + +## Fill in this file to specify the project being created, and the referenced @@ -138,6 +138,8 @@ index 0000000..18dfc48 +# /dev/video/usb when loaded. Default is "misc". +DRIVER_PATH = + ++TARGET_DIR = . ++ +## include the makefile-engine +include $(BUILDHOME)/etc/makefile-engine -- diff --git a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe index 5a0e80f7e..544b91c46 100644 --- a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe +++ b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe @@ -46,9 +46,7 @@ BUILD() INSTALL() { - cd src - architecture=${buildArchitecture/_/-} mkdir -p $appsDir - cp objects.$architecture-release/Randomizer $appsDir + cp src/Randomizer $appsDir addAppDeskbarSymlink $appsDir/Randomizer } 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 004/306] 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 005/306] 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 006/306] 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 007/306] 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 008/306] 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 009/306] 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 010/306] 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 011/306] 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 012/306] 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 aaf85ed5902beaef180f6cee11629fdc90abd2df Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Thu, 12 Dec 2013 22:16:10 +0000 Subject: [PATCH 013/306] 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 014/306] 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 886f0073429fd3150ee11d02c14247d928cb8846 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 13 Dec 2013 14:36:35 +0000 Subject: [PATCH 015/306] 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 016/306] 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 de3688e783a1e314dce0b5fdb681257f66a3af74 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 13 Dec 2013 16:01:36 +0000 Subject: [PATCH 017/306] 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 8cbb56d2095b65665cd0f3d17af17c82a33f671e Mon Sep 17 00:00:00 2001 From: noryb009 Date: Fri, 13 Dec 2013 19:37:04 -0500 Subject: [PATCH 018/306] 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 b44b238d95ab58dc88f5fc0c431c6128ee2eb158 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 14 Dec 2013 10:35:10 +0000 Subject: [PATCH 019/306] 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 020/306] 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 021/306] 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 b7b41c7c00f81da5bec062be5479ff74d41db382 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sat, 14 Dec 2013 12:16:20 +0000 Subject: [PATCH 022/306] MinimizeAll: ln -> symlinkRelative, removed error about dir existing --- haiku-apps/minimizeall/minimizeall-1.0.0.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe index 58bb1f9d8..9d7ddc1bd 100644 --- a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe +++ b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe @@ -40,7 +40,7 @@ BUILD_REQUIRES=" BUILD() { cd trunk - mkdir bin || true + mkdir -p bin # Step 1 - Building the app cd app @@ -67,5 +67,6 @@ INSTALL() cp trunk/bin/DeskbarAddOn $appsDir/MinimizeAll/DeskbarAddOn addAppDeskbarSymlink $appsDir/MinimizeAll/MinimizeAll mkdir -p "$dataDir/deskbar/menu/Desktop applets" - ln -s $appsDir/MinimizeAll/DeskbarAddOn "$dataDir/deskbar/menu/Desktop applets/MinimizeAll" + symlinkRelative -s "$appsDir/MinimizeAll/DeskbarAddOn" \ + "$dataDir/deskbar/menu/Desktop applets/MinimizeAll" } 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 023/306] 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 024/306] 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 025/306] 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 026/306] 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 027/306] 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 028/306] 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 029/306] 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 030/306] 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 031/306] 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 032/306] 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 033/306] 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 034/306] 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 035/306] 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 036/306] 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 037/306] 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 038/306] 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 039/306] 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 040/306] 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 041/306] 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 042/306] 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 043/306] 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 044/306] 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 045/306] 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 046/306] 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 047/306] 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 048/306] 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 049/306] 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 050/306] 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 051/306] 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 052/306] 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 053/306] 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 054/306] 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 055/306] 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 056/306] 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 057/306] 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 058/306] 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 059/306] 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 060/306] 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 061/306] 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 062/306] 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 063/306] 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 064/306] 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 8cd0e1d77a65b2ba724e32775bc3c46cd70eec5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 18 Dec 2013 22:43:38 +0000 Subject: [PATCH 065/306] Boost 1.55 First recipe --- dev-libs/boost/boost-1.55.0.recipe | 185 ++++++++++++++++++++++++++--- 1 file changed, 167 insertions(+), 18 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 3269e6f00..03723af63 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -16,6 +16,7 @@ ARCHITECTURES="?x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86" SOURCE_DIR="boost_1_55_0" PATCHES="boost-1.55.0.patch" +DISABLE_SOURCE_PACKAGE=yes PROVIDES=" lib:boost = 1.55.0 @@ -33,38 +34,43 @@ BUILD_PREREQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libiconv + devel:libbz2 + devel:libz " REQUIRES=" lib:libiconv + lib:libbz2 + lib:libz " BUILD() { ./bootstrap.sh \ --without-icu \ - --prefix=`finddir B_SYSTEM_DIRECTORY` \ - --exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \ - --libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \ - #--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` + --prefix=$prefix \ + --exec-prefix=$binDir \ + --libdir=$libDir \ + --includedir=$includeDir ./bjam \ - -sICU_PATH=`finddir B_SYSTEM_DIRECTORY` \ - -sICONV_PATH=`finddir B_SYSTEM_DIRECTORY` \ + -sICU_PATH=$prefix \ + -sICONV_PATH=$prefix \ -d2 \ --without-mpi \ - --prefix=`finddir B_SYSTEM_DIRECTORY` \ - --exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \ - --libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \ - #--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` \ + --prefix=$prefix \ + --exec-prefix=$binDir \ + --libdir=$libDir \ + --includedir=$includeDir \ --enable-threads=posix \ --enable-thread-local-alloc \ - --enable-parallel-mark \ + --enable-parallel-mark \ inlining=on \ - linkflags=-L`finddir B_SYSTEM_LIB_DIRECTORY` \ + linkflags=-L$libDir \ threading=multi \ variant=release \ link=shared \ runtime-link=shared + --without-python } INSTALL() @@ -72,17 +78,160 @@ INSTALL() ./bjam install \ -d2 \ --prefix=$prefix \ - #--exec-prefix=${DESTDIR}/`finddir B_SYSTEM_BIN_DIRECTORY` \ - #--libdir=${DESTDIR}/`finddir B_SYSTEM_LIB_DIRECTORY` \ - #--includedir=${DESTDIR}/`finddir B_SYSTEM_HEADERS_DIRECTORY` \ + --exec-prefix=$binDir \ + --libdir=$libDir \ + --includedir=$includeDir \ inlining=on \ - --without-mpi + --without-mpi \ + --without-python + + packageEntries devel $includeDir + packageEntries atomic $libDir/*atomic* + packageEntries chrono $libDir/*chrono* + packageEntries date_time $libDir/*date_time* + packageEntries exception $libDir/*exception* + packageEntries filesystem $libDir/*filesystem* + packageEntries graph $libDir/*graph* + packageEntries iostreams $libDir/*iostreams* + packageEntries locale $libDir/*locale* + packageEntries log $libDir/*log* + packageEntries math $libDir/*math* + packageEntries program_options $libDir/*program_options* + packageEntries random $libDir/*random* + packageEntries regex $libDir/*regex* + packageEntries serialization $libDir/*serialization* + packageEntries signals $libDir/*signals* + packageEntries system $libDir/*system* + packageEntries test $libDir/*test* + packageEntries thread $libDir/*thread* + packageEntries timer $libDir/*timer* + packageEntries wave $libDir/*wave* } PROVIDES_devel=" - boost${secondaryArchSuffix} = $portVersion + boost_devel$secondaryArchSuffix = $portVersion " REQUIRES_devel=" - boost${secondaryArchSuffix} == $portVersion base + haiku$secondaryArchSuffix >= $haikuVersion " +PROVIDES_atomic=" + boost_atomic$secondaryArchSuffix = $portVersion +" +REQUIRES_atomic=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_chrono=" + boost_chrono$secondaryArchSuffix = $portVersion +" +REQUIRES_chrono=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_date_time=" + boost_date_time$secondaryArchSuffix = $portVersion +" +REQUIRES_date_time=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_exception=" + boost_exception$secondaryArchSuffix = $portVersion +" +REQUIRES_exception=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_filesystem=" + boost_filesystem$secondaryArchSuffix = $portVersion +" +REQUIRES_filesystem=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_graph=" + boost_graph$secondaryArchSuffix = $portVersion +" +REQUIRES_graph=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_iostreams=" + boost_iostreams$secondaryArchSuffix = $portVersion +" +REQUIRES_iostreams=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_locale=" + boost_locale$secondaryArchSuffix = $portVersion +" +REQUIRES_locale=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_log=" + boost_log$secondaryArchSuffix = $portVersion +" +REQUIRES_log=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_math=" + boost_math$secondaryArchSuffix = $portVersion +" +REQUIRES_math=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_program_options=" + boost_program_options$secondaryArchSuffix = $portVersion +" +REQUIRES_program_options=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_random=" + boost_random$secondaryArchSuffix = $portVersion +" +REQUIRES_random=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_regex=" + boost_regex$secondaryArchSuffix = $portVersion +" +REQUIRES_regex=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_serialization=" + boost_serialization$secondaryArchSuffix = $portVersion +" +REQUIRES_serialization=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_signals=" + boost_signals$secondaryArchSuffix = $portVersion +" +REQUIRES_signals=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_system=" + boost_system$secondaryArchSuffix = $portVersion +" +REQUIRES_system=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_test=" + boost_test$secondaryArchSuffix = $portVersion +" +REQUIRES_test=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_thread=" + boost_thread$secondaryArchSuffix = $portVersion +" +REQUIRES_thread=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_timer=" + boost_timer$secondaryArchSuffix = $portVersion +" +REQUIRES_timer=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_wave=" + boost_wave$secondaryArchSuffix = $portVersion +" +REQUIRES_wave=" + haiku$secondaryArchSuffix >= $haikuVersion +" From 75b9915aa3dab2bbc6f5696256ee601ac10124bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 18 Dec 2013 23:08:38 +0000 Subject: [PATCH 066/306] Fixed dependencies --- dev-libs/boost/boost-1.55.0.recipe | 172 ++++++++++++++++++----------- 1 file changed, 106 insertions(+), 66 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 03723af63..a60c44c22 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -69,8 +69,9 @@ BUILD() threading=multi \ variant=release \ link=shared \ - runtime-link=shared - --without-python + runtime-link=shared \ + --without-python \ + --disable-icu } INSTALL() @@ -111,127 +112,166 @@ INSTALL() PROVIDES_devel=" boost_devel$secondaryArchSuffix = $portVersion " - -REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion - " PROVIDES_atomic=" boost_atomic$secondaryArchSuffix = $portVersion " -REQUIRES_atomic=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_chrono=" boost_chrono$secondaryArchSuffix = $portVersion " -REQUIRES_chrono=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_date_time=" boost_date_time$secondaryArchSuffix = $portVersion " -REQUIRES_date_time=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_exception=" boost_exception$secondaryArchSuffix = $portVersion " -REQUIRES_exception=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_filesystem=" boost_filesystem$secondaryArchSuffix = $portVersion " -REQUIRES_filesystem=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_graph=" boost_graph$secondaryArchSuffix = $portVersion " -REQUIRES_graph=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_iostreams=" boost_iostreams$secondaryArchSuffix = $portVersion " -REQUIRES_iostreams=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_locale=" boost_locale$secondaryArchSuffix = $portVersion " -REQUIRES_locale=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_log=" boost_log$secondaryArchSuffix = $portVersion " -REQUIRES_log=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_math=" boost_math$secondaryArchSuffix = $portVersion " -REQUIRES_math=" - haiku$secondaryArchSuffix >= $haikuVersion +PROVIDES_random=" + boost_random$secondaryArchSuffix = $portVersion " PROVIDES_program_options=" boost_program_options$secondaryArchSuffix = $portVersion " -REQUIRES_program_options=" - haiku$secondaryArchSuffix >= $haikuVersion -" -PROVIDES_random=" - boost_random$secondaryArchSuffix = $portVersion -" -REQUIRES_random=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_regex=" boost_regex$secondaryArchSuffix = $portVersion " -REQUIRES_regex=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_serialization=" boost_serialization$secondaryArchSuffix = $portVersion " -REQUIRES_serialization=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_signals=" boost_signals$secondaryArchSuffix = $portVersion " -REQUIRES_signals=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_system=" boost_system$secondaryArchSuffix = $portVersion " -REQUIRES_system=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_test=" boost_test$secondaryArchSuffix = $portVersion " -REQUIRES_test=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_thread=" boost_thread$secondaryArchSuffix = $portVersion " -REQUIRES_thread=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_timer=" boost_timer$secondaryArchSuffix = $portVersion " -REQUIRES_timer=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_wave=" boost_wave$secondaryArchSuffix = $portVersion " -REQUIRES_wave=" + +REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +REQUIRES_atomic=" haiku$secondaryArchSuffix >= $haikuVersion " + +REQUIRES_chrono=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_system$secondaryArchSuffix = $portVersion +" + +REQUIRES_date_time=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_exception=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_filesystem=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_system$secondaryArchSuffix = $portVersion +" + +REQUIRES_graph=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_regex$secondaryArchSuffix = $portVersion +" + +REQUIRES_iostreams=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_locale=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_chrono$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix = $portVersion + boost_thread$secondaryArchSuffix = $portVersion +" + +REQUIRES_log=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_chrono$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix = $portVersion + boost_date_time$secondaryArchSuffix = $portVersion + boost_thread$secondaryArchSuffix = $portVersion +" + +REQUIRES_math=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_program_options=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_random=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_regex=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_serialization=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_signals=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_system=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_test=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_thread=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_system$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix = $portVersion +" + +REQUIRES_timer=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_chrono$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix = $portVersion +" + +REQUIRES_wave=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_chrono$secondaryArchSuffix = $portVersion + boost_date_time$secondaryArchSuffix = $portVersion + boost_filesystem$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix = $portVersion + boost_thread$secondaryArchSuffix = $portVersion +" From 4a486704d8337bf59ddbaf424724a30018ddad1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 00:07:34 +0000 Subject: [PATCH 067/306] Fixed dependecies equals --- dev-libs/boost/boost-1.55.0.recipe | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index a60c44c22..0537980f5 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -183,7 +183,7 @@ REQUIRES_atomic=" REQUIRES_chrono=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix == $portVersion " REQUIRES_date_time=" @@ -196,12 +196,12 @@ REQUIRES_exception=" REQUIRES_filesystem=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix == $portVersion " REQUIRES_graph=" haiku$secondaryArchSuffix >= $haikuVersion - boost_regex$secondaryArchSuffix = $portVersion + boost_regex$secondaryArchSuffix == $portVersion " REQUIRES_iostreams=" @@ -210,17 +210,17 @@ REQUIRES_iostreams=" REQUIRES_locale=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix = $portVersion - boost_system$secondaryArchSuffix = $portVersion - boost_thread$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_thread$secondaryArchSuffix == $portVersion " REQUIRES_log=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix = $portVersion - boost_system$secondaryArchSuffix = $portVersion - boost_date_time$secondaryArchSuffix = $portVersion - boost_thread$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_date_time$secondaryArchSuffix == $portVersion + boost_thread$secondaryArchSuffix == $portVersion " REQUIRES_math=" @@ -257,21 +257,21 @@ REQUIRES_test=" REQUIRES_thread=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix = $portVersion - boost_chrono$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_chrono$secondaryArchSuffix == $portVersion " REQUIRES_timer=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix = $portVersion - boost_system$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion " REQUIRES_wave=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix = $portVersion - boost_date_time$secondaryArchSuffix = $portVersion - boost_filesystem$secondaryArchSuffix = $portVersion - boost_system$secondaryArchSuffix = $portVersion - boost_thread$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_date_time$secondaryArchSuffix == $portVersion + boost_filesystem$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_thread$secondaryArchSuffix == $portVersion " From 1cc9bfe6f60692ecfad837a495cde021b132f56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 01:10:38 +0000 Subject: [PATCH 068/306] TypeTraits patch --- dev-libs/boost/boost-1.55.0.recipe | 5 ++++- dev-libs/boost/patches/type_traits.patch | 26 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 dev-libs/boost/patches/type_traits.patch diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 0537980f5..d03754488 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -15,7 +15,10 @@ 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" +PATCHES=" + boost-1.55.0.patch + type_traits.patch +" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch new file mode 100644 index 000000000..a2c26785d --- /dev/null +++ b/dev-libs/boost/patches/type_traits.patch @@ -0,0 +1,26 @@ +diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp +index 1b15c7e..e953f00 100644 +--- a/boost/config/platform/haiku.hpp ++++ b/boost/config/platform/haiku.hpp +@@ -10,13 +10,21 @@ + #define BOOST_PLATFORM "Haiku" + + #define BOOST_NO_INTRINSIC_WCHAR_T ++#define BOOST_NO_STD_WSTRING + #define BOOST_HAS_UNISTD_H ++#define BOOST_EXCEPTION_DISABLE ++#define BOOST_NO_EXCEPTIONS ++#define BOOST_NO_AUTO_PTR ++#define GLIBC_HAVE_LONG_LONG + + #define BOOST_HAS_BETHREADS + + #ifndef BOOST_DISABLE_THREADS + # define BOOST_HAS_THREADS + #endif ++#define BOOST_NO_CXX11_HDR_TYPE_TRAITS ++#define BOOST_NO_CXX11_ATOMIC_SMART_PTR ++ + + // + // thread API's not auto detected: From 7040721b486f2448311fbea9a6520c595228d6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 01:24:34 +0000 Subject: [PATCH 069/306] Context package --- dev-libs/boost/boost-1.55.0.recipe | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index d03754488..d132ceaaf 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -92,6 +92,7 @@ INSTALL() packageEntries devel $includeDir packageEntries atomic $libDir/*atomic* packageEntries chrono $libDir/*chrono* + packageEntries context $libDir/*context* packageEntries date_time $libDir/*date_time* packageEntries exception $libDir/*exception* packageEntries filesystem $libDir/*filesystem* @@ -121,6 +122,9 @@ PROVIDES_atomic=" PROVIDES_chrono=" boost_chrono$secondaryArchSuffix = $portVersion " +PROVIDES_context=" + boost_context$secondaryArchSuffix = $portVersion +" PROVIDES_date_time=" boost_date_time$secondaryArchSuffix = $portVersion " @@ -189,6 +193,10 @@ REQUIRES_chrono=" boost_system$secondaryArchSuffix == $portVersion " +REQUIRES_context=" + haiku$secondaryArchSuffix >= $haikuVersion +" + REQUIRES_date_time=" haiku$secondaryArchSuffix >= $haikuVersion " From ad64fd97bcb9f9d8ad6b0727a7a413320b098a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 01:39:49 +0000 Subject: [PATCH 070/306] Pacthes modified --- dev-libs/boost/patches/type_traits.patch | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch index a2c26785d..e1c12c434 100644 --- a/dev-libs/boost/patches/type_traits.patch +++ b/dev-libs/boost/patches/type_traits.patch @@ -1,17 +1,14 @@ diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp -index 1b15c7e..e953f00 100644 +index 1b15c7e..c1b8e74 100644 --- a/boost/config/platform/haiku.hpp +++ b/boost/config/platform/haiku.hpp -@@ -10,13 +10,21 @@ - #define BOOST_PLATFORM "Haiku" +@@ -11,12 +11,18 @@ #define BOOST_NO_INTRINSIC_WCHAR_T -+#define BOOST_NO_STD_WSTRING #define BOOST_HAS_UNISTD_H -+#define BOOST_EXCEPTION_DISABLE -+#define BOOST_NO_EXCEPTIONS +#define BOOST_NO_AUTO_PTR +#define GLIBC_HAVE_LONG_LONG ++#define BOOST_HAS_STDINT_H #define BOOST_HAS_BETHREADS From 119fc87aec8b083ca29fd76b0f68006e81120871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 01:51:47 +0000 Subject: [PATCH 071/306] Try to fix boost::thread --- dev-libs/boost/patches/type_traits.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch index e1c12c434..0da167cce 100644 --- a/dev-libs/boost/patches/type_traits.patch +++ b/dev-libs/boost/patches/type_traits.patch @@ -1,14 +1,15 @@ diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp -index 1b15c7e..c1b8e74 100644 +index 1b15c7e..a0bfb8c 100644 --- a/boost/config/platform/haiku.hpp +++ b/boost/config/platform/haiku.hpp -@@ -11,12 +11,18 @@ +@@ -11,12 +11,19 @@ #define BOOST_NO_INTRINSIC_WCHAR_T #define BOOST_HAS_UNISTD_H +#define BOOST_NO_AUTO_PTR +#define GLIBC_HAVE_LONG_LONG +#define BOOST_HAS_STDINT_H ++#define BOOST_NOT_STD_WSTRING #define BOOST_HAS_BETHREADS From 03bcd41e3d02d5000de72e4243137c5f63e49474 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Wed, 18 Dec 2013 20:56:13 -0500 Subject: [PATCH 072/306] 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 073/306] 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 074/306] 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 075/306] 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 076/306] 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 077/306] 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 078/306] 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 079/306] 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 080/306] 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 081/306] 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 082/306] 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 083/306] 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 084/306] 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 085/306] 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 086/306] 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 087/306] 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 088/306] 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 089/306] 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 090/306] 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 091/306] 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 092/306] 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 093/306] 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 094/306] 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 095/306] 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 096/306] 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 93aa86c4d351fff52a68f63a6232e93a69534bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 06:12:30 +0000 Subject: [PATCH 097/306] Pacthed finished --- dev-libs/boost/patches/type_traits.patch | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch index 0da167cce..02b4a07cb 100644 --- a/dev-libs/boost/patches/type_traits.patch +++ b/dev-libs/boost/patches/type_traits.patch @@ -1,15 +1,19 @@ diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp -index 1b15c7e..a0bfb8c 100644 +index 1b15c7e..9a3becd 100644 --- a/boost/config/platform/haiku.hpp +++ b/boost/config/platform/haiku.hpp -@@ -11,12 +11,19 @@ +@@ -9,18 +9,29 @@ - #define BOOST_NO_INTRINSIC_WCHAR_T + #define BOOST_PLATFORM "Haiku" + +-#define BOOST_NO_INTRINSIC_WCHAR_T ++//#define BOOST_NO_INTRINSIC_WCHAR_T #define BOOST_HAS_UNISTD_H +#define BOOST_NO_AUTO_PTR +#define GLIBC_HAVE_LONG_LONG +#define BOOST_HAS_STDINT_H -+#define BOOST_NOT_STD_WSTRING ++//#define BOOST_NOT_STD_WSTRING ++#define BOOST_HASH_NO_EXTENSIONS #define BOOST_HAS_BETHREADS @@ -18,7 +22,14 @@ index 1b15c7e..a0bfb8c 100644 #endif +#define BOOST_NO_CXX11_HDR_TYPE_TRAITS +#define BOOST_NO_CXX11_ATOMIC_SMART_PTR -+ ++#define BOOST_NO_CXX11_STATIC_ASSERT ++#define BOOST_NO_CXX11_VARIADIC_MACROS // // thread API's not auto detected: + // ++#define BOOST_HAS_SCHED_YIELD ++#define BOOST_HAS_PTHREAD_YIELD + #define BOOST_HAS_GETTIMEOFDAY + + // boilerplate code: From 6374b32d8efab0280a5dbbf9384d383d30d1dd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 06:19:24 +0000 Subject: [PATCH 098/306] Coroutine library --- dev-libs/boost/boost-1.55.0.recipe | 157 +++++++++++++---------------- 1 file changed, 72 insertions(+), 85 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index d132ceaaf..a9663b525 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -93,6 +93,7 @@ INSTALL() packageEntries atomic $libDir/*atomic* packageEntries chrono $libDir/*chrono* packageEntries context $libDir/*context* + packageEntries coroutine $libDir/*coroutine* packageEntries date_time $libDir/*date_time* packageEntries exception $libDir/*exception* packageEntries filesystem $libDir/*filesystem* @@ -116,116 +117,80 @@ INSTALL() PROVIDES_devel=" boost_devel$secondaryArchSuffix = $portVersion " +REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion +" PROVIDES_atomic=" boost_atomic$secondaryArchSuffix = $portVersion " +REQUIRES_atomic=" + haiku$secondaryArchSuffix >= $haikuVersion +" PROVIDES_chrono=" boost_chrono$secondaryArchSuffix = $portVersion " -PROVIDES_context=" - boost_context$secondaryArchSuffix = $portVersion -" -PROVIDES_date_time=" - boost_date_time$secondaryArchSuffix = $portVersion -" -PROVIDES_exception=" - boost_exception$secondaryArchSuffix = $portVersion -" -PROVIDES_filesystem=" - boost_filesystem$secondaryArchSuffix = $portVersion -" -PROVIDES_graph=" - boost_graph$secondaryArchSuffix = $portVersion -" -PROVIDES_iostreams=" - boost_iostreams$secondaryArchSuffix = $portVersion -" -PROVIDES_locale=" - boost_locale$secondaryArchSuffix = $portVersion -" -PROVIDES_log=" - boost_log$secondaryArchSuffix = $portVersion -" -PROVIDES_math=" - boost_math$secondaryArchSuffix = $portVersion -" -PROVIDES_random=" - boost_random$secondaryArchSuffix = $portVersion -" -PROVIDES_program_options=" - boost_program_options$secondaryArchSuffix = $portVersion -" -PROVIDES_regex=" - boost_regex$secondaryArchSuffix = $portVersion -" -PROVIDES_serialization=" - boost_serialization$secondaryArchSuffix = $portVersion -" -PROVIDES_signals=" - boost_signals$secondaryArchSuffix = $portVersion -" -PROVIDES_system=" - boost_system$secondaryArchSuffix = $portVersion -" -PROVIDES_test=" - boost_test$secondaryArchSuffix = $portVersion -" -PROVIDES_thread=" - boost_thread$secondaryArchSuffix = $portVersion -" -PROVIDES_timer=" - boost_timer$secondaryArchSuffix = $portVersion -" -PROVIDES_wave=" - boost_wave$secondaryArchSuffix = $portVersion -" - -REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion - " - -REQUIRES_atomic=" - haiku$secondaryArchSuffix >= $haikuVersion -" - REQUIRES_chrono=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion " - +PROVIDES_context=" + boost_context$secondaryArchSuffix = $portVersion +" REQUIRES_context=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_coroutine=" + boost_coroutine$secondaryArchSuffix = $portVersion +" +REQUIRES_coroutine=" + boost_context$secondaryArchSuffix == $portVersion +" +PROVIDES_date_time=" + boost_date_time$secondaryArchSuffix = $portVersion +" REQUIRES_date_time=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_exception=" + boost_exception$secondaryArchSuffix = $portVersion +" REQUIRES_exception=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_filesystem=" + boost_filesystem$secondaryArchSuffix = $portVersion +" REQUIRES_filesystem=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion + lib:libz$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix +" +PROVIDES_graph=" + boost_graph$secondaryArchSuffix = $portVersion " - REQUIRES_graph=" haiku$secondaryArchSuffix >= $haikuVersion boost_regex$secondaryArchSuffix == $portVersion " - +PROVIDES_iostreams=" + boost_iostreams$secondaryArchSuffix = $portVersion +" REQUIRES_iostreams=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_locale=" + boost_locale$secondaryArchSuffix = $portVersion +" REQUIRES_locale=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion boost_thread$secondaryArchSuffix == $portVersion " - +PROVIDES_log=" + boost_log$secondaryArchSuffix = $portVersion +" REQUIRES_log=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion @@ -233,51 +198,73 @@ REQUIRES_log=" boost_date_time$secondaryArchSuffix == $portVersion boost_thread$secondaryArchSuffix == $portVersion " - +PROVIDES_math=" + boost_math$secondaryArchSuffix = $portVersion +" REQUIRES_math=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_program_options=" + boost_program_options$secondaryArchSuffix = $portVersion +" REQUIRES_program_options=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_random=" + boost_random$secondaryArchSuffix = $portVersion +" REQUIRES_random=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_regex=" + boost_regex$secondaryArchSuffix = $portVersion +" REQUIRES_regex=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_serialization=" + boost_serialization$secondaryArchSuffix = $portVersion +" REQUIRES_serialization=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_signals=" + boost_signals$secondaryArchSuffix = $portVersion +" REQUIRES_signals=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_system=" + boost_system$secondaryArchSuffix = $portVersion +" REQUIRES_system=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_test=" + boost_test$secondaryArchSuffix = $portVersion +" REQUIRES_test=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_thread=" + boost_thread$secondaryArchSuffix = $portVersion +" REQUIRES_thread=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion boost_chrono$secondaryArchSuffix == $portVersion " - +PROVIDES_timer=" + boost_timer$secondaryArchSuffix = $portVersion +" REQUIRES_timer=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion " - +PROVIDES_wave=" + boost_wave$secondaryArchSuffix = $portVersion +" REQUIRES_wave=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion From 62cbcc8576cefa1b35f0ba4acd736477133fec4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 06:49:26 +0000 Subject: [PATCH 099/306] Boost installation --- dev-libs/boost/boost-1.55.0.recipe | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index a9663b525..db56d6e75 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -33,6 +33,8 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:jam cmd:iconv + cmd:make + binutils " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion @@ -79,15 +81,21 @@ BUILD() INSTALL() { - ./bjam install \ - -d2 \ - --prefix=$prefix \ - --exec-prefix=$binDir \ - --libdir=$libDir \ - --includedir=$includeDir \ - inlining=on \ - --without-mpi \ - --without-python + #./bjam install \ + # -d2 \ + # --prefix=$prefix \ + # --exec-prefix=$binDir \ + # --libdir=$libDir \ + # --includedir=$includeDir \ + # inlining=on \ + # --without-mpi \ + # --without-python \ + # --disable-icu + mkdir -p $includeDir + mkdir -p $libDir + + cp -rf boost $includeDir + cp stage/lib/* $libDir packageEntries devel $includeDir packageEntries atomic $libDir/*atomic* From a5c1e1aa59220e637016c1b097d223100a05faed Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Thu, 19 Dec 2013 20:18:31 +0000 Subject: [PATCH 100/306] Added Muscle 6.00 recipe (currently builds only on GCC4) --- net-misc/muscle/muscle-6.00.recipe | 51 ++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 net-misc/muscle/muscle-6.00.recipe diff --git a/net-misc/muscle/muscle-6.00.recipe b/net-misc/muscle/muscle-6.00.recipe new file mode 100644 index 000000000..5edc6bb1a --- /dev/null +++ b/net-misc/muscle/muscle-6.00.recipe @@ -0,0 +1,51 @@ +DESCRIPTION="The MUSCLE system is a robust, somewhat scalable, cross-platform client-server solution for dynamic distributed applications for Haiku and other operating systems. + It allows (n) client programs (each of which may be running on a separate computer and/or under a different OS) to communicate with each other in a many-to-many message-passing style. + It employs a central server to which client programs may connect or disconnect at any time (this design is similar to other client-server systems such as Quake servers, IRC servers, and Napster servers, but more general in application). + In addition to the client-server system, MUSCLE contains classes to support peer-to-peer message streaming connections, as well as some handy miscellaneous utility classes." +SUMMARY="Robust, somewhat scalable, cross-platform client-server solution" +COPYRIGHT="2000-2009 Meyer Sound Laboratories Inc." +LICENSE="BSD (3-clause)" +HOMEPAGE="https://public.msli.com/lcs/muscle/index.html" +SRC_URI="https://public.msli.com/lcs/muscle/muscle6.00.zip" +CHECKSUM_MD5="06eda494fc9bd2fcf847939160be0e61" +REVISION="1" + +ARCHITECTURES="!x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" + +PROVIDES=" + muscle = $portVersion + cmd:muscled$secondaryArchSuffix = $portVersion + cmd:admin$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libz$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + +SOURCE_DIR="muscle" + +BUILD() +{ + cd server + make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + mkdir -p $binDir + + cd server + cp admin muscled $binDir +} From f37a1491f9a2955a51c5e1c444d65e1914ee7b85 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Thu, 19 Dec 2013 21:35:46 -0700 Subject: [PATCH 101/306] 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 102/306] 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 103/306] 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 5b8ac1a0f3135a46080aab66a41aa13760b9d7fc Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sat, 14 Dec 2013 21:44:20 -0500 Subject: [PATCH 104/306] Fix aalib recipe The non-devel package provided "aalib", while the devel package needed "libaa" --- media-libs/aalib/aalib-1.4rc4.recipe | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe index aade064cd..bcbcc4185 100644 --- a/media-libs/aalib/aalib-1.4rc4.recipe +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -36,11 +36,11 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:automake cmd:makeinfo -" + " PATCHES=" aalib-1.4rc4.patch -" + " BUILD() { @@ -68,7 +68,7 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - libaa${secondaryArchSuffix}_devel = $portVersion compat >= 1 + aalib${secondaryArchSuffix}_devel = $portVersion compat >= 1 cmd:aafire${secondaryArchSuffix} = $portVersion compat >= 1 cmd:aainfo${secondaryArchSuffix} = $portVersion compat >= 1 cmd:aalib_config${secondaryArchSuffix} = $portVersion compat >= 1 @@ -78,8 +78,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - libaa$secondaryArchSuffix == $portVersion base + aalib$secondaryArchSuffix == $portVersion base lib:libaa$secondaryArchSuffix >= 1.0.4 compat >= 1 - lib:libroot$secondaryArchSuffix >= $haikuVersion " From 9fca4531c594c8ce1ca6ba300b097f849c8191c2 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 20 Dec 2013 08:43:22 -0800 Subject: [PATCH 105/306] 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 106/306] 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 107/306] 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 108/306] 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 109/306] 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" From 67d6b061f151855f96c7b5e8ae1933466c47b403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 20 Dec 2013 18:38:59 +0000 Subject: [PATCH 110/306] Removed comments --- dev-libs/boost/boost-1.55.0.recipe | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index db56d6e75..74d270f35 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -19,7 +19,6 @@ PATCHES=" boost-1.55.0.patch type_traits.patch " -DISABLE_SOURCE_PACKAGE=yes PROVIDES=" lib:boost = 1.55.0 @@ -81,16 +80,6 @@ BUILD() INSTALL() { - #./bjam install \ - # -d2 \ - # --prefix=$prefix \ - # --exec-prefix=$binDir \ - # --libdir=$libDir \ - # --includedir=$includeDir \ - # inlining=on \ - # --without-mpi \ - # --without-python \ - # --disable-icu mkdir -p $includeDir mkdir -p $libDir From ba7b6295bddfe671568675f0caebeaaa6ef2a637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 20 Dec 2013 21:07:30 +0000 Subject: [PATCH 111/306] Changed architectures --- dev-libs/boost/boost-1.55.0.recipe | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 74d270f35..b1a2daff6 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -12,8 +12,11 @@ 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" +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 ?x86_64" SOURCE_DIR="boost_1_55_0" PATCHES=" boost-1.55.0.patch From 8e43a176778b7efe55dfd30e031290206269ef7c Mon Sep 17 00:00:00 2001 From: noryb009 Date: Fri, 20 Dec 2013 18:32:10 -0500 Subject: [PATCH 112/306] Clean up aalib recipe --- media-libs/aalib/aalib-1.4rc4.recipe | 39 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe index bcbcc4185..74bf61761 100644 --- a/media-libs/aalib/aalib-1.4rc4.recipe +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -1,14 +1,14 @@ SUMMARY="aalib is an ASCII rendering 2D library" DESCRIPTION="aalib is a software library which allows applications to automatically convert still and moving images into ASCII art. -" + " HOMEPAGE="http://aa-project.sourceforge.net/aalib/" SRC_URI="http://prdownloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz" SOURCE_DIR="aalib-1.4.0" CHECKSUM_MD5="d5aa8e9eae07b7441298b5c30490f6a6" REVISION="2" LICENSE="Public Domain" -COPYRIGHT="1997 by Jam Hubicka" +COPYRIGHT="1997 Jam Hubicka" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -16,26 +16,26 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" aalib$secondaryArchSuffix = $portVersion compat >= 1 lib:libaa$secondaryArchSuffix = 1.0.4 compat >= 1 -" - + " REQUIRES=" haiku >= $haikuVersion -" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion -" + " BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:libtoolize cmd:aclocal cmd:autoconf cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make cmd:makeinfo + cmd:ranlib " PATCHES=" @@ -61,24 +61,25 @@ INSTALL() # devel package packageEntries devel \ $binDir \ + $dataDir \ $developDir \ - $manDir/man3 + $documentationDir } # ----- devel package ------------------------------------------------------- PROVIDES_devel=" aalib${secondaryArchSuffix}_devel = $portVersion compat >= 1 - cmd:aafire${secondaryArchSuffix} = $portVersion compat >= 1 - cmd:aainfo${secondaryArchSuffix} = $portVersion compat >= 1 - cmd:aalib_config${secondaryArchSuffix} = $portVersion compat >= 1 - cmd:aasavefont${secondaryArchSuffix} = $portVersion compat >= 1 - cmd:aatest${secondaryArchSuffix} = $portVersion compat >= 1 + devel:aalib$secondaryArchSuffix = $portVersion compat >= 1 devel:libaa$secondaryArchSuffix = $portVersion compat >= 1 -" + cmd:aafire$secondaryArchSuffix = $portVersion compat >= 1 + cmd:aainfo$secondaryArchSuffix = $portVersion compat >= 1 + cmd:aalib_config$secondaryArchSuffix = $portVersion compat >= 1 + cmd:aasavefont$secondaryArchSuffix = $portVersion compat >= 1 + cmd:aatest$secondaryArchSuffix = $portVersion compat >= 1 + " REQUIRES_devel=" aalib$secondaryArchSuffix == $portVersion base - lib:libaa$secondaryArchSuffix >= 1.0.4 compat >= 1 -" + " From fb0ccdb1d99c458f152ea13deb7d0ded1d03bebf Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sat, 21 Dec 2013 11:11:30 +0100 Subject: [PATCH 113/306] Add recipe for youtube-dl. --- .../youtube_dl/youtube_dl-2013.12.20.recipe | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 net-misc/youtube_dl/youtube_dl-2013.12.20.recipe diff --git a/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe b/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe new file mode 100644 index 000000000..b9d5d7361 --- /dev/null +++ b/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe @@ -0,0 +1,56 @@ +SUMMARY="A command-line program to download videos from various sites." +DESCRIPTION=" + The program is usually invoked as youtube-dl followed by options + and the video URL. + Run 'youtube-dl --help' and get a summary of all options. + + Some YouTube videos are served using Adobe's proprietary RTMP + protocol, which imposes DRM restrictions and encrypts the + connection. youtube-dl is not able to download these videos by + itself. + " +HOMEPAGE="http://rg3.github.io/youtube-dl/index.html" +SRC_URI="https://yt-dl.org/downloads/2013.12.20/youtube-dl-2013.12.20.tar.gz" +CHECKSUM_MD5="be0cf52206f9ba3f5f841deec3ce3bde" +REVISION="1" +LICENSE="Public Domain" +COPYRIGHT="2006-2013 Ricardo Garcia Gonzalez" + +ARCHITECTURES="any" + +PROVIDES=" + youtube_dl = $portVersion + cmd:youtube_dl = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + cmd:python + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:make + cmd:zip + " + +SOURCE_DIR="youtube-dl" + +BUILD() +{ + true +} + +INSTALL() +{ + zip -q youtube-dl youtube_dl/*.py youtube_dl/*/*.py + zip -q -j youtube-dl youtube_dl/__main__.py + echo '#!/bin/python' > youtube-dl + cat youtube-dl.zip >> youtube-dl + rm youtube-dl.zip + chmod a+x youtube-dl + + mkdir -p $binDir $manDir/man1 + cp -a youtube-dl $binDir + cp -a youtube-dl.1 $manDir/man1 +} From 54d1cf8641a3ea0bce857046692b8b53aa9f38d1 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 02:37:13 -0800 Subject: [PATCH 114/306] Fixed lcms on x86 --- media-libs/lcms/lcms-2.5.recipe | 45 ++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/media-libs/lcms/lcms-2.5.recipe b/media-libs/lcms/lcms-2.5.recipe index f8874d21a..6bde06ecd 100644 --- a/media-libs/lcms/lcms-2.5.recipe +++ b/media-libs/lcms/lcms-2.5.recipe @@ -8,32 +8,35 @@ LICENSE="MIT" COPYRIGHT="2007 Marti Maria" ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - lcms = 2.5 compat >= 2 - lib:liblcms2 - cmd:jpgicc - cmd:linkicc - cmd:psicc - cmd:tificc - cmd:transicc + lcms$secondaryArchSuffix = 2.5 compat >= 2 + lib:liblcms2$secondaryArchSuffix + cmd:jpgicc$secondaryArchSuffix + cmd:linkicc$secondaryArchSuffix + cmd:psicc$secondaryArchSuffix + cmd:tificc$secondaryArchSuffix + cmd:transicc$secondaryArchSuffix " REQUIRES=" - haiku - lib:libjpeg - lib:libpng - lib:libtiff - lib:libz" + haiku >= $haikuVersion + lib:libjpeg$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " BUILD_REQUIRES=" - devel:libjpeg - devel:libpng - devel:libtiff - devel:libz" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " BUILD_PREREQUIRES=" - haiku_devel cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:libtoolize @@ -71,10 +74,10 @@ INSTALL() # ----- devel package --------------------------------------- PROVIDES_devel=" - lcms_devel = $portVersion - devel:lcms = 2.5 compat >= 2 - devel:liblcms2 = 2.0.1 compat >= 2 + lcms${secondaryArchSuffix}_devel = $portVersion + devel:lcms$secondaryArchSuffix = 2.5 compat >= 2 + devel:liblcms2$secondaryArchSuffix = 2.0.1 compat >= 2 " REQUIRES_devel=" - lcms == $portVersion base + lcms$secondaryArchSuffix == $portVersion base " From c53a8bdace6a483fcccf0d900690301668dc63aa Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 02:40:53 -0800 Subject: [PATCH 115/306] Moved haiku_devel to BUILD_REQUIRES in fluidsynth recipe. Runs into PTHREAD not found when running cmake. --- media-sound/fluidsynth/fluidsynth-1.1.6.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe index a48739939..de09af679 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe +++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe @@ -23,10 +23,10 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:cmake cmd:make cmd:gcc$secondaryArchSuffix From e760dedf497e33471161ceff9139fa1555e79576 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 02:43:17 -0800 Subject: [PATCH 116/306] Moved haiku_devel to BUILD_REQUIRES in fluidsynth recipe. Runs into PTHREAD not found when running cmake. --- media-sound/fluidsynth/fluidsynth-1.1.6.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe index de09af679..9ee32b4fa 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe +++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe @@ -7,8 +7,8 @@ LICENSE="GNU LGPL v2.1" COPYRIGHT="2007-2012 Josh Green, Pedro Lopez-Cabanillas, David Henningsson" REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES=" fluidsynth$secondaryArchSuffix = $portVersion From 06ffcf777c45a8c13fbd4e4f67153d00e9c7a98c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 02:57:58 -0800 Subject: [PATCH 117/306] Updated libart recipe for secondaryArchSuffix support --- .../libart_lgpl/libart_lgpl-2.3.21.recipe | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe index 40dfb8b7c..6f7fd5535 100644 --- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe +++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe @@ -7,20 +7,23 @@ REVISION="1" LICENSE="GNU LGPL v2.1" COPYRIGHT="2001-2010 Mathieu Lacage and Raph Levien" -ARCHITECTURES="x86 x86_gcc2" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - libart_lgpl= $portVersion - cmd:libart2_config = $portVersion compat >= 2 - lib:libart_lgpl_2 = 2.3.21 compat >= 2 - " + libart_lgpl$secondaryArchSuffix = $portVersion + lib:libart_lgpl_2$secondaryArchSuffix = 2.3.21 compat >= 2 + " + REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " + BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " + BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion cmd:aclocal cmd:autoreconf cmd:libtool @@ -28,6 +31,7 @@ BUILD_PREREQUIRES=" cmd:ld${secondaryArchSuffix} cmd:gcc${secondaryArchSuffix} " + BUILD() { libtoolize --force --copy --install @@ -45,15 +49,18 @@ INSTALL() # devel package packageEntries devel \ - $developDir + $developDir \ + $binDir } # ----- devel package PROVIDES_devel=" - libart_lgpl_2 = $portVersion - devel:libart_lgpl_2 = 2.3.21 compat >= 2 + libart_lgpl_2$secondaryArchSuffix = $portVersion + devel:libart_lgpl_2$secondaryArchSuffix = 2.3.21 compat >= 2 + cmd:libart2_config$secondaryArchSuffix = $portVersion compat >= 2 " + REQUIRES_devel=" - libart_lgpl_2 == $portVersion base + libart_lgpl_2$secondaryArchSuffix == $portVersion base " From 85dd49df72907c58c8c593459a4d685158dfa439 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sat, 21 Dec 2013 12:24:16 +0100 Subject: [PATCH 118/306] New recipe for newest UberTuber 0.9.8. Updated SRC_URI with newest UberTuber version. Patch not needed any more. Added youtube_dl to REQUIRES; no longer part of UberTuber. Removed unneeded commands from BUILD_PREREQUIRES. Slightly more elegant INSTALL(). --- haiku-apps/ubertuber/ubertuber-0.9.8.recipe | 63 +++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 haiku-apps/ubertuber/ubertuber-0.9.8.recipe diff --git a/haiku-apps/ubertuber/ubertuber-0.9.8.recipe b/haiku-apps/ubertuber/ubertuber-0.9.8.recipe new file mode 100644 index 000000000..09696f18b --- /dev/null +++ b/haiku-apps/ubertuber/ubertuber-0.9.8.recipe @@ -0,0 +1,63 @@ +SUMMARY="A tool to play back online videos in MediaPlayer" +DESCRIPTION=" + UberTuber grabs clips from various sites and opens them in your media + player while they're being downloaded. The Python script youtube-dl + downloads the video file to the temporary folder. + From there it is either played back while it gets downloaded or moved to + another location determined in a file dialog. + + UberTuber monitors the system clipboard for URLs pointing to the supported + websites and automatically inserts them into its URL text field. + + At this moment there is support for clips from: + + YouTube, Google video, MetaCafe, DailyMotion, Yahoo video, + Photobucket, DepositFiles, Vimeo.com, blip.tv, Facebook video + and Escapist magazine. + + It may also work on videos from other sites... + " +HOMEPAGE="http://sourceforge.net/projects/ubertuber/" +SRC_URI="git://git.code.sf.net/p/ubertuber/code#9d33e8525806a581ed5229b213e81be9ecd29252" +LICENSE="MIT" +COPYRIGHT="2013 Humdinger" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + ubertuber = $portVersion + app:ubertuber = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + cmd:youtube_dl + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + makefile_engine + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:make + " + +USER_SETTINGS_FILES="settings/UberTuber_settings" + +BUILD() +{ + make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + ARCH=$(echo $buildArchitecture | sed 's/_/-/g') + + ubertuberDir=$appsDir/UberTuber + mkdir -p $ubertuberDir + + cp -af objects.$ARCH-release/UberTuber $ubertuberDir + cp -af ReadMe.html $ubertuberDir + cp -r images $ubertuberDir + + addAppDeskbarSymlink $ubertuberDir/UberTuber +} \ No newline at end of file From c50f9398ee338d7db1120383911f5a21fe77601a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 03:25:01 -0800 Subject: [PATCH 119/306] Update jasper for proper secondaryArchSuffix support --- media-libs/jasper/jasper-1.900.1.recipe | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/media-libs/jasper/jasper-1.900.1.recipe b/media-libs/jasper/jasper-1.900.1.recipe index 9d521657a..780d42167 100644 --- a/media-libs/jasper/jasper-1.900.1.recipe +++ b/media-libs/jasper/jasper-1.900.1.recipe @@ -8,8 +8,8 @@ CHECKSUM_MD5="a342b2b4495b3e1394e161eb5d85d754" LICENSE="JasPer v2" COPYRIGHT="1999-2007 Michael D. Adams" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" jasper$secondaryArchSuffix = $portVersion compat >= 1.0.0 @@ -89,14 +89,13 @@ REQUIRES_devel=" if [ -z "$secondaryArchSuffix" ]; then SUMMARY_tools="The jasper tools" PROVIDES_tools=" - jasper_tools = $portVersion - cmd:imgcmp = $portVersion - cmd:imginfo = $portVersion - cmd:jasper = $portVersion - cmd:tmrdemo = $portVersion + jasper_tools$secondaryArchSuffix = $portVersion + cmd:imgcmp$secondaryArchSuffix = $portVersion + cmd:imginfo$secondaryArchSuffix = $portVersion + cmd:jasper$secondaryArchSuffix = $portVersion + cmd:tmrdemo$secondaryArchSuffix = $portVersion " REQUIRES_tools=" - haiku >= $haikuVersion - jasper == $portVersion base + jasper$secondaryArchSuffix == $portVersion base " -fi \ No newline at end of file +fi From 1b493dad3e42fb6a13749e2b6cc9f776ca0c6f7b Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 04:00:44 -0800 Subject: [PATCH 120/306] Added foldershaper, recipe by 2013 GCI student NumberNoid --- .../foldershaper/foldershaper-1.0.recipe | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 haiku-apps/foldershaper/foldershaper-1.0.recipe diff --git a/haiku-apps/foldershaper/foldershaper-1.0.recipe b/haiku-apps/foldershaper/foldershaper-1.0.recipe new file mode 100644 index 000000000..164d110b9 --- /dev/null +++ b/haiku-apps/foldershaper/foldershaper-1.0.recipe @@ -0,0 +1,47 @@ +SUMMARY="A tool to retro-fit looks and layout of existing folders" +DESCRIPTION="If you want your folders to have a certain icon, set of columns, backgrounds, pergaps even some default content, +FolderShaper lets you chnage all that in a snap. Create a perfect folder, add it as a foldershaper template, then drop your +folders on FolderShaper and select the template from the pop-up menu." +HOMEPAGE="https://github.com/HaikuArchives/FolderShaper" +SRC_URI="git://github.com/HaikuArchives/FolderShaper.git" +REVISION="1" +LICENSE="Public Domain" +COPYRIGHT="2005 Jonas Sundström" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + foldershaper = $portVersion + app:foldershaper = $portVersion + addon:foldershaper = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:make + cmd:mkdepend + " + +BUILD() +{ + cd Source + make +} + +INSTALL() +{ + cd Source + make install INSTALL_DIR=$appsDir/FolderShaper + mkdir -p $addOnsDir/Tracker + ln -s $appsDir/FolderShaper/FolderShaper $addOnsDir/Tracker + addAppDeskbarSymlink $appsDir/FolderShaper/FolderShaper "FolderShaper" + cp ../README $appsDir/FolderShaper/README +} From 102e3d98dc0e9bd663cfa3ec669c625b7d50e27f Mon Sep 17 00:00:00 2001 From: Mrowqa Date: Sat, 21 Dec 2013 14:51:02 +0100 Subject: [PATCH 121/306] Added recipe file for gloox library --- net-libs/gloox/gloox-1.0.9.recipe | 84 ++++++++++++++++++++++ net-libs/gloox/patches/gloox-1.0.9.patch | 90 ++++++++++++++++++++++++ 2 files changed, 174 insertions(+) create mode 100644 net-libs/gloox/gloox-1.0.9.recipe create mode 100644 net-libs/gloox/patches/gloox-1.0.9.patch diff --git a/net-libs/gloox/gloox-1.0.9.recipe b/net-libs/gloox/gloox-1.0.9.recipe new file mode 100644 index 000000000..97a93298b --- /dev/null +++ b/net-libs/gloox/gloox-1.0.9.recipe @@ -0,0 +1,84 @@ +DESCRIPTION=" + Rock-solid, full-featured Jabber/XMPP client library, written in clean + ANSI C++ + " +SUMMARY="Full-featured Jabber/XMPP client library, written in clean ANSI C++" +HOMEPAGE="http://camaya.net/gloox/" +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2012 Jakob Schröter" +SRC_URI="http://camaya.net/download/gloox-1.0.9.tar.bz2" +CHECKSUM_MD5="48fc9aa5210c2a1ce253751a4d38e19c" +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" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" +PATCHES="gloox-1.0.9.patch" + +PROVIDES=" + gloox$secondaryArchSuffix = $portVersion + lib:libgloox$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libssl$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libssl$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + openssl$secondaryArchSuffix + openssl${secondaryArchSuffix}_devel + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + " +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + runConfigure ./configure + make +} + +INSTALL() +{ + make install + + # prepare development lib links + prepareInstalledDevelLib libgloox + + # devel package + packageEntries devel $developDir +} + +TEST() +{ + make check +} + + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + gloox${secondaryArchSuffix}_devel = $portVersion + devel:gloox$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + gloox$secondaryArchSuffix == $portVersion base + " diff --git a/net-libs/gloox/patches/gloox-1.0.9.patch b/net-libs/gloox/patches/gloox-1.0.9.patch new file mode 100644 index 000000000..efa188d33 --- /dev/null +++ b/net-libs/gloox/patches/gloox-1.0.9.patch @@ -0,0 +1,90 @@ +diff --git a/configure.ac b/configure.ac +index 402c399..20555ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR(src/gloox.cpp) + AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + + dnl create a config.h file (Automake will add -DHAVE_CONFIG_H) +-AM_CONFIG_HEADER(config.h.unix) ++AC_CONFIG_HEADER(config.h.unix) + + AC_SUBST(VERSION) + +@@ -326,8 +326,8 @@ AC_MSG_RESULT($getaddrinfo) + + dnl Checks for header files. + AC_HEADER_STDC +-AC_CHECK_HEADERS(unistd.h strings.h errno.h arpa/nameser.h) +-AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)]) ++AC_CHECK_HEADERS(unistd.h wchar.h string.h cstring.h strings.h errno.h arpa/nameser.h) ++AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(network,setsockopt)]) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST +diff --git a/src/connectiontcpbase.cpp b/src/connectiontcpbase.cpp +index 2da70c0..b28f8e8 100644 +--- a/src/connectiontcpbase.cpp ++++ b/src/connectiontcpbase.cpp +@@ -10,7 +10,17 @@ + This software is distributed without any warranty. + */ + ++#if defined HAVE_STRING_H ++#include ++#endif ++ ++#if defined HAVE_WCHAR_H ++#include ++#endif + ++#if __GNUC__ > 3 ++#include ++#endif + + #include "gloox.h" + +diff --git a/src/connectiontcpserver.cpp b/src/connectiontcpserver.cpp +index 68c8f7b..236ce8e 100644 +--- a/src/connectiontcpserver.cpp ++++ b/src/connectiontcpserver.cpp +@@ -10,7 +10,17 @@ + This software is distributed without any warranty. + */ + ++#if defined HAVE_STRING_H ++#include ++#endif ++ ++#if defined HAVE_WCHAR_H ++#include ++#endif + ++#if __GNUC__ > 3 ++#include ++#endif + + #include "gloox.h" + +diff --git a/src/dns.cpp b/src/dns.cpp +index fd72c57..e03d99a 100644 +--- a/src/dns.cpp ++++ b/src/dns.cpp +@@ -10,6 +10,17 @@ + This software is distributed without any warranty. + */ + ++#if defined HAVE_STRING_H ++#include ++#endif ++ ++#if defined HAVE_WCHAR_H ++#include ++#endif ++ ++#if __GNUC__ > 3 ++#include ++#endif + + #include "config.h" + From 29397b17f3b1e9dab31903923552cabdc93c7703 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 21 Dec 2013 18:37:04 +0100 Subject: [PATCH 122/306] Add recipe for minicom. --- net-dialup/minicom/minicom-2.6.2.recipe | 61 +++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 net-dialup/minicom/minicom-2.6.2.recipe diff --git a/net-dialup/minicom/minicom-2.6.2.recipe b/net-dialup/minicom/minicom-2.6.2.recipe new file mode 100644 index 000000000..432353088 --- /dev/null +++ b/net-dialup/minicom/minicom-2.6.2.recipe @@ -0,0 +1,61 @@ +SUMMARY="Minicom is a menu driven communications program." +DESCRIPTION=" +Minicom is a menu driven communications program. +It emulates ANSI and VT102 terminals. +It has a dialing directory and auto zmodem download. +" +HOMEPAGE="https://alioth.debian.org/projects/minicom/" +SRC_URI="https://alioth.debian.org/frs/download.php/file/3869/minicom-2.6.2.tar.gz" +CHECKSUM_MD5="203c56c4b447f45e2301b0cc4e83da3c" +COPYRIGHT=" + 1991,1992,1993,1994,1995,1996 Miquel van Smoorenburg." +LICENSE="GNU GPL v2" +REVISION="1" +ARCHITECTURES="x86 x86_64" +SECONDARY_ARCHITECTURES="x86" +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 + +PROVIDES=" + minicom$secondaryArchSuffix = $portVersion + cmd:minicom$secondaryArchSuffix = $portVersion + cmd:xminicom$secondaryArchSuffix = $portVersion + cmd:ascii_xfr$secondaryArchSuffix = $portVersion + cmd:runscript$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libiconv$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix + " + +BUILD_REQUIRES=" + devel:libiconv$secondaryArchSuffix + devel:libncurses$secondaryArchSuffix +" + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + LOCKDIR=`finddir B_USER_SETTINGS_DIRECTORY`/serial + mkdir -p $LOCKDIR + CFLAGS="-DTIOCM_CAR=TIOCM_CD -lnetwork" runConfigure ./configure \ + --enable-lock-dir=$LOCKDIR + make $jobArgs +} + +INSTALL() +{ + make install +} From 0912e5c3271e88d035e3df1e6849eb7569ee9df9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 13:54:31 -0800 Subject: [PATCH 123/306] Disabled smpeg in sdl_mixer until proper fix is found --- media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 4 ++-- 1 file changed, 2 insertions(+), 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 af302a881..0102b2323 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -25,7 +25,7 @@ REQUIRES=" lib:libvorbis$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libmikmod$secondaryArchSuffix - lib:libsmpeg$secondaryArchSuffix +# lib:libsmpeg$secondaryArchSuffix " BUILD_REQUIRES=" @@ -37,7 +37,7 @@ BUILD_REQUIRES=" devel:libvorbis$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libmikmod$secondaryArchSuffix - devel:libsmpeg$secondaryArchSuffix +# devel:libsmpeg$secondaryArchSuffix " BUILD_PREREQUIRES=" From f32286b373d123109560b012ebbea8e5c2c52e36 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 15:52:44 -0800 Subject: [PATCH 124/306] Fixed fribidi on x86 --- dev-libs/fribidi/fribidi-0.19.5.recipe | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dev-libs/fribidi/fribidi-0.19.5.recipe b/dev-libs/fribidi/fribidi-0.19.5.recipe index 2e66680e7..350489585 100644 --- a/dev-libs/fribidi/fribidi-0.19.5.recipe +++ b/dev-libs/fribidi/fribidi-0.19.5.recipe @@ -11,19 +11,23 @@ COPYRIGHT="2004 Sharif FarsiWeb, Inc 1999,2000 Dov Grobgeld" ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - fribidi = $portVersion - cmd:fribidi = 0.19.5 compat >= 0.19 - lib:libfribidi = 0.3.4 compat >= 0 + fribidi$secondaryArchSuffix = $portVersion + cmd:fribidi$secondaryArchSuffix = 0.19.5 compat >= 0.19 + lib:libfribidi$secondaryArchSuffix = 0.3.4 compat >= 0 " + REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion " + BUILD_REQUIRES=" - " -BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf cmd:automake @@ -32,13 +36,14 @@ BUILD_PREREQUIRES=" cmd:libtoolize cmd:make " + PATCH() { sed -i 's/PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION/#/' configure.ac sed -i 's/FRIBIDI_USE_GLIB=1/FRIBIDI_USE_GLIB=0/' configure.ac sed -i 's/FRIBIDI_USE_GLIB=0)/#/' configure.ac - } + BUILD() { libtoolize --force --copy --install @@ -70,10 +75,11 @@ TEST() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - fribidi_devel = $portVersion - devel:libfribidi = 0.3.4 compat >= 0 - devel:fribidi = 0.19.5 compat >= 0.19 + fribidi${secondaryArchSuffix}_devel = $portVersion + devel:libfribidi$secondaryArchSuffix = 0.3.4 compat >= 0 + devel:fribidi$secondaryArchSuffix = 0.19.5 compat >= 0.19 " + REQUIRES_devel=" - fribidi == $portVersion base + fribidi$secondaryArchSuffix == $portVersion base " From b7c8cd4620d97a3dea4b615ca096d21a9a6b3955 Mon Sep 17 00:00:00 2001 From: Mrowqa Date: Sun, 22 Dec 2013 01:01:18 +0100 Subject: [PATCH 125/306] Recipe for gloox: corrected some details. --- net-libs/gloox/gloox-1.0.9.recipe | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net-libs/gloox/gloox-1.0.9.recipe b/net-libs/gloox/gloox-1.0.9.recipe index 97a93298b..9b124a8e1 100644 --- a/net-libs/gloox/gloox-1.0.9.recipe +++ b/net-libs/gloox/gloox-1.0.9.recipe @@ -36,9 +36,6 @@ BUILD_REQUIRES=" devel:libcrypto$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - openssl$secondaryArchSuffix - openssl${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:make cmd:libtoolize @@ -77,7 +74,7 @@ TEST() PROVIDES_devel=" gloox${secondaryArchSuffix}_devel = $portVersion - devel:gloox$secondaryArchSuffix = $portVersion + devel:libgloox$secondaryArchSuffix = $portVersion " REQUIRES_devel=" gloox$secondaryArchSuffix == $portVersion base From 0929d0b5f41410bf9d9ca4558a45c5088b34e5c8 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sat, 21 Dec 2013 19:38:37 -0500 Subject: [PATCH 126/306] Add aalibtranslator recipe --- .../aalibtranslator-0.0.1.recipe | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe diff --git a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe new file mode 100644 index 000000000..d9d540f8a --- /dev/null +++ b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe @@ -0,0 +1,45 @@ +SUMMARY="Save image files as ASCII text art" +DESCRIPTION=" + The AalibTranslator for Haiku allows you to save image files as + ASCII text art. + " +HOMEPAGE="https://github.com/noryb009/AalibTranslator/" +SRC_URI="git://github.com/noryb009/AalibTranslator.git#e69df6765106af986454611fa2c960e0ecdb1562" +LICENSE="MIT" +COPYRIGHT="2013 Luke (noryb009)" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + aalibtranslator = $portVersion + app:aalibtranslator = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libaa + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libaa + " +BUILD_PREREQUIRES=" + cmd:gcc + makefile_engine + cmd:make + cmd:mkdepend + " + +BUILD() +{ + make \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` \ + TARGET_DIR=. +} + +INSTALL() +{ + mkdir -p $addOnsDir/Translators + cp AALIBTranslator $addOnsDir/Translators +} From fa7769ee34516b87faa9379b689dda96779d958f Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sat, 21 Dec 2013 19:58:10 -0500 Subject: [PATCH 127/306] Add OptiPNG recipe --- media-gfx/optipng/optipng-0.7.4.recipe | 54 +++++++++++++++++++ media-gfx/optipng/patches/optipng-0.7.4.patch | 25 +++++++++ 2 files changed, 79 insertions(+) create mode 100644 media-gfx/optipng/optipng-0.7.4.recipe create mode 100644 media-gfx/optipng/patches/optipng-0.7.4.patch diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.4.recipe new file mode 100644 index 000000000..8f1d55968 --- /dev/null +++ b/media-gfx/optipng/optipng-0.7.4.recipe @@ -0,0 +1,54 @@ +SUMMARY="A PNG optimizer, making PNG files smaller" +DESCRIPTION=" + OptiPNG is a PNG optimizer, recompressing PNG files so they + become smaller, without losing any information. Additionally, + OptiPNG can convert other image formats, such as BMP, + GIF, PNM and TIFF, to PNG files. + " +HOMEPAGE="http://optipng.sourceforge.net/" +SRC_URI="http://prdownloads.sourceforge.net/optipng/optipng-0.7.4.tar.gz?download" +CHECKSUM_MD5="8853d89aaf859065e95dcdf98b6bed73" +LICENSE="Zlib" +COPYRIGHT="2001-2012 Cosmin Truta" +REVISION="1" +ARCHITECTURES="?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86" +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 + +PROVIDES=" + optipng$secondaryArchSuffix = $portVersion + cmd:optipng$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:ar + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:ranlib + " + +PATCHES=" + optipng-0.7.4.patch + " + +BUILD() +{ + ./configure -bindir=$binDir -mandir=$manDir + make +} + +INSTALL() +{ + make install +} diff --git a/media-gfx/optipng/patches/optipng-0.7.4.patch b/media-gfx/optipng/patches/optipng-0.7.4.patch new file mode 100644 index 000000000..8f27d354f --- /dev/null +++ b/media-gfx/optipng/patches/optipng-0.7.4.patch @@ -0,0 +1,25 @@ +From 8fc175d03be69e84940012866ffdfa0b7b6c865b Mon Sep 17 00:00:00 2001 +From: Luke +Date: Fri, 20 Dec 2013 17:11:40 +0000 +Subject: [PATCH] Remove reference to libm + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 5437b74..f7087fe 100755 +--- a/configure ++++ b/configure +@@ -305,7 +305,7 @@ sed_config=" + s#@ARFLAGS@#${ARFLAGS-cru}#g + s#@RANLIB@#${RANLIB-ranlib}#g + s#@LIBS@#${LIBS-}#g +- s#@LIBM@#${LIBM--lm}#g ++ s#@LIBM@#${LIBM-}#g + s#@LIBZ@#${LIBZ--lz}#g + s#@LIBPNG@#${LIBPNG--lpng}#g + s#@DIFF@#${DIFF-diff -b -u}#g +-- +1.8.3.4 + From 4ddaf46945e6e888a026bd7ae5f5318621a8709b Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 22 Dec 2013 03:43:18 -0800 Subject: [PATCH 128/306] Fixed smpeg on x86, at least it's symlinking to the right files now. --- media-libs/smpeg/smpeg-0.4.5.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 931784c7b..6509fb52a 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -60,7 +60,8 @@ INSTALL() { make install - prepareInstalledDevelLibs libsmpeg + prepareInstalledDevelLibs libsmpeg \ + libsmpeg-0.4 fixDevelopLibDirReferences $binDir/smpeg-config fixPkgconfig From 6293b2e658bbae371d3c53c015fb05185ff698f0 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 22 Dec 2013 03:47:31 -0800 Subject: [PATCH 129/306] WIP dix for sdl_mixer, but now back to undefined references trying to build playwave and platmus --- media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 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 0102b2323..8d565361d 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -13,7 +13,9 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" sdl_mixer$secondaryArchSuffix = $portVersion compat >= 1.2 lib:libSDL_mixer$secondaryArchSuffix = 1.2_0.12.0 compat >= 1.2_0 - lib:libSDL_mixer_1.2$secondaryArchSuffix = 0.12.0 compat >= 0 + lib:libSDL_mixer_1.2$secondaryArchSuffix = 0.12.0 compat >= 0 + cmd:playwave$secondaryArchSuffix + cmd:playmus$secondaryArchSuffix " REQUIRES=" @@ -25,7 +27,7 @@ REQUIRES=" lib:libvorbis$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libmikmod$secondaryArchSuffix -# lib:libsmpeg$secondaryArchSuffix + lib:libsmpeg$secondaryArchSuffix " BUILD_REQUIRES=" @@ -37,7 +39,7 @@ BUILD_REQUIRES=" devel:libvorbis$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libmikmod$secondaryArchSuffix -# devel:libsmpeg$secondaryArchSuffix + devel:libsmpeg$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -62,8 +64,9 @@ BUILD() libtoolize --force --copy --install aclocal --force --install -I acinclude autoconf - runConfigure ./configure - make + runConfigure ./configure \ + SMPEG_CONFIG=smpeg_config$secondaryArchSuffix + make $jobArgs } INSTALL() From b5003e601695f1e1290cafb9795a65be7a531680 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 22 Dec 2013 16:00:19 +0000 Subject: [PATCH 130/306] Add BlogPositive v0.2.0 recipe --- .../blogpositive/blogpositive-0.1.0.recipe | 4 +- .../blogpositive/blogpositive-0.2.0.recipe | 52 +++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 haiku-apps/blogpositive/blogpositive-0.2.0.recipe diff --git a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe index e5a35c0d8..d923b261d 100644 --- a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe @@ -6,12 +6,12 @@ DESCRIPTION=" " HOMEPAGE="http://blogpositive.puckipedia.com" SRC_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.1.0" -REVISION="1" +REVISION="2" LICENSE="MIT" COPYRIGHT="2013 :Puck Meerburg" -ARCHITECTURES="x86 x86_gcc2 ?x86_64" +ARCHITECTURES="x86 x86_gcc2 x86_64" PROVIDES=" blogpositive = $portVersion diff --git a/haiku-apps/blogpositive/blogpositive-0.2.0.recipe b/haiku-apps/blogpositive/blogpositive-0.2.0.recipe new file mode 100644 index 000000000..27407e6ca --- /dev/null +++ b/haiku-apps/blogpositive/blogpositive-0.2.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 connect to Wordpress and LiveJournal blogs for now. + " +HOMEPAGE="http://blogpositive.puckipedia.com" +SRC_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.2.0" +REVISION="1" + +LICENSE="MIT" +COPYRIGHT="2013 :Puck Meerburg" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +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 ae98463e1b73919892462e8cfa9090380018b356 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 22 Dec 2013 09:31:41 -0800 Subject: [PATCH 131/306] Remove old boost recipes and patches --- dev-libs/boost/boost-1.42.0.recipe | 26 -- dev-libs/boost/boost-1.50.0.recipe | 52 ---- dev-libs/boost/boost-1.53.0.recipe | 52 ---- dev-libs/boost/patches/boost-1.42.0.patch | 225 --------------- dev-libs/boost/patches/boost-1.50.0.patch | 337 ---------------------- dev-libs/boost/patches/boost-1.53.0.patch | 337 ---------------------- 6 files changed, 1029 deletions(-) delete mode 100644 dev-libs/boost/boost-1.42.0.recipe delete mode 100644 dev-libs/boost/boost-1.50.0.recipe delete mode 100644 dev-libs/boost/boost-1.53.0.recipe delete mode 100644 dev-libs/boost/patches/boost-1.42.0.patch delete mode 100644 dev-libs/boost/patches/boost-1.50.0.patch delete mode 100644 dev-libs/boost/patches/boost-1.53.0.patch diff --git a/dev-libs/boost/boost-1.42.0.recipe b/dev-libs/boost/boost-1.42.0.recipe deleted file mode 100644 index f7789a6c3..000000000 --- a/dev-libs/boost/boost-1.42.0.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="boost" -HOMEPAGE="http://www.boost.org/" -SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.42.0/boost_1_42_0.tar.bz2/download" -CHECKSUM_MD5="7bf3b4eb841b62ffb0ade2b82218ebe6" -REVISION="1" -STATUS_HAIKU="broken" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -DEPEND="" -BUILD() -{ - cd boost_1_42_0 - ./bootstrap.sh --prefix=`finddir B_COMMON_DIRECTORY` - ./bjam --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=/boot/common/lib \ - --includedir=/boot/common/include \ - variant=release \ - link=shared \ - threading=single \ - runtime-link=shared -} - -INSTALL() -{ - cd boost_1_42_0 - ./bjam install -} diff --git a/dev-libs/boost/boost-1.50.0.recipe b/dev-libs/boost/boost-1.50.0.recipe deleted file mode 100644 index 590e1969e..000000000 --- a/dev-libs/boost/boost-1.50.0.recipe +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION="boost" -HOMEPAGE="http://www.boost.org/" -SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.50.0/boost_1_50_0.tar.bz2/download" -CHECKSUM_MD5="52dd00be775e689f55a987baebccc462" -REVISION="1" -STATUS_HAIKU="stable" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -DEPEND="boehm-gc" -BUILD() -{ - cd boost_1_50_0 - ./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() -{ - cd boost_1_50_0 - ./bjam install \ - -d2 \ - --prefix=${DESTDIR}/`finddir B_COMMON_DIRECTORY` \ - #--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 -} - -LICENSE="Boost v1.0" -COPYRIGHT="1998-2011 Beman Dawes, David Abrahams, Rene Rivera, et al." diff --git a/dev-libs/boost/boost-1.53.0.recipe b/dev-libs/boost/boost-1.53.0.recipe deleted file mode 100644 index 4b4a6adbe..000000000 --- a/dev-libs/boost/boost-1.53.0.recipe +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION="boost" -HOMEPAGE="http://www.boost.org/" -SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.53.0/boost_1_53_0.tar.bz2/download" -CHECKSUM_MD5="a00d22605d5dbcfb4c9936a9b35bc4c2" -REVISION="1" -STATUS_HAIKU="broken" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -DEPEND="boehm-gc" -BUILD() -{ - cd boost_1_53_0 - ./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() -{ - cd boost_1_53_0 - ./bjam install \ - -d2 \ - --prefix=${DESTDIR}/`finddir B_COMMON_DIRECTORY` \ - #--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 -} - -LICENSE="Boost v1.0" -COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al." diff --git a/dev-libs/boost/patches/boost-1.42.0.patch b/dev-libs/boost/patches/boost-1.42.0.patch deleted file mode 100644 index 8066356b5..000000000 --- a/dev-libs/boost/patches/boost-1.42.0.patch +++ /dev/null @@ -1,225 +0,0 @@ -diff -Naur boost_1_42_0/boost/config/platform/haiku.hpp boost_1_42_0-haiku/boost/config/platform/haiku.hpp ---- boost_1_42_0/boost/config/platform/haiku.hpp 1970-01-01 00:00:00.000000000 +0000 -+++ boost_1_42_0-haiku/boost/config/platform/haiku.hpp 2010-04-23 02:22:35.100925440 +0000 -@@ -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 -Naur boost_1_42_0/boost/config/select_platform_config.hpp boost_1_42_0-haiku/boost/config/select_platform_config.hpp ---- boost_1_42_0/boost/config/select_platform_config.hpp 2009-05-30 11:16:25.057409536 +0000 -+++ boost_1_42_0-haiku/boost/config/select_platform_config.hpp 2010-04-23 02:22:24.092798976 +0000 -@@ -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 -Naur boost_1_42_0/boost/config/stdlib/libstdcpp3.hpp boost_1_42_0-haiku/boost/config/stdlib/libstdcpp3.hpp ---- boost_1_42_0/boost/config/stdlib/libstdcpp3.hpp 2009-05-30 11:16:25.057671680 +0000 -+++ boost_1_42_0-haiku/boost/config/stdlib/libstdcpp3.hpp 2010-04-23 02:23:34.217841664 +0000 -@@ -31,7 +31,7 @@ - - #ifdef __GLIBCXX__ // gcc 3.4 and greater: - # if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ -- || defined(_GLIBCXX__PTHREADS) -+ || defined(_GLIBCXX__PTHREADS) || 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 -Naur boost_1_42_0/boost/thread/thread_time.hpp boost_1_42_0-haiku/boost/thread/thread_time.hpp ---- boost_1_42_0/boost/thread/thread_time.hpp 2008-06-18 13:01:08.030408704 +0000 -+++ boost_1_42_0-haiku/boost/thread/thread_time.hpp 2010-04-23 02:24:59.809500672 +0000 -@@ -17,6 +17,9 @@ - - inline system_time get_system_time() - { -+#ifndef BOOST_DATE_TIME_HAS_HIGH_PRECISION_CLOCK -+# error "High precision clock not supported on this platform" -+#endif - return boost::date_time::microsec_clock::universal_time(); - } - -diff -Naur boost_1_42_0/tools/build/v2/tools/builtin.jam boost_1_42_0-haiku/tools/build/v2/tools/builtin.jam ---- boost_1_42_0/tools/build/v2/tools/builtin.jam 2009-10-28 07:47:51.000786432 +0000 -+++ boost_1_42_0-haiku/tools/build/v2/tools/builtin.jam 2010-04-23 02:26:20.131596288 +0000 -@@ -39,7 +39,7 @@ - - - .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd -- openbsd osf qnx qnxnto sgi solaris unix unixware windows -+ openbsd osf 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 -@@ -77,6 +77,7 @@ - case MACOSX : host-os = darwin ; - case KFREEBSD : host-os = freebsd ; - case LINUX : host-os = linux ; -+ case HAIKU : host-os = haiku ; - case SUNOS : - ECHO "SunOS is not a supported operating system." ; - ECHO "We believe last version of SunOS was released in 1992, " ; -diff -Naur boost_1_42_0/tools/build/v2/tools/gcc.jam boost_1_42_0-haiku/tools/build/v2/tools/gcc.jam ---- boost_1_42_0/tools/build/v2/tools/gcc.jam 2009-10-28 07:47:51.003145728 +0000 -+++ boost_1_42_0-haiku/tools/build/v2/tools/gcc.jam 2010-04-23 02:28:40.680001536 +0000 -@@ -858,7 +858,7 @@ - # Differs from 'link' above only by -shared. - actions link.dll bind LIBRARIES - { -- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) -+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -nostart -Wl,-shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - } - - rule setup-threading ( targets * : sources * : properties * ) -@@ -889,6 +889,10 @@ - { - # BeOS has no threading options, so do not set anything here. - } -+ case haiku : -+ { -+ # pthread. -+ } - case *bsd : - { - option = -pthread ; -diff -Naur boost_1_42_0/tools/jam/src/Jambase boost_1_42_0-haiku/tools/jam/src/Jambase ---- boost_1_42_0/tools/jam/src/Jambase 2009-01-10 19:42:28.047185920 +0000 -+++ boost_1_42_0-haiku/tools/jam/src/Jambase 2010-04-23 02:31:10.925106176 +0000 -@@ -849,6 +849,18 @@ - NOARSCAN ?= true ; - STDHDRS ?= /boot/develop/headers/posix ; - } -+else if $(OS) = HAIKU -+{ -+ BINDIR ?= /boot/common/bin ; -+ CC ?= gcc ; -+ C++ ?= $(CC) ; -+ FORTRAN ?= "" ; -+ LIBDIR ?= /boot/common/lib ; -+ LINK ?= gcc ; -+ LINKLIBS ?= -lnetwork ; -+ NOARSCAN ?= true ; -+ STDHDRS ?= /boot/develop/headers/posix ; -+} - else if $(UNIX) - { - switch $(OS) -diff -Naur boost_1_42_0/tools/jam/src/boehm_gc/config.guess boost_1_42_0-haiku/tools/jam/src/boehm_gc/config.guess ---- boost_1_42_0/tools/jam/src/boehm_gc/config.guess 2007-08-11 05:53:37.019922944 +0000 -+++ boost_1_42_0-haiku/tools/jam/src/boehm_gc/config.guess 2010-04-23 02:33:06.863502336 +0000 -@@ -1199,6 +1199,9 @@ - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -diff -Naur boost_1_42_0/tools/jam/src/boehm_gc/include/private/gcconfig.h boost_1_42_0-haiku/tools/jam/src/boehm_gc/include/private/gcconfig.h ---- boost_1_42_0/tools/jam/src/boehm_gc/include/private/gcconfig.h 2007-08-11 05:53:37.032243712 +0000 -+++ boost_1_42_0-haiku/tools/jam/src/boehm_gc/include/private/gcconfig.h 2010-04-23 02:34:09.906231808 +0000 -@@ -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 -Naur boost_1_42_0/tools/jam/src/fileunix.c boost_1_42_0-haiku/tools/jam/src/fileunix.c ---- boost_1_42_0/tools/jam/src/fileunix.c 2009-01-10 19:42:28.045613056 +0000 -+++ boost_1_42_0-haiku/tools/jam/src/fileunix.c 2010-04-23 02:34:44.754712576 +0000 -@@ -80,6 +80,7 @@ - - # if defined( OS_QNX ) || \ - defined( OS_BEOS ) || \ -+ defined( OS_HAIKU ) || \ - defined( OS_MPEIX ) - # define NO_AR - # define HAVE_AR -diff -Naur boost_1_42_0/tools/jam/src/jam.h boost_1_42_0-haiku/tools/jam/src/jam.h ---- boost_1_42_0/tools/jam/src/jam.h 2009-01-10 19:42:28.046923776 +0000 -+++ boost_1_42_0-haiku/tools/jam/src/jam.h 2010-04-23 02:35:27.411828224 +0000 -@@ -234,6 +234,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 -Naur boost_1_42_0/tools/jam/src/jambase.c boost_1_42_0-haiku/tools/jam/src/jambase.c ---- boost_1_42_0/tools/jam/src/jambase.c 2009-01-10 19:42:28.047448064 +0000 -+++ boost_1_42_0-haiku/tools/jam/src/jambase.c 2010-04-23 02:36:46.935329792 +0000 -@@ -554,6 +554,18 @@ - "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 $(UNIX)\n", - "{\n", - "switch $(OS)\n", diff --git a/dev-libs/boost/patches/boost-1.50.0.patch b/dev-libs/boost/patches/boost-1.50.0.patch deleted file mode 100644 index 5a25a3870..000000000 --- a/dev-libs/boost/patches/boost-1.50.0.patch +++ /dev/null @@ -1,337 +0,0 @@ -diff -Naur boost_1_50_0/boost/config/platform/haiku.hpp boost_1_50_0-haiku/boost/config/platform/haiku.hpp ---- boost_1_50_0/boost/config/platform/haiku.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ boost_1_50_0-haiku/boost/config/platform/haiku.hpp 2012-08-16 01:16:44.000000000 +0200 -@@ -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 -Naur boost_1_50_0/boost/config/select_platform_config.hpp boost_1_50_0-haiku/boost/config/select_platform_config.hpp ---- boost_1_50_0/boost/config/select_platform_config.hpp 2011-10-10 13:50:55.047185920 +0200 -+++ boost_1_50_0-haiku/boost/config/select_platform_config.hpp 2012-08-16 13:32:04.000000000 +0200 -@@ -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 -Naur boost_1_50_0/boost/config/stdlib/libstdcpp3.hpp boost_1_50_0-haiku/boost/config/stdlib/libstdcpp3.hpp ---- boost_1_50_0/boost/config/stdlib/libstdcpp3.hpp 2012-05-15 13:57:21.047972352 +0200 -+++ boost_1_50_0-haiku/boost/config/stdlib/libstdcpp3.hpp 2012-08-16 15:22:26.000000000 +0200 -@@ -35,7 +35,8 @@ - # if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ - || defined(_GLIBCXX__PTHREADS) \ - || defined(_GLIBCXX_HAS_GTHREADS) \ -- || defined(_WIN32) -+ || defined(_WIN32) \ -+ || 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 -Naur boost_1_50_0/boost/thread/detail/platform.hpp boost_1_50_0-haiku/boost/thread/detail/platform.hpp ---- boost_1_50_0/boost/thread/detail/platform.hpp 2012-05-22 19:03:15.043253760 +0200 -+++ boost_1_50_0-haiku/boost/thread/detail/platform.hpp 2012-08-16 23:24:30.135266304 +0200 -@@ -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 -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/dyn_load.c boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/dyn_load.c ---- boost_1_50_0/tools/build/v2/engine/boehm_gc/dyn_load.c 2011-06-06 22:36:21.020185088 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/dyn_load.c 2012-08-16 13:10:40.000000000 +0200 -@@ -64,7 +64,7 @@ - !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 @@ - # 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 @@ - - #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 -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h ---- boost_1_50_0/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h 2011-06-06 22:36:21.022282240 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h 2012-08-16 13:17:27.000000000 +0200 -@@ -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 -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/include/gc.h boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/gc.h ---- boost_1_50_0/tools/build/v2/engine/boehm_gc/include/gc.h 2011-06-06 22:36:21.022020096 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/gc.h 2012-08-16 13:12:51.000000000 +0200 -@@ -494,7 +494,7 @@ - /* 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 -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h ---- boost_1_50_0/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h 2011-06-06 22:36:21.024117248 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h 2012-08-16 13:49:16.000000000 +0200 -@@ -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 -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/os_dep.c boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/os_dep.c ---- boost_1_50_0/tools/build/v2/engine/boehm_gc/os_dep.c 2011-06-06 22:36:21.030408704 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/os_dep.c 2012-08-16 13:52:23.000000000 +0200 -@@ -777,6 +777,16 @@ - # 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 @@ - - #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 @@ - # 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 -Naur boost_1_50_0/tools/build/v2/engine/fileunix.c boost_1_50_0-haiku/tools/build/v2/engine/fileunix.c ---- boost_1_50_0/tools/build/v2/engine/fileunix.c 2012-04-26 05:35:55.037224448 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/fileunix.c 2012-08-16 13:54:03.000000000 +0200 -@@ -81,6 +81,7 @@ - - # if defined( OS_QNX ) || \ - defined( OS_BEOS ) || \ -+ defined( OS_HAIKU ) || \ - defined( OS_MPEIX ) - # define NO_AR - # define HAVE_AR -diff -Naur boost_1_50_0/tools/build/v2/engine/jam.h boost_1_50_0-haiku/tools/build/v2/engine/jam.h ---- boost_1_50_0/tools/build/v2/engine/jam.h 2012-06-06 06:00:21.039059456 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/jam.h 2012-08-16 13:57:51.000000000 +0200 -@@ -151,6 +151,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 -Naur boost_1_50_0/tools/build/v2/engine/jambase.c boost_1_50_0-haiku/tools/build/v2/engine/jambase.c ---- boost_1_50_0/tools/build/v2/engine/jambase.c 2011-06-06 22:36:21.039321600 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/jambase.c 2012-08-16 14:03:05.000000000 +0200 -@@ -548,6 +548,18 @@ - "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 -Naur boost_1_50_0/tools/build/v2/tools/builtin.jam boost_1_50_0-haiku/tools/build/v2/tools/builtin.jam ---- boost_1_50_0/tools/build/v2/tools/builtin.jam 2011-06-06 22:36:21.022020096 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/tools/builtin.jam 2012-08-16 15:57:04.000000000 +0200 -@@ -40,7 +40,7 @@ - - - .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd -- openbsd osf qnx qnxnto sgi solaris unix unixware windows -+ openbsd osf 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 -@@ -75,6 +75,7 @@ - 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 -Naur boost_1_50_0/tools/build/v2/tools/builtin.py boost_1_50_0-haiku/tools/build/v2/tools/builtin.py ---- boost_1_50_0/tools/build/v2/tools/builtin.py 2012-04-26 05:35:55.022020096 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/tools/builtin.py 2012-08-16 15:59:13.000000000 +0200 -@@ -103,6 +103,7 @@ - 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 -Naur boost_1_50_0/tools/build/v2/tools/gcc.jam boost_1_50_0-haiku/tools/build/v2/tools/gcc.jam ---- boost_1_50_0/tools/build/v2/tools/gcc.jam 2012-04-26 05:35:55.025165824 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/tools/gcc.jam 2012-08-16 13:40:12.000000000 +0200 -@@ -1050,6 +1050,10 @@ - case beos : - { - # BeOS has no threading options, so do not set anything here. -+ } -+ case haiku : -+ { -+ option = ; - } - case *bsd : - { -@@ -1067,7 +1071,7 @@ - } - case * : - { -- option = -pthread ; -+ option = -pthreads ; - libs = rt ; - } - } -diff -Naur boost_1_50_0/tools/build/v2/tools/gcc.py boost_1_50_0-haiku/tools/build/v2/tools/gcc.py ---- boost_1_50_0/tools/build/v2/tools/gcc.py 2012-04-26 05:35:55.025165824 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/tools/gcc.py 2012-08-16 15:06:53.000000000 +0200 -@@ -675,6 +675,9 @@ - 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 -Naur boost_1_50_0/tools/build/v2/tools/python.jam boost_1_50_0-haiku/tools/build/v2/tools/python.jam ---- boost_1_50_0/tools/build/v2/tools/python.jam 2012-04-26 05:35:55.029097984 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/tools/python.jam 2012-08-16 15:52:51.000000000 +0200 -@@ -648,13 +648,14 @@ - 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 ; - } - } diff --git a/dev-libs/boost/patches/boost-1.53.0.patch b/dev-libs/boost/patches/boost-1.53.0.patch deleted file mode 100644 index 7210abc07..000000000 --- a/dev-libs/boost/patches/boost-1.53.0.patch +++ /dev/null @@ -1,337 +0,0 @@ -diff -urN boost_1_53_0/boost/config/platform/haiku.hpp boost_1_53_0-haiku/boost/config/platform/haiku.hpp ---- boost_1_53_0/boost/config/platform/haiku.hpp 1969-12-31 16:00:00.000000000 -0800 -+++ boost_1_53_0-haiku/boost/config/platform/haiku.hpp 2013-03-28 00:49:51.271056896 -0700 -@@ -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 -urN boost_1_53_0/boost/config/select_platform_config.hpp boost_1_53_0-haiku/boost/config/select_platform_config.hpp ---- boost_1_53_0/boost/config/select_platform_config.hpp 2011-10-10 04:50:55.036175872 -0700 -+++ boost_1_53_0-haiku/boost/config/select_platform_config.hpp 2013-03-28 00:40:07.746586112 -0700 -@@ -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 -urN boost_1_53_0/boost/config/stdlib/libstdcpp3.hpp boost_1_53_0-haiku/boost/config/stdlib/libstdcpp3.hpp ---- boost_1_53_0/boost/config/stdlib/libstdcpp3.hpp 2012-07-15 08:59:05.036700160 -0700 -+++ boost_1_53_0-haiku/boost/config/stdlib/libstdcpp3.hpp 2013-03-28 00:40:17.162267136 -0700 -@@ -35,7 +35,8 @@ - # if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ - || defined(_GLIBCXX__PTHREADS) \ - || defined(_GLIBCXX_HAS_GTHREADS) \ -- || defined(_WIN32) -+ || defined(_WIN32) \ -+ || 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 -urN boost_1_53_0/boost/thread/detail/platform.hpp boost_1_53_0-haiku/boost/thread/detail/platform.hpp ---- boost_1_53_0/boost/thread/detail/platform.hpp 2012-07-08 22:55:01.064225280 -0700 -+++ boost_1_53_0-haiku/boost/thread/detail/platform.hpp 2013-03-28 00:40:28.586153984 -0700 -@@ -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 -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/dyn_load.c boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/dyn_load.c ---- boost_1_53_0/tools/build/v2/engine/boehm_gc/dyn_load.c 2011-06-06 13:36:21.029360128 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/dyn_load.c 2013-03-28 00:40:38.863240192 -0700 -@@ -64,7 +64,7 @@ - !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 @@ - # 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 @@ - - #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 -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h ---- boost_1_53_0/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h 2011-06-06 13:36:21.031719424 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h 2013-03-28 00:40:49.546045952 -0700 -@@ -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 -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/include/gc.h boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/gc.h ---- boost_1_53_0/tools/build/v2/engine/boehm_gc/include/gc.h 2011-06-06 13:36:21.031195136 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/gc.h 2013-03-28 00:40:57.427556864 -0700 -@@ -494,7 +494,7 @@ - /* 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 -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h ---- boost_1_53_0/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h 2011-06-06 13:36:21.034078720 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h 2013-03-28 00:41:08.074448896 -0700 -@@ -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 -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/os_dep.c boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/os_dep.c ---- boost_1_53_0/tools/build/v2/engine/boehm_gc/os_dep.c 2011-06-06 13:36:21.039583744 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/os_dep.c 2013-03-28 00:41:17.561774592 -0700 -@@ -777,6 +777,16 @@ - # 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 @@ - - #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 @@ - # 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 -urN boost_1_53_0/tools/build/v2/engine/fileunix.c boost_1_53_0-haiku/tools/build/v2/engine/fileunix.c ---- boost_1_53_0/tools/build/v2/engine/fileunix.c 2012-04-25 20:35:55.046399488 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/fileunix.c 2013-03-28 00:41:26.497549312 -0700 -@@ -81,6 +81,7 @@ - - # if defined( OS_QNX ) || \ - defined( OS_BEOS ) || \ -+ defined( OS_HAIKU ) || \ - defined( OS_MPEIX ) - # define NO_AR - # define HAVE_AR -diff -urN boost_1_53_0/tools/build/v2/engine/jam.h boost_1_53_0-haiku/tools/build/v2/engine/jam.h ---- boost_1_53_0/tools/build/v2/engine/jam.h 2012-06-05 21:00:21.048234496 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/jam.h 2013-03-28 00:41:36.127139840 -0700 -@@ -151,6 +151,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 -urN boost_1_53_0/tools/build/v2/engine/jambase.c boost_1_53_0-haiku/tools/build/v2/engine/jambase.c ---- boost_1_53_0/tools/build/v2/engine/jambase.c 2011-06-06 13:36:21.048496640 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/jambase.c 2013-03-28 00:41:44.670040064 -0700 -@@ -548,6 +548,18 @@ - "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 -urN boost_1_53_0/tools/build/v2/tools/builtin.jam boost_1_53_0-haiku/tools/build/v2/tools/builtin.jam ---- boost_1_53_0/tools/build/v2/tools/builtin.jam 2011-06-06 13:36:21.033816576 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/tools/builtin.jam 2013-03-28 00:41:54.663748608 -0700 -@@ -40,7 +40,7 @@ - - - .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd -- openbsd osf qnx qnxnto sgi solaris unix unixware windows -+ openbsd osf 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 -@@ -75,6 +75,7 @@ - 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 -urN boost_1_53_0/tools/build/v2/tools/builtin.py boost_1_53_0-haiku/tools/build/v2/tools/builtin.py ---- boost_1_53_0/tools/build/v2/tools/builtin.py 2012-04-25 20:35:55.034078720 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/tools/builtin.py 2013-03-28 00:42:04.759693312 -0700 -@@ -103,6 +103,7 @@ - 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 -urN boost_1_53_0/tools/build/v2/tools/gcc.jam boost_1_53_0-haiku/tools/build/v2/tools/gcc.jam ---- boost_1_53_0/tools/build/v2/tools/gcc.jam 2012-04-25 20:35:55.037224448 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/tools/gcc.jam 2013-03-28 00:42:15.700710912 -0700 -@@ -1050,6 +1050,10 @@ - case beos : - { - # BeOS has no threading options, so do not set anything here. -+ } -+ case haiku : -+ { -+ option = ; - } - case *bsd : - { -@@ -1067,7 +1071,7 @@ - } - case * : - { -- option = -pthread ; -+ option = -pthreads ; - libs = rt ; - } - } -diff -urN boost_1_53_0/tools/build/v2/tools/gcc.py boost_1_53_0-haiku/tools/build/v2/tools/gcc.py ---- boost_1_53_0/tools/build/v2/tools/gcc.py 2012-04-25 20:35:55.037224448 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/tools/gcc.py 2013-03-28 00:42:26.814219264 -0700 -@@ -675,6 +675,9 @@ - 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 -urN boost_1_53_0/tools/build/v2/tools/python.jam boost_1_53_0-haiku/tools/build/v2/tools/python.jam ---- boost_1_53_0/tools/build/v2/tools/python.jam 2012-04-25 20:35:55.041156608 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/tools/python.jam 2013-03-28 00:42:37.560463872 -0700 -@@ -648,13 +648,14 @@ - 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 3b8353d558899facf84fcec7f7e912f6a3b0d8bd Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Sun, 22 Dec 2013 16:08:38 -0500 Subject: [PATCH 132/306] sdl_mixer: Fix inverted summary and description. --- media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 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 8d565361d..c6fa95bdb 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -1,11 +1,11 @@ -SUMMARY="sdl_mixer is a simple multi-channel audio mixer library. It supports any number of simultaneously playing channels of 16 bit stereo audio, plus a single channel of music, mixed by the popular FLAC, MikMoD MOD, Timidity MIDI, Ogg Vorbis, and SMPEG MP3 libraries." -DESCRIPTION="Simple Direct Layer Mixer Library" +SUMMARY="Simple Direct Layer Mixer Library" +DESCRIPTION="sdl_mixer is a simple multi-channel audio mixer library. It supports any number of simultaneously playing channels of 16 bit stereo audio, plus a single channel of music, mixed by the popular FLAC, MikMoD MOD, Timidity MIDI, Ogg Vorbis, and SMPEG MP3 libraries." HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz" CHECKSUM_MD5="e03ff73d77a55e3572ad0217131dc4a1" LICENSE="Zlib" COPYRIGHT="1997-2012 Sam Lantinga" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" From b21e942c2652e720f35d0145f2a586b119027ef9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 22 Dec 2013 14:16:50 -0800 Subject: [PATCH 133/306] Fixed formatting of boost recipe and merged patches into one patchset --- dev-libs/boost/boost-1.55.0.recipe | 172 +++++--- dev-libs/boost/patches/boost-1.55.0.patchset | 403 +++++++++++++++++++ 2 files changed, 511 insertions(+), 64 deletions(-) create mode 100644 dev-libs/boost/patches/boost-1.55.0.patchset diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index b1a2daff6..a7c54ba93 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -7,7 +7,7 @@ DESCRIPTION=" " 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" +SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2" CHECKSUM_MD5="d6eef4b4cacb2183f2bf265a5a03a354" REVISION="1" LICENSE="Boost v1.0" @@ -17,20 +17,31 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then ARCHITECTURES="$ARCHITECTURES x86_gcc2" fi SECONDARY_ARCHITECTURES="x86 ?x86_64" + SOURCE_DIR="boost_1_55_0" -PATCHES=" - boost-1.55.0.patch - type_traits.patch -" + +PATCHES="boost-1.55.0.patchset" PROVIDES=" lib:boost = 1.55.0 " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libiconv$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libiconv$secondaryArchSuffix + devel:libbz2$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " + BUILD_PREREQUIRES=" boehm_gc - libiconv - libiconv_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:jam @@ -38,18 +49,6 @@ BUILD_PREREQUIRES=" cmd:make binutils " -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - devel:libiconv - devel:libbz2 - devel:libz - " - -REQUIRES=" - lib:libiconv - lib:libbz2 - lib:libz - " BUILD() { @@ -117,154 +116,199 @@ INSTALL() PROVIDES_devel=" boost_devel$secondaryArchSuffix = $portVersion " + REQUIRES_devel=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_atomic=" boost_atomic$secondaryArchSuffix = $portVersion -" + " + REQUIRES_atomic=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_chrono=" boost_chrono$secondaryArchSuffix = $portVersion -" + " + REQUIRES_chrono=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion -" + " + PROVIDES_context=" boost_context$secondaryArchSuffix = $portVersion -" + " + REQUIRES_context=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_coroutine=" boost_coroutine$secondaryArchSuffix = $portVersion -" + " + REQUIRES_coroutine=" boost_context$secondaryArchSuffix == $portVersion -" + " + PROVIDES_date_time=" boost_date_time$secondaryArchSuffix = $portVersion -" + " + REQUIRES_date_time=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_exception=" boost_exception$secondaryArchSuffix = $portVersion -" + " + REQUIRES_exception=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_filesystem=" boost_filesystem$secondaryArchSuffix = $portVersion -" + " + REQUIRES_filesystem=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion lib:libz$secondaryArchSuffix lib:libbz2$secondaryArchSuffix -" + " + PROVIDES_graph=" boost_graph$secondaryArchSuffix = $portVersion -" + " + REQUIRES_graph=" haiku$secondaryArchSuffix >= $haikuVersion boost_regex$secondaryArchSuffix == $portVersion -" + " + PROVIDES_iostreams=" boost_iostreams$secondaryArchSuffix = $portVersion -" + " + REQUIRES_iostreams=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_locale=" boost_locale$secondaryArchSuffix = $portVersion -" + " + REQUIRES_locale=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion boost_thread$secondaryArchSuffix == $portVersion -" + " + PROVIDES_log=" boost_log$secondaryArchSuffix = $portVersion -" + " + REQUIRES_log=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion boost_date_time$secondaryArchSuffix == $portVersion boost_thread$secondaryArchSuffix == $portVersion -" + " + PROVIDES_math=" boost_math$secondaryArchSuffix = $portVersion -" + " + REQUIRES_math=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_program_options=" boost_program_options$secondaryArchSuffix = $portVersion -" + " + REQUIRES_program_options=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_random=" boost_random$secondaryArchSuffix = $portVersion -" + " + REQUIRES_random=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_regex=" boost_regex$secondaryArchSuffix = $portVersion -" + " + REQUIRES_regex=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_serialization=" boost_serialization$secondaryArchSuffix = $portVersion -" + " + REQUIRES_serialization=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_signals=" boost_signals$secondaryArchSuffix = $portVersion -" + " + REQUIRES_signals=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_system=" boost_system$secondaryArchSuffix = $portVersion -" + " + REQUIRES_system=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_test=" boost_test$secondaryArchSuffix = $portVersion -" + " + REQUIRES_test=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_thread=" boost_thread$secondaryArchSuffix = $portVersion -" + " + REQUIRES_thread=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion boost_chrono$secondaryArchSuffix == $portVersion -" + " + PROVIDES_timer=" boost_timer$secondaryArchSuffix = $portVersion -" + " + REQUIRES_timer=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion -" + " + PROVIDES_wave=" boost_wave$secondaryArchSuffix = $portVersion -" + " + REQUIRES_wave=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion @@ -272,4 +316,4 @@ REQUIRES_wave=" boost_filesystem$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion boost_thread$secondaryArchSuffix == $portVersion -" + " diff --git a/dev-libs/boost/patches/boost-1.55.0.patchset b/dev-libs/boost/patches/boost-1.55.0.patchset new file mode 100644 index 000000000..899f987a2 --- /dev/null +++ b/dev-libs/boost/patches/boost-1.55.0.patchset @@ -0,0 +1,403 @@ +From f194ab93c5c29020d5f0f4915b1f554645986587 Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Sun, 22 Dec 2013 10:01:12 -0800 +Subject: applying patch boost-1.55.0.patch + + +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 ; + } + } +-- +1.8.3.4 + + +From 0d11043b05a45a1bc8091387ba45f1fe41fe2e55 Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Sun, 22 Dec 2013 10:01:23 -0800 +Subject: applying patch type_traits.patch + + +diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp +index 1b15c7e..9a3becd 100644 +--- a/boost/config/platform/haiku.hpp ++++ b/boost/config/platform/haiku.hpp +@@ -9,18 +9,26 @@ + + #define BOOST_PLATFORM "Haiku" + +-#define BOOST_NO_INTRINSIC_WCHAR_T + #define BOOST_HAS_UNISTD_H ++#define GLIBC_HAVE_LONG_LONG ++#define BOOST_HAS_STDINT_H ++#define BOOST_HASH_NO_EXTENSIONS + + #define BOOST_HAS_BETHREADS + + #ifndef BOOST_DISABLE_THREADS + # define BOOST_HAS_THREADS + #endif ++#define BOOST_NO_CXX11_HDR_TYPE_TRAITS ++#define BOOST_NO_CXX11_ATOMIC_SMART_PTR ++#define BOOST_NO_CXX11_STATIC_ASSERT ++#define BOOST_NO_CXX11_VARIADIC_MACROS + + // + // thread API's not auto detected: + // ++#define BOOST_HAS_SCHED_YIELD ++#define BOOST_HAS_PTHREAD_YIELD + #define BOOST_HAS_GETTIMEOFDAY + + // boilerplate code: +-- +1.8.3.4 + From 94b731a9392f26204503118e414b17989dc37332 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 22 Dec 2013 16:13:28 -0700 Subject: [PATCH 134/306] Fix libmikmod on secondary arch's --- media-libs/libmikmod/libmikmod-3.3.3.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/libmikmod/libmikmod-3.3.3.recipe b/media-libs/libmikmod/libmikmod-3.3.3.recipe index 86867168d..9df23963c 100644 --- a/media-libs/libmikmod/libmikmod-3.3.3.recipe +++ b/media-libs/libmikmod/libmikmod-3.3.3.recipe @@ -5,7 +5,7 @@ SRC_URI="http://sourceforge.net/projects/mikmod/files/libmikmod/3.3.3/libmikmod- CHECKSUM_MD5="0e0f9bce8f8e598ca292b41e0ae385c8" LICENSE="GNU LGPL v2.1" COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, Steve McIntyre, Peter Amstutz, and Miodrag Vallat." -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -69,5 +69,5 @@ PROVIDES_devel=" " REQUIRES_devel=" - libmikmod == $portVersion base + libmikmod$secondaryArchSuffix == $portVersion base " From 1b39f2f4a16e52b08d0381a7767e235c9a1d65c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 23 Dec 2013 00:33:00 +0100 Subject: [PATCH 135/306] qemacs: Add a recipe for current CVS The Haiku port has been upstreamed, so no need for a patch. --- app-editors/qemacs/qemacs-0.4.0dev.recipe | 65 +++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 app-editors/qemacs/qemacs-0.4.0dev.recipe diff --git a/app-editors/qemacs/qemacs-0.4.0dev.recipe b/app-editors/qemacs/qemacs-0.4.0dev.recipe new file mode 100644 index 000000000..1c698813c --- /dev/null +++ b/app-editors/qemacs/qemacs-0.4.0dev.recipe @@ -0,0 +1,65 @@ +SUMMARY="QEmacs editor" +DESCRIPTION="QEmacs (for Quick Emacs), a very small but powerful UNIX editor. + It has features that even big editors lack : + - Full screen editor with an Emacs look and feel with all Emacs common features. + - Full UTF8 support. + - WYSIWYG HTML/XML/CSS2 mode graphical editing. + - WYSIWYG DocBook. + - C mode: coloring with immediate update. Emacs like auto-indent. + - Shell mode, Hexadecimal editing... + + The provided qemacs-pe2qe script converts your Pe color settings to the Qemacs syntax." +HOMEPAGE="http://bellard.org/qemacs/" +SRC_URI="cvs://:pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs/qemacs" +#CHECKSUM_MD5="" +REVISION="1" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2000-2003 Fabrice Bellard" + +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 + cmd:qemacs_pe2qe$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:which + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:texi2html + " + +BUILD() +{ + ./configure --prefix=$prefix --datadir=$dataDir --mandir=$manDir + make +} + +INSTALL() +{ + make install + install -m 755 haiku-pe2qe.sh $binDir/qemacs-pe2qe + addAppDeskbarSymlink $binDir/qe QEmacs +} + From c60ef3bce26b4a1141b71e9b69cd7732122401f4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 23 Dec 2013 01:01:22 +0100 Subject: [PATCH 136/306] openjdk: Build with external zlib * Patch the build system to allow building with an external zlib instead of using the included one. Since the included zlib symbols would be visible also to other JNI code (e.g. translators used by the SWT libs), this could cause problems where a newer version was required (e.g. libpng used by the PNG translator). * Verified ALT_JDK_IMPORT_PATH as needed to be set. --- .../openjdk/openjdk-1.7_2013_11_08.recipe | 8 +- .../openjdk-1.7_2013_11_08-source8.patchset | 203 +++++++++++++++++- 2 files changed, 203 insertions(+), 8 deletions(-) diff --git a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe index 8d2d49743..a3c65686b 100644 --- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe +++ b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe @@ -40,7 +40,7 @@ CHECKSUM_MD5_11="18d15dfd71117daadb332af003d08212" SRC_URI_12="http://ports-space.haiku-files.org/source/openjdk/jdk7-jaxws2_2_4-b03-2011_05_27.zip#noarchive" CHECKSUM_MD5_12="2f5b829ade70f67fe272d0b322e3e702" -REVISION="1" +REVISION="2" ARCHITECTURES="x86 !x86_gcc2" DISABLE_SOURCE_PACKAGE=yes @@ -91,12 +91,14 @@ REQUIRES=" haiku >= $haikuVersion lib:libfreetype lib:libiconv + lib:libz " BUILD_REQUIRES=" haiku_devel >= $haikuVersion devel:libfreetype devel:libiconv + devel:libz " BUILD_PREREQUIRES=" @@ -154,7 +156,7 @@ BUILD() # set up environment export ALT_BOOTDIR=${OPENJDK_DIR}/j2sdk-image -export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR + export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR export ANT=${OPENJDK_DIR}/ant export ALT_OUTPUTDIR=${OPENJDK_DIR}/output export LANG=C @@ -169,6 +171,8 @@ export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR export ALLOW_DOWNLOADS=false + export USE_EXTERNAL_ZLIB=true + # Build. cd jdk make diff --git a/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset b/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset index 6ebc6e320..2e55306cb 100644 --- a/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset +++ b/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset @@ -1,4 +1,4 @@ -From 5cca79ee50fbf704e67d337a16adf66877a976cd Mon Sep 17 00:00:00 2001 +From 255d3c92d7bf021c109a7ef7a0376fcbf7cb9ac5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 9 Nov 2013 02:30:27 +0100 Subject: Defs-haiku.gmk: Fix Haiku specific *_PATH variables @@ -67,7 +67,7 @@ index c1cc440..134e128 100644 1.8.3.4 -From cab8b76a94407e51e0a9c665b53f28588e003a8b Mon Sep 17 00:00:00 2001 +From 9e2dcc26b19f2fa0694ee7608c74ad3716054679 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 9 Nov 2013 02:35:20 +0100 Subject: PLATFORM_API_HaikuOS_PCM.cpp: Fix SoundConsumer include @@ -91,7 +91,7 @@ index ec111fc..d69c6a9 100644 1.8.3.4 -From f8a888057bba2123556300ca7cb200ff6b0f3186 Mon Sep 17 00:00:00 2001 +From 645161b7ecc348da7f94ddac74277a9569321f6b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 9 Nov 2013 14:52:36 +0100 Subject: Fix freetype paths for Haiku @@ -116,7 +116,7 @@ index a478f97..c0dc0d0 100644 1.8.3.4 -From aad23df8dd37db1f0b5c3cd82cb90bb3f23e303f Mon Sep 17 00:00:00 2001 +From daedb42f69c0c3b4a39e4ea354a53799c89265ab Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 9 Nov 2013 14:53:56 +0100 Subject: HaikuFontManager: Use BPathFinder API to find font dirs @@ -165,7 +165,7 @@ index a645d00..66af9ab 100644 1.8.3.4 -From dcfb77462ec97c8b72c746dcb3d18bf2d488fe62 Mon Sep 17 00:00:00 2001 +From 7052c7beb2d10b40f35ac6c4868cb238d3b0d7db Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 26 Nov 2013 17:50:46 +0100 Subject: Make use of $ORIGIN in rpath now supported in Haiku @@ -234,7 +234,7 @@ index bb0db1e..74e744e 100644 1.8.3.4 -From d71b1d303b0b6681b76c7557eec6e581734e0a7c Mon Sep 17 00:00:00 2001 +From c0578bc31277c67e94d8a8d71f7e47db49d0ec37 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 4 Dec 2013 03:23:53 +0100 Subject: make/java/java/Makefile: Missing generated classes @@ -257,3 +257,194 @@ index 93878e6..bd94e8f 100644 -- 1.8.3.4 + +From e730fb5a7d27fdc3f9213f2d75ad5ef5519e20c4 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sun, 22 Dec 2013 21:21:11 +0100 +Subject: Add support for using an external zlib + +To enable it, USE_EXTERNAL_ZLIB must be set to true. EXTERNAL_ZLIB_LIB +and EXTERNAL_ZLIB_HEADERS_PATH can be set to the library to link +against and the headers path respectively. The former defaults to +"-lz". + +diff --git a/make/com/sun/java/pack/Makefile b/make/com/sun/java/pack/Makefile +index 22e0b69..ce28479 100644 +--- a/make/com/sun/java/pack/Makefile ++++ b/make/com/sun/java/pack/Makefile +@@ -70,9 +70,14 @@ ifeq ($(STANDALONE),true) + $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \ + $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX) + +- ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) +- OTHER_CXXFLAGS += $(ZINCLUDE) +- LDDFLAGS += $(ZIPOBJS) ++ ifeq ($(USE_EXTERNAL_ZLIB), true) ++ OTHER_CXXFLAGS += $(EXTERNAL_ZLIB_CPPFLAGS) ++ LDDFLAGS += $(EXTERNAL_ZLIB_LIB) ++ else ++ ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) ++ OTHER_CXXFLAGS += $(ZINCLUDE) ++ LDDFLAGS += $(ZIPOBJS) ++ endif + else + OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI + OTHER_LDLIBS += $(JVMLIB) +diff --git a/make/common/Defs.gmk b/make/common/Defs.gmk +index c0dc0d0..07849f3 100644 +--- a/make/common/Defs.gmk ++++ b/make/common/Defs.gmk +@@ -210,6 +210,21 @@ ZLIB_VERSION = 1.2.3 + + + # ++# External zlib support ++# ++ifeq ($(USE_EXTERNAL_ZLIB), true) ++ ifndef EXTERNAL_ZLIB_LIB ++ EXTERNAL_ZLIB_LIB = -lz ++ endif ++ ifdef EXTERNAL_ZLIB_HEADERS_PATH ++ EXTERNAL_ZLIB_CPPFLAGS = -I$(EXTERNAL_ZLIB_HEADERS_PATH) ++ else ++ EXTERNAL_ZLIB_CPPFLAGS = ++ endif ++endif ++ ++ ++# + # Localizations for the different parts of the product beyond English + # + +diff --git a/make/java/jli/Makefile b/make/java/jli/Makefile +index 3e5994d..5500e73 100644 +--- a/make/java/jli/Makefile ++++ b/make/java/jli/Makefile +@@ -69,13 +69,17 @@ FILES_c = \ + parse_manifest.c \ + version_comp.c \ + wildcard.c \ +- jli_util.c \ +- inflate.c \ +- inftrees.c \ +- inffast.c \ +- zadler32.c \ +- zcrc32.c \ +- zutil.c ++ jli_util.c ++ ++ifneq ($(USE_EXTERNAL_ZLIB), true) ++ FILES_c += \ ++ inflate.c \ ++ inftrees.c \ ++ inffast.c \ ++ zadler32.c \ ++ zcrc32.c \ ++ zutil.c ++endif + + ifneq ($(PLATFORM), windows) + FILES_c += ergo.c +@@ -131,7 +135,12 @@ endif + + OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) + OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC) +-OTHER_INCLUDES += -I$(ZIP_SRC) ++ ++ifeq ($(USE_EXTERNAL_ZLIB), true) ++ OTHER_INCLUDES += $(EXTERNAL_ZLIB_CPPFLAGS) ++else ++ OTHER_INCLUDES += -I$(ZIP_SRC) ++endif + + # + # Library to compile. +@@ -164,6 +173,13 @@ library:: $(STATIC_LIBRARY) + endif # PLATFORM + + # +-# Add to ambient vpath so we pick up the library files ++# Add to ambient vpath so we pick up the library files. When using an external ++# zlib, add the library instead of the sources. + # +-vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC) ++vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC) ++ ++ifeq ($(USE_EXTERNAL_ZLIB), true) ++ LDLIBS += $(EXTERNAL_ZLIB_LIB) ++else ++ vpath %.c $(ZIP_SRC) ++endif +diff --git a/make/java/zip/FILES_c.gmk b/make/java/zip/FILES_c.gmk +index 6664887..97c6d3f 100644 +--- a/make/java/zip/FILES_c.gmk ++++ b/make/java/zip/FILES_c.gmk +@@ -29,16 +29,20 @@ FILES_c = \ + Deflater.c \ + Inflater.c \ + ZipFile.c \ +- zip_util.c \ +- compress.c \ +- deflate.c \ +- gzio.c \ +- infback.c \ +- inffast.c \ +- inflate.c \ +- inftrees.c \ +- trees.c \ +- uncompr.c \ +- zadler32.c \ +- zcrc32.c \ +- zutil.c ++ zip_util.c ++ ++ifneq ($(USE_EXTERNAL_ZLIB), true) ++ FILES_c += \ ++ compress.c \ ++ deflate.c \ ++ gzio.c \ ++ infback.c \ ++ inffast.c \ ++ inflate.c \ ++ inftrees.c \ ++ trees.c \ ++ uncompr.c \ ++ zadler32.c \ ++ zcrc32.c \ ++ zutil.c ++endif +diff --git a/make/java/zip/Makefile b/make/java/zip/Makefile +index 906e7e8..15b2d45 100644 +--- a/make/java/zip/Makefile ++++ b/make/java/zip/Makefile +@@ -74,14 +74,24 @@ else + CPPFLAGS += -UDEBUG + endif + +-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) ++ifeq ($(USE_EXTERNAL_ZLIB), true) ++ CPPFLAGS += $(EXTERNAL_ZLIB_CPPFLAGS) ++else ++ CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) ++endif ++ + CPPFLAGS += -I$(SHARE_SRC)/native/java/io + CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io + + # +-# Add to ambient vpath so we pick up the library files ++# Add to ambient vpath so we pick up the library files. When using an external ++# zlib, add the library instead. + # +-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION) ++ifeq ($(USE_EXTERNAL_ZLIB), true) ++ LDLIBS += $(EXTERNAL_ZLIB_LIB) ++else ++ vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION) ++endif + + # + # Link to JVM library for JVM_Zip* functions +-- +1.8.3.4 + From 7d325a720c9a7914bbed8004dbf56993b2d91805 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 23 Dec 2013 01:38:17 +0000 Subject: [PATCH 137/306] mesa: Add Mesa 10.0.1 for x86 * Drop 10.0.0 as it didn't include the OpenGL kit headers and wasn't used yet --- ...{mesa-10.0.0.recipe => mesa-10.0.1.recipe} | 28 +- sys-libs/mesa/patches/mesa-10.0.1.patchset | 354 ++++++++++++++++++ 2 files changed, 374 insertions(+), 8 deletions(-) rename sys-libs/mesa/{mesa-10.0.0.recipe => mesa-10.0.1.recipe} (85%) create mode 100644 sys-libs/mesa/patches/mesa-10.0.1.patchset diff --git a/sys-libs/mesa/mesa-10.0.0.recipe b/sys-libs/mesa/mesa-10.0.1.recipe similarity index 85% rename from sys-libs/mesa/mesa-10.0.0.recipe rename to sys-libs/mesa/mesa-10.0.1.recipe index 493995545..3167cd28c 100644 --- a/sys-libs/mesa/mesa-10.0.0.recipe +++ b/sys-libs/mesa/mesa-10.0.1.recipe @@ -7,9 +7,9 @@ DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification. HOMEPAGE="http://www.mesa3d.org/" 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="2" +SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0.1/MesaLib-10.0.1.tar.bz2" +CHECKSUM_MD5="0a72ca5b36046a658bf6038326ff32ed" +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 @@ -28,6 +28,8 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion " + +PATCHES="mesa-10.0.1.patchset" # We're locked to LLVM 3.2 as 3.3 is broken at the moment on Haiku. # Mesa should build with any newer LLVM version however. @@ -60,11 +62,6 @@ INSTALL() { mesaBuildDir=build/haiku-$effectiveTargetArchitecture - mkdir -p $includeDir/GL - cp include/GL/gl.h $includeDir/GL/ - cp include/GL/gl_mangle.h $includeDir/GL/ - cp include/GL/glext.h $includeDir/GL/ - # libGL.so makes up the core of our OpenGL kit mkdir -p $libDir cp $(find $mesaBuildDir -name 'libGL.so') $libDir @@ -76,6 +73,21 @@ INSTALL() cp $(find $mesaBuildDir -name 'libswpipe.so') \ "$addOnsDir/opengl/Software Pipe" + # OpenGL Kit + mkdir -p $includeDir/os/opengl/GL + cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ + 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/ + 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 diff --git a/sys-libs/mesa/patches/mesa-10.0.1.patchset b/sys-libs/mesa/patches/mesa-10.0.1.patchset new file mode 100644 index 000000000..9aed3f820 --- /dev/null +++ b/sys-libs/mesa/patches/mesa-10.0.1.patchset @@ -0,0 +1,354 @@ +From dfe5d4f383c16208d32c498e2c3e92095422d532 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Sat, 14 Dec 2013 11:46:05 -0600 +Subject: [PATCH] Haiku: Add in public GL kit headers + +* These make up the base of what C++ GL Haiku + applications use for 3D rendering. +* Not placed in includes/GL to prevent Haiku headers + from getting installed on non-Haiku systems +--- + include/HaikuGL/GLRenderer.h | 76 +++++++++++++++++ + include/HaikuGL/GLView.h | 193 +++++++++++++++++++++++++++++++++++++++++++ + include/HaikuGL/OpenGLKit.h | 10 +++ + include/HaikuGL/README | 28 +++++++ + 4 files changed, 307 insertions(+) + create mode 100644 include/HaikuGL/GLRenderer.h + create mode 100644 include/HaikuGL/GLView.h + create mode 100644 include/HaikuGL/OpenGLKit.h + create mode 100644 include/HaikuGL/README + +diff --git a/include/HaikuGL/GLRenderer.h b/include/HaikuGL/GLRenderer.h +new file mode 100644 +index 0000000..7ffcc34 +--- /dev/null ++++ b/include/HaikuGL/GLRenderer.h +@@ -0,0 +1,76 @@ ++/* ++ * Copyright 2006, Philippe Houdoin. All rights reserved. ++ * Distributed under the terms of the MIT License. ++ ++ * This header defines BGLRenderer, the base class making up ++ * the Haiku GL renderer add-ons (essentially selfcontained C++ ++ * shared libraries that do the actual rendering such as ++ * libswpipe.so and libswrast.so) ++ */ ++#ifndef GLRENDERER_H ++#define GLRENDERER_H ++ ++ ++#include ++#include ++ ++ ++class BGLDispatcher; ++class GLRendererRoster; ++ ++typedef unsigned long renderer_id; ++ ++class BGLRenderer ++{ ++ // Private unimplemented copy constructors ++ BGLRenderer(const BGLRenderer &); ++ BGLRenderer & operator=(const BGLRenderer &); ++ ++public: ++ BGLRenderer(BGLView *view, ulong bgl_options, ++ BGLDispatcher *dispatcher); ++ virtual ~BGLRenderer(); ++ ++ void Acquire(); ++ void Release(); ++ ++ virtual void LockGL(); ++ virtual void UnlockGL(); ++ ++ virtual void SwapBuffers(bool VSync = false); ++ virtual void Draw(BRect updateRect); ++ virtual status_t CopyPixelsOut(BPoint source, BBitmap *dest); ++ virtual status_t CopyPixelsIn(BBitmap *source, BPoint dest); ++ ++ virtual void FrameResized(float width, float height); ++ ++ virtual void DirectConnected(direct_buffer_info *info); ++ virtual void EnableDirectMode(bool enabled); ++ ++ inline int32 ReferenceCount() const { return fRefCount; }; ++ inline ulong Options() const { return fOptions; }; ++ inline BGLView* GLView() { return fView; }; ++ inline BGLDispatcher* GLDispatcher() { return fDispatcher; }; ++ ++private: ++ friend class GLRendererRoster; ++ ++ virtual status_t _Reserved_Renderer_0(int32, void *); ++ virtual status_t _Reserved_Renderer_1(int32, void *); ++ virtual status_t _Reserved_Renderer_2(int32, void *); ++ virtual status_t _Reserved_Renderer_3(int32, void *); ++ virtual status_t _Reserved_Renderer_4(int32, void *); ++ ++ volatile int32 fRefCount; // How much we're still usefull? ++ BGLView* fView; // Never forget who is the boss! ++ ulong fOptions; // Keep that tune in memory ++ BGLDispatcher* fDispatcher;// Our personal GL API call dispatcher ++ ++ GLRendererRoster* fOwningRoster; ++ renderer_id fID; ++}; ++ ++extern "C" _EXPORT BGLRenderer* instantiate_gl_renderer(BGLView *view, ulong options, BGLDispatcher *dispatcher); ++ ++ ++#endif // GLRENDERER_H +diff --git a/include/HaikuGL/GLView.h b/include/HaikuGL/GLView.h +new file mode 100644 +index 0000000..b848578 +--- /dev/null ++++ b/include/HaikuGL/GLView.h +@@ -0,0 +1,193 @@ ++/* ++ * Copyright 2008-2013, Haiku, Inc. All Rights Reserved. ++ * Distributed under the terms of the MIT License. ++ * ++ * This header defines BGLView, the base class making up ++ * the Haiku GL Kit. ++ * ++ */ ++#ifndef BGLVIEW_H ++#define BGLVIEW_H ++ ++ ++#include ++ ++#define BGL_RGB 0 ++#define BGL_INDEX 1 ++#define BGL_SINGLE 0 ++#define BGL_DOUBLE 2 ++#define BGL_DIRECT 0 ++#define BGL_INDIRECT 4 ++#define BGL_ACCUM 8 ++#define BGL_ALPHA 16 ++#define BGL_DEPTH 32 ++#define BGL_OVERLAY 64 ++#define BGL_UNDERLAY 128 ++#define BGL_STENCIL 512 ++ ++#ifdef __cplusplus ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++ ++struct glview_direct_info; ++class BGLRenderer; ++class GLRendererRoster; ++ ++class BGLView : public BView { ++public: ++ BGLView(BRect rect, const char* name, ++ ulong resizingMode, ulong mode, ++ ulong options); ++ virtual ~BGLView(); ++ ++ void LockGL(); ++ void UnlockGL(); ++ void SwapBuffers(); ++ void SwapBuffers(bool vSync); ++ ++ BView* EmbeddedView(); // deprecated, returns NULL ++ void* GetGLProcAddress(const char* procName); ++ ++ status_t CopyPixelsOut(BPoint source, BBitmap *dest); ++ status_t CopyPixelsIn(BBitmap *source, BPoint dest); ++ ++ // Mesa's GLenum is uint where Be's ones was ulong! ++ virtual void ErrorCallback(unsigned long errorCode); ++ ++ virtual void Draw(BRect updateRect); ++ virtual void AttachedToWindow(); ++ virtual void AllAttached(); ++ virtual void DetachedFromWindow(); ++ virtual void AllDetached(); ++ ++ virtual void FrameResized(float newWidth, float newHeight); ++ virtual status_t Perform(perform_code d, void *arg); ++ ++ virtual status_t Archive(BMessage *data, bool deep = true) const; ++ ++ virtual void MessageReceived(BMessage *message); ++ virtual void SetResizingMode(uint32 mode); ++ ++ virtual void Show(); ++ virtual void Hide(); ++ ++ virtual BHandler* ResolveSpecifier(BMessage *msg, int32 index, ++ BMessage *specifier, int32 form, ++ const char *property); ++ virtual status_t GetSupportedSuites(BMessage *data); ++ ++ void DirectConnected(direct_buffer_info *info); ++ void EnableDirectMode(bool enabled); ++ ++ void* getGC() { return fGc; } // ??? ++ ++ virtual void GetPreferredSize(float* width, float* height); ++ ++private: ++ ++ virtual void _ReservedGLView1(); ++ virtual void _ReservedGLView2(); ++ virtual void _ReservedGLView3(); ++ virtual void _ReservedGLView4(); ++ virtual void _ReservedGLView5(); ++ virtual void _ReservedGLView6(); ++ virtual void _ReservedGLView7(); ++ virtual void _ReservedGLView8(); ++ ++ BGLView(const BGLView &); ++ BGLView &operator=(const BGLView &); ++ ++ void _DitherFront(); ++ bool _ConfirmDither(); ++ void _Draw(BRect rect); ++ void _CallDirectConnected(); ++ ++ void* fGc; ++ uint32 fOptions; ++ uint32 fDitherCount; ++ BLocker fDrawLock; ++ BLocker fDisplayLock; ++ glview_direct_info* fClipInfo; ++ ++ BGLRenderer* fRenderer; ++ GLRendererRoster* fRoster; ++ ++ BBitmap* fDitherMap; ++ BRect fBounds; ++ int16* fErrorBuffer[2]; ++ uint64 _reserved[8]; ++ ++ void _LockDraw(); ++ void _UnlockDraw(); ++ ++// BeOS compatibility ++private: ++ BGLView(BRect rect, char* name, ++ ulong resizingMode, ulong mode, ++ ulong options); ++}; ++ ++ ++class BGLScreen : public BWindowScreen { ++public: ++ BGLScreen(char* name, ++ ulong screenMode, ulong options, ++ status_t *error, bool debug=false); ++ ~BGLScreen(); ++ ++ void LockGL(); ++ void UnlockGL(); ++ void SwapBuffers(); ++ // Mesa's GLenum is uint where Be's ones was ulong! ++ virtual void ErrorCallback(unsigned long errorCode); ++ ++ virtual void ScreenConnected(bool connected); ++ virtual void FrameResized(float width, float height); ++ virtual status_t Perform(perform_code code, void *arg); ++ ++ virtual status_t Archive(BMessage *data, bool deep = true) const; ++ virtual void MessageReceived(BMessage *message); ++ ++ virtual void Show(); ++ virtual void Hide(); ++ ++ virtual BHandler* ResolveSpecifier(BMessage *message, ++ int32 index, ++ BMessage *specifier, ++ int32 form, ++ const char *property); ++ virtual status_t GetSupportedSuites(BMessage *data); ++ ++private: ++ ++ virtual void _ReservedGLScreen1(); ++ virtual void _ReservedGLScreen2(); ++ virtual void _ReservedGLScreen3(); ++ virtual void _ReservedGLScreen4(); ++ virtual void _ReservedGLScreen5(); ++ virtual void _ReservedGLScreen6(); ++ virtual void _ReservedGLScreen7(); ++ virtual void _ReservedGLScreen8(); ++ ++ BGLScreen(const BGLScreen &); ++ BGLScreen &operator=(const BGLScreen &); ++ ++ void* fGc; ++ long fOptions; ++ BLocker fDrawLock; ++ ++ int32 fColorSpace; ++ uint32 fScreenMode; ++ ++ uint64 _reserved[7]; ++}; ++ ++#endif // __cplusplus ++ ++#endif // BGLVIEW_H +diff --git a/include/HaikuGL/OpenGLKit.h b/include/HaikuGL/OpenGLKit.h +new file mode 100644 +index 0000000..f482871 +--- /dev/null ++++ b/include/HaikuGL/OpenGLKit.h +@@ -0,0 +1,10 @@ ++/* ++ * Master include file for the Haiku OpenGL Kit. ++ */ ++ ++#include ++#include ++ ++// Projects needing GL/glu.h and GL/glut.h should now ++// include these headers independently as glu and glut ++// are no longe core parts of mesa +diff --git a/include/HaikuGL/README b/include/HaikuGL/README +new file mode 100644 +index 0000000..0f8503f +--- /dev/null ++++ b/include/HaikuGL/README +@@ -0,0 +1,28 @@ ++These headers make up the Haiku Op*nGL kit. ++ ++Headers in this directory preserve some BeOS™ compatibility ++compatibility, so changes should be mentioned to the Haiku ++project mailing list. ++ ++http://haiku-os.org ++ ++Normal Haiku Op*enGL layout: ++ ++ * headers/os/OpenGLKit.h ++ * headers/os/opengl/GLView.h ++ * headers/os/opengl/GLRenderer.h ++ * headers/os/opengl/GL/gl.h ++ * headers/os/opengl/GL/gl_mangle.h ++ * headers/os/opengl/GL/glext.h ++ * headers/os/opengl/GL/osmesa.h (needed?) ++ ++Extras: ++ ++ * headers/os/opengl/GL/glu.h ++ * headers/os/opengl/GL/glut.h ++ ++OpenGL™ is a trademark of SGI. The usage of this trademark ++in the Haiku GL Kit is not a sign of any certification or ++endorsement by SGI or its affiliates. Usage is purely to ++allow legacy compatibility with the BeOS™ and its 3D GL ++rendering subsystem. +-- +1.8.3.4 + From 9bdf703e0f4ce1081ce58ec885756571c389a6a8 Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Mon, 23 Dec 2013 02:33:31 +0000 Subject: [PATCH 138/306] Add Cherry Blossom recipe and patch --- .../cherry_blossom/cherry_blossom-1.0.recipe | 46 +++++++++++++++++++ .../patches/cherry_blossom-1.0.patch | 36 +++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe create mode 100644 haiku-apps/cherry_blossom/patches/cherry_blossom-1.0.patch diff --git a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe new file mode 100644 index 000000000..9fed0758c --- /dev/null +++ b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe @@ -0,0 +1,46 @@ +SUMMARY="Cherry Blossom is an iTunes style media player for the Haiku Operating System." +HOMEPAGE="http://gitorious.org/cherry-blossom/" +SRC_URI="git+http://gitorious.org/cherry-blossom/cherry-blossom.git" +REVISION="1" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + cherry_blosom = $portVersion + app:cherry_blosom = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + taglib_devel + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:make + cmd:mkdepend + " + +PATCHES="cherry_blossom-1.0.patch" + +BUILD() +{ + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + mkdir -p ${appsDir} + cp -a objects/Cherry_Blossom $appsDir + addAppDeskbarSymlink ${appsDir}/Cherry_Blossom +} +LICENSE="MIT" +COPYRIGHT="Copyright (c) 2010 Bryce Groff" + +DESCRIPTION=" Cherry Blossom is a 100% native application and does not try to be portable to any other operating system. Cherry Blossom uses Haiku specific API’s for handling media, so if Haiku can play your media files, then Cherry Blossom will also be able to play your files." diff --git a/haiku-apps/cherry_blossom/patches/cherry_blossom-1.0.patch b/haiku-apps/cherry_blossom/patches/cherry_blossom-1.0.patch new file mode 100644 index 000000000..984da661e --- /dev/null +++ b/haiku-apps/cherry_blossom/patches/cherry_blossom-1.0.patch @@ -0,0 +1,36 @@ +diff --git a/makefile b/makefile +new file mode 100644 +index 0000000..d134de0 +--- /dev/null ++++ b/makefile +@@ -0,0 +1,30 @@ ++NAME= Cherry_Blossom ++ ++TYPE= APP ++ ++SRCS= interface/DrawingTidbits.cpp \ ++interface/PositionToolTip.cpp \ ++interface/TransportButton.cpp \ ++interface/PeakView.cpp \ ++interface/SeekSlider.cpp \ ++interface/VolumeSlider.cpp \ ++views/AlbumView.cpp \ ++views/ControlView.cpp \ ++views/MusicView.cpp \ ++views/SearchView.cpp \ ++views/ArtistView.cpp \ ++views/GenreView.cpp \ ++views/PlayListView.cpp \ ++views/SongView.cpp \ ++CherryBlossom.cpp \ ++CherryBlossomWindow.cpp \ ++ ++SYSTEM_INCLUDE_PATHS = /boot/system/develop/headers/private/interface/ \ ++ /boot/system/develop/headers/private/shared/ ++ ++ ++LIBS= be locale tag ++ ++APP_VERSION = 1.0 ++ ++include $(BUILDHOME)/etc/makefile-engine From 0b4fe2733a61baee4d215504ceb30409687b819b Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 22 Dec 2013 19:52:52 -0700 Subject: [PATCH 139/306] Mark dragonmemory as broken The game doesn't actually run. Apparently nobody bothered to test the students work --- games-kids/dragonmemory/dragonmemory-1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-kids/dragonmemory/dragonmemory-1.recipe b/games-kids/dragonmemory/dragonmemory-1.recipe index cdf2e8c96..d8f734df7 100644 --- a/games-kids/dragonmemory/dragonmemory-1.recipe +++ b/games-kids/dragonmemory/dragonmemory-1.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://sourceforge.net/projects/dragonmemory/" SRC_URI="http://cznic.dl.sourceforge.net/project/dragonmemory/DragonMemory-source.tgz" SRC_URI2="http://heanet.dl.sourceforge.net/project/dragonmemory/DragonMemory-source.tgz" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="!x86_gcc2 !x86 !x86_64" SOURCE_DIR="DragonMemory" PROVIDES=" From 46c9aa22eb6eae39aa98cf44d0604ebe9b509ae8 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 22 Dec 2013 19:57:58 -0700 Subject: [PATCH 140/306] Fix rezerware build ... since nobody bothered to check the work of the student Also, enable sound effects so I can test sdl-mixer --- .../rezerwar/patches/rezerwar-0.4.2.patch | 33 --------- .../rezerwar/patches/rezerwar-0.4.2.patchset | 68 +++++++++++++++++++ games-puzzle/rezerwar/rezerwar-0.4.2.recipe | 8 +-- 3 files changed, 71 insertions(+), 38 deletions(-) delete mode 100644 games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch create mode 100644 games-puzzle/rezerwar/patches/rezerwar-0.4.2.patchset diff --git a/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch b/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch deleted file mode 100644 index 18254aacf..000000000 --- a/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- ../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/patches/rezerwar-0.4.2.patchset b/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patchset new file mode 100644 index 000000000..1ac7b966e --- /dev/null +++ b/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patchset @@ -0,0 +1,68 @@ +From 4daa17a279a72f67e7ca9414e3be6ef6d95c21ad Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Sun, 22 Dec 2013 19:53:37 -0700 +Subject: applying patch rezerwar-0.4.2.patch + + +diff --git a/configure b/configure +index 7933d69..623bd32 100755 +--- a/configure ++++ b/configure +@@ -232,7 +232,7 @@ Debug) + 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" +diff --git a/src/main.c b/src/main.c +index ffc8a06..3132672 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -32,7 +32,8 @@ + #endif + + #include "SDL.h" +- ++#include ++#include + #include "rezerwar.h" + #include "config.h" + +@@ -231,7 +232,8 @@ main(int ac, char **av) + 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); +-- +1.8.3.4 + + +From 8fcb551ba8ea30777bf83db46a163c24f3308a06 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Sun, 22 Dec 2013 19:54:31 -0700 +Subject: Enable sound fx + + +diff --git a/configure b/configure +index 623bd32..10584ec 100755 +--- a/configure ++++ b/configure +@@ -239,7 +239,6 @@ Haiku|BeOS) + TARGET_DATA="$TARGET" + CFG_DATAPATH="$TARGET" + CFG_CFGPATH=".rezerwar" +- CFG_NOSOUND=1 + MK_EXTRAOBJS="strsep.o" + ;; + Win32|MINGW32*) +-- +1.8.3.4 + diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe index 8443aefe7..8f9e51990 100644 --- a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe +++ b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe @@ -35,13 +35,11 @@ BUILD_PREREQUIRES=" cmd:sdl_config$secondaryArchSuffix " -PATCHES=" - rezerwar-0.4.2.patch - " +PATCHES="rezerwar-0.4.2.patchset" BUILD() { - configure + ./configure make } @@ -53,4 +51,4 @@ INSTALL() cp src/rezerwar $appsDir/rezerwar/rezerwar addAppDeskbarSymlink $appsDir/rezerwar/rezerwar "Rezerwar" -} \ No newline at end of file +} From a833b6c1949f96c3ffa714de8e252c7455094905 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 22 Dec 2013 20:00:56 -0700 Subject: [PATCH 141/306] Fix SDL DECLSPEC value on Haiku Remove the Haiku specific code and just use the default method Resolves issue #77 --- media-libs/libsdl/libsdl-1.2.15.recipe | 2 +- .../libsdl/patches/libsdl-1.2.15.patchset | 31 ++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index dee7ebf21..7f01025c3 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Simple Direct Media Layer is a cross-platform development library d HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz" CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85" -REVISION="1" +REVISION="2" LICENSE="GNU LGPL v2.1" COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/libsdl/patches/libsdl-1.2.15.patchset b/media-libs/libsdl/patches/libsdl-1.2.15.patchset index b4adbd8ae..d36d015a9 100644 --- a/media-libs/libsdl/patches/libsdl-1.2.15.patchset +++ b/media-libs/libsdl/patches/libsdl-1.2.15.patchset @@ -1,4 +1,4 @@ -From db1b7894554a9d3460483d278b8dd50595e43135 Mon Sep 17 00:00:00 2001 +From 59cfb52a4c0564e1713c37be2ae6026f9e4e76a9 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 22 Nov 2013 23:38:56 +0100 Subject: Remove Alsa and ESD detection @@ -36,7 +36,7 @@ index 08c8e1e..84d9a55 100644 1.8.3.4 -From 4243b5c80de7a51abb05d6f4eb5a82984607024e Mon Sep 17 00:00:00 2001 +From b2657c374826ed213072b5e80263f59a42e76faf Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 22 Nov 2013 23:39:26 +0100 Subject: Fix samples vs bytes issues @@ -67,7 +67,7 @@ index de635f8..7faf571 100644 1.8.3.4 -From 03c94f6b8dbaec508da9ec16fecbb3411f70c0c7 Mon Sep 17 00:00:00 2001 +From 847264a916bb4b9e3bfa1ff8217beed67b37b8a4 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 22 Nov 2013 23:40:12 +0100 Subject: Various fixes to the video code @@ -147,7 +147,7 @@ index c32b661..a26f18b 100644 1.8.3.4 -From b0294206194d97e8bb8a69a214e4c8bd3311ed03 Mon Sep 17 00:00:00 2001 +From 6a8dccbefe9522f65a07177441a93251cfcc8d9f Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 23 Nov 2013 11:59:00 +0100 Subject: Actually fix the sample vs bytes problem in audio driver. @@ -200,3 +200,26 @@ index 7faf571..300bf03 100644 -- 1.8.3.4 + +From 112569083122d8d14b2571aaf2b73483ce3738db Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Sun, 22 Dec 2013 18:37:30 -0700 +Subject: Remove Haiku from specialized DECLSPEC definition + + +diff --git a/include/begin_code.h b/include/begin_code.h +index 27e2f7b..d5e2f1f 100644 +--- a/include/begin_code.h ++++ b/include/begin_code.h +@@ -41,7 +41,7 @@ + * Some compilers use a special export keyword + */ + #ifndef DECLSPEC +-# if defined(__BEOS__) || defined(__HAIKU__) ++# if defined(__BEOS__) + # if defined(__GNUC__) + # define DECLSPEC + # else +-- +1.8.3.4 + From 8acdaec3e962517d486b7902b480af320d82f6b2 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 23 Dec 2013 04:31:53 +0000 Subject: [PATCH 142/306] mesa: Fix missing developLibDir symlink --- sys-libs/mesa/mesa-10.0.1.recipe | 4 +++- sys-libs/mesa/mesa-7.9.2.recipe | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe index 3167cd28c..51e5dcfe0 100644 --- a/sys-libs/mesa/mesa-10.0.1.recipe +++ b/sys-libs/mesa/mesa-10.0.1.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.1/MesaLib-10.0.1.tar.bz2" CHECKSUM_MD5="0a72ca5b36046a658bf6038326ff32ed" -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 @@ -65,6 +65,8 @@ INSTALL() # libGL.so makes up the core of our OpenGL kit mkdir -p $libDir cp $(find $mesaBuildDir -name 'libGL.so') $libDir + mkdir -p $developLibDir + symlinkRelative -s $libDir/libGL.so $developLibDir # Our rendering add-ons mkdir -p $addOnsDir/opengl diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index ae5a26b99..4ce2b3d50 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -10,7 +10,7 @@ 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" +REVISION="2" ARCHITECTURES="x86_gcc2" if [ $effectiveTargetArchitecture != x86 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -59,6 +59,8 @@ INSTALL() # libGL.so makes up the core of our OpenGL kit mkdir -p $libDir cp $(find ./lib/ -name 'libGL.so') $libDir + mkdir -p $developLibDir + symlinkRelative -s $libDir/libGL.so $developLibDir # Our rendering add-on mkdir -p $addOnsDir/opengl From 675da32d28311cb0297e1da12eeaf7690a844b5e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 22 Dec 2013 22:08:13 -0800 Subject: [PATCH 143/306] Removed the download at the end of the sourceforge url for optipng --- media-gfx/optipng/optipng-0.7.4.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.4.recipe index 8f1d55968..354d2cac9 100644 --- a/media-gfx/optipng/optipng-0.7.4.recipe +++ b/media-gfx/optipng/optipng-0.7.4.recipe @@ -6,7 +6,7 @@ DESCRIPTION=" GIF, PNM and TIFF, to PNG files. " HOMEPAGE="http://optipng.sourceforge.net/" -SRC_URI="http://prdownloads.sourceforge.net/optipng/optipng-0.7.4.tar.gz?download" +SRC_URI="http://prdownloads.sourceforge.net/optipng/optipng-0.7.4.tar.gz" CHECKSUM_MD5="8853d89aaf859065e95dcdf98b6bed73" LICENSE="Zlib" COPYRIGHT="2001-2012 Cosmin Truta" @@ -31,6 +31,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion " + BUILD_PREREQUIRES=" cmd:ar cmd:gcc$secondaryArchSuffix From eac5997828984f331d20cecc546405ad193866df Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 23 Dec 2013 06:28:53 +0000 Subject: [PATCH 144/306] mesa: Fix reversed header symlink --- sys-libs/mesa/mesa-10.0.1.recipe | 26 +++++++++++++------------- sys-libs/mesa/mesa-7.9.2.recipe | 16 ++++++++-------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe index 51e5dcfe0..c6de0d81b 100644 --- a/sys-libs/mesa/mesa-10.0.1.recipe +++ b/sys-libs/mesa/mesa-10.0.1.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.1/MesaLib-10.0.1.tar.bz2" CHECKSUM_MD5="0a72ca5b36046a658bf6038326ff32ed" -REVISION="2" +REVISION="3" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -75,20 +75,20 @@ INSTALL() cp $(find $mesaBuildDir -name 'libswpipe.so') \ "$addOnsDir/opengl/Software Pipe" - # OpenGL Kit - mkdir -p $includeDir/os/opengl/GL - cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ - cp ./include/HaikuGL/GLView.h $includeDir/os/opengl/ - cp ./include/HaikuGL/GLRenderer.h $includeDir/os/opengl/ + # OpenGL Kit + mkdir -p $includeDir/os/opengl + cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ + 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/ - cp ./include/GL/gl_mangle.h $includeDir/os/opengl/GL/ - cp ./include/GL/glext.h $includeDir/os/opengl/GL/ + # Standard GL headers + mkdir -p $includeDir/GL + cp ./include/GL/gl.h $includeDir/GL/ + cp ./include/GL/gl_mangle.h $includeDir/GL/ + cp ./include/GL/glext.h $includeDir/GL/ - # Symlink GL in kit to system GL directory - cd $includeDir - ln -snf os/opengl/GL GL + # Create GL symlink in opengl kit + symlinkRelative -s $includeDir/GL $includeDir/os/opengl/GL # devel package packageEntries devel \ diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index 4ce2b3d50..2d0e30d24 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -10,7 +10,7 @@ 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="2" +REVISION="3" ARCHITECTURES="x86_gcc2" if [ $effectiveTargetArchitecture != x86 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -68,19 +68,19 @@ INSTALL() "$addOnsDir/opengl/Legacy Software Rasterizer" # OpenGL Kit - mkdir -p $includeDir/os/opengl/GL + mkdir -p $includeDir/os/opengl cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ 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/ - cp ./include/GL/gl_mangle.h $includeDir/os/opengl/GL/ - cp ./include/GL/glext.h $includeDir/os/opengl/GL/ + mkdir -p $includeDir/GL + cp ./include/GL/gl.h $includeDir/GL/ + cp ./include/GL/gl_mangle.h $includeDir/GL/ + cp ./include/GL/glext.h $includeDir/GL/ - # Symlink GL in kit to system GL directory - cd $includeDir - ln -snf os/opengl/GL GL + # Create GL symlink in opengl kit + symlinkRelative -s $includeDir/GL $includeDir/os/opengl/GL # devel package packageEntries devel \ From fa383dd65140c378b70d7f20106e6fbbeb556480 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 23 Dec 2013 07:25:22 +0000 Subject: [PATCH 145/306] mesa: Flag 7.9.2 as tested on x86_gcc2 secondary --- sys-libs/mesa/mesa-7.9.2.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index 2d0e30d24..8aa51a19d 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -17,7 +17,7 @@ if [ $effectiveTargetArchitecture != x86 ]; then # for a different secondary architecture. ARCHITECTURES="$ARCHITECTURES x86" fi -SECONDARY_ARCHITECTURES="?x86_gcc2" +SECONDARY_ARCHITECTURES="x86_gcc2" PROVIDES=" mesa$secondaryArchSuffix = $portVersion compat >= 7.9 From e9e665c314a7d18f20ede81db8165c56a3befd79 Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Mon, 23 Dec 2013 14:41:39 +0000 Subject: [PATCH 146/306] Move license, copyright and description to the top --- haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe index 9fed0758c..e1a8bc377 100644 --- a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe +++ b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe @@ -1,10 +1,14 @@ -SUMMARY="Cherry Blossom is an iTunes style media player for the Haiku Operating System." +DESCRIPTION="Cherry Blossom is a 100% native application and does not try to be portable to any other operating system. Cherry Blossom uses Haiku specific API’s for handling media, so if Haiku can play your media files, then Cherry Blossom will also be able to play your files." +SUMMARY="Cherry Blossom is media player for the Haiku Operating System." HOMEPAGE="http://gitorious.org/cherry-blossom/" SRC_URI="git+http://gitorious.org/cherry-blossom/cherry-blossom.git" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +LICENSE="MIT" +COPYRIGHT="2010 Bryce Groff" + PROVIDES=" cherry_blosom = $portVersion app:cherry_blosom = $portVersion @@ -40,7 +44,3 @@ INSTALL() cp -a objects/Cherry_Blossom $appsDir addAppDeskbarSymlink ${appsDir}/Cherry_Blossom } -LICENSE="MIT" -COPYRIGHT="Copyright (c) 2010 Bryce Groff" - -DESCRIPTION=" Cherry Blossom is a 100% native application and does not try to be portable to any other operating system. Cherry Blossom uses Haiku specific API’s for handling media, so if Haiku can play your media files, then Cherry Blossom will also be able to play your files." From a8c79c70ccd4597ad780e4a144c560c1302da08d Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Mon, 23 Dec 2013 14:45:54 +0000 Subject: [PATCH 147/306] Remove mention of other operating system --- haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe index e1a8bc377..545814d11 100644 --- a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe +++ b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe @@ -1,4 +1,4 @@ -DESCRIPTION="Cherry Blossom is a 100% native application and does not try to be portable to any other operating system. Cherry Blossom uses Haiku specific API’s for handling media, so if Haiku can play your media files, then Cherry Blossom will also be able to play your files." +DESCRIPTION="Cherry Blossom is a 100% native application. Cherry Blossom uses Haiku specific API’s for handling media, so if Haiku can play your media files, then Cherry Blossom will also be able to play your files." SUMMARY="Cherry Blossom is media player for the Haiku Operating System." HOMEPAGE="http://gitorious.org/cherry-blossom/" SRC_URI="git+http://gitorious.org/cherry-blossom/cherry-blossom.git" From 7eb12d20946d1c4618ab973bb03befe5dec7d8f0 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 23 Dec 2013 10:33:59 -0600 Subject: [PATCH 148/306] llvm: Properly flag 3.3 as broken to ensure proper Mesa build --- sys-devel/llvm/llvm-3.3.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/llvm/llvm-3.3.recipe b/sys-devel/llvm/llvm-3.3.recipe index f78c5b4ff..9dd0abcd1 100644 --- a/sys-devel/llvm/llvm-3.3.recipe +++ b/sys-devel/llvm/llvm-3.3.recipe @@ -8,9 +8,9 @@ REVISION="1" CHECKSUM_MD5="40564e1dc390f9844f1711c08b08e391" ARCHITECTURES="!x86 !x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - ARCHITECTURES="$ARCHITECTURES x86_gcc2" + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi -SECONDARY_ARCHITECTURES="x86" +SECONDARY_ARCHITECTURES="!x86" PROVIDES=" llvm$secondaryArchSuffix = $portVersion From 1b319035c326a41adcfaf8eff94fea6120e440a9 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 23 Dec 2013 10:34:53 -0600 Subject: [PATCH 149/306] mesa: Require proper llvm secondaryArchSuffix --- sys-libs/mesa/mesa-10.0.1.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe index c6de0d81b..cc30f8926 100644 --- a/sys-libs/mesa/mesa-10.0.1.recipe +++ b/sys-libs/mesa/mesa-10.0.1.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.1/MesaLib-10.0.1.tar.bz2" CHECKSUM_MD5="0a72ca5b36046a658bf6038326ff32ed" -REVISION="3" +REVISION="4" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -37,7 +37,7 @@ PATCHES="mesa-10.0.1.patchset" # changing LLVM versions shouldn't introduce any abi issues. BUILD_PREREQUIRES=" libxml2_python - llvm == 3.2 + llvm${secondaryArchSuffix} == 3.2 cmd:bison cmd:find cmd:flex From 2a3641bc154a0ab1d17a096823a1e8f20cb0048d Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 23 Dec 2013 12:29:53 -0700 Subject: [PATCH 150/306] Add gcc2 support for optipng Also switched it to use the system lib{png,z} --- media-gfx/optipng/optipng-0.7.4.recipe | 22 +++++---- media-gfx/optipng/patches/optipng-0.7.4.patch | 25 ----------- .../optipng/patches/optipng-0.7.4.patchset | 45 +++++++++++++++++++ 3 files changed, 55 insertions(+), 37 deletions(-) delete mode 100644 media-gfx/optipng/patches/optipng-0.7.4.patch create mode 100644 media-gfx/optipng/patches/optipng-0.7.4.patchset diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.4.recipe index 354d2cac9..b20530acf 100644 --- a/media-gfx/optipng/optipng-0.7.4.recipe +++ b/media-gfx/optipng/optipng-0.7.4.recipe @@ -10,14 +10,8 @@ SRC_URI="http://prdownloads.sourceforge.net/optipng/optipng-0.7.4.tar.gz" CHECKSUM_MD5="8853d89aaf859065e95dcdf98b6bed73" LICENSE="Zlib" COPYRIGHT="2001-2012 Cosmin Truta" -REVISION="1" -ARCHITECTURES="?x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86" -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 +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" optipng$secondaryArchSuffix = $portVersion @@ -26,10 +20,14 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libpng + lib:libz " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libpng + devel:libz " BUILD_PREREQUIRES=" @@ -39,13 +37,13 @@ BUILD_PREREQUIRES=" cmd:ranlib " -PATCHES=" - optipng-0.7.4.patch - " +PATCHES="optipng-0.7.4.patchset" BUILD() { - ./configure -bindir=$binDir -mandir=$manDir + ./configure -bindir=$binDir -mandir=$manDir \ + -with-system-libpng \ + -with-system-zlib make } diff --git a/media-gfx/optipng/patches/optipng-0.7.4.patch b/media-gfx/optipng/patches/optipng-0.7.4.patch deleted file mode 100644 index 8f27d354f..000000000 --- a/media-gfx/optipng/patches/optipng-0.7.4.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8fc175d03be69e84940012866ffdfa0b7b6c865b Mon Sep 17 00:00:00 2001 -From: Luke -Date: Fri, 20 Dec 2013 17:11:40 +0000 -Subject: [PATCH] Remove reference to libm - ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 5437b74..f7087fe 100755 ---- a/configure -+++ b/configure -@@ -305,7 +305,7 @@ sed_config=" - s#@ARFLAGS@#${ARFLAGS-cru}#g - s#@RANLIB@#${RANLIB-ranlib}#g - s#@LIBS@#${LIBS-}#g -- s#@LIBM@#${LIBM--lm}#g -+ s#@LIBM@#${LIBM-}#g - s#@LIBZ@#${LIBZ--lz}#g - s#@LIBPNG@#${LIBPNG--lpng}#g - s#@DIFF@#${DIFF-diff -b -u}#g --- -1.8.3.4 - diff --git a/media-gfx/optipng/patches/optipng-0.7.4.patchset b/media-gfx/optipng/patches/optipng-0.7.4.patchset new file mode 100644 index 000000000..aeb75492f --- /dev/null +++ b/media-gfx/optipng/patches/optipng-0.7.4.patchset @@ -0,0 +1,45 @@ +From 9aeb37585d609791981ff00956a99d54a9bf446e Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 23 Dec 2013 12:13:23 -0700 +Subject: applying patch optipng-0.7.4.patch + + +diff --git a/configure b/configure +index 5437b74..f7087fe 100755 +--- a/configure ++++ b/configure +@@ -305,7 +305,7 @@ sed_config=" + s#@ARFLAGS@#${ARFLAGS-cru}#g + s#@RANLIB@#${RANLIB-ranlib}#g + s#@LIBS@#${LIBS-}#g +- s#@LIBM@#${LIBM--lm}#g ++ s#@LIBM@#${LIBM-}#g + s#@LIBZ@#${LIBZ--lz}#g + s#@LIBPNG@#${LIBPNG--lpng}#g + s#@DIFF@#${DIFF-diff -b -u}#g +-- +1.8.3.4 + + +From 02727f980a432201225b91c51f7f76fad3d12cca Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 23 Dec 2013 12:16:17 -0700 +Subject: Remove Wextra from CFLAGS to make gcc2 happy + + +diff --git a/configure b/configure +index f7087fe..f3bca47 100755 +--- a/configure ++++ b/configure +@@ -192,7 +192,7 @@ rm -f $test.c $test.o + if test $gccish -ne 0 + then + CC="${CC-$cc}" +- CFLAGS="${CFLAGS--O2 -Wall -Wextra}" ++ CFLAGS="${CFLAGS--O2 -Wall}" + else + CC="${CC-cc}" + CFLAGS="${CFLAGS--O}" +-- +1.8.3.4 + From 10d97d7caff6943827fee56442095626362c229f Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 23 Dec 2013 14:57:01 -0700 Subject: [PATCH 151/306] Update keepassx to 2.0a5 --HG-- rename : app-admin/keepassx/keepassx-2.0a4.git.recipe => app-admin/keepassx/keepassx-2.0a5.recipe rename : app-admin/keepassx/patches/keepassx-2.0a4.git.patchset => app-admin/keepassx/patches/keepassx-2.0a5.patchset --- app-admin/keepassx/additional-files/keepassx.rdef | 2 +- .../{keepassx-2.0a4.git.recipe => keepassx-2.0a5.recipe} | 4 ++-- .../{keepassx-2.0a4.git.patchset => keepassx-2.0a5.patchset} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename app-admin/keepassx/{keepassx-2.0a4.git.recipe => keepassx-2.0a5.recipe} (95%) rename app-admin/keepassx/patches/{keepassx-2.0a4.git.patchset => keepassx-2.0a5.patchset} (100%) diff --git a/app-admin/keepassx/additional-files/keepassx.rdef b/app-admin/keepassx/additional-files/keepassx.rdef index b42fffa85..2ca7d82b6 100644 --- a/app-admin/keepassx/additional-files/keepassx.rdef +++ b/app-admin/keepassx/additional-files/keepassx.rdef @@ -7,7 +7,7 @@ resource app_version { minor = 0, variety = B_APPV_ALPHA, - internal = 4, + internal = 5, short_info = "Qt password manager", long_info = "" diff --git a/app-admin/keepassx/keepassx-2.0a4.git.recipe b/app-admin/keepassx/keepassx-2.0a5.recipe similarity index 95% rename from app-admin/keepassx/keepassx-2.0a4.git.recipe rename to app-admin/keepassx/keepassx-2.0a5.recipe index 1cd686d36..a8d9ddc3a 100644 --- a/app-admin/keepassx/keepassx-2.0a4.git.recipe +++ b/app-admin/keepassx/keepassx-2.0a5.recipe @@ -18,7 +18,7 @@ Especially someone who generates passwords frequently will appreciate this feature. " HOMEPAGE="http://www.keepassx.org/" -SRC_URI="git+https://github.com/keepassx/keepassx.git#755241df5c" +SRC_URI="git+https://github.com/keepassx/keepassx.git#2.0-alpha5" COPYRIGHT=" 2010-2012, Felix Geyer 2011-2012, Florian Geyer @@ -63,7 +63,7 @@ BUILD_PREREQUIRES=" cmd:xres " -PATCHES="keepassx-2.0a4.git.patchset" +PATCHES="keepassx-2.0a5.patchset" BUILD() { diff --git a/app-admin/keepassx/patches/keepassx-2.0a4.git.patchset b/app-admin/keepassx/patches/keepassx-2.0a5.patchset similarity index 100% rename from app-admin/keepassx/patches/keepassx-2.0a4.git.patchset rename to app-admin/keepassx/patches/keepassx-2.0a5.patchset From 78cbf32a67505cd78dd019604aaed9539ae1069d Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 24 Dec 2013 15:05:56 +0000 Subject: [PATCH 152/306] Added gnulib recipe. Just copies binary and related files to $dataDir/gnulib and symlinks binary to $binDir/gnulib_tool --- dev-libs/gnulib/gnulib-2013_12_17.recipe | 47 ++++++++++++++++++++++++ dev-libs/gnulib/gnulib-9999.recipe | 24 ------------ 2 files changed, 47 insertions(+), 24 deletions(-) create mode 100644 dev-libs/gnulib/gnulib-2013_12_17.recipe delete mode 100644 dev-libs/gnulib/gnulib-9999.recipe diff --git a/dev-libs/gnulib/gnulib-2013_12_17.recipe b/dev-libs/gnulib/gnulib-2013_12_17.recipe new file mode 100644 index 000000000..5a206279a --- /dev/null +++ b/dev-libs/gnulib/gnulib-2013_12_17.recipe @@ -0,0 +1,47 @@ +DESCRIPTION="Gnulib is a source code library that provides basic functionality to programs and libraries. +Many software packages make use of Gnulib to avoid reinventing the portability wheel. +Gnulib is intended to be the canonical source for most of the important “portability†and/or common files for software projects. +These are files intended to be shared at the source level; Gnulib is not a typical library meant to be installed and linked against. Thus, unlike most projects, Gnulib does not normally generate a source tarball distribution; instead, developers grab modules directly from the source repository." +SUMMARY="Gnulib is a library of common routines intended to be shared at the source level" +HOMEPAGE="http://www.gnu.org/software/gnulib" +SRC_URI="git+git://git.savannah.gnu.org/gnulib.git" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" +LICENSE="GNULIB" +COPYRIGHT="1985-2013 Free Software Foundation." + +PROVIDES=" + gnulib = $portVersion + cmd:gnulib_tool$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES="" # No build, no requirements + +BUILD_PREREQUIRES="" # No build, no requirements + +BUILD() +{ + # Nothing to build + exit 0 +} + +INSTALL() +{ + # Try to install gnulib-tool + + mkdir -p $dataDir/gnulib $binDir + + cp gnulib-tool $dataDir/gnulib/gnulib_tool # Fix binary name in help + cp -R check-copyright check-module posix-modules build-aux config doc lib m4 modules tests top $dataDir/gnulib + ln -s $dataDir/gnulib/gnulib_tool $binDir/gnulib_tool +} + +TEST() +{ + make check +} diff --git a/dev-libs/gnulib/gnulib-9999.recipe b/dev-libs/gnulib/gnulib-9999.recipe deleted file mode 100644 index 35cbc5db5..000000000 --- a/dev-libs/gnulib/gnulib-9999.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="Gnulib is a library of common routines intended to be shared at the source level" -HOMEPAGE="http://www.gnu.org/software/gnulib" -SRC_URI="git+git://git.savannah.gnu.org/gnulib.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -#CHECKSUM_MD5="" -BUILD() -{ - echo "gnulib isn't meant to be built." -} - -INSTALL() -{ - echo "gnulib isn't meant to be installed." -} - -TEST() -{ - make check -} - -LICENSE="GNULIB" -COPYRIGHT="1985-2011 Free Software Foundation." From 85fd14ca9a33ffb43326b1c6d03aa7fc92499a32 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Wed, 25 Dec 2013 00:03:36 -0500 Subject: [PATCH 153/306] Add OptiPNGTranslator recipe --- .../optipngtranslator-0.0.1.recipe | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe diff --git a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe new file mode 100644 index 000000000..4930cc182 --- /dev/null +++ b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe @@ -0,0 +1,50 @@ +SUMMARY="Save optimized PNG files" +DESCRIPTION=" + The OptiPNGTranslator for Haiku allows you to save images as + PNG files which have been optimized by OptiPNG. + " +HOMEPAGE="https://github.com/noryb009/OptiPNGTranslator/" +SRC_URI="git://github.com/noryb009/OptiPNGTranslator.git#8e3996a92d840f3c097cf954e001d4f371265161" +LICENSE="MIT" +COPYRIGHT="2013 Luke (noryb009)" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +if [ $buildArchitecture = x86_gcc2 ] && \ + [ $targetArchitecture = x86_gcc2 ]; then + optipngSuffix="_x86" +fi + +PROVIDES=" + optipngtranslator = $portVersion + app:optipngtranslator = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:optipng$optipngSuffix + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:as + cmd:gcc + makefile_engine + cmd:make + cmd:mkdepend + " + +BUILD() +{ + make \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` \ + TARGET_DIR=. +} + +INSTALL() +{ + mkdir -p $addOnsDir/Translators + cp OptiPNGTranslator $addOnsDir/Translators +} From 87aec6f02d7cfb90a6ced3fb8b0487a81a2d17ca Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Wed, 25 Dec 2013 16:45:30 +0000 Subject: [PATCH 154/306] Trying to make a functional gnulib recipe in x86 --- dev-libs/gnulib/gnulib-2013_12_17.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-libs/gnulib/gnulib-2013_12_17.recipe b/dev-libs/gnulib/gnulib-2013_12_17.recipe index 5a206279a..a60138d83 100644 --- a/dev-libs/gnulib/gnulib-2013_12_17.recipe +++ b/dev-libs/gnulib/gnulib-2013_12_17.recipe @@ -6,8 +6,8 @@ SUMMARY="Gnulib is a library of common routines intended to be shared at the sou HOMEPAGE="http://www.gnu.org/software/gnulib" SRC_URI="git+git://git.savannah.gnu.org/gnulib.git" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" LICENSE="GNULIB" COPYRIGHT="1985-2013 Free Software Foundation." @@ -17,7 +17,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES="" # No build, no requirements From 8000bae547c2e9951d15a0e3fc3e697cf79eeb14 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 24 Dec 2013 20:27:43 +0000 Subject: [PATCH 155/306] Added libidn recipe and patch (not sure if needed) --- dev-libs/libidn/libidn-1.9.recipe | 100 +++++++++++++++++++++++ dev-libs/libidn/patches/libidn-1.9.patch | 11 +++ 2 files changed, 111 insertions(+) create mode 100644 dev-libs/libidn/libidn-1.9.recipe create mode 100644 dev-libs/libidn/patches/libidn-1.9.patch diff --git a/dev-libs/libidn/libidn-1.9.recipe b/dev-libs/libidn/libidn-1.9.recipe new file mode 100644 index 000000000..e65e192d3 --- /dev/null +++ b/dev-libs/libidn/libidn-1.9.recipe @@ -0,0 +1,100 @@ +SUMMARY="libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications." +DESCRIPTION="GNU Libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications. Libidn's purpose is to encode and decode internationalized domain names." + +HOMEPAGE="http://www.gnu.org/software/libidn/" +SRC_URI="http://ftpmirror.gnu.org/libidn/libidn-1.9.tar.gz" +CHECKSUM_MD5="f4d794639564256a367566302611224e" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +REVISION="1" + +LICENSE=" + GNU GPL v3 + GNU LGPL v2.1 + " +COPYRIGHT=" + 2004-2008 Simon Josefsson + 1998, 1999 Tom Tromey + 2001 Red Hat Software + 1994-2007 Free Software Foundation + " + +PROVIDES=" + libidn = $portVersion + lib:libidn$secondaryArchSuffix = $portVersion + cmd:idn$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libiconv$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libiconv$secondaryArchSuffix + gettext${secondaryArchSuffix}_libintl + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:gnulib_tool$secondaryArchSuffix + cmd:gperf + cmd:help2man$secondaryArchSuffix + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:make + cmd:makeinfo + " + +PATCHES="libidn-1.9.patch" + +BUILD() +{ + gnulib_tool --import --local-dir=gl/override --source-base=gl \ + --m4-base=gl/m4 --libtool --no-vc-files \ + csharpcomp-script error fdl gendocs getopt gnupload gpl-3.0 lgpl-2.1 \ + maintainer-makefile progname version-etc + + gnulib_tool --import --local-dir=lib/gl/override --source-base=lib/gl \ + --m4-base=lib/gl/m4 --lgpl=2 --libtool --macro-prefix=lgl --no-vc-files \ + gettext-h stdint striconv strverscmp + + libtoolize --force --copy --install + + # Libtoolize is going to ask us to add the contents of some files + # to aclocal.m4 + for i in m4/{libtool,lt{options,sugar,version,~obsolete}}.m4; do cat $i >> aclocal.m4; done + + aclocal -I m4 -I gl/m4 -I lib/gl/m4 + autoconf + automake --add-missing + + runConfigure ./configure --enable-shared + make +} + +INSTALL() +{ + make install + + prepareInstalledDevelLib libidn + fixPkgconfig + + packageEntries devel \ + $developDir \ + $documentationDir +} + +# ------ devel package ------------------------------------------------------ + +PROVIDES_devel=" + libidn${secondaryArchSuffix}_devel = $portVersion + devel:libidn$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + libidn$secondaryArchSuffix == $portVersion base + " diff --git a/dev-libs/libidn/patches/libidn-1.9.patch b/dev-libs/libidn/patches/libidn-1.9.patch new file mode 100644 index 000000000..75210c0fe --- /dev/null +++ b/dev-libs/libidn/patches/libidn-1.9.patch @@ -0,0 +1,11 @@ +diff -ur libidn-1.9-orig/configure.ac libidn-1.9/configure.ac +--- libidn-1.9-orig/configure.ac 2013-12-24 15:51:24.035913728 +0000 ++++ libidn-1.9/configure.ac 2013-12-24 16:39:55.968622080 +0000 +@@ -28,6 +28,7 @@ + AC_SUBST(LT_REVISION, 38) + AC_SUBST(LT_AGE, 5) + ++AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_AUX_DIR([build-aux]) + AM_INIT_AUTOMAKE([1.10]) + AB_INIT From fbdc84afceda2c39ff517b530a812a950e47b1fe Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 24 Dec 2013 15:45:49 +0000 Subject: [PATCH 156/306] Added help2man recipe --- app-text/help2man/help2man-1.43.3.recipe | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 app-text/help2man/help2man-1.43.3.recipe diff --git a/app-text/help2man/help2man-1.43.3.recipe b/app-text/help2man/help2man-1.43.3.recipe new file mode 100644 index 000000000..9ccf6bb17 --- /dev/null +++ b/app-text/help2man/help2man-1.43.3.recipe @@ -0,0 +1,45 @@ +SUMMARY="help2man produces simple manual pages from the ‘--help’ and ‘--version’ output of other commands." +DESCRIPTION="help2man is a tool for automatically generating simple manual pages from program output. +This program is intended to provide an easy way for software authors to include a manual page in their distribution without having to maintain that document. +Given a program which produces reasonably standard ‘--help’ and ‘--version’ outputs, help2man can re-arrange that output into something which resembles a manual page." + +HOMEPAGE="http://www.gnu.org/software/help2man/" +SRC_URI="http://ftpmirror.gnu.org/help2man/help2man-1.43.3.tar.gz" +CHECKSUM_MD5="a84868db7c139238df8add5d86a0b54f" + +REVISION="1" + +LICENSE="GNU GPL v3" +COPYRIGHT="1997-2013 Free Software Foundation" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + help2man = $portVersion + cmd:help2man$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + cmd:perl + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:perl + " + +BUILD() +{ + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} From f16ec6872a0df57f76c8a85e20551fb7194dcca4 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 25 Dec 2013 12:26:43 -0800 Subject: [PATCH 157/306] Fixed antiword recipe --- app-text/antiword/antiword-0.37.recipe | 38 ++++++++++++------- app-text/antiword/patches/antiword-0.37.patch | 8 ++-- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/app-text/antiword/antiword-0.37.recipe b/app-text/antiword/antiword-0.37.recipe index 43db486d6..aa1b51eeb 100644 --- a/app-text/antiword/antiword-0.37.recipe +++ b/app-text/antiword/antiword-0.37.recipe @@ -15,33 +15,43 @@ COPYRIGHT="1998-2005 A.J. van Os" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" PROVIDES=" - antiword = $portVersion - cmd:antiword = $portVersion -" + antiword = $portVersion + cmd:antiword = $portVersion + cmd:kantiword =$portVersion + " REQUIRES=" - haiku >= $haikuVersion -" + haiku >= $haikuVersion + " BUILD_REQUIRES=" -" + haiku_devel >= $haikuVersion + " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:make -" + cmd:gcc + cmd:make + " PATCHES=" - antiword-0.37.patch -" + antiword-0.37.patch + " + +USER_SETTINGS_FILES=" + settings/antiword_settings + " BUILD() { - make --makefile Makefile.haiku + + make --makefile Makefile.haiku BINDIR=$binDir \ + ANTIWORD_SETTINGS=$settingsDir/antiword \ + ANTIWORD_DATA=$dataDir/antiword } INSTALL() { - make --makefile Makefile.haiku global_install + make --makefile Makefile.haiku global_install BINDIR=$binDir \ + ANTIWORD_SETTINGS=$settingsDir/antiword \ + ANTIWORD_DATA=$dataDir/antiword } diff --git a/app-text/antiword/patches/antiword-0.37.patch b/app-text/antiword/patches/antiword-0.37.patch index 02cf41c35..117c4e06a 100644 --- a/app-text/antiword/patches/antiword-0.37.patch +++ b/app-text/antiword/patches/antiword-0.37.patch @@ -51,11 +51,11 @@ diff -Naur antiword-0.37/Makefile.haiku antiword-0.37-haiku/Makefile.haiku + antiword\ + kantiword + -+LOCAL_INSTALL_DIR = $(HOME)/bin -+LOCAL_RESOURCES_DIR = $(HOME)/.antiword ++LOCAL_INSTALL_DIR = $(BINDIR) ++LOCAL_RESOURCES_DIR = $(ANTIWORD_SETTINGS) + -+GLOBAL_INSTALL_DIR = /boot/common/bin -+GLOBAL_RESOURCES_DIR = /boot/common/data/antiword ++GLOBAL_INSTALL_DIR = $(BINDIR) ++GLOBAL_RESOURCES_DIR = $(ANTIWORD_DATA) + +all: $(PROGS) + From 57d1b03533e9d5c2c068faa08785891ee03803a9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 25 Dec 2013 12:28:04 -0800 Subject: [PATCH 158/306] Enable libGL for libsdl --- media-libs/libsdl/libsdl-1.2.15.recipe | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index 7f01025c3..2fbd2668e 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Simple Direct Media Layer is a cross-platform development library d HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz" CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85" -REVISION="2" +REVISION="3" LICENSE="GNU LGPL v2.1" COPYRIGHT="1997-2012 Sam Lantinga" @@ -15,9 +15,10 @@ PROVIDES=" lib:libSDL$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0 lib:libSDL_1.2$secondaryArchSuffix = 0.11.4 compat >= 0 " + REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion -# lib:libGL$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libglu$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -25,7 +26,7 @@ REQUIRES=" " BUILD_REQUIRES=" -# devel:libGL$secondaryArchSuffix + devel:libGL$secondaryArchSuffix devel:libglu$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix From 76d471398f26191d078462eac3d65931cba76b5a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 25 Dec 2013 12:38:16 -0800 Subject: [PATCH 159/306] Enable libGL for libsdl2 --- media-libs/libsdl2/libsdl2-2.0.1.recipe | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/media-libs/libsdl2/libsdl2-2.0.1.recipe b/media-libs/libsdl2/libsdl2-2.0.1.recipe index 335db0da9..83cf33207 100644 --- a/media-libs/libsdl2/libsdl2-2.0.1.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.1.recipe @@ -19,7 +19,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion -# lib:libGL$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libglu$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -27,17 +27,15 @@ REQUIRES=" " BUILD_REQUIRES=" -# devel:mesa + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libGL$secondaryArchSuffix devel:libglu$secondaryArchSuffix devel:libpng$secondaryArchSuffix - devel:libpng$secondaryArchSuffix >= 1.5 -# ^^ Haikuporter fails if we try to check this one? - devel:libjpeg$secondaryArchSuffix >= 9 - devel:libtiff$secondaryArchSuffix >= 3.9 + devel:libjpeg$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:autoconf cmd:libtool cmd:aclocal @@ -66,16 +64,16 @@ INSTALL() libSDL2-2.0 fixPkgconfig - fixDevelopLibDirReferences $binDir/sdl2-config + fixDevelopLibDirReferences $binDir/sdl2-config$secondaryArchSuffix packageEntries devel \ - $developDir $binDir/sdl2-config $dataDir + $developDir $binDir/sdl2-config$secondaryArchSuffix $dataDir } # ----- devel package ------------------------------------- PROVIDES_devel=" libsdl2${secondaryArchSuffix}_devel = $portVersion compat >= 2.0 - cmd:sdl2_config = $portVersion compat >= 2.0 + cmd:sdl2_config$secondaryArchSuffix = $portVersion compat >= 2.0 devel:libSDL2$secondaryArchSuffix = 2.0_0.1.0 compat >= 2.0_0 devel:libSDL2main$secondaryArchSuffix = 2.0_0.1.0 compat >= 2.0_0 devel:libSDL2_test$secondaryArchSuffix = 2.0_0.1.0 compat >= 2.0_0 From fdcfc804586101cf2e23768f24dcd15e32004753 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 25 Dec 2013 12:48:36 -0800 Subject: [PATCH 160/306] Updated taglib recipe, but will still need a bit more work for secondaryArchSuffix --- media-libs/taglib/taglib-1.7.2.recipe | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe index 878fcf5e8..28059eae7 100644 --- a/media-libs/taglib/taglib-1.7.2.recipe +++ b/media-libs/taglib/taglib-1.7.2.recipe @@ -1,5 +1,5 @@ SUMMARY="TabLib Audio Meta-Data Library" -DESCRIPTION="TagLib Audio Meta-Data Library" +DESCRIPTION="TagLib is a library for reading and editing the meta-data of several popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files." HOMEPAGE="http://github.com/taglib" SRC_URI="http://taglib.github.io/releases/taglib-1.7.2.tar.gz" CHECKSUM_MD5="b0a9e797d3833fb933c7c3176de3d720" @@ -13,43 +13,44 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" taglib$secondaryArchSuffix = $portVersion - cmd:taglib_config lib:libtag$secondaryArchSuffix = 1.7.2 compat >= 1.7 lib:libtag_c$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libz + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libz + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix - cmd:cmake$secondaryArchSuffix + cmd:cmake cmd:make " -SOURCE_DIR="$portVersionedName" +#SOURCE_DIR="$portVersionedName" BUILD() { cmake . -DCMAKE_INSTALL_PREFIX:PATH=$prefix \ -DBIN_INSTALL_DIR=$binDir \ - -DLIB_INSTALL_DIR=$developLibDir - make + -DLIB_INSTALL_DIR=$developLibDir \ + -DLIB_SUFFIX="/${secondaryArchSuffx/_/}" + make $jobArgs } -#-DINCLUDE_INSTALL_DIR=$developDir/headers \ + INSTALL() { make install mkdir -p $developDir/headers mv $prefix/include/taglib $developDir/headers + rm -rf $prefix/include prepareInstalledDevelLibs \ libtag \ @@ -67,6 +68,7 @@ PROVIDES_devel=" taglib${secondaryArchSuffix}_devel = $portVersion compat >= 1.7 devel:libtag$secondaryArchSuffix = 1.7.2 compat >= 1.7 devel:libtag_c$secondaryArchSuffix = 0.0.0 compat >= 0 + cmd:taglib_config$secondaryArchSuffix " REQUIRES_devel=" From db9ff2f3f484e77f80a41ca5e9ab0dd926edcadd Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 25 Dec 2013 13:19:55 -0800 Subject: [PATCH 161/306] Fixed apr url as reported in issue #73 --- dev-libs/apr/apr-1.4.6.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe index d8b6ed15f..2e532b2bb 100644 --- a/dev-libs/apr/apr-1.4.6.recipe +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -1,6 +1,6 @@ SUMMARY="Apache Portable Runtime Library" HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz" +SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.6.tar.gz" COPYRIGHT="2012 The Apache Software Foundation." LICENSE="Apache v2" CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb" From d97a2aabd96fa00b00b76d75a52ce8acf221ffb4 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 17:52:56 -0600 Subject: [PATCH 162/306] all: Don't use portVersionedName for SOURCE_DIR * portVersionedName contains the secondary architecture, so using it means secondary package builds fail. example: $portVersionedName is libwow_x86-0.0.0 when doing an x86 build on x86_gcc2 --- app-arch/bzip2/bzip2-1.0.6.recipe | 1 - app-arch/libarchive/libarchive-3.1.2.recipe | 1 - app-arch/tar/tar-1.26.recipe | 1 - app-doc/doxygen/doxygen-1.6.3.recipe | 1 - app-editors/nano/nano-2.2.6.recipe | 1 - app-misc/colordiff/colordiff-1.0.13.recipe | 1 - app-misc/getopt/getopt-1.1.5.recipe | 1 - app-shells/zsh/zsh-5.0.2.recipe | 1 - app-text/asciidoc/asciidoc-8.6.8.recipe | 1 - app-text/aspell/aspell-0.60.6.1.recipe | 1 - app-text/discount/discount-2.1.3.recipe | 1 - app-text/dos2unix/dos2unix-1.0.recipe | 1 - app-text/htmldoc/htmldoc-1.8.27.recipe | 1 - app-text/mdocml/mdocml-1.12.2.recipe | 1 - app-text/rman/rman-3.2.recipe | 1 - app-text/texi2html/texi2html-1.82.recipe | 1 - dev-lang/nasm/nasm-2.08.01.recipe | 1 - dev-lang/perl/perl-5.10.1.recipe | 1 - dev-lang/perl/perl-5.18.1.recipe | 1 - dev-lang/swig/swig-2.0.11.recipe | 1 - dev-lang/yasm/yasm-1.1.0.recipe | 1 - dev-lang/yasm/yasm-1.2.0.recipe | 1 - dev-libs/apr/apr-1.4.6.recipe | 1 - dev-libs/apr_util/apr_util-1.3.10.recipe | 1 - dev-libs/gmp/gmp-5.1.1.recipe | 2 -- dev-libs/libcss/libcss-0.2.0_git.recipe | 1 - dev-libs/libevent/libevent-1.4.14b.recipe | 2 +- dev-libs/libevent/libevent-2.0.21.recipe | 2 +- dev-libs/libparserutils/libparserutils-0.1.2_git.recipe | 1 - dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe | 1 - dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe | 1 - dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe | 1 - dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe | 1 - dev-libs/openssl/openssl-1.0.0d.recipe | 1 - dev-python/docutils/docutils-0.11.recipe | 1 - dev-python/dulwich/dulwich-0.9.1.recipe | 1 - dev-python/ordereddict/ordereddict-1.1.recipe | 1 - dev-scheme/chicken/chicken-4.8.0.5.recipe | 1 - dev-util/cmake/cmake-2.8.5.recipe | 1 - dev-util/cscope/cscope-15.7a.recipe | 1 - dev-util/ctags/ctags-5.8.recipe | 1 - dev-util/fastdep/fastdep-0.16.recipe | 1 - dev-util/global/global-6.2.9.recipe | 1 - dev-util/idutils/idutils-4.6.recipe | 1 - dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe | 1 - dev-util/patchutils/patchutils-0.3.3.recipe | 1 - dev-vcs/cvs/cvs-1.12.13.1.recipe | 1 - dev-vcs/git/git-1.7.10.2.recipe | 1 - dev-vcs/git/git-1.8.3.4.recipe | 1 - dev-vcs/mercurial/mercurial-2.2.2.recipe | 1 - dev-vcs/subversion/subversion-1.6.15.recipe | 1 - dev-vcs/subversion/subversion-1.6.18.recipe | 1 - haiku-apps/armyknife/armyknife-66.recipe | 1 - haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe | 1 - haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe | 1 - haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe | 1 - haiku-apps/mkdepend/mkdepend-1.7.recipe | 1 - haiku-apps/pe/pe-2.4.3_hg602.recipe | 1 - haiku-apps/pe/pe-2.4.3_hg606.recipe | 1 - haiku-apps/pe/pe-2.4.3_hg610.recipe | 1 - haiku-apps/pe/pe-2.4.3_hg611.recipe | 1 - haiku-apps/pe/pe-2.4.3_hg614.recipe | 1 - haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe | 1 - haiku-apps/vision/vision-0.9.7.r947.recipe | 1 - media-gfx/graphviz/graphviz-2.26.3.recipe | 1 - media-gfx/pngcrush/pngcrush-1.7.67.recipe | 2 +- media-libs/taglib/taglib-1.7.2.recipe | 1 - media-sound/lame/lame-3.99.5.recipe | 1 - net-misc/neon/neon-0.29.6.recipe | 1 - net-misc/openssh/openssh-5.8p2.recipe | 1 - net-misc/openssh/openssh-6.0p1.recipe | 1 - net-misc/rsync/rsync-3.1.0.recipe | 1 - net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe | 2 +- net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe | 1 - sys-apps/diffutils/diffutils-3.3.recipe | 1 - sys-apps/dtc/dtc-1.4.0.recipe | 2 +- sys-apps/ed/ed-1.7.recipe | 1 - sys-apps/file/file-5.15.recipe | 1 - sys-apps/gawk/gawk-3.1.8.recipe | 1 - sys-apps/grep/grep-2.14.recipe | 1 - sys-apps/groff/groff-1.20.1.recipe | 1 - sys-apps/man/man-1.6g.recipe | 1 - sys-apps/sed/sed-4.2.1.recipe | 1 - sys-devel/autoconf/autoconf-2.68.recipe | 1 - sys-devel/autoconf/autoconf-2.69.recipe | 1 - sys-devel/automake/automake-1.11.1.recipe | 1 - sys-devel/automake/automake-1.12.2.recipe | 1 - sys-devel/automake/automake-1.13.1.recipe | 1 - sys-devel/binutils/binutils-2.17_2013_04_21.recipe | 2 +- sys-devel/bison/bison-2.4.3.recipe | 1 - sys-devel/bison/bison-2.5.recipe | 2 +- sys-devel/flex/flex-2.5.35.recipe | 1 - sys-devel/jam/jam-2.5_2012_10_12.recipe | 2 +- sys-devel/libtool/libtool-2.4.recipe | 1 - sys-devel/m4/m4-1.4.16.recipe | 1 - sys-devel/make/make-3.82.recipe | 1 - sys-devel/patch/patch-2.7.1.recipe | 1 - sys-libs/readline/readline-6.2.recipe | 1 - sys-libs/slang/slang-2.2.4.recipe | 1 - www-client/w3m/w3m-0.5.3.recipe | 1 - 100 files changed, 8 insertions(+), 101 deletions(-) diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe index b13574a48..f9ffdcfcb 100644 --- a/app-arch/bzip2/bzip2-1.0.6.recipe +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -44,7 +44,6 @@ BUILD_PREREQUIRES=" cmd:sed " -#SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-arch/libarchive/libarchive-3.1.2.recipe b/app-arch/libarchive/libarchive-3.1.2.recipe index 4443a094d..ea29f56d2 100644 --- a/app-arch/libarchive/libarchive-3.1.2.recipe +++ b/app-arch/libarchive/libarchive-3.1.2.recipe @@ -94,7 +94,6 @@ REQUIRES_devel=" PATCHES="libarchive-3.1.2.patchset" -#SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index 4bb2b7dd7..8f5dcc2a0 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -43,7 +43,6 @@ BUILD_PREREQUIRES=" defineDebugInfoPackage tar \ $binDir/tar -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe index cc4ac12bf..b71b257ab 100644 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -39,7 +39,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe index 168ac8b4c..a820e115c 100644 --- a/app-editors/nano/nano-2.2.6.recipe +++ b/app-editors/nano/nano-2.2.6.recipe @@ -39,7 +39,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-misc/colordiff/colordiff-1.0.13.recipe b/app-misc/colordiff/colordiff-1.0.13.recipe index e28644734..c31aa1735 100644 --- a/app-misc/colordiff/colordiff-1.0.13.recipe +++ b/app-misc/colordiff/colordiff-1.0.13.recipe @@ -11,7 +11,6 @@ REVISION="1" ARCHITECTURES="any" LICENSE="GNU GPL v2" COPYRIGHT="2002-2012 Dave Ewart" -SOURCE_DIR="$portVersionedName" PATCHES="colordiff-1.0.13.patch" PROVIDES=" diff --git a/app-misc/getopt/getopt-1.1.5.recipe b/app-misc/getopt/getopt-1.1.5.recipe index 8cd7bf544..920f38b8d 100644 --- a/app-misc/getopt/getopt-1.1.5.recipe +++ b/app-misc/getopt/getopt-1.1.5.recipe @@ -22,7 +22,6 @@ LICENSE="GNU GPL v2" COPYRIGHT="1997-2012 Frodo Looijaard" ARCHITECTURES="x86 x86_gcc2" -SOURCE_DIR="$portVersionedName" PROVIDES=" getopt = $portVersion diff --git a/app-shells/zsh/zsh-5.0.2.recipe b/app-shells/zsh/zsh-5.0.2.recipe index 95f01ab0e..b3c0a5f82 100644 --- a/app-shells/zsh/zsh-5.0.2.recipe +++ b/app-shells/zsh/zsh-5.0.2.recipe @@ -36,7 +36,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-text/asciidoc/asciidoc-8.6.8.recipe b/app-text/asciidoc/asciidoc-8.6.8.recipe index b95ef81bf..cd4e26ef0 100644 --- a/app-text/asciidoc/asciidoc-8.6.8.recipe +++ b/app-text/asciidoc/asciidoc-8.6.8.recipe @@ -30,7 +30,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/app-text/aspell/aspell-0.60.6.1.recipe b/app-text/aspell/aspell-0.60.6.1.recipe index f58de8e60..04f7afdf2 100644 --- a/app-text/aspell/aspell-0.60.6.1.recipe +++ b/app-text/aspell/aspell-0.60.6.1.recipe @@ -65,7 +65,6 @@ REQUIRES_devel=" aspell == $portVersion " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/app-text/discount/discount-2.1.3.recipe b/app-text/discount/discount-2.1.3.recipe index 01a6664bf..44a76bbae 100644 --- a/app-text/discount/discount-2.1.3.recipe +++ b/app-text/discount/discount-2.1.3.recipe @@ -14,7 +14,6 @@ LICENSE="BSD (4-clause)" COPYRIGHT="2007-2012 David Loren Parsons" ARCHITECTURES="x86 x86_gcc2" CHECKSUM_MD5="a1a4eade44f8141e38f2be7f2ed56c98" -SOURCE_DIR="$portVersionedName" PROVIDES=" discount = $portVersion compat >= 2 diff --git a/app-text/dos2unix/dos2unix-1.0.recipe b/app-text/dos2unix/dos2unix-1.0.recipe index da241b4d2..b4cc9e89a 100644 --- a/app-text/dos2unix/dos2unix-1.0.recipe +++ b/app-text/dos2unix/dos2unix-1.0.recipe @@ -24,7 +24,6 @@ BUILD_PREREQUIRES=" cmd:gcc " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe index f597e02da..a8849a6f8 100644 --- a/app-text/htmldoc/htmldoc-1.8.27.recipe +++ b/app-text/htmldoc/htmldoc-1.8.27.recipe @@ -38,7 +38,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-text/mdocml/mdocml-1.12.2.recipe b/app-text/mdocml/mdocml-1.12.2.recipe index 8455c8fdb..46e834274 100644 --- a/app-text/mdocml/mdocml-1.12.2.recipe +++ b/app-text/mdocml/mdocml-1.12.2.recipe @@ -13,7 +13,6 @@ COPYRIGHT="2008-2013 Ingo Schwarze, Kristaps Dzonsons" LICENSE="ISC" REVISION="1" ARCHITECTURES="x86 x86_gcc2" -SOURCE_DIR="$portVersionedName" PROVIDES=" mdocml = $portVersion diff --git a/app-text/rman/rman-3.2.recipe b/app-text/rman/rman-3.2.recipe index 8eedc8590..22fb11fd4 100644 --- a/app-text/rman/rman-3.2.recipe +++ b/app-text/rman/rman-3.2.recipe @@ -9,7 +9,6 @@ COPYRIGHT="2003 Thomas A. Phelps" SRC_URI="http://downloads.sourceforge.net/project/polyglotman/polyglotman/3.2/rman-3.2.tar.gz" CHECKSUM_MD5="6d1d67641c6d042595a96a62340d3cc6" PATCHES="rman-3.2.patch" -SOURCE_DIR="$portVersionedName" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" diff --git a/app-text/texi2html/texi2html-1.82.recipe b/app-text/texi2html/texi2html-1.82.recipe index 60e23953b..4c2ebd478 100644 --- a/app-text/texi2html/texi2html-1.82.recipe +++ b/app-text/texi2html/texi2html-1.82.recipe @@ -33,7 +33,6 @@ BUILD_PREREQUIRES=" cmd:perl " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-lang/nasm/nasm-2.08.01.recipe b/dev-lang/nasm/nasm-2.08.01.recipe index 7c47d5cab..0c4664f23 100644 --- a/dev-lang/nasm/nasm-2.08.01.recipe +++ b/dev-lang/nasm/nasm-2.08.01.recipe @@ -27,7 +27,6 @@ BUILD_PREREQUIRES=" cmd:perl " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe index 586b5b5af..28cafe29d 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -85,7 +85,6 @@ GLOBAL_WRITABLE_FILES=" non-packaged/lib/perl5/site_perl/5.10.1/BePC-haiku directory " -SOURCE_DIR="$portVersionedName" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL BUILD() diff --git a/dev-lang/perl/perl-5.18.1.recipe b/dev-lang/perl/perl-5.18.1.recipe index fbdf7710c..a1f39b5df 100644 --- a/dev-lang/perl/perl-5.18.1.recipe +++ b/dev-lang/perl/perl-5.18.1.recipe @@ -97,7 +97,6 @@ GLOBAL_WRITABLE_FILES=" non-packaged/lib/perl5/site_perl/$portVersion/$perlArchName directory keep-old " -SOURCE_DIR="$portVersionedName" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL BUILD() diff --git a/dev-lang/swig/swig-2.0.11.recipe b/dev-lang/swig/swig-2.0.11.recipe index b746c7c55..c7a1652eb 100644 --- a/dev-lang/swig/swig-2.0.11.recipe +++ b/dev-lang/swig/swig-2.0.11.recipe @@ -28,7 +28,6 @@ CHECKSUM_MD5="291ba57c0acd218da0b0916c280dcbae" REVISION="1" ARCHITECTURES="?x86 ?x86_gcc2" -SOURCE_DIR="$portVersionedName" PROVIDES=" swig = $portVersion diff --git a/dev-lang/yasm/yasm-1.1.0.recipe b/dev-lang/yasm/yasm-1.1.0.recipe index 4ae067250..3bd64ea40 100644 --- a/dev-lang/yasm/yasm-1.1.0.recipe +++ b/dev-lang/yasm/yasm-1.1.0.recipe @@ -31,7 +31,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe index 70e7758f5..72376125f 100644 --- a/dev-lang/yasm/yasm-1.2.0.recipe +++ b/dev-lang/yasm/yasm-1.2.0.recipe @@ -33,7 +33,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe index 2e532b2bb..12ff0d6bd 100644 --- a/dev-libs/apr/apr-1.4.6.recipe +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -28,7 +28,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/apr_util/apr_util-1.3.10.recipe b/dev-libs/apr_util/apr_util-1.3.10.recipe index d54f98417..eac650587 100644 --- a/dev-libs/apr_util/apr_util-1.3.10.recipe +++ b/dev-libs/apr_util/apr_util-1.3.10.recipe @@ -31,7 +31,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe index 8edc663a3..ae82b8f71 100644 --- a/dev-libs/gmp/gmp-5.1.1.recipe +++ b/dev-libs/gmp/gmp-5.1.1.recipe @@ -22,8 +22,6 @@ BUILD_REQUIRES=" cmd:make " -SOURE_DIR="$portVersionedName" - BUILD() { libtoolize --force --copy --install diff --git a/dev-libs/libcss/libcss-0.2.0_git.recipe b/dev-libs/libcss/libcss-0.2.0_git.recipe index 37944be56..95c448e3b 100644 --- a/dev-libs/libcss/libcss-0.2.0_git.recipe +++ b/dev-libs/libcss/libcss-0.2.0_git.recipe @@ -37,7 +37,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe index 3681bbc1a..854e20439 100644 --- a/dev-libs/libevent/libevent-1.4.14b.recipe +++ b/dev-libs/libevent/libevent-1.4.14b.recipe @@ -38,7 +38,7 @@ BUILD_PREREQUIRES=" cmd:libtoolize cmd:make " -SOURCE_DIR="$portVersionedName-stable" +SOURCE_DIR="libevent-${portVersion}-stable" PATCHES="libevent-1.4.14b.patch" diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index adde785c0..4091668cc 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -50,7 +50,7 @@ BUILD_PREREQUIRES=" cmd:libtoolize cmd:make " -SOURCE_DIR="$portVersionedName-stable" +SOURCE_DIR="libevent-${portVersion}-stable" PATCHES="libevent-2.0.21.patch" diff --git a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe index cd3f2e789..773612158 100644 --- a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe +++ b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe @@ -34,7 +34,6 @@ BUILD_PREREQUIRES=" cmd:perl " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe index 522d04a76..921e0572a 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe @@ -23,7 +23,6 @@ BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe index 9f14ce4ff..1a7e22288 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe @@ -23,7 +23,6 @@ BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe index 3d86900af..1f19d399e 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe @@ -27,7 +27,6 @@ BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe index 137b0efeb..5dc1ad5cb 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe +++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe @@ -31,7 +31,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe index 5bc4a71bd..8003a24bd 100644 --- a/dev-libs/openssl/openssl-1.0.0d.recipe +++ b/dev-libs/openssl/openssl-1.0.0d.recipe @@ -50,7 +50,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-python/docutils/docutils-0.11.recipe b/dev-python/docutils/docutils-0.11.recipe index 1843e0372..56bf9de62 100644 --- a/dev-python/docutils/docutils-0.11.recipe +++ b/dev-python/docutils/docutils-0.11.recipe @@ -17,7 +17,6 @@ LICENSE="Public Domain Python" REVISION="1" ARCHITECTURES="x86 x86_gcc2" -SOURCE_DIR="$portVersionedName" PROVIDES=" docutils = $portVersion diff --git a/dev-python/dulwich/dulwich-0.9.1.recipe b/dev-python/dulwich/dulwich-0.9.1.recipe index a0f4383a6..ef14719da 100644 --- a/dev-python/dulwich/dulwich-0.9.1.recipe +++ b/dev-python/dulwich/dulwich-0.9.1.recipe @@ -34,7 +34,6 @@ BUILD_PREREQUIRES=" cmd:gcc " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-python/ordereddict/ordereddict-1.1.recipe b/dev-python/ordereddict/ordereddict-1.1.recipe index 283e6ba3f..113e0e55e 100644 --- a/dev-python/ordereddict/ordereddict-1.1.recipe +++ b/dev-python/ordereddict/ordereddict-1.1.recipe @@ -13,7 +13,6 @@ LICENSE="MIT" REVISION="1" ARCHITECTURES="x86 x86_gcc2" -SOURCE_DIR="$portVersionedName" PROVIDES=" ordereddict = $portVersion diff --git a/dev-scheme/chicken/chicken-4.8.0.5.recipe b/dev-scheme/chicken/chicken-4.8.0.5.recipe index fd6eff435..a79f72325 100644 --- a/dev-scheme/chicken/chicken-4.8.0.5.recipe +++ b/dev-scheme/chicken/chicken-4.8.0.5.recipe @@ -8,7 +8,6 @@ LICENSE="BSD (2-clause)" COPYRIGHT="2008-2013 The Chicken Team 2000-2007 Felix L. Winkelmann" -SOURCE_DIR="$portVersionedName" ARCHITECTURES="?x86 ?x86_gcc2" PROVIDES=" diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe index bb36e152c..1aeea4b7c 100644 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -31,7 +31,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-util/cscope/cscope-15.7a.recipe b/dev-util/cscope/cscope-15.7a.recipe index af4f32cdd..8636e606d 100644 --- a/dev-util/cscope/cscope-15.7a.recipe +++ b/dev-util/cscope/cscope-15.7a.recipe @@ -18,7 +18,6 @@ ARCHITECTURES="x86 x86_gcc2" LICENSE="BSD (3-clause)" COPYRIGHT="1998-2000 The Santa Cruz Operation" -SOURCE_DIR="$portVersionedName" PATCHES="cscope-15.7a.patch" diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe index ada66ce26..2316e3d98 100644 --- a/dev-util/ctags/ctags-5.8.recipe +++ b/dev-util/ctags/ctags-5.8.recipe @@ -25,7 +25,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-util/fastdep/fastdep-0.16.recipe b/dev-util/fastdep/fastdep-0.16.recipe index 8b20c2e5b..27460178e 100644 --- a/dev-util/fastdep/fastdep-0.16.recipe +++ b/dev-util/fastdep/fastdep-0.16.recipe @@ -28,7 +28,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-util/global/global-6.2.9.recipe b/dev-util/global/global-6.2.9.recipe index d2871ddb8..e6ea3dc58 100644 --- a/dev-util/global/global-6.2.9.recipe +++ b/dev-util/global/global-6.2.9.recipe @@ -17,7 +17,6 @@ LICENSE="GNU GPL v3" COPYRIGHT="2000-2013 Tama Communications Corporation 2007-2013 Free Software Foundation, Inc." -SOURCE_DIR="$portVersionedName" ARCHITECTURES="x86 x86_gcc2" PATCHES="global-6.2.9.patch" diff --git a/dev-util/idutils/idutils-4.6.recipe b/dev-util/idutils/idutils-4.6.recipe index 6dfc6310f..0f120bac7 100644 --- a/dev-util/idutils/idutils-4.6.recipe +++ b/dev-util/idutils/idutils-4.6.recipe @@ -19,7 +19,6 @@ CHECKSUM_MD5="99b572536377fcddb4d38e86a3c215fd" REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT="1986-2012 Free Software Foundation, Inc." -SOURCE_DIR="$portVersionedName" ARCHITECTURES="x86 x86_gcc2" PATCHES="idutils-4.6.patchset" diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe index 7bdcadc5e..7ecec7633 100644 --- a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe +++ b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe @@ -27,7 +27,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-util/patchutils/patchutils-0.3.3.recipe b/dev-util/patchutils/patchutils-0.3.3.recipe index 04e7517c7..9dcb4698c 100644 --- a/dev-util/patchutils/patchutils-0.3.3.recipe +++ b/dev-util/patchutils/patchutils-0.3.3.recipe @@ -28,7 +28,6 @@ CHECKSUM_MD5="b640b6b8af6183f83eacf7bd6d2460cb" REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2001-2013 Tim Waugh" -SOURCE_DIR="$portVersionedName" ARCHITECTURES="x86 x86_gcc2" PROVIDES=" diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index 90733f849..86927afbf 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -47,7 +47,6 @@ BUILD_PREREQUIRES=" cmd:nano " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe index 59acbc1d9..1f4011927 100644 --- a/dev-vcs/git/git-1.7.10.2.recipe +++ b/dev-vcs/git/git-1.7.10.2.recipe @@ -15,7 +15,6 @@ COPYRIGHT="2005-2012 Git Authors (see git web site for list)" SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.2.tar.gz" CHECKSUM_MD5="2e2ee53243ab8e7cf10f15c5229c3fce" -SOURCE_DIR="$portVersionedName" PATCHES="git-1.7.10.2.patch" SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.7.10.2.tar.gz" diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe index 29cdc9ed1..a49785a80 100644 --- a/dev-vcs/git/git-1.8.3.4.recipe +++ b/dev-vcs/git/git-1.8.3.4.recipe @@ -15,7 +15,6 @@ COPYRIGHT="2005-2012 Git Authors (see git web site for list)" SRC_URI="http://git-core.googlecode.com/files/git-1.8.3.4.tar.gz" CHECKSUM_MD5="80eec3201a5d012913d287b85adaee8e" -SOURCE_DIR="$portVersionedName" PATCHES="git-1.8.3.4.patchset" SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.8.3.4.tar.gz" diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index 8439a5fa0..67e316361 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -34,7 +34,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe index 7f65e4efa..0fe86df65 100644 --- a/dev-vcs/subversion/subversion-1.6.15.recipe +++ b/dev-vcs/subversion/subversion-1.6.15.recipe @@ -64,7 +64,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index 310f8886f..b8f994d95 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -80,7 +80,6 @@ USER_SETTINGS_FILES=" settings/subversion directory " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/haiku-apps/armyknife/armyknife-66.recipe b/haiku-apps/armyknife/armyknife-66.recipe index ba8558809..740b2f82c 100644 --- a/haiku-apps/armyknife/armyknife-66.recipe +++ b/haiku-apps/armyknife/armyknife-66.recipe @@ -24,7 +24,6 @@ BUILD_PREREQUIRES=" cmd:make cmd:unzip " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe index 174a7daa3..6411277fe 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe @@ -24,7 +24,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe index e0d8b7520..682fca82e 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe @@ -24,7 +24,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe index d73ddd84a..aa7ce58fe 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe @@ -24,7 +24,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe index d79500d01..d3caf177a 100644 --- a/haiku-apps/mkdepend/mkdepend-1.7.recipe +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -24,7 +24,6 @@ BUILD_PREREQUIRES=" cmd:ld " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe index 12c5e075b..7b63d0768 100644 --- a/haiku-apps/pe/pe-2.4.3_hg602.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -43,7 +43,6 @@ USER_SETTINGS_FILES=" settings/pe directory " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/haiku-apps/pe/pe-2.4.3_hg606.recipe b/haiku-apps/pe/pe-2.4.3_hg606.recipe index 3b8507d15..03276a6b2 100644 --- a/haiku-apps/pe/pe-2.4.3_hg606.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg606.recipe @@ -43,7 +43,6 @@ USER_SETTINGS_FILES=" settings/pe directory " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/haiku-apps/pe/pe-2.4.3_hg610.recipe b/haiku-apps/pe/pe-2.4.3_hg610.recipe index cd5e867e4..8d59f898a 100644 --- a/haiku-apps/pe/pe-2.4.3_hg610.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg610.recipe @@ -41,7 +41,6 @@ USER_SETTINGS_FILES=" settings/pe directory " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/haiku-apps/pe/pe-2.4.3_hg611.recipe b/haiku-apps/pe/pe-2.4.3_hg611.recipe index 22439f93f..170f6020e 100644 --- a/haiku-apps/pe/pe-2.4.3_hg611.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg611.recipe @@ -45,7 +45,6 @@ USER_SETTINGS_FILES=" settings/pe directory " -SOURCE_DIR="$portVersionedName" PATCHES=" pe-2.4.3_hg611.patch diff --git a/haiku-apps/pe/pe-2.4.3_hg614.recipe b/haiku-apps/pe/pe-2.4.3_hg614.recipe index bf1a6eb7a..7a18426da 100644 --- a/haiku-apps/pe/pe-2.4.3_hg614.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg614.recipe @@ -45,7 +45,6 @@ USER_SETTINGS_FILES=" settings/pe directory " -SOURCE_DIR="$portVersionedName" PATCHES=" pe-2.4.3_hg611.patch3 diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe index 903c58163..2c7d52b42 100644 --- a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe +++ b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe @@ -32,7 +32,6 @@ BUILD_PREREQUIRES=" cmd:unzip cmd:xres " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/haiku-apps/vision/vision-0.9.7.r947.recipe b/haiku-apps/vision/vision-0.9.7.r947.recipe index 4a899e921..3143c09b1 100644 --- a/haiku-apps/vision/vision-0.9.7.r947.recipe +++ b/haiku-apps/vision/vision-0.9.7.r947.recipe @@ -32,7 +32,6 @@ USER_SETTINGS_FILES=" settings/Vision directory " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/media-gfx/graphviz/graphviz-2.26.3.recipe b/media-gfx/graphviz/graphviz-2.26.3.recipe index eb05ab454..db569ac21 100644 --- a/media-gfx/graphviz/graphviz-2.26.3.recipe +++ b/media-gfx/graphviz/graphviz-2.26.3.recipe @@ -34,7 +34,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/media-gfx/pngcrush/pngcrush-1.7.67.recipe b/media-gfx/pngcrush/pngcrush-1.7.67.recipe index c35be6463..e1e8590a9 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.67.recipe +++ b/media-gfx/pngcrush/pngcrush-1.7.67.recipe @@ -17,7 +17,7 @@ COPYRIGHT="1998-2009 Glenn Randers-Pehrson 2005 Greg Roelofs" ARCHITECTURES="x86 x86_gcc2" -SOURCE_DIR="${portVersionedName}-nolib" +SOURCE_DIR="pngcrush-${portVersion}-nolib" PROVIDES=" pngcrush = $portVersion compat >= 1.7 diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe index 28059eae7..422954734 100644 --- a/media-libs/taglib/taglib-1.7.2.recipe +++ b/media-libs/taglib/taglib-1.7.2.recipe @@ -33,7 +33,6 @@ BUILD_PREREQUIRES=" cmd:make " -#SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe index 5f6b8b0b3..b7acf7cf8 100644 --- a/media-sound/lame/lame-3.99.5.recipe +++ b/media-sound/lame/lame-3.99.5.recipe @@ -33,7 +33,6 @@ BUILD_REQUIRES=" " PATCHES="lame-3.99.5.patch" -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index 19118733b..6b71d573e 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -59,7 +59,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe index 8b0c28a9f..b149e3b18 100644 --- a/net-misc/openssh/openssh-5.8p2.recipe +++ b/net-misc/openssh/openssh-5.8p2.recipe @@ -50,7 +50,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index 7bb7085e7..b8316422b 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -70,7 +70,6 @@ PACKAGE_USERS=" " PACKAGE_GROUPS="sshd" -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/net-misc/rsync/rsync-3.1.0.recipe b/net-misc/rsync/rsync-3.1.0.recipe index 3af0133bf..44c28ca89 100644 --- a/net-misc/rsync/rsync-3.1.0.recipe +++ b/net-misc/rsync/rsync-3.1.0.recipe @@ -39,7 +39,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe index e6dd12837..a13ea3c74 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe @@ -30,7 +30,7 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName/wpa_supplicant" +SOURCE_DIR="wpa_supplicant-${portVersion}/wpa_supplicant" BUILD() { diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe index e40f8f37e..e9a67a6a5 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe @@ -31,7 +31,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/diffutils/diffutils-3.3.recipe b/sys-apps/diffutils/diffutils-3.3.recipe index 5391d5f56..583fc5da9 100644 --- a/sys-apps/diffutils/diffutils-3.3.recipe +++ b/sys-apps/diffutils/diffutils-3.3.recipe @@ -46,7 +46,6 @@ BUILD_PREREQUIRES=" PATCHES="diffutils-3.3.patchset" -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/dtc/dtc-1.4.0.recipe b/sys-apps/dtc/dtc-1.4.0.recipe index 907703ff7..387681a71 100644 --- a/sys-apps/dtc/dtc-1.4.0.recipe +++ b/sys-apps/dtc/dtc-1.4.0.recipe @@ -33,7 +33,7 @@ BUILD_PREREQUIRES=" cmd:make " -PATCHES="${portVersionedName}.patch" +PATCHES="dtc-${portVersion}.patch" BUILD() { diff --git a/sys-apps/ed/ed-1.7.recipe b/sys-apps/ed/ed-1.7.recipe index 1ce1ffa25..d1352e658 100644 --- a/sys-apps/ed/ed-1.7.recipe +++ b/sys-apps/ed/ed-1.7.recipe @@ -25,7 +25,6 @@ BUILD_REQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/file/file-5.15.recipe b/sys-apps/file/file-5.15.recipe index 6878f1668..b2f370b93 100644 --- a/sys-apps/file/file-5.15.recipe +++ b/sys-apps/file/file-5.15.recipe @@ -52,7 +52,6 @@ REQUIRES_devel=" PATCHES="file-5.15.patch" -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe index 0b1fe50e5..e2e5a4cdf 100644 --- a/sys-apps/gawk/gawk-3.1.8.recipe +++ b/sys-apps/gawk/gawk-3.1.8.recipe @@ -36,7 +36,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index 07bed6a21..fc3a7c32e 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -45,7 +45,6 @@ defineDebugInfoPackage grep \ $binDir/fgrep \ $binDir/grep -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe index 66cbd7eb0..49639b32d 100644 --- a/sys-apps/groff/groff-1.20.1.recipe +++ b/sys-apps/groff/groff-1.20.1.recipe @@ -68,7 +68,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" DEPEND="" BUILD() diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe index 2a0a618aa..b4c8456c4 100644 --- a/sys-apps/man/man-1.6g.recipe +++ b/sys-apps/man/man-1.6g.recipe @@ -62,7 +62,6 @@ GLOBAL_WRITABLE_FILES=" settings/man.conf keep-old " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index 7038c8e07..d7f82e46d 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -38,7 +38,6 @@ BUILD_PREREQUIRES=" defineDebugInfoPackage sed \ $binDir/sed -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 9065d079d..70b5deb7b 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -45,7 +45,6 @@ BUILD_PREREQUIRES=" " BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index d754e0e88..8e56bcf97 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -49,7 +49,6 @@ BUILD_PREREQUIRES=" " BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe index 41723ca7c..bfa7103d1 100644 --- a/sys-devel/automake/automake-1.11.1.recipe +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -39,7 +39,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/automake/automake-1.12.2.recipe b/sys-devel/automake/automake-1.12.2.recipe index c91eb34bc..d70818f7e 100644 --- a/sys-devel/automake/automake-1.12.2.recipe +++ b/sys-devel/automake/automake-1.12.2.recipe @@ -42,7 +42,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index 2b271b2b6..3195941f6 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -42,7 +42,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { 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 384391eaa..4b17e93a7 100644 --- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe +++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe @@ -50,7 +50,7 @@ BUILD_PREREQUIRES=" cmd:tar " -SOURCE_DIR="$portVersionedName/legacy/binutils" +SOURCE_DIR="binutils-$portVersion/legacy/binutils" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL binutilsDir=$(pwd) diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index 1263bfbda..c6da80506 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -42,7 +42,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/bison/bison-2.5.recipe b/sys-devel/bison/bison-2.5.recipe index 2d61f06b9..c82ef16fc 100644 --- a/sys-devel/bison/bison-2.5.recipe +++ b/sys-devel/bison/bison-2.5.recipe @@ -20,7 +20,7 @@ REVISION="1" ARCHITECTURES="?x86" -PATCHES="${portVersionedName}.patch" +PATCHES="bison-${portVersion}.patch" PROVIDES=" bison = $portVersion compat >= 2.5 diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 3a5ac50a0..e568bb789 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -37,7 +37,6 @@ BUILD_PREREQUIRES=" cmd:makeinfo " -SOURCE_DIR="$portVersionedName" BUILD() { 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 713fa098f..37e98f628 100644 --- a/sys-devel/jam/jam-2.5_2012_10_12.recipe +++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe @@ -42,7 +42,7 @@ BUILD_PREREQUIRES=" cmd:ld " -SOURCE_DIR="$portVersionedName/jam" +SOURCE_DIR="jam-${portVersion}/jam" BUILD() { diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index cec49589f..e9f5a42c3 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -45,7 +45,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index 31d1cf934..e3c3a4491 100644 --- a/sys-devel/m4/m4-1.4.16.recipe +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -41,7 +41,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index 67c416f55..192519546 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -36,7 +36,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/patch/patch-2.7.1.recipe b/sys-devel/patch/patch-2.7.1.recipe index 43966cda9..37388be0e 100644 --- a/sys-devel/patch/patch-2.7.1.recipe +++ b/sys-devel/patch/patch-2.7.1.recipe @@ -27,7 +27,6 @@ BUILD_PREREQUIRES=" cmd:gcc " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe index a261402a2..7526a15f9 100644 --- a/sys-libs/readline/readline-6.2.recipe +++ b/sys-libs/readline/readline-6.2.recipe @@ -34,7 +34,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-libs/slang/slang-2.2.4.recipe b/sys-libs/slang/slang-2.2.4.recipe index 5fd2852d7..45cd8e32a 100644 --- a/sys-libs/slang/slang-2.2.4.recipe +++ b/sys-libs/slang/slang-2.2.4.recipe @@ -51,7 +51,6 @@ BUILD_PREREQUIRES=" cmd:ncurses5_config " -SOURCE_DIR="$portVersionedName" GLOBAL_WRITABLE_FILES=" settings/slsh.rc keep-old diff --git a/www-client/w3m/w3m-0.5.3.recipe b/www-client/w3m/w3m-0.5.3.recipe index 01a25beed..64abaf33e 100644 --- a/www-client/w3m/w3m-0.5.3.recipe +++ b/www-client/w3m/w3m-0.5.3.recipe @@ -14,7 +14,6 @@ LICENSE="W3M" COPYRIGHT="1994-2011 Akinori ITO 2002-2011 Hironori SAKAMOTO 2002-2011 Fumitoshi UKAI" -SOURCE_DIR="$portVersionedName" PATCHES="w3m-0.5.3.patch" From abe988f6a9dd727217cb2856bf94482889662ef6 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 17:56:03 -0600 Subject: [PATCH 163/306] taglib: stop silly wip name * Flagging as broken on all architectures should be enough to prevent it from being used --- ...-1.9.1.broken-recipe => taglib-1.9.1.recipe} | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) rename media-libs/taglib/{WIP-taglib-1.9.1.broken-recipe => taglib-1.9.1.recipe} (96%) diff --git a/media-libs/taglib/WIP-taglib-1.9.1.broken-recipe b/media-libs/taglib/taglib-1.9.1.recipe similarity index 96% rename from media-libs/taglib/WIP-taglib-1.9.1.broken-recipe rename to media-libs/taglib/taglib-1.9.1.recipe index fa7950f2a..173551bc4 100644 --- a/media-libs/taglib/WIP-taglib-1.9.1.broken-recipe +++ b/media-libs/taglib/taglib-1.9.1.recipe @@ -6,7 +6,7 @@ CHECKSUM_MD5="0d35df96822bbd564c5504cb3c2e4d86" COPYRIGHT="2002-2013 Scott Wheeler" LICENSE="GNU LGPL v2 MPL v1.1 - " + " REVISION="1" ARCHITECTURES="!x86 !x86_64" @@ -18,7 +18,7 @@ PROVIDES=" lib:libtag$secondaryArchSuffix = 1.9.1 compat >= 1.9 lib:libtag_c$secondaryArchSuffix = 0.0.0 compat >= 0 " - + REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libz @@ -35,29 +35,28 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" - -BUILD() +BUILD() { cmake . -DCMAKE_INSTALL_PREFIX:PATH=$prefix \ -DBIN_INSTALL_DIR=$binDir \ -DLIB_INSTALL_DIR=$developLibDir make } + #-DINCLUDE_INSTALL_DIR=$developDir/headers \ INSTALL() { make install - + mkdir -p $developDir/headers mv $prefix/include/taglib $developDir/headers - + prepareInstalledDevelLibs \ libtag \ libtag_c - + fixPkgconfig - + # devel package packageEntries devel \ $developDir \ From c40c7f837ba8e4c32a6a73ce41f36a5e3207bea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 26 Dec 2013 00:48:47 +0000 Subject: [PATCH 164/306] Agg 2.5 --- x11-libs/agg/agg-2.5.recipe | 66 +++++++++++++++++++++++++++++-------- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe index e5d686489..a84cb6e4f 100644 --- a/x11-libs/agg/agg-2.5.recipe +++ b/x11-libs/agg/agg-2.5.recipe @@ -1,27 +1,65 @@ +SUMMARY="Anti-Grain Geometry (AGG)" DESCRIPTION="Anti-Grain Geometry (AGG) is an Open Source, free of charge graphic library, written in industrially standard C++." HOMEPAGE="http://antigrain.com" SRC_URI="http://www.antigrain.com/agg-2.5.tar.gz" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="0229a488bc47be10a2fee6cf0b2febd6" +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2006 Maxim Shemanarev" + +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + lib:libagg = $portVersion +" +REQUIRES=" + haiku >= $haikuVersion + lib:libsdl +" +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libsdl +" +BUILD_PREREQUIRES=" + cmd:gcc + cmd:make + cmd:autoconf + cmd:automake + cmd:ld + cmd:libtoolize +" + +SOURCE_DIR="agg-2.5" + BUILD() { - cd agg-2.5 - libtoolize --force --copy --install - aclocal - autoheader - autoconf - automake --foreign --add-missing --ignore-deps - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + #libtoolize --force --copy --install + #aclocal + #autoheader + #autoconf + #automake --foreign --add-missing --ignore-deps + #./configure --prefix=$prefix + #make + cd src + g++ -o libagg.so -shared -fPIC *.cpp ctrl/*.cpp -I../include -lbe -ltranslation } INSTALL() { - cd agg-2.5 - make install DESTDIR=${DESTDIR} + mkdir -p $libDir + mkdir -p $developDir/headers/agg + mkdir -p $developLibDir + + cp src/libagg.so $libDir + cp src/libagg.so $developLibDir + cp -r include/* $developDir/headers/agg/ + packageEntries devel \ + $developDir } +PROVIDES_devel=" + devel:libagg = $portVersion +" +REQUIRES_devel=" + lib:libagg == $portVersion base +" -LICENSE="GNU GPL v2" -COPYRIGHT="2002-2006 Maxim Shemanarev" From c86b0c5ec49904306a7e25f3e9064d10deef8d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 26 Dec 2013 00:50:16 +0000 Subject: [PATCH 165/306] Gnash 0.8.10 --- media-video/gnash/gnash-0.8.10.recipe | 97 +++++++++++++++++++ media-video/gnash/patches/GnashImageGif.patch | 14 +++ media-video/gnash/patches/utility.patch | 13 +++ 3 files changed, 124 insertions(+) create mode 100644 media-video/gnash/gnash-0.8.10.recipe create mode 100644 media-video/gnash/patches/GnashImageGif.patch create mode 100644 media-video/gnash/patches/utility.patch diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe new file mode 100644 index 000000000..855f94d9b --- /dev/null +++ b/media-video/gnash/gnash-0.8.10.recipe @@ -0,0 +1,97 @@ +SUMMARY="Gnash" +DESCRIPTION="Gnash" +HOMEPAGE="http://www.gnu.org/software/gnash/" +SRC_URI="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2" +CHECKSUM_MD5="63e9f79c41d93d48c5a2fa94856548c4" +COPYRIGHT="2005-2012 Free Software Foundation" +LICENSE="GNU GPL v3" +REVISION="1" + +DISABLE_SOURCE_PACKAGE=yes + +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 x86_64" + +PROVIDES=" + gnash$secondaryArchSuffix = $portVersion +" +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libgif$secondaryArchSuffix + lib:libavcodec$secondaryArchSuffix + lib:libspeex$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + boost_thread$secondaryArchSuffix + boost_program_options$secondaryArchSuffix + boost_iostreams$secondaryArchSuffix + boost_serialization$secondaryArchSuffix + boost_date_time$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libsdl_sound$secondaryArchSuffix + lib:libagg$secondaryArchSuffix + #lib:libfreetype$secondaryArchSuffix >= 2.5.0.1 + #lib:libfontconfig$secondaryArchSuffix +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libgif$secondaryArchSuffix + devel:libavcodec$secondaryArchSuffix + devel:libspeex$secondaryArchSuffix + devel:libexpat$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + boost_devel$secondaryArchSuffix + boost_thread$secondaryArchSuffix + boost_program_options$secondaryArchSuffix + boost_iostreams$secondaryArchSuffix + boost_serialization$secondaryArchSuffix + boost_date_time$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix + devel:libsdl_sound$secondaryArchSuffix + devel:libagg$secondaryArchSuffix + #devel:libfontconfig$secondaryArchSuffix + #devel:libfreetype$secondaryArchSuffix >= 2.5.0.1 +" +BUILD_PREREQUIRES=" + cmd:pkg_config + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make +" + +SOURCE_DIR="gnash-0.8.10" + +PATCHES=" + GnashImageGif.patch + utility.patch +" + +BUILD() +{ + runConfigure ./configure --enable-renderer=agg --enable-media=ffmpeg \ + --enable-gui=sdl --enable-sound=sdl --without-gconf --disable-extensions \ + --with-agg-incl=$portPackageLinksDir/devel~libagg/develop/headers/agg \ + --with-agg-lib=$portPackageLinksDir/lib~libagg/lib/ + make +} +INSTALL() +{ + make install +} +TEST() +{ + make check +} diff --git a/media-video/gnash/patches/GnashImageGif.patch b/media-video/gnash/patches/GnashImageGif.patch new file mode 100644 index 000000000..3d3e502c7 --- /dev/null +++ b/media-video/gnash/patches/GnashImageGif.patch @@ -0,0 +1,14 @@ +diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp +index eeba4b7..bddb452 100644 +--- a/libbase/GnashImageGif.cpp ++++ b/libbase/GnashImageGif.cpp +@@ -269,7 +269,8 @@ GifInput::processRecord(GifRecordType record) + void + GifInput::read() + { +- _gif = DGifOpen(_inStream.get(), &readData); ++ int error_code; ++ _gif = DGifOpen(_inStream.get(), &readData, &error_code); + + GifRecordType record; + diff --git a/media-video/gnash/patches/utility.patch b/media-video/gnash/patches/utility.patch new file mode 100644 index 000000000..865733ee0 --- /dev/null +++ b/media-video/gnash/patches/utility.patch @@ -0,0 +1,13 @@ +diff --git a/libbase/utility.h b/libbase/utility.h +index 8b9f48c..51ea858 100644 +--- a/libbase/utility.h ++++ b/libbase/utility.h +@@ -61,7 +61,7 @@ namespace std + }; + #endif + +-#if defined(__HAIKU__) ++#if defined(__HAIKU_OLD) + namespace std { + class wstring : public std::basic_string + { From a5a25257626fb5053a02eb3ac982d144b9bb40a8 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 19:23:49 -0600 Subject: [PATCH 166/306] libevent: Looking for lib:libnetwork which is not provided * While it built, wouldn't install due to this * Maybe haiku${secondaryArchSuffix} is supposed to have this provides, but currently doesn't --- dev-libs/libevent/libevent-2.0.21.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index 4091668cc..189d22bfb 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -7,7 +7,7 @@ CHECKSUM_MD5="b2405cc9ebf264aa47ff615d9de527a2" LICENSE="BSD (3-clause)" COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86" @@ -29,11 +29,11 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libnetwork$secondaryArchSuffix >= $haikuVersion lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix - lib:libnetwork >= $haikuVersion " +# haiku${secondaryArchSuffix} doesn't define included libraries yet +# lib:libnetwork$secondaryArchSuffix >= $haikuVersion BUILD_REQUIRES=" devel:libssl$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix From 5f9ccf48589b9eaa79f19607b350d3033a829d1b Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 19:32:22 -0600 Subject: [PATCH 167/306] libevent: Actually provide libevent * Would prevent other packages from using it properly and prevent proper _devel installation --- dev-libs/libevent/libevent-2.0.21.recipe | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index 189d22bfb..9a1b241b8 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -7,25 +7,24 @@ CHECKSUM_MD5="b2405cc9ebf264aa47ff615d9de527a2" LICENSE="BSD (3-clause)" COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86" - SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" + libevent${secondaryArchSuffix} = ${portVersion} cmd:event_rpcgen.py - lib:libevent$secondaryArchSuffix = 2.0_5.1.9 compat >= 2.0_5 lib:libevent$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_openssl_2.0$secondaryArchSuffix= 5.1.9 compat >= 5 + lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_openssl$secondaryArchSuffix= 5.1.9 compat >= 5 + lib:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion @@ -99,7 +98,6 @@ PROVIDES_devel=" lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - devel:libevent$secondaryArchSuffix = 2.0_5.1.9 compat >= 2.0_5 devel:libevent$secondaryArchSuffix = 5.1.9 compat >= 5 devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 @@ -112,7 +110,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - libevent$secondaryArchSuffix == $portVersion base + libevent$secondaryArchSuffix == $portVersion base devel:libssl devel:libcrypto " From 95121224b7bf8711cea56885ba8b936b7a8e9b05 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 20:11:19 -0600 Subject: [PATCH 168/306] transmission: Fix patch * No work on recipe as this is GCI, just repair patch prefix --- net-p2p/transmission/patches/transmission-2.75.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net-p2p/transmission/patches/transmission-2.75.patch b/net-p2p/transmission/patches/transmission-2.75.patch index 91a47f0a3..4aa1b4cbe 100644 --- a/net-p2p/transmission/patches/transmission-2.75.patch +++ b/net-p2p/transmission/patches/transmission-2.75.patch @@ -1,6 +1,6 @@ -diff -Naur transmission-2.75/third-party/miniupnp/connecthostport.c transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/connecthostport.c +diff -Naur transmission-2.75/third-party/miniupnp/connecthostport.c transmission-2.75-haiku/third-party/miniupnp/connecthostport.c --- transmission-2.75/third-party/miniupnp/connecthostport.c 2012-10-24 13:01:10.429654016 +0000 -+++ transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 ++++ transmission-2.75-haiku/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 @@ -24,6 +24,7 @@ #else /* #ifdef _WIN32 */ #include @@ -9,9 +9,9 @@ diff -Naur transmission-2.75/third-party/miniupnp/connecthostport.c transmission #include #define closesocket close #include -diff -Naur transmission-2.75/third-party/miniupnp/miniupnpc.c transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/miniupnpc.c +diff -Naur transmission-2.75/third-party/miniupnp/miniupnpc.c transmission-2.75-haiku/third-party/miniupnp/miniupnpc.c --- transmission-2.75/third-party/miniupnp/miniupnpc.c 2012-10-24 13:01:10.457703424 +0000 -+++ transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +0000 ++++ transmission-2.75-haiku/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +0000 @@ -17,7 +17,7 @@ #endif #endif @@ -21,9 +21,9 @@ diff -Naur transmission-2.75/third-party/miniupnp/miniupnpc.c transmission-2.75- #define HAS_IP_MREQN #endif -diff -Naur transmission-2.75/third-party/miniupnp/portlistingparse.c transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/portlistingparse.c +diff -Naur transmission-2.75/third-party/miniupnp/portlistingparse.c transmission-2.75-haiku/third-party/miniupnp/portlistingparse.c --- transmission-2.75/third-party/miniupnp/portlistingparse.c 2012-10-24 13:01:10.221511680 +0000 -+++ transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 ++++ transmission-2.75-haiku/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 @@ -28,7 +28,7 @@ /* Helper function */ From 0d8ce154e2c27e4ee1c62484bcafc6f6f906ddeb Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Thu, 26 Dec 2013 02:13:56 +0000 Subject: [PATCH 169/306] Add BeVexed recipe --- haiku-games/BeVexed/bevexed-1.1.recipe | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 haiku-games/BeVexed/bevexed-1.1.recipe diff --git a/haiku-games/BeVexed/bevexed-1.1.recipe b/haiku-games/BeVexed/bevexed-1.1.recipe new file mode 100644 index 000000000..a23ae9a65 --- /dev/null +++ b/haiku-games/BeVexed/bevexed-1.1.recipe @@ -0,0 +1,46 @@ +SUMMARY="A maddeningly-addictive puzzle game." +DESCRIPTION="A maddeningly-addictive puzzle game. +The concept is simple: put the tiles in the grid on the left such that the numbers match wherever 2 tiles touch." +HOMEPAGE="https://github.com/HaikuArchives/BeVexed" +SRC_URI="git+https://github.com/HaikuArchives/BeVexed" +REVISION="1" + +LICENSE="MIT" +COPYRIGHT="2006 DarkWyrm" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + BeVexed = $portVersion + app:BeVexed = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:make + cmd:mkdepend + " + +BUILD() +{ + cd source + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + cd source + mkdir -p $appsDir + cp -a objects/BeVexed $appsDir + addAppDeskbarSymlink $appsDir/BeVexed +} From 9db398a240675e9e2a0e7f5681ed494c91ff13b7 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 20:25:04 -0600 Subject: [PATCH 170/306] glu: Fix GLU for new libGL provided by Mesa * Remove glapi hacks --- sys-libs/glu/glu-9.0.0.recipe | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe index 85569360c..6850e66d6 100644 --- a/sys-libs/glu/glu-9.0.0.recipe +++ b/sys-libs/glu/glu-9.0.0.recipe @@ -5,7 +5,7 @@ COPYRIGHT="Copyright (C) 1999-2012 Brian Paul and others. All Rights Reserved." LICENSE="MIT" SRC_URI="ftp://freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.gz" CHECKSUM_MD5="bbc57d4fe3bd3fb095bdbef6fcb977c4" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -15,12 +15,13 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libGL${secondaryArchSuffix} " BUILD_REQUIRES=" - devel:libglapi$secondaryArchSuffix + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libGL$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make @@ -29,13 +30,6 @@ BUILD_PREREQUIRES=" BUILD() { - # The Haiku build system builds libGL.so from libglapi and libglu. Since the - # glu build system requires libGL.so (since the shared libglu.so is linked - # against it), we build a dummy libGL.so from libglapi.a. - gcc -o libGL.so -shared -Xlinker --whole-archive -lglapi - libglLinkFlags="-L$(pwd)" - - LDFLAGS="$libglLinkFlags" \ runConfigure ./configure make $jobArgs } From 2a04cfa799c01b68bb763eb38356673341e72922 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 26 Dec 2013 02:34:48 +0000 Subject: [PATCH 171/306] Expanded the DESCRIPTION for sdl_image --- media-libs/sdl_image/sdl_image-1.2.12.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-libs/sdl_image/sdl_image-1.2.12.recipe b/media-libs/sdl_image/sdl_image-1.2.12.recipe index b96f04700..d1a9b9f1d 100644 --- a/media-libs/sdl_image/sdl_image-1.2.12.recipe +++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe @@ -1,5 +1,6 @@ SUMMARY="Simple Direct Media Layer Image Library" -DESCRIPTION="Simple Direct Media Layer Image Library" +DESCRIPTION="SDL_image is an image file loading library. It loads images as SDL surfaces, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV +As of SDL_image 1.2.5, JPEG, PNG, TIFF, and WEBP image loading libraries are dynamically loaded, so if you don't need to load those formats, you don't need to include those shared libraries. libpng depends on libz, and libtiff depends on both libz and libjpeg." HOMEPAGE="http://www.libsdl.org/projects/SDL_image" SRC_URI="http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz" CHECKSUM_MD5="a0f9098ebe5400f0bdc9b62e60797ecb" From f781cc04e8c8181361f8b829beb48bb4ab44e138 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 22:31:26 -0600 Subject: [PATCH 172/306] libsdl2: fix build as devel:libtiff is missing from haiku_devel --- media-libs/libsdl2/libsdl2-2.0.1.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/media-libs/libsdl2/libsdl2-2.0.1.recipe b/media-libs/libsdl2/libsdl2-2.0.1.recipe index 83cf33207..2b00bcefe 100644 --- a/media-libs/libsdl2/libsdl2-2.0.1.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.1.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Simple DirectMedia Layer is a cross-platform development library de HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL2-2.0.1.tar.gz" CHECKSUM_MD5="0eb97039488bf463e775295f7b18b227" -REVISION="1" +REVISION="2" LICENSE="Zlib" COPYRIGHT="1997-2013 Sam Lantinga" @@ -12,6 +12,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libsdl2$secondaryArchSuffix = $portVersion compat >= 2.0 + cmd:sdl2_config = $portVersion lib:libSDL2$secondaryArchSuffix = 2.0_0.1.0 compat >= 2.0_0.0 lib:libSDL2_2.0$secondaryArchSuffix = 0.1.0 compat >= 0.0 lib:libSDL2_2.0.1$secondaryArchSuufix = 0.1.0 compat >= 0.0 @@ -32,8 +33,8 @@ BUILD_REQUIRES=" devel:libglu$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix - devel:libtiff$secondaryArchSuffix " +# devel:libtiff$secondaryArchSuffix # haiku_devel missing devel_libtiff BUILD_PREREQUIRES=" cmd:autoconf From 1e01e0e2654d2669ba97045739ea443907ac4019 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 22:39:06 -0600 Subject: [PATCH 173/306] sdl2_ttf: Fix up recipe. --- media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe | 67 ++++++++++++++++------ 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe index 4e4931e00..4a7325c29 100644 --- a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe +++ b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe @@ -1,48 +1,79 @@ -SUMMARY="Simple Direct Media Layer Image Library" -DESCRIPTION="SDL" +SUMMARY="A TrueType font rendering library for SDL2" +DESCRIPTION=" + SDL_ttf is a TrueType font rendering library that is used with the SDL + library, and almost as portable. It depends on freetype2 to handle the + TrueType font data. It allows a programmer to use multiple TrueType fonts + without having to code a font rendering routine themselves. With the power + of outline fonts and antialiasing, high quality text output can be obtained + without much effort. + " HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.12.tar.gz" CHECKSUM_MD5="79787216b56cb4707f39d538f2225e00" -REVISION="1" +REVISION="2" LICENSE="Zlib" COPYRIGHT="1997-2013 Sam Lantinga" ARCHITECTURES="x86 x86_gcc2" +SECONDARY_ARCHITECTURES="?x86 ?x86_gcc2" PROVIDES=" - lib:SDL2_ttf + sdl2_ttf${secondaryArchSuffix} = $portVersion + lib:libSDL2_ttf${secondaryArchSuffix} " REQUIRES=" - lib:libsdl2 + haiku${secondaryArchSuffix} >= $haikuVersion + lib:libfreetype${secondaryArchSuffix} + lib:libSDL2${secondaryArchSuffix} + lib:libz${secondaryArchSuffix} " BUILD_REQUIRES=" - cmd:autoconf - cmd:libtool - cmd:aclocal - cmd:make - cmd:gcc${secondaryArchSuffix} - cmd:ld${secondaryArchSuffix} + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libfreetype${secondaryArchSuffix} + devel:libSDL2${secondaryArchSuffix} + devel:libz${secondaryArchSuffix} " BUILD_PREREQUIRES=" + cmd:libtoolize + cmd:aclocal + cmd:automake + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make " SOURCE_DIR="SDL2_ttf-$portVersion" BUILD() { -# rm -f acinclude.m4 -# libtoolize --copy --force --install -# aclocal --install -I acinclude -# echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" -# ./autogen.sh - runConfigure ./configure - make + libtoolize --copy --force --install + aclocal --install -I acinclude + autoconf + runConfigure ./configure --with-x=no + make $jobArgs } INSTALL() { make install + + prepareInstalledDevelLibs libSDL2_ttf + fixPkgconfig + + packageEntries devel \ + $developDir } + +PROVIDES_devel=" + sdl2_ttf${secondaryArchSuffix}_devel = ${portVersion} compat >= 1.2 + devel:sdl2_ttf$secondaryArchSuffix = ${portVersion} compat >= 1.2 + devel:libSDL2_ttf$secondaryArchSuffix = 2.0_0.10.1 compat >= 2.0_0 + " + +REQUIRES_devel=" + sdl2_ttf$secondaryArchSuffix == $portVersion base + " From bfd53c6e2ff8d173822d51ca6f5d2a1540815c09 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 26 Dec 2013 00:07:32 -0600 Subject: [PATCH 174/306] sdl2_mixer: Add sdl2_mixer recipe --- .../sdl2_mixer/patches/sdl2_mixer-2.0.0.patch | 13 +++ media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe | 89 +++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 media-libs/sdl2_mixer/patches/sdl2_mixer-2.0.0.patch create mode 100644 media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe diff --git a/media-libs/sdl2_mixer/patches/sdl2_mixer-2.0.0.patch b/media-libs/sdl2_mixer/patches/sdl2_mixer-2.0.0.patch new file mode 100644 index 000000000..d27437b7a --- /dev/null +++ b/media-libs/sdl2_mixer/patches/sdl2_mixer-2.0.0.patch @@ -0,0 +1,13 @@ +diff --git a/configure.in b/configure.in +index f71c002..cd41fc0 100644 +--- a/configure.in ++++ b/configure.in +@@ -493,7 +493,7 @@ if test x$enable_music_ogg = xyes; then + fi + else + AC_CHECK_HEADER([vorbis/vorbisfile.h], [have_ogg_hdr=yes]) +- AC_CHECK_LIB([vorbisfile -lvorbis -logg -lm], [ov_open_callbacks], [have_ogg_lib=yes]) ++ AC_CHECK_LIB([vorbisfile -lvorbis -logg], [ov_open_callbacks], [have_ogg_lib=yes]) + if test x$have_ogg_hdr = xyes -a x$have_ogg_lib = xyes; then + case "$host" in + *-*-darwin*) diff --git a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe new file mode 100644 index 000000000..a219d9e46 --- /dev/null +++ b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe @@ -0,0 +1,89 @@ +SUMMARY="Simple Direct Layer Mixer Library" +DESCRIPTION="sdl2_mixer is a simple multi-channel audio mixer library. It supports any number of simultaneously playing channels of 16 bit stereo audio, plus a single channel of music, mixed by the popular FLAC, MikMoD MOD, Timidity MIDI, Ogg Vorbis, and SMPEG MP3 libraries." +HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" +SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.0.tar.gz" +CHECKSUM_MD5="65f6d80df073a1fb3bb537fbda031b50" +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PATCHES="sdl2_mixer-${portVersion}.patch" + +PROVIDES=" + sdl2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0 + lib:libSDL2_mixer$secondaryArchSuffix = 2.0 + lib:libSDL2_mixer_2.0$secondaryArchSuffix = 0.0 + cmd:playwave$secondaryArchSuffix + cmd:playmus$secondaryArchSuffix + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libSDL2$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libflac$secondaryArchSuffix +# lib:libfluidsynth$secondaryArchSuffix + lib:libmad$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix +# lib:libmikmod$secondaryArchSuffix # requires libSDL +# lib:libsmpeg$secondaryArchSuffix # requires libSDL + " + +BUILD_REQUIRES=" + devel:libSDL2$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libflac$secondaryArchSuffix +# devel:libfluidsynth$secondaryArchSuffix + devel:libmad$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix +# devel:libmikmod$secondaryArchSuffix # requires libSDL +# devel:libsmpeg$secondaryArchSuffix # requires libSDL + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtool + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +SOURCE_DIR="SDL2_mixer-$portVersion" + +BUILD() +{ + libtoolize --force --copy --install + aclocal --force --install -I acinclude + autoconf + runConfigure ./configure \ + SMPEG_CONFIG=smpeg_config$secondaryArchSuffix + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libSDL2_mixer + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + sdl2_mixer${secondaryArchSuffix}_devel = $portVersion compat >= 2.0 + devel:sdl2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0 + devel:libSDL2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0 + " + +REQUIRES_devel=" + sdl2_mixer$secondaryArchSuffix == $portVersion base + " From 86e97737a8f7eaf6d455d19d3f43f37c2f5fd629 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 26 Dec 2013 01:01:25 -0600 Subject: [PATCH 175/306] libzip: Fix recipe, add new version with configure * cmake version didn't create pkgconfig --- dev-libs/libzip/libzip-0.10.1.recipe | 65 +++++++++++++++++++++--- dev-libs/libzip/libzip-0.11.2.recipe | 75 ++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 7 deletions(-) create mode 100644 dev-libs/libzip/libzip-0.11.2.recipe diff --git a/dev-libs/libzip/libzip-0.10.1.recipe b/dev-libs/libzip/libzip-0.10.1.recipe index 11d333880..4975d1381 100644 --- a/dev-libs/libzip/libzip-0.10.1.recipe +++ b/dev-libs/libzip/libzip-0.10.1.recipe @@ -1,24 +1,75 @@ +SUMMARY="A C library for reading, creating, and modifying zip archives." DESCRIPTION="libzip is a C library for reading, creating, and modifying zip archives." HOMEPAGE="http://www.nih.at/libzip/" SRC_URI="http://www.nih.at/libzip/libzip-0.10.1.tar.bz2" CHECKSUM_MD5="d3e933ae049204badccf605f20aaecde" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libzip${secondaryArchSuffix} = $portVersion + lib:libzip${secondaryArchSuffix} = $portVersion + cmd:zipcmp${secondaryArchSuffix} + cmd:zipmerge${secondaryArchSuffix} + cmd:ziptorrent${secondaryArchSuffix} + " +REQUIRES=" + haiku${secondaryArchSuffix} >= $haikuVersion + lib:libz${secondaryArchSuffix} + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libz${secondaryArchSuffix} + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + BUILD() { - cd libzip-0.10.1 - sed -i 's/MAN_PATH man/MAN_PATH documentation\/man/' man/CMakeLists.txt sed -i 's/DESTINATION lib\/libzip\/include/DESTINATION include/' CMakeLists.txt - cmake . - make + + cmake -DCMAKE_INSTALL_PREFIX=$prefix + make $jobArgs } INSTALL() { - cd libzip-0.10.1 make install + + # clean up includes + mkdir -p $includeDir + mv $prefix/include/* $includeDir/ + rm -rf $prefix/include + + # clean up man pages + mkdir -p $manDir + mv $prefix/man/* $manDir/ + rm -rf $prefix/man + + prepareInstalledDevelLibs \ + libzip \ + + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir } +PROVIDES_devel=" + libzip${secondaryArchSuffix}_devel = $portVersion + devel:libzip$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + libzip$secondaryArchSuffix == $portVersion base + " + LICENSE="BSD (3-clause)" COPYRIGHT="1999-2012 Dieter Baron and Thomas Klausner" diff --git a/dev-libs/libzip/libzip-0.11.2.recipe b/dev-libs/libzip/libzip-0.11.2.recipe new file mode 100644 index 000000000..9d22f1f4d --- /dev/null +++ b/dev-libs/libzip/libzip-0.11.2.recipe @@ -0,0 +1,75 @@ +SUMMARY="A C library for reading, creating, and modifying zip archives." +DESCRIPTION="libzip is a C library for reading, creating, and modifying zip archives." +HOMEPAGE="http://www.nih.at/libzip/" +SRC_URI="http://www.nih.at/libzip/libzip-0.11.2.tar.gz" +CHECKSUM_MD5="c5437df15e4825d40cdc3ec8b9b7516c" +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libzip${secondaryArchSuffix} = $portVersion + lib:libzip${secondaryArchSuffix} = $portVersion + cmd:zipcmp${secondaryArchSuffix} + cmd:zipmerge${secondaryArchSuffix} + cmd:ziptorrent${secondaryArchSuffix} + " +REQUIRES=" + haiku${secondaryArchSuffix} >= $haikuVersion + lib:libz${secondaryArchSuffix} + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libz${secondaryArchSuffix} + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + sed -i 's/LN = ln/LN = cp/' man/Makefile.in + + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + +# # clean up includes +# mkdir -p $includeDir +# mv $prefix/include/* $includeDir/ +# rm -rf $prefix/include +# +# # clean up man pages +# mkdir -p $manDir +# mv $prefix/man/* $manDir/ +# rm -rf $prefix/man + + prepareInstalledDevelLibs \ + libzip \ + + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + libzip${secondaryArchSuffix}_devel = $portVersion + devel:libzip$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + libzip$secondaryArchSuffix == $portVersion base + " + +LICENSE="BSD (3-clause)" +COPYRIGHT="1999-2012 Dieter Baron and Thomas Klausner" From 243625d0267a6600eaa244322bf64989722f0506 Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Thu, 26 Dec 2013 18:24:37 +0000 Subject: [PATCH 176/306] Add USER_SETTINGS_FILES to BeVexed recipe --- haiku-games/BeVexed/bevexed-1.1.recipe | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/haiku-games/BeVexed/bevexed-1.1.recipe b/haiku-games/BeVexed/bevexed-1.1.recipe index a23ae9a65..142389309 100644 --- a/haiku-games/BeVexed/bevexed-1.1.recipe +++ b/haiku-games/BeVexed/bevexed-1.1.recipe @@ -30,6 +30,10 @@ BUILD_PREREQUIRES=" cmd:mkdepend " +USER_SETTINGS_FILES=" + /boot/home/config/settings/BeVexed + " + BUILD() { cd source From 2cc9035401617e4371a5bd3c36884706c96cc8ff Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Thu, 26 Dec 2013 19:25:53 +0000 Subject: [PATCH 177/306] Small correct BeVexed recipe --- haiku-games/BeVexed/bevexed-1.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-games/BeVexed/bevexed-1.1.recipe b/haiku-games/BeVexed/bevexed-1.1.recipe index 142389309..d08630b6b 100644 --- a/haiku-games/BeVexed/bevexed-1.1.recipe +++ b/haiku-games/BeVexed/bevexed-1.1.recipe @@ -31,7 +31,7 @@ BUILD_PREREQUIRES=" " USER_SETTINGS_FILES=" - /boot/home/config/settings/BeVexed + settings/BeVexed " BUILD() From f50ad9c9af2cfb388a0bc6cbcbaa5d8245b220b2 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Thu, 26 Dec 2013 20:57:50 +0000 Subject: [PATCH 178/306] Add RemoteControl recipe --- haiku-apps/remotecontrol/licenses/Unknown | 1 + .../remotecontrol/remotecontrol-1.1.recipe | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 haiku-apps/remotecontrol/licenses/Unknown create mode 100644 haiku-apps/remotecontrol/remotecontrol-1.1.recipe diff --git a/haiku-apps/remotecontrol/licenses/Unknown b/haiku-apps/remotecontrol/licenses/Unknown new file mode 100644 index 000000000..6f00e7a6b --- /dev/null +++ b/haiku-apps/remotecontrol/licenses/Unknown @@ -0,0 +1 @@ +The license is nowhere noted, but on BeBits and HaikuWare it says the license is Freeware. diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe new file mode 100644 index 000000000..b0090db97 --- /dev/null +++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe @@ -0,0 +1,54 @@ +SUMMARY="Remote control your Haiku machines with ease!" +DESCRIPTION=" + RemoteControl is an application that allows the user + to control a remote PC as if he was seating in front of it. + It can be useful if you have a PC with no screen, + keyboard or mouse connected, or simply if it is too far away. + " +HOMEPAGE="https://github.com/HaikuArchives/RemoteControl" +SRC_URI="git://github.com/HaikuArchives/RemoteControl#c59e89e3643e4693a75e5b5456596533d068cc29" +REVISION="1" +LICENSE="Unknown" +COPYRIGHT="2001 Thomas Thiriez" + +ARCHITECTURES="x86 x86_gcc2" + + +PROVIDES=" + remotecontrol = $portVersion + cmd:rcserver = $portVersion + cmd:rcclient = $portVersion + addon:rcinputfilter = $portVersion + addon:rcinputdevice = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:g++ + cmd:xres + cmd:make + cmd:mkdepend + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD() +{ + cd sources + make -C RCClient + make -C RCInputDevice + make -C RCInputFilter + make -C RCServer +} + +INSTALL() +{ + cd sources + make -C RCClient install INSTALL_DIR=$binDir + make -C RCServer install INSTALL_DIR=$binDir + make -C RCInputDevice install INSTALL_DIR=$addOnsDir/input_server/devices + make -C RCInputFilter install INSTALL_DIR=$addOnsDir/input_server/filters +} From 655701431f35320e9b270204f2bcc20e5536b2ff Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 26 Dec 2013 14:31:32 -0800 Subject: [PATCH 179/306] Pin the bevexed recipe to the current working git commit --- haiku-games/{BeVexed => bevexed}/bevexed-1.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename haiku-games/{BeVexed => bevexed}/bevexed-1.1.recipe (92%) diff --git a/haiku-games/BeVexed/bevexed-1.1.recipe b/haiku-games/bevexed/bevexed-1.1.recipe similarity index 92% rename from haiku-games/BeVexed/bevexed-1.1.recipe rename to haiku-games/bevexed/bevexed-1.1.recipe index d08630b6b..d4e925d93 100644 --- a/haiku-games/BeVexed/bevexed-1.1.recipe +++ b/haiku-games/bevexed/bevexed-1.1.recipe @@ -2,7 +2,7 @@ SUMMARY="A maddeningly-addictive puzzle game." DESCRIPTION="A maddeningly-addictive puzzle game. The concept is simple: put the tiles in the grid on the left such that the numbers match wherever 2 tiles touch." HOMEPAGE="https://github.com/HaikuArchives/BeVexed" -SRC_URI="git+https://github.com/HaikuArchives/BeVexed" +SRC_URI="git+https://github.com/HaikuArchives/BeVexed#3a45d8f364" REVISION="1" LICENSE="MIT" From f38cb58805e43dcd43ce5edf683268bfb9595fb4 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 26 Dec 2013 14:34:10 -0800 Subject: [PATCH 180/306] Update libcoverart for secondaryArchSuffix support, but still fails to build due to directory issue. --- .../libcoverart/libcoverart-1.0.0.recipe | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/media-libs/libcoverart/libcoverart-1.0.0.recipe b/media-libs/libcoverart/libcoverart-1.0.0.recipe index 2abcb919e..dd701d87a 100644 --- a/media-libs/libcoverart/libcoverart-1.0.0.recipe +++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe @@ -7,41 +7,49 @@ LICENSE="GNU LGPL v2" COPYRIGHT="2012 Andrew Hawkins" REVISION="1" -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86 ?x86_64" PROVIDES=" - lib:libcoverart + libcoverart = $portVersion + lib:libcoverart$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku - lib:libjansson - lib:libneon + haiku$secondaryArchSuffix >= $haikuVersion + lib:libjansson$secondaryArchSuffix + lib:libneon$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libjansson - devel:libneon + devel:libjansson$secondaryArchSuffix + devel:libneon$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:cmake - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " SOURCE_DIR="libcoverart-{PROJECT_VERSION}" BUILD() { - cmake . + cmake . make } INSTALL() { make install + prepareInstalledDevelLibs libcoverart + fixPkgconfig + + packageEntries devel \ + $developDir } TEST() @@ -50,3 +58,12 @@ TEST() cd tests ./test } + +PROVIDES_devel=" + libcoverart${secondaryArchSuffix}_devel = $portVersion + devel:libcoverart$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + libcoverart$secondaryArchSuffix == $portVersion base + " From 8233edace18efad3de0c18e1d41f2c52119086ad Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 26 Dec 2013 14:36:13 -0800 Subject: [PATCH 181/306] Mark libcoverart as not tested --- media-libs/libcoverart/libcoverart-1.0.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/libcoverart/libcoverart-1.0.0.recipe b/media-libs/libcoverart/libcoverart-1.0.0.recipe index dd701d87a..21ecc5edc 100644 --- a/media-libs/libcoverart/libcoverart-1.0.0.recipe +++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe @@ -7,8 +7,8 @@ LICENSE="GNU LGPL v2" COPYRIGHT="2012 Andrew Hawkins" REVISION="1" -ARCHITECTURES="x86_gcc2 x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86 ?x86_64" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86 ?x86_64" PROVIDES=" libcoverart = $portVersion From a45c9e2eac3833b6965b7d1b0f2062f816ca7321 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 26 Dec 2013 14:38:24 -0800 Subject: [PATCH 182/306] Fixed lame recipe --- media-sound/lame/lame-3.99.5.recipe | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe index b7acf7cf8..35d2a9d61 100644 --- a/media-sound/lame/lame-3.99.5.recipe +++ b/media-sound/lame/lame-3.99.5.recipe @@ -15,7 +15,7 @@ PROVIDES=" lib:libmp3lame = $portVersion compat >= 0.0.0 " REQUIRES=" - haiku + haiku >= $haikuVersion lib:libiconv " BUILD_REQUIRES=" @@ -85,6 +85,4 @@ PROVIDES_devel=" " REQUIRES_devel=" lame == $portVersion base - lib:libiconv >= 2 - lib:libroot " From 7dbd21bd91a23a0223580e22f6b7087cbda9beea Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 26 Dec 2013 22:15:30 -0600 Subject: [PATCH 183/306] boehm_bc: Fix recipe secondary arch issues * Recipe wasn't designed properly for secondary architecture building --- dev-libs/boehm_gc/boehm_gc-7.2d.recipe | 41 +++++++++++++------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dev-libs/boehm_gc/boehm_gc-7.2d.recipe b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe index f724e9412..ee03cfeca 100644 --- a/dev-libs/boehm_gc/boehm_gc-7.2d.recipe +++ b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe @@ -9,42 +9,33 @@ be otherwise accessed." HOMEPAGE="http://www.hpl.hp.com/personal/Hans_Boehm/gc/" SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2d.tar.gz" -REVISION="1" -ARCHITECTURES="x86 x86_gcc2" +REVISION="2" +ARCHITECTURES="x86 x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" CHECKSUM_MD5="91340b28c61753a789eb6077675d87d2" SOURCE_DIR="gc-7.2" PATCHES="boehm_gc-7.2d.patch" PROVIDES=" - boehm_gc = $portVersion compat >= 7 - lib:libgc = $portVersion compat >= 7 - lib:libcord = $portVersion compat >= 7 + boehm_gc$secondaryArchSuffix = $portVersion compat >= 7 + lib:libgc$secondaryArchSuffix = $portVersion compat >= 7 + lib:libcord$secondaryArchSuffix = $portVersion compat >= 7 " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:libtoolize cmd:autoconf cmd:make - cmd:gcc - cmd:ld - " - -PROVIDES_devel=" - boehm_gc_devel = $portVersion compat >= 7 - devel:libgc = $portVersion compat >= 7 - devel:libcord = $portVersion compat >= 7 - " - -REQUIRES_devel=" - boehm_gc == $portVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix " BUILD() @@ -52,7 +43,7 @@ BUILD() libtoolize --force --copy --install autoconf -f runConfigure ./configure --enable-threads=posix \ - --enable-thread-local-alloc --enable-parallel-mark + --enable-thread-local-alloc --enable-parallel-mark make } @@ -69,6 +60,16 @@ TEST() make check } +PROVIDES_devel=" + boehm_gc${secondaryArchSuffix}_devel = $portVersion compat >= 7 + devel:libgc${secondaryArchSuffix} = $portVersion compat >= 7 + devel:libcord${secondaryArchSuffix} = $portVersion compat >= 7 + " + +REQUIRES_devel=" + boehm_gc${secondaryArchSuffix} == $portVersion base + " + LICENSE="BOEHM" COPYRIGHT="1988, 1989 Hans-J. Boehm, Alan J. Demers 1991-1996 by Xerox Corporation. All rights reserved. From 79654b99c84e036524afe4e084302f70cced88c4 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Fri, 27 Dec 2013 02:41:58 -0500 Subject: [PATCH 184/306] Add Recibe recipe --- haiku-apps/recibe/recibe-1.0b1.recipe | 52 +++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 haiku-apps/recibe/recibe-1.0b1.recipe diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe new file mode 100644 index 000000000..9ae0fd70d --- /dev/null +++ b/haiku-apps/recibe/recibe-1.0b1.recipe @@ -0,0 +1,52 @@ +SUMMARY="A cooking recipe manager" +DESCRIPTION=" + Recibe, written by DarkWyrm, is a cooking recipe manager. The + database, which needs to be downloaded separately, includes + around 52,000 different recipes for you to try. + + If you download the recipe database, place it inside your settings + directory, which is likely `/boot/home/config/settings/' . + " +HOMEPAGE="https://github.com/HaikuArchives/Recibe" +SRC_URI="git://github.com/HaikuArchives/Recibe.git#c1d5a57264d8964a2592bc9b43588b3430bd48ad" +LICENSE="MIT" +COPYRIGHT="2007 DarkWyrm" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + recibe = $portVersion + app:recibe = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libsqlite3 + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libsqlite3 + " + +BUILD_PREREQUIRES=" + cmd:gcc + makefile_engine + cmd:make + cmd:mkdepend + cmd:xres + " + +BUILD() +{ + cd sources + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + mkdir -p $appsDir + cp sources/objects/Recibe $appsDir + addAppDeskbarSymlink $appsDir/Recibe +} From a583f23662cb143449cd77f8f4b7fcb79121f66b Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 27 Dec 2013 10:02:09 +0000 Subject: [PATCH 185/306] RemoteControl: Fix DESCRIPTION --- haiku-apps/remotecontrol/remotecontrol-1.1.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe index b0090db97..6501984a1 100644 --- a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe +++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe @@ -1,9 +1,9 @@ SUMMARY="Remote control your Haiku machines with ease!" DESCRIPTION=" - RemoteControl is an application that allows the user - to control a remote PC as if he was seating in front of it. - It can be useful if you have a PC with no screen, - keyboard or mouse connected, or simply if it is too far away. + With the Remote Control app, you can control another Haiku computer also + running the Remote Control app. The app is able to just view what's + on the screen, or also control the computer. This package contains the + RCClient client and RCServer server. Both are to be run in the terminal. " HOMEPAGE="https://github.com/HaikuArchives/RemoteControl" SRC_URI="git://github.com/HaikuArchives/RemoteControl#c59e89e3643e4693a75e5b5456596533d068cc29" From 8b7e7a24bfa00b52968362d50022536d4e5f6d21 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 27 Dec 2013 10:19:40 +0000 Subject: [PATCH 186/306] Just rewrite it a bit more... --- haiku-apps/remotecontrol/remotecontrol-1.1.recipe | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe index 6501984a1..a5cbbc480 100644 --- a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe +++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe @@ -1,9 +1,10 @@ SUMMARY="Remote control your Haiku machines with ease!" DESCRIPTION=" With the Remote Control app, you can control another Haiku computer also - running the Remote Control app. The app is able to just view what's - on the screen, or also control the computer. This package contains the - RCClient client and RCServer server. Both are to be run in the terminal. + running the Remote Control app, no matter where it is. + The app is able to just view what's on the screen, or also control the computer. + This package contains the RCClient client and RCServer server. + Both are to be run in the terminal. " HOMEPAGE="https://github.com/HaikuArchives/RemoteControl" SRC_URI="git://github.com/HaikuArchives/RemoteControl#c59e89e3643e4693a75e5b5456596533d068cc29" From 313b29ceba4a315f84afa9641736ac195373ef58 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Thu, 26 Dec 2013 18:28:19 +0000 Subject: [PATCH 187/306] Fixed intltool-0.40.6 recipe to be compatible with .recipe format --- dev-util/intltool/intltool-0.40.6.recipe | 67 +++++++++++++++++++----- 1 file changed, 54 insertions(+), 13 deletions(-) diff --git a/dev-util/intltool/intltool-0.40.6.recipe b/dev-util/intltool/intltool-0.40.6.recipe index 05eb668c7..c1864ceb3 100644 --- a/dev-util/intltool/intltool-0.40.6.recipe +++ b/dev-util/intltool/intltool-0.40.6.recipe @@ -1,25 +1,66 @@ -DESCRIPTION="intltool" -HOMEPAGE="http://www.gnome.org/" +SUMMARY="intltool is a set of tools to centralize translation of file formats." +DESCRIPTION="intltool is a set of tools to centralize translation of many different file formats using GNU gettext-compatible PO files. + +The intltool collection can be used to do these things: + +* Extract translatable strings from various source files (.xml.in, +glade, .desktop.in, .server.in, .oaf.in). + +* Collect the extracted strings together with messages from traditional +source files (.c, .h) in po/PACKAGE.pot. + +* Merge back the translations from .po files into .xml, .desktop and +oaf files. This merge step will happen at build resp. installation time." + +HOMEPAGE="http://freedesktop.org/wiki/Software/intltool" SRC_URI="ftp://ftp.gnome.org/pub/gnome/sources/intltool/0.40/intltool-0.40.6.tar.gz" CHECKSUM_MD5="8e40f9d1c7308eddbfd24b22cd540631" -REVISION="2" -STATUS_HAIKU="stable" -MESSAGE="Requires XML::Parser perl module installed" -DEPEND="" + +LICENSE="GNU GPL v2" +COPYRIGHT="1994-1996, 1999-2002, 2004, 2005 Free Software Foundation, Inc." + +REVISION="3" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + intltool = $portVersion + cmd:intltool_extract$secondaryArchSuffix = $portVersion + cmd:intltool_merge$secondaryArchSuffix = $portVersion + cmd:intltool_prepare$secondaryArchSuffix = $portVersion + cmd:intltool_update$secondaryArchSuffix = $portVersion + cmd:intltoolize$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + cmd:perl + xml_parser + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + xml_parser + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:perl + cmd:autoconf + " + BUILD() { - cd intltool-0.40.6 - ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ - --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ - --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \ + runConfigure ./configure make } INSTALL() { - cd intltool-0.40.6 make install +} + +TEST () +{ make check } -LICENSE="GNU GPL v2" -COPYRIGHT="1994-1996, 1999-2002, 2004, 2005 Free Software Foundation, Inc." From b9f88033a805c85aef1e54fa33f04dfd118c4057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 27 Dec 2013 13:54:58 +0100 Subject: [PATCH 188/306] srm: Add recipe Current CVS has been fixed, so we don't need any patch. --- app-misc/srm/srm-1.2.12_cvs.recipe | 50 ++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 app-misc/srm/srm-1.2.12_cvs.recipe diff --git a/app-misc/srm/srm-1.2.12_cvs.recipe b/app-misc/srm/srm-1.2.12_cvs.recipe new file mode 100644 index 000000000..869e84fe8 --- /dev/null +++ b/app-misc/srm/srm-1.2.12_cvs.recipe @@ -0,0 +1,50 @@ +SUMMARY="srm - secure file deletion for posix systems" +DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking." +HOMEPAGE="http://srm.sourceforge.net/" +SRC_URI="cvs://:pserver:anonymous@srm.cvs.sourceforge.net:/cvsroot/srm/srm" +REVISION="1" +LICENSE="MIT (no promotion)" +COPYRIGHT="2000 Matthew D. Gauthier" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + srm$secondaryArchSuffix = $portVersion + cmd:srm = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:make + cmd:gcc$secondaryArchSuffix + " + +BUILD() +{ + #./autogen.sh ... + aclocal + autoheader + automake --add-missing + autoconf + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} + +# Beware, needs at least 5GB of disk space free. +TEST() +{ + make test +} From c5bb6aeca66099c1e3887e3e5bdf62e002709557 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Fri, 27 Dec 2013 13:15:03 +0000 Subject: [PATCH 189/306] Fixed libevent recipe (it was producing a broken symlink and throwed a policy warning when compiling on x86) --- dev-libs/libevent/libevent-2.0.21.recipe | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index 9a1b241b8..ca13be77a 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -7,14 +7,14 @@ CHECKSUM_MD5="b2405cc9ebf264aa47ff615d9de527a2" LICENSE="BSD (3-clause)" COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libevent${secondaryArchSuffix} = ${portVersion} - cmd:event_rpcgen.py + cmd:event_rpcgen.py$secondaryArchSuffix lib:libevent$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 @@ -76,10 +76,11 @@ INSTALL() libevent_pthreads \ libevent_openssl - mv .libs/libevent_core.* \ - .libs/libevent_extra.* \ - .libs/libevent_pthreads.* \ - .libs/libevent_openssl.* \ + cp .libs/libevent-*.so* \ + .libs/libevent_core-*.so* \ + .libs/libevent_extra-*.so* \ + .libs/libevent_pthreads-*.so* \ + .libs/libevent_openssl-*.so* \ $developLibDir fixPkgconfig From 08e04d1c9f3ff978c89d18c6dbf46fd42d1014af Mon Sep 17 00:00:00 2001 From: noryb009 Date: Fri, 27 Dec 2013 02:40:47 -0500 Subject: [PATCH 190/306] Update supported targets for OptiPNGTranslator Mark x86 and x86_64 as supported targets in OptiPNG and OptiPNGTranslator. --- haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe | 2 +- media-gfx/optipng/optipng-0.7.4.recipe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe index 4930cc182..bb58c9542 100644 --- a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe +++ b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe @@ -8,7 +8,7 @@ SRC_URI="git://github.com/noryb009/OptiPNGTranslator.git#8e3996a92d840f3c097cf95 LICENSE="MIT" COPYRIGHT="2013 Luke (noryb009)" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" if [ $buildArchitecture = x86_gcc2 ] && \ [ $targetArchitecture = x86_gcc2 ]; then diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.4.recipe index b20530acf..1c7d493a2 100644 --- a/media-gfx/optipng/optipng-0.7.4.recipe +++ b/media-gfx/optipng/optipng-0.7.4.recipe @@ -11,7 +11,7 @@ CHECKSUM_MD5="8853d89aaf859065e95dcdf98b6bed73" LICENSE="Zlib" COPYRIGHT="2001-2012 Cosmin Truta" REVISION="2" -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" optipng$secondaryArchSuffix = $portVersion From e2fb3046f87bf6ebf106a76942b265e176f87496 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 27 Dec 2013 19:05:34 +0000 Subject: [PATCH 191/306] Update license and change website --- haiku-apps/remotecontrol/licenses/RemoteControl Unknown | 2 ++ haiku-apps/remotecontrol/licenses/Unknown | 1 - haiku-apps/remotecontrol/remotecontrol-1.1.recipe | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 haiku-apps/remotecontrol/licenses/RemoteControl Unknown delete mode 100644 haiku-apps/remotecontrol/licenses/Unknown diff --git a/haiku-apps/remotecontrol/licenses/RemoteControl Unknown b/haiku-apps/remotecontrol/licenses/RemoteControl Unknown new file mode 100644 index 000000000..2ae52a044 --- /dev/null +++ b/haiku-apps/remotecontrol/licenses/RemoteControl Unknown @@ -0,0 +1,2 @@ +There isn't a specific license set, but on BeBits and HaikuWare it says the license is Freeware. HaikuWare and BeBits also have the source when +you download it. The official website (http://thomas.thiriez.free.fr/beos/RemoteControl/index.html) also just says "freeware" diff --git a/haiku-apps/remotecontrol/licenses/Unknown b/haiku-apps/remotecontrol/licenses/Unknown deleted file mode 100644 index 6f00e7a6b..000000000 --- a/haiku-apps/remotecontrol/licenses/Unknown +++ /dev/null @@ -1 +0,0 @@ -The license is nowhere noted, but on BeBits and HaikuWare it says the license is Freeware. diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe index a5cbbc480..24a2c4370 100644 --- a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe +++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe @@ -6,10 +6,10 @@ DESCRIPTION=" This package contains the RCClient client and RCServer server. Both are to be run in the terminal. " -HOMEPAGE="https://github.com/HaikuArchives/RemoteControl" +HOMEPAGE="http://thomas.thiriez.free.fr/beos/RemoteControl/index.html" SRC_URI="git://github.com/HaikuArchives/RemoteControl#c59e89e3643e4693a75e5b5456596533d068cc29" REVISION="1" -LICENSE="Unknown" +LICENSE="RemoteControl Unknown" COPYRIGHT="2001 Thomas Thiriez" ARCHITECTURES="x86 x86_gcc2" From 3f14b4c88b89ca79cc3b6b17b009f2651cef83ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 27 Dec 2013 21:50:21 +0100 Subject: [PATCH 192/306] jamvm: Update recipe --- dev-java/jamvm/jamvm-1.5.4.recipe | 54 ++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe index 771a21d35..2308cea60 100644 --- a/dev-java/jamvm/jamvm-1.5.4.recipe +++ b/dev-java/jamvm/jamvm-1.5.4.recipe @@ -1,28 +1,60 @@ -DESCRIPTION="JamVM" -HOMEPAGE="http://jamvm.sourceforge.net" +SUMMARY="JamVM" +DESCRIPTION="JamVM is a new Java Virtual Machine which conforms to the JVM specification version 2 (blue book). + In comparison to most other VM's (free and commercial) it is extremely small," +HOMEPAGE="http://jamvm.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/jamvm/files/jamvm/JamVM%201.5.4/jamvm-1.5.4.tar.gz/download" REVISION="1" -STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="7654e9657691f5f09c4f481ed4686176" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +LICENSE="GNU GPL v2" +COPYRIGHT="2003-2010 Robert Lougher" + +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + jamvm$secondaryArchSuffix = $portVersion + cmd:jamvm$secondaryArchSuffix = $portVersion + lib:libjvm_x86 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libz$secondaryArchSuffix >= 1.2.8 + " +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:aclocal + cmd:libtool + cmd:make + cmd:gcc$secondaryArchSuffix + " + + +PATCHES="jamvm-1.5.4.patch" BUILD() { - cd jamvm-1.5.4 libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-classpath-install-dir=`finddir B_COMMON_DIRECTORY` + runConfigure ./configure \ + --with-classpath-install-dir= make } INSTALL() { - cd jamvm-1.5.4 make install + prepareInstalledDevelLibs } - -LICENSE="GNU GPL v2" -COPYRIGHT="2003-2010 Robert Lougher" From 4d5c0e3c569e3bcfe1df4933814fcfff2268b0a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 27 Dec 2013 22:06:39 +0100 Subject: [PATCH 193/306] jamvm: Fix devel libs --- dev-java/jamvm/jamvm-1.5.4.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe index 2308cea60..e402dfc2f 100644 --- a/dev-java/jamvm/jamvm-1.5.4.recipe +++ b/dev-java/jamvm/jamvm-1.5.4.recipe @@ -22,7 +22,8 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" jamvm$secondaryArchSuffix = $portVersion cmd:jamvm$secondaryArchSuffix = $portVersion - lib:libjvm_x86 + lib:libjvm$secondaryArchSuffix + devel:libjvm$secondaryArchSuffix " REQUIRES=" haiku$secondaryArchSuffix @@ -56,5 +57,5 @@ BUILD() INSTALL() { make install - prepareInstalledDevelLibs + prepareInstalledDevelLib libjvm } From 8e1c7cbcaa936193acdb024e1a4ff15c609fc221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 28 Dec 2013 09:22:20 +0100 Subject: [PATCH 194/306] recibe: Fix recipe (EOF due to backtick in description) --- haiku-apps/recibe/recibe-1.0b1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe index 9ae0fd70d..3d3516d93 100644 --- a/haiku-apps/recibe/recibe-1.0b1.recipe +++ b/haiku-apps/recibe/recibe-1.0b1.recipe @@ -5,7 +5,7 @@ DESCRIPTION=" around 52,000 different recipes for you to try. If you download the recipe database, place it inside your settings - directory, which is likely `/boot/home/config/settings/' . + directory, which is likely '/boot/home/config/settings/' . " HOMEPAGE="https://github.com/HaikuArchives/Recibe" SRC_URI="git://github.com/HaikuArchives/Recibe.git#c1d5a57264d8964a2592bc9b43588b3430bd48ad" From f754c72bb96d072527eefe13baa279134143d8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 28 Dec 2013 09:55:15 +0100 Subject: [PATCH 195/306] getconf: Add recipe to build the FreeBSD getconf We provide a makefile-engine makefile as a patch since the existing makefile requires FreeBSD's buildsystem. --- sys-apps/getconf/getconf-r260000.recipe | 46 +++++ .../getconf/patches/getconf-makefile.patch | 177 ++++++++++++++++++ 2 files changed, 223 insertions(+) create mode 100644 sys-apps/getconf/getconf-r260000.recipe create mode 100644 sys-apps/getconf/patches/getconf-makefile.patch diff --git a/sys-apps/getconf/getconf-r260000.recipe b/sys-apps/getconf/getconf-r260000.recipe new file mode 100644 index 000000000..b307ae299 --- /dev/null +++ b/sys-apps/getconf/getconf-r260000.recipe @@ -0,0 +1,46 @@ +SUMMARY="Prints out values of POSIX configuration variables" +DESCRIPTION="FreeBSD getconf + + The getconf command prints values of system configuration variables. + It is a command interface to the values returned by sysconf(3), confstr(3), and pathconf(3)." +HOMEPAGE="http://www.freebsd.org/" +COPYRIGHT="2000 Massachusetts Institute of Technology" +LICENSE="MIT" +SRC_URI="svn+http://svn.freebsd.org/base/head/usr.bin/getconf#260000" +#CHECKSUM_MD5="" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="getconf-makefile.patch" + +PROVIDES=" + getconf = $portVersion + cmd:getconf = $portVersion +" +REQUIRES=" + haiku >= $haikuVersion +" +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion +" +BUILD_PREREQUIRES=" + makefile_engine + cmd:mkdepend + cmd:gcc + cmd:make +" + +BUILD() +{ + export COPYRIGHT + export LICENSE + export PORT_VERSION=$portVersion + make -f makefile.haiku $jobArgs +} + +INSTALL() +{ + make -f makefile.haiku install INSTALL_DIR=$binDir + mkdir -p $manDir/man1 + install -m 644 getconf.1 $manDir/man1/ +} diff --git a/sys-apps/getconf/patches/getconf-makefile.patch b/sys-apps/getconf/patches/getconf-makefile.patch new file mode 100644 index 000000000..62d05bc28 --- /dev/null +++ b/sys-apps/getconf/patches/getconf-makefile.patch @@ -0,0 +1,177 @@ +From 0ad9f5b07a4d3734402efb6519a5778f9fc18b20 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= +Date: Sat, 28 Dec 2013 09:49:05 +0100 +Subject: [PATCH] Add Haiku makefile +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: François Revol +--- + makefile.haiku | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 154 insertions(+) + create mode 100644 makefile.haiku + +diff --git a/makefile.haiku b/makefile.haiku +new file mode 100644 +index 0000000..ed83568 +--- /dev/null ++++ b/makefile.haiku +@@ -0,0 +1,154 @@ ++%.c: %.gperf ++ LC_ALL=C awk -f ${CURDIR}/fake-gperf.awk $< >$@ ++ ++GENSRC=confstr.c limits.c pathconf.c progenv.c sysconf.c ++ ++## BeOS Generic Makefile v2.5 ## ++ ++## Fill in this file to specify the project being created, and the referenced ++## makefile-engine will do all of the hard work for you. This handles both ++## Intel and PowerPC builds of the BeOS and Haiku. ++ ++## Application Specific Settings --------------------------------------------- ++ ++# specify the name of the binary ++NAME= getconf ++ ++# specify the type of binary ++# APP: Application ++# SHARED: Shared library or add-on ++# STATIC: Static library archive ++# DRIVER: Kernel Driver ++TYPE= APP ++ ++# if you plan to use localization features ++# specify the application MIME siganture ++APP_MIME_SIG= ++ ++# add support for new Pe and Eddie features ++# to fill in generic makefile ++ ++#%{ ++# @src->@ ++ ++# specify the source files to use ++# full paths or paths relative to the makefile can be included ++# all files, regardless of directory, will have their object ++# files created in the common object directory. ++# Note that this means this makefile will not work correctly ++# if two source files with the same name (source.c or source.cpp) ++# are included from different directories. Also note that spaces ++# in folder names do not work well with this makefile. ++SRCS= getconf.c $(GENSRC) ++ ++# specify the resource definition files to use ++# full path or a relative path to the resource file can be used. ++RDEFS= ++ ++# specify the resource files to use. ++# full path or a relative path to the resource file can be used. ++# both RDEFS and RSRCS can be defined in the same makefile. ++RSRCS= ++ ++# @<-src@ ++#%} ++ ++# end support for Pe and Eddie ++ ++# specify additional libraries to link against ++# there are two acceptable forms of library specifications ++# - if your library follows the naming pattern of: ++# libXXX.so or libXXX.a you can simply specify XXX ++# library: libbe.so entry: be ++# ++# - for version-independent linking of standard C++ libraries please add ++# $(STDCPPLIBS) instead of raw "stdc++[.r4] [supc++]" library names ++# ++# - for localization support add following libs: ++# locale localestub ++# ++# - if your library does not follow the standard library ++# 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= bsd ++ ++# specify additional paths to directories following the standard ++# libXXX.so or libXXX.a naming scheme. You can specify full paths ++# or paths relative to the makefile. The paths included may not ++# be recursive, so include all of the paths where libraries can ++# be found. Directories where source files are found are ++# automatically included. ++LIBPATHS= ++ ++# additional paths to look for system headers ++# thes use the form: #include
++# source file directories are NOT auto-included here ++SYSTEM_INCLUDE_PATHS = ++ ++# additional paths to look for local headers ++# thes use the form: #include "header" ++# source file directories are automatically included ++LOCAL_INCLUDE_PATHS = ++ ++# specify the level of optimization that you desire ++# NONE, SOME, FULL ++OPTIMIZE= ++ ++# specify here the codes for languages you are going ++# to support in this application. The default "en" ++# one must be provided too. "make catkeys" will recreate only ++# locales/en.catkeys file. Use it as template for creating other ++# languages catkeys. All localization files must be placed ++# in "locales" sub-directory. ++LOCALES= ++ ++# specify any preprocessor symbols to be defined. The symbols will not ++# have their values set automatically; you must supply the value (if any) ++# to use. For example, setting DEFINES to "DEBUG=1" will cause the ++# compiler option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" ++# would pass "-DDEBUG" on the compiler's command line. ++DEFINES= ++ ++# specify special warning levels ++# if unspecified default warnings will be used ++# NONE = supress all warnings ++# ALL = enable all warnings ++WARNINGS = ++ ++# specify whether image symbols will be created ++# so that stack crawls in the debugger are meaningful ++# if TRUE symbols will be created ++SYMBOLS = ++ ++# specify debug settings ++# if TRUE will allow application to be run from a source-level ++# debugger. Note that this will disable all optimzation. ++DEBUGGER = ++ ++# specify additional compiler flags for all files ++COMPILER_FLAGS = ++ ++# specify additional linker flags ++LINKER_FLAGS = ++ ++# specify the version of this particular item ++# (for example, -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL") ++# This may also be specified in a resource. ++APP_VERSION = -long "$PORT_VERSION "`echo -n -e '\302\251'`"$COPYRIGHT ($LICENSE license)" ++ ++# (for TYPE == DRIVER only) Specify desired location of driver in the /dev ++# hierarchy. Used by the driverinstall rule. E.g., DRIVER_PATH = video/usb will ++# instruct the driverinstall rule to place a symlink to your driver's binary in ++# ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will appear at ++# /dev/video/usb when loaded. Default is "misc". ++DRIVER_PATH = ++ ++## include the makefile-engine ++DEVEL_DIRECTORY := \ ++ $(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY) ++include $(DEVEL_DIRECTORY)/etc/makefile-engine ++ ++clean :: FORCE ++ rm -r $(GENSRC) ++ +-- +1.8.3.4 + From 13883e78b6a7891057b9b12a393b6e1305227e6d Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Fri, 27 Dec 2013 14:06:33 +0000 Subject: [PATCH 196/306] Transmission 2.82 recipe and patch --- .../patches/transmission-2.82.patch | 108 ++++++++++++++++++ net-p2p/transmission/transmission-2.82.recipe | 104 +++++++++++++++++ 2 files changed, 212 insertions(+) create mode 100644 net-p2p/transmission/patches/transmission-2.82.patch create mode 100644 net-p2p/transmission/transmission-2.82.recipe diff --git a/net-p2p/transmission/patches/transmission-2.82.patch b/net-p2p/transmission/patches/transmission-2.82.patch new file mode 100644 index 000000000..d874f536a --- /dev/null +++ b/net-p2p/transmission/patches/transmission-2.82.patch @@ -0,0 +1,108 @@ +diff -ur transmission-2.82/libtransmission/platform-quota.c transmission-2.82-haiku/libtransmission/platform-quota.c +--- transmission-2.82/libtransmission/platform-quota.c 2013-08-09 02:45:44.822345728 +0000 ++++ transmission-2.82-haiku/libtransmission/platform-quota.c 2013-12-27 10:29:53.872415232 +0000 +@@ -16,7 +16,7 @@ + #include /* getuid() */ + #include /* evutil_ascii_strcasecmp () */ + +-#ifndef WIN32 ++#if !defined(WIN32) && !defined(__HAIKU__) + #include /* types needed by quota.h */ + #if defined(__FreeBSD__) || defined(__OpenBSD__) + #include /* quotactl() */ +@@ -67,7 +67,7 @@ + **** + ***/ + +-#ifndef WIN32 ++#if !defined(WIN32) && !defined(__HAIKU__) + static const char * + getdev (const char * path) + { +@@ -300,7 +300,7 @@ + { + int64_t ret = -1; + +-#ifndef WIN32 ++#if !defined(WIN32) && !defined(__HAIKU__) + + if (info->fstype && !evutil_ascii_strcasecmp(info->fstype, "xfs")) + { +@@ -347,7 +347,7 @@ + + info = tr_new0 (struct tr_device_info, 1); + info->path = tr_strdup (path); +-#ifndef WIN32 ++#if !defined(WIN32) && !defined(__HAIKU__) + info->device = tr_strdup (getblkdev (path)); + info->fstype = tr_strdup (getfstype (path)); + #endif +diff -ur transmission-2.82/third-party/miniupnp/connecthostport.c transmission-2.82-haiku/third-party/miniupnp/connecthostport.c +--- transmission-2.82/third-party/miniupnp/connecthostport.c 2013-08-09 02:47:50.398196736 +0000 ++++ transmission-2.82-haiku/third-party/miniupnp/connecthostport.c 2013-12-27 10:30:00.589037568 +0000 +@@ -24,6 +24,7 @@ + #else /* #ifdef _WIN32 */ + #include + #include ++#include + #include + #define closesocket close + #include +diff -ur transmission-2.82/third-party/miniupnp/miniupnpc.c transmission-2.82-haiku/third-party/miniupnp/miniupnpc.c +--- transmission-2.82/third-party/miniupnp/miniupnpc.c 2013-08-09 02:47:50.894435328 +0000 ++++ transmission-2.82-haiku/third-party/miniupnp/miniupnpc.c 2013-12-27 10:30:00.625737728 +0000 +@@ -17,7 +17,7 @@ + #endif + #endif + +-#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) ++#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) && !defined(__HAIKU__) + #define HAS_IP_MREQN + #endif + +diff -ur transmission-2.82/third-party/miniupnp/portlistingparse.c transmission-2.82-haiku/third-party/miniupnp/portlistingparse.c +--- transmission-2.82/third-party/miniupnp/portlistingparse.c 2013-08-09 02:47:50.074186752 +0000 ++++ transmission-2.82-haiku/third-party/miniupnp/portlistingparse.c 2013-12-27 10:30:00.638582784 +0000 +@@ -28,7 +28,7 @@ + + /* Helper function */ + static UNSIGNED_INTEGER +-atoui(const char * p, int l) ++my_atoui(const char * p, int l) + { + UNSIGNED_INTEGER r = 0; + while(l > 0 && *p) +@@ -92,7 +92,7 @@ + pm->remoteHost[l] = '\0'; + break; + case NewExternalPort: +- pm->externalPort = (unsigned short)atoui(data, l); ++ pm->externalPort = (unsigned short)my_atoui(data, l); + break; + case NewProtocol: + if(l > 3) +@@ -101,21 +101,21 @@ + pm->protocol[l] = '\0'; + break; + case NewInternalPort: +- pm->internalPort = (unsigned short)atoui(data, l); ++ pm->internalPort = (unsigned short)my_atoui(data, l); + break; + case NewInternalClient: + memcpy(pm->internalClient, data, l); + pm->internalClient[l] = '\0'; + break; + case NewEnabled: +- pm->enabled = (unsigned char)atoui(data, l); ++ pm->enabled = (unsigned char)my_atoui(data, l); + break; + case NewDescription: + memcpy(pm->description, data, l); + pm->description[l] = '\0'; + break; + case NewLeaseTime: +- pm->leaseTime = atoui(data, l); ++ pm->leaseTime = my_atoui(data, l); + break; + default: + break; diff --git a/net-p2p/transmission/transmission-2.82.recipe b/net-p2p/transmission/transmission-2.82.recipe new file mode 100644 index 000000000..f6e3acec1 --- /dev/null +++ b/net-p2p/transmission/transmission-2.82.recipe @@ -0,0 +1,104 @@ +SUMMARY="Transmission is a cross-platform open source BitTorrent client" +DESCRIPTION="Transmission is a cross-platform BitTorrent client that is: + +Open Source. + +Transmission is an open source, volunteer-based project. Unlike some BitTorrent clients, Transmission doesn't play games with its users to make money: + +Transmission doesn't bundle toolbars, pop-up ads, flash ads, twitter tools, or anything else. +It doesn't hold some feaures back for a payware version. +Its source code is available for anyone to review. +We don't track our users, and our website and forums have no third-party ads or analytics. + +Easy. + +Transmission is designed for easy, powerful use. We've set the defaults to Just Work and it only takes a few clicks to configure advanced features like watch directories, bad peer blocklists, and the web interface. + +Lean. + +In separate benchmarks, Linux Format and Lacrocivious both found Transmission to use less CPU than any other GUI client. It even used less CPU than some non-GUI clients. + +Transmission also has the lowest memory footprint of any major BitTorrent client. + +Imageshack chose Transmission for its BitTorrent farms because the competition requires amounts of memory several times greater than Transmission. + +Transmission's small footprint is one reason why many home device manufacturers, such as FON, Belkin, and Networked Media Tank ship with Transmission. When Belkin and Vuze Inc. partnered to write a Torrent Genie to let people who ran Vuze and owned a Belkin router keep sharing files even when Vuze wasn't running, they decided to use Transmission -- not Vuze's own BitTorrent client -- on the router. + +Native. + +Unlike many cross-platform applications, Transmission integrates seamlessly with your operating system. + +Powerful. + +Transmission has the features you want from a BitTorrent client: encryption, a web interface, peer exchange, magnet links, DHT, µTP, UPnP and NAT-PMP port forwarding, webseed support, watch directories, tracker editing, global and per-torrent speed limits, and more." + +HOMEPAGE="http://www.transmissionbt.com/" +SRC_URI="https://transmission.cachefly.net/transmission-2.82.tar.xz" +CHECKSUM_MD5="a5ef870c0410b12d10449c2d36fa4661" + +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" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" + +PROVIDES=" + transmission = $portVersion + cmd:transmission_cli$secondaryArchSuffix + cmd:transmission_create$secondaryArchSuffix + cmd:transmission_daemon$secondaryArchSuffix + cmd:transmission_edit$secondaryArchSuffix + cmd:transmission_remote$secondaryArchSuffix + cmd:transmission_show$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libssl$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libevent$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libssl$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libevent$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libgettextlib$secondaryArchSuffix >= 0.14.1 + intltool >= 0.40 + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:make + " + +LICENSE="Transmission + MIT + GNU GPL v2 + " +COPYRIGHT="2005-2013. All code is copyrighted by the respective authors." + +PATCHES="transmission-2.82.patch" + +BUILD() +{ + runConfigure ./configure --without-gtk --datadir=$dataDir + make +} + +INSTALL() +{ + make install +} From b15e9432673f95ceb5084f67cc431e8c94653dec Mon Sep 17 00:00:00 2001 From: Mrowqa Date: Sat, 28 Dec 2013 14:21:37 +0100 Subject: [PATCH 197/306] Added cleaned recipe for neverball --- games-puzzle/neverball/neverball-1.5.4.recipe | 72 +++++++++++++++++++ .../neverball/patches/neverball-1.5.4.patch | 13 ++++ 2 files changed, 85 insertions(+) create mode 100644 games-puzzle/neverball/neverball-1.5.4.recipe create mode 100644 games-puzzle/neverball/patches/neverball-1.5.4.patch diff --git a/games-puzzle/neverball/neverball-1.5.4.recipe b/games-puzzle/neverball/neverball-1.5.4.recipe new file mode 100644 index 000000000..0320cce4a --- /dev/null +++ b/games-puzzle/neverball/neverball-1.5.4.recipe @@ -0,0 +1,72 @@ +DESCRIPTION=" + Neverball is part puzzle game, part action game, and entirely a test + of skill. Tilt the floor to roll a ball through an obstacle course + before time runs out. + " +SUMMARY="Tilt the floor to roll a ball through an course before time runs out." +HOMEPAGE="http://neverball.org" +COPYRIGHT="2002-2010 The Neverball Team" +LICENSE="GNU GPL v2" +SRC_URI="http://neverball.org/neverball-1.5.4.tar.gz" +CHECKSUM_MD5="c523b0f72c2035831310e821162f7bd7" +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" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" +PATCHES="neverball-1.5.4.patch" + +PROVIDES=" + neverball$secondaryArchSuffix = $portVersion + app:neverball$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libphysfs$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libsdl_mixer$secondaryArchSuffix + lib:libsdl_ttf$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + + lib:libpng$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libphysfs$secondaryArchSuffix + devel:libsdl$secondaryArchSuffix + devel:libsdl_mixer$secondaryArchSuffix + devel:libsdl_ttf$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + + devel:libpng$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + gettext$secondaryArchSuffix # it's needed + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:libpng_config$secondaryArchSuffix + " + +BUILD() +{ + make +} + +INSTALL() +{ + mkdir -p $appsDir/neverball + cp -rf neverball neverputt mapc README COPYING CHANGES data $appsDir/neverball + addAppDeskbarSymlink $appsDir/neverball/neverball +} diff --git a/games-puzzle/neverball/patches/neverball-1.5.4.patch b/games-puzzle/neverball/patches/neverball-1.5.4.patch new file mode 100644 index 000000000..60a118e94 --- /dev/null +++ b/games-puzzle/neverball/patches/neverball-1.5.4.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index a22fed1..e095a3a 100644 +--- a/Makefile ++++ b/Makefile +@@ -111,7 +111,7 @@ ifeq ($(ENABLE_WII),1) + TILT_LIBS := -lcwiimote -lbluetooth + endif + +-OGL_LIBS := -lGL -lm ++OGL_LIBS := -lGL -lintl + + ifdef MINGW + ifneq ($(ENABLE_NLS),0) From 833029bbb08981d11d53f2cdf41a27ee7bca2450 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sat, 28 Dec 2013 13:39:09 +0000 Subject: [PATCH 198/306] Fixed more policy warnings and added cmd:python to REQUIRES and BUILD_PREREQUIRES for libevent --- dev-libs/libevent/libevent-2.0.21.recipe | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index ca13be77a..e8ffed740 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -30,6 +30,7 @@ REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix + cmd:python " # haiku${secondaryArchSuffix} doesn't define included libraries yet # lib:libnetwork$secondaryArchSuffix >= $haikuVersion @@ -48,6 +49,7 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make + cmd:python " SOURCE_DIR="libevent-${portVersion}-stable" @@ -100,6 +102,7 @@ PROVIDES_devel=" lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 devel:libevent$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 From cef0053f87bd85b712c4024a244c3590cf5b2e99 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sat, 28 Dec 2013 23:24:16 +0000 Subject: [PATCH 199/306] Added tor 0.2.4.20 recipe --- net-misc/tor/licenses/Tor | 141 +++++++++++++++++++++++++++++++ net-misc/tor/tor-0.2.4.20.recipe | 73 ++++++++++++++++ 2 files changed, 214 insertions(+) create mode 100644 net-misc/tor/licenses/Tor create mode 100644 net-misc/tor/tor-0.2.4.20.recipe diff --git a/net-misc/tor/licenses/Tor b/net-misc/tor/licenses/Tor new file mode 100644 index 000000000..4ed3bd8da --- /dev/null +++ b/net-misc/tor/licenses/Tor @@ -0,0 +1,141 @@ + This file contains the license for Tor, + a free software project to provide anonymity on the Internet. + + It also lists the licenses for other components used by Tor. + + For more information about Tor, see https://www.torproject.org/. + + If you got this file as a part of a larger bundle, + there may be other license terms that you should be aware of. + +=============================================================================== +Tor is distributed under this license: + +Copyright (c) 2001-2004, Roger Dingledine +Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson +Copyright (c) 2007-2013, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +=============================================================================== +src/ext/strlcat.c and src/ext/strlcpy.c by Todd C. Miller are licensed +under the following license: + + * Copyright (c) 1998 Todd C. Miller + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +=============================================================================== +src/ext/tor_queue.h is licensed under the following license: + + * Copyright (c) 1991, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + +=============================================================================== +src/config/geoip is licensed under the following license: + +OPEN DATA LICENSE (GeoLite Country and GeoLite City databases) + +Copyright (c) 2008 MaxMind, Inc. All Rights Reserved. + +All advertising materials and documentation mentioning features or use of +this database must display the following acknowledgment: +"This product includes GeoLite data created by MaxMind, available from +http://maxmind.com/" + +Redistribution and use with or without modification, are permitted provided +that the following conditions are met: +1. Redistributions must retain the above copyright notice, this list of +conditions and the following disclaimer in the documentation and/or other +materials provided with the distribution. +2. All advertising materials and documentation mentioning features or use of +this database must display the following acknowledgement: +"This product includes GeoLite data created by MaxMind, available from +http://maxmind.com/" +3. "MaxMind" may not be used to endorse or promote products derived from this +database without specific prior written permission. + +THIS DATABASE IS PROVIDED BY MAXMIND, INC ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL MAXMIND BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +=============================================================================== +If you got Tor as a static binary with OpenSSL included, then you should know: + "This product includes software developed by the OpenSSL Project + for use in the OpenSSL Toolkit (http://www.openssl.org/)" +=============================================================================== diff --git a/net-misc/tor/tor-0.2.4.20.recipe b/net-misc/tor/tor-0.2.4.20.recipe new file mode 100644 index 000000000..416a8dff6 --- /dev/null +++ b/net-misc/tor/tor-0.2.4.20.recipe @@ -0,0 +1,73 @@ +SUMMARY="A virtual layer that helps you improve privacy and anonymity" +DESCRIPTION="Tor is a network of virtual tunnels that allows people and groups to improve their privacy and security on the Internet. It also enables software developers to create new communication tools with built-in privacy features. Tor provides the foundation for a range of applications that allow organizations and individuals to share information over public networks without compromising their privacy. + +Individuals use Tor to keep websites from tracking them and their family members, or to connect to news sites, instant messaging services, or the like when these are blocked by their local Internet providers. Tor's hidden services let users publish web sites and other services without needing to reveal the location of the site. Individuals also use Tor for socially sensitive communication: chat rooms and web forums for rape and abuse survivors, or people with illnesses. + +Journalists use Tor to communicate more safely with whistleblowers and dissidents. Non-governmental organizations (NGOs) use Tor to allow their workers to connect to their home website while they're in a foreign country, without notifying everybody nearby that they're working with that organization. + +Groups such as Indymedia recommend Tor for safeguarding their members' online privacy and security. Activist groups like the Electronic Frontier Foundation (EFF) recommend Tor as a mechanism for maintaining civil liberties online. Corporations use Tor as a safe way to conduct competitive analysis, and to protect sensitive procurement patterns from eavesdroppers. They also use it to replace traditional VPNs, which reveal the exact amount and timing of communication. Which locations have employees working late? Which locations have employees consulting job-hunting websites? Which research divisions are communicating with the company's patent lawyers? + +A branch of the U.S. Navy uses Tor for open source intelligence gathering, and one of its teams used Tor while deployed in the Middle East recently. Law enforcement uses Tor for visiting or surveilling web sites without leaving government IP addresses in their web logs, and for security during sting operations. + +The variety of people who use Tor is actually part of what makes it so secure. Tor hides you among the other users on the network, so the more populous and diverse the user base for Tor is, the more your anonymity will be protected." + +HOMEPAGE="https://www.torproject.org" +SRC_URI="https://www.torproject.org/dist/tor-0.2.4.20.tar.gz" +CHECKSUM_MD5="a8cd8e3b3a3f6a7770f2c22d280f19b8" + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + tor = $portVersion + cmd:tor$secondaryArchSuffix + cmd:tor_gencert$secondaryArchSuffix + cmd:tor_resolve$secondaryArchSuffix + cmd:torify$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libevent$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libevent$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + +LICENSE="Tor" +COPYRIGHT=" + 2001-2004, Roger Dingledine + 2004-2006, Roger Dingledine, Nick Mathewson + 2007-2013, The Tor Project, Inc. + " + +USER_SETTINGS_FILES=" + settings/tor directory + " + +GLOBAL_WRITABLE_FILES=" + settings/tor/torrc.sample auto-merge + " + +BUILD() +{ + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} From f297bf2782a3eaa21246463cf1376549212ab7a8 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sun, 29 Dec 2013 01:25:13 -0500 Subject: [PATCH 200/306] Update recibe's recipe Update recibe's recipe to include the recipe database. --- .../install_recipes_database.sh | 22 +++++++++++++++ haiku-apps/recibe/recibe-1.0b1.recipe | 27 +++++++++++++++---- 2 files changed, 44 insertions(+), 5 deletions(-) create mode 100755 haiku-apps/recibe/additional-files/install_recipes_database.sh diff --git a/haiku-apps/recibe/additional-files/install_recipes_database.sh b/haiku-apps/recibe/additional-files/install_recipes_database.sh new file mode 100755 index 000000000..4bbcf677c --- /dev/null +++ b/haiku-apps/recibe/additional-files/install_recipes_database.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +settingsDir="$(finddir B_USER_SETTINGS_DIRECTORY)" + +recibeSysDataDir="$(finddir B_SYSTEM_DATA_DIRECTORY)" +recibeUserDataDir="$(finddir B_USER_DATA_DIRECTORY)" +recibesFileBase="recibe/recipes.db.zip" + +if [ -f "$settingsDir/recipes.db" ]; then + exit 0 # already have a recipes database +fi + +if [ -f "$recibeSysDataDir/$recibesFileBase" ]; then + recipesZipFile="$recibeSysDataDir/$recibesFileBase" +elif [ -f "$recibeUserDataDir/$recibesFileBase" ]; then + recipesZipFile="$recibeUserDataDir/$recibesFileBase" +else + exit 1 # couldn't find recipes.db +fi + +cd "$settingsDir" +unzip "$recipesZipFile" diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe index 3d3516d93..aa060dc2f 100644 --- a/haiku-apps/recibe/recibe-1.0b1.recipe +++ b/haiku-apps/recibe/recibe-1.0b1.recipe @@ -1,19 +1,22 @@ SUMMARY="A cooking recipe manager" DESCRIPTION=" Recibe, written by DarkWyrm, is a cooking recipe manager. The - database, which needs to be downloaded separately, includes - around 52,000 different recipes for you to try. - - If you download the recipe database, place it inside your settings - directory, which is likely '/boot/home/config/settings/' . + included database contains around 52,000 different recipes for + you to try. " HOMEPAGE="https://github.com/HaikuArchives/Recibe" SRC_URI="git://github.com/HaikuArchives/Recibe.git#c1d5a57264d8964a2592bc9b43588b3430bd48ad" +SRC_URI_2="http://ports-space.haiku-files.org/recibe/recipes.db.zip#noarchive" +CHECKSUM_MD5_2="1dda608c90b426521b69ab51311f0f15" LICENSE="MIT" COPYRIGHT="2007 DarkWyrm" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ADDITIONAL_FILES=" + install_recipes_database.sh + " + PROVIDES=" recibe = $portVersion app:recibe = $portVersion @@ -37,6 +40,14 @@ BUILD_PREREQUIRES=" cmd:xres " +USER_SETTINGS_FILES=" + settings/recipes.db + settings/Recibe_favorites + " +POST_INSTALL_SCRIPTS=" + $relativePostInstallDir/install_recipes_database.sh + " + BUILD() { cd sources @@ -49,4 +60,10 @@ INSTALL() mkdir -p $appsDir cp sources/objects/Recibe $appsDir addAppDeskbarSymlink $appsDir/Recibe + + mkdir -p $dataDir/recibe + cp $sourceDir2/recipes.db.zip $dataDir/recibe + + mkdir -p $postInstallDir + cp $portDir/additional-files/install_recipes_database.sh $postInstallDir } From 54479651f4c661e1b6f854e94f52b0eb618c76b3 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 29 Dec 2013 01:07:08 -0700 Subject: [PATCH 201/306] Fix bzip2 library location and symlinks * Move the static library to $libDir on secondary arch builds * Create libbz2.so symlink so things can actually find/use the shared lib * Remove $binDir and $manDir on secondary arch builds The bin commands were already excluded from the package because of where they were installed. This just gets rid of the policy warning --- app-arch/bzip2/bzip2-1.0.6.recipe | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe index f9ffdcfcb..9cdb5608f 100644 --- a/app-arch/bzip2/bzip2-1.0.6.recipe +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -5,7 +5,7 @@ LICENSE="bzip2" COPYRIGHT="1996-2010 Julian R Seward" SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz" CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86 x86_gcc2" @@ -57,8 +57,15 @@ INSTALL() make install PREFIX=$prefix mkdir -p $libDir + + #move the static library to the right dir for secondary arch builds + if [ -n "$secondaryArchSuffix" ];then + mv $prefix/lib/libbz2.a $libDir + fi + # also install shared lib - cp -a libbz2.so.1.0.6 libbz2.so.1.0 $libDir + ln -sf libbz2.so.1.0.6 libbz2.so + cp -a libbz2.so.1.0.6 libbz2.so.1.0 libbz2.so $libDir # move man pages mkdir -p $manDir @@ -77,6 +84,12 @@ INSTALL() # devel package packageEntries devel \ $developDir + + #remove bin commands and man pages when building for secondary arch + if [ -n "$secondaryArchSuffix" ];then + rm -rf $prefix/bin + rm -rf $manDir + fi } # ----- devel package ------------------------------------------------------- From af174e27ca5f0774a97c72b0e7d1b0cb5fcaec7d Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 29 Dec 2013 01:17:00 -0700 Subject: [PATCH 202/306] Make boost into a usable recipe ... since apparently it wasn't tested when being merged * Fixed the _devel package so that it actually contains devel stuff (in particular the static libs and shared lib symlinks) * Fixed all of the REQUIRES/PROVIDES entries * Enable ICU support * Enable parallel building There should probably be a _doc package and we might want to split the _devel package with a separate package for each of the libs. --- dev-libs/boost/boost-1.55.0.recipe | 294 +++++++++++++++++++++-------- 1 file changed, 215 insertions(+), 79 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index a7c54ba93..9ea43b1ff 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -9,12 +9,14 @@ 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" CHECKSUM_MD5="d6eef4b4cacb2183f2bf265a5a03a354" -REVISION="1" +REVISION="2" LICENSE="Boost v1.0" COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al." ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi SECONDARY_ARCHITECTURES="x86 ?x86_64" @@ -23,106 +25,189 @@ SOURCE_DIR="boost_1_55_0" PATCHES="boost-1.55.0.patchset" PROVIDES=" - lib:boost = 1.55.0 + boost$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libiconv$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix - lib:libz$secondaryArchSuffix + boost_atomic$secondaryArchSuffix == $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_context$secondaryArchSuffix == $portVersion + boost_coroutine$secondaryArchSuffix == $portVersion + boost_date_time$secondaryArchSuffix == $portVersion + boost_filesystem$secondaryArchSuffix == $portVersion + boost_graph$secondaryArchSuffix == $portVersion + boost_iostreams$secondaryArchSuffix == $portVersion + boost_locale$secondaryArchSuffix == $portVersion + boost_log$secondaryArchSuffix == $portVersion + boost_math$secondaryArchSuffix == $portVersion + boost_program_options$secondaryArchSuffix == $portVersion + boost_random$secondaryArchSuffix == $portVersion + boost_regex$secondaryArchSuffix == $portVersion + boost_serialization$secondaryArchSuffix == $portVersion + boost_signals$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_test$secondaryArchSuffix == $portVersion + boost_thread$secondaryArchSuffix == $portVersion + boost_timer$secondaryArchSuffix == $portVersion + boost_unit_test_framework$secondaryArchSuffix == $portVersion + boost_wave$secondaryArchSuffix == $portVersion " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion - devel:libiconv$secondaryArchSuffix devel:libbz2$secondaryArchSuffix devel:libz$secondaryArchSuffix + devel:libicuuc$secondaryArchSuffix + devel:libicui18n$secondaryArchSuffix + devel:libicudata$secondaryArchSuffix " BUILD_PREREQUIRES=" - boehm_gc cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:jam - cmd:iconv - cmd:make - binutils " BUILD() { ./bootstrap.sh \ - --without-icu \ --prefix=$prefix \ --exec-prefix=$binDir \ --libdir=$libDir \ --includedir=$includeDir - ./bjam \ - -sICU_PATH=$prefix \ - -sICONV_PATH=$prefix \ - -d2 \ + + ./b2 $jobArgs \ --without-mpi \ - --prefix=$prefix \ - --exec-prefix=$binDir \ - --libdir=$libDir \ - --includedir=$includeDir \ --enable-threads=posix \ --enable-thread-local-alloc \ --enable-parallel-mark \ inlining=on \ - linkflags=-L$libDir \ threading=multi \ variant=release \ - link=shared \ + link=static,shared \ runtime-link=shared \ - --without-python \ - --disable-icu + --without-python } INSTALL() { - mkdir -p $includeDir - mkdir -p $libDir - - cp -rf boost $includeDir - cp stage/lib/* $libDir - - packageEntries devel $includeDir - packageEntries atomic $libDir/*atomic* - packageEntries chrono $libDir/*chrono* - packageEntries context $libDir/*context* - packageEntries coroutine $libDir/*coroutine* - packageEntries date_time $libDir/*date_time* - packageEntries exception $libDir/*exception* - packageEntries filesystem $libDir/*filesystem* - packageEntries graph $libDir/*graph* - packageEntries iostreams $libDir/*iostreams* - packageEntries locale $libDir/*locale* - packageEntries log $libDir/*log* - packageEntries math $libDir/*math* - packageEntries program_options $libDir/*program_options* - packageEntries random $libDir/*random* - packageEntries regex $libDir/*regex* - packageEntries serialization $libDir/*serialization* - packageEntries signals $libDir/*signals* - packageEntries system $libDir/*system* - packageEntries test $libDir/*test* - packageEntries thread $libDir/*thread* - packageEntries timer $libDir/*timer* - packageEntries wave $libDir/*wave* + ./b2 $jobArgs \ + --without-mpi \ + --enable-threads=posix \ + --enable-thread-local-alloc \ + --enable-parallel-mark \ + inlining=on \ + threading=multi \ + variant=release \ + link=static,shared \ + runtime-link=shared \ + --without-python \ + install + + prepareInstalledDevelLibs libboost_atomic \ + libboost_chrono libboost_context libboost_coroutine \ + libboost_date_time libboost_filesystem libboost_iostreams \ + libboost_locale libboost_log libboost_log_setup \ + libboost_math_c99 libboost_math_c99f libboost_math_c99l \ + libboost_math_tr1 libboost_math_tr1f libboost_math_tr1l \ + libboost_program_options libboost_random libboost_regex \ + libboost_serialization libboost_signals libboost_system \ + libboost_thread libboost_timer libboost_unit_test_framework \ + libboost_wave libboost_wserialization libboost_prg_exec_monitor \ + libboost_exception libboost_graph libboost_test_exec_monitor + + packageEntries devel $developDir + packageEntries atomic $libDir/libboost_atomic* + packageEntries chrono $libDir/libboost_chrono* + packageEntries context $libDir/libboost_context* + packageEntries coroutine $libDir/libboost_coroutine* + packageEntries date_time $libDir/libboost_date_time* +# packageEntries exception $libDir/libboost_exception* + packageEntries filesystem $libDir/libboost_filesystem* + packageEntries graph $libDir/libboost_graph* + packageEntries iostreams $libDir/libboost_iostreams* + packageEntries locale $libDir/libboost_locale* + packageEntries log $libDir/libboost_log* + packageEntries math $libDir/libboost_math* + packageEntries program_options $libDir/libboost_program_options* + packageEntries random $libDir/libboost_random* + packageEntries regex $libDir/libboost_regex* + packageEntries serialization $libDir/libboost_serialization* $libDir/libboost_wserialization* + packageEntries signals $libDir/libboost_signals* + packageEntries system $libDir/libboost_system* + packageEntries test $libDir/libboost_prg_exec_monitor* + packageEntries thread $libDir/libboost_thread* + packageEntries timer $libDir/libboost_timer* + packageEntries unit_test_framework $libDir/libboost_unit_test_framework* + packageEntries wave $libDir/libboost_wave* } PROVIDES_devel=" boost_devel$secondaryArchSuffix = $portVersion + devel:libboost_atomic$secondaryArchSuffix = $portVersion + devel:libboost_chrono$secondaryArchSuffix = $portVersion + devel:libboost_context$secondaryArchSuffix = $portVersion + devel:libboost_coroutine$secondaryArchSuffix = $portVersion + devel:libboost_date_time$secondaryArchSuffix = $portVersion + devel:libboost_exception$secondaryArchSuffix = $portVersion + devel:libboost_filesystem$secondaryArchSuffix = $portVersion + devel:libboost_graph$secondaryArchSuffix = $portVersion + devel:libboost_iostreams$secondaryArchSuffix = $portVersion + devel:libboost_locale$secondaryArchSuffix = $portVersion + devel:libboost_log$secondaryArchSuffix = $portVersion + devel:libboost_log_setup$secondaryArchSuffix = $portVersion + devel:libboost_math_c99$secondaryArchSuffix = $portVersion + devel:libboost_math_c99f$secondaryArchSuffix = $portVersion + devel:libboost_math_c99l$secondaryArchSuffix = $portVersion + devel:libboost_math_tr1$secondaryArchSuffix = $portVersion + devel:libboost_math_tr1f$secondaryArchSuffix = $portVersion + devel:libboost_math_tr1l$secondaryArchSuffix = $portVersion + devel:libboost_prg_exec_monitor$secondaryArchSuffix = $portVersion + devel:libboost_program_options$secondaryArchSuffix = $portVersion + devel:libboost_random$secondaryArchSuffix = $portVersion + devel:libboost_regex$secondaryArchSuffix = $portVersion + devel:libboost_serialization$secondaryArchSuffix = $portVersion + devel:libboost_signals$secondaryArchSuffix = $portVersion + devel:libboost_system$secondaryArchSuffix = $portVersion + devel:libboost_test_exec_monitor$secondaryArchSuffix = $portVersion + devel:libboost_thread$secondaryArchSuffix = $portVersion + devel:libboost_timer$secondaryArchSuffix = $portVersion + devel:libboost_unit_test_framework$secondaryArchSuffix = $portVersion + devel:libboost_wave$secondaryArchSuffix = $portVersion + devel:libboost_wserialization$secondaryArchSuffix = $portVersion " REQUIRES_devel=" haiku$secondaryArchSuffix >= $haikuVersion + boost$secondaryArchSuffix == $portVersion + boost_atomic$secondaryArchSuffix == $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_context$secondaryArchSuffix == $portVersion + boost_coroutine$secondaryArchSuffix == $portVersion + boost_date_time$secondaryArchSuffix == $portVersion +# boost_exception$secondaryArchSuffix == $portVersion + boost_filesystem$secondaryArchSuffix == $portVersion + boost_graph$secondaryArchSuffix == $portVersion + boost_iostreams$secondaryArchSuffix == $portVersion + boost_locale$secondaryArchSuffix == $portVersion + boost_log$secondaryArchSuffix == $portVersion + boost_math$secondaryArchSuffix == $portVersion + boost_program_options$secondaryArchSuffix == $portVersion + boost_random$secondaryArchSuffix == $portVersion + boost_regex$secondaryArchSuffix == $portVersion + boost_serialization$secondaryArchSuffix == $portVersion + boost_signals$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_test$secondaryArchSuffix == $portVersion + boost_thread$secondaryArchSuffix == $portVersion + boost_timer$secondaryArchSuffix == $portVersion + boost_unit_test_framework$secondaryArchSuffix == $portVersion + boost_wave$secondaryArchSuffix == $portVersion " PROVIDES_atomic=" boost_atomic$secondaryArchSuffix = $portVersion + lib:libboost_atomic$secondaryArchSuffix = $portVersion " REQUIRES_atomic=" @@ -131,15 +216,17 @@ REQUIRES_atomic=" PROVIDES_chrono=" boost_chrono$secondaryArchSuffix = $portVersion + lib:libboost_chrono$secondaryArchSuffix = $portVersion " REQUIRES_chrono=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion " PROVIDES_context=" boost_context$secondaryArchSuffix = $portVersion + lib:libboost_context$secondaryArchSuffix = $portVersion " REQUIRES_context=" @@ -148,81 +235,107 @@ REQUIRES_context=" PROVIDES_coroutine=" boost_coroutine$secondaryArchSuffix = $portVersion + lib:libboost_coroutine$secondaryArchSuffix = $portVersion " REQUIRES_coroutine=" - boost_context$secondaryArchSuffix == $portVersion + haiku$secondaryArchSuffix >= $haikuVersion + lib:libboost_context$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion " PROVIDES_date_time=" boost_date_time$secondaryArchSuffix = $portVersion + lib:libboost_date_time$secondaryArchSuffix = $portVersion " REQUIRES_date_time=" haiku$secondaryArchSuffix >= $haikuVersion " -PROVIDES_exception=" - boost_exception$secondaryArchSuffix = $portVersion - " +#PROVIDES_exception=" +# boost_exception$secondaryArchSuffix = $portVersion +# lib:libboost_exception$secondaryArchSuffix = $portVersion +# " -REQUIRES_exception=" - haiku$secondaryArchSuffix >= $haikuVersion - " +#REQUIRES_exception=" +# haiku$secondaryArchSuffix >= $haikuVersion +# " PROVIDES_filesystem=" boost_filesystem$secondaryArchSuffix = $portVersion + lib:libboost_filesystem$secondaryArchSuffix = $portVersion " REQUIRES_filesystem=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion lib:libz$secondaryArchSuffix lib:libbz2$secondaryArchSuffix " PROVIDES_graph=" boost_graph$secondaryArchSuffix = $portVersion + lib:libboost_graph$secondaryArchSuffix = $portVersion " REQUIRES_graph=" haiku$secondaryArchSuffix >= $haikuVersion - boost_regex$secondaryArchSuffix == $portVersion + lib:libboost_regex$secondaryArchSuffix == $portVersion + lib:libicuuc$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix + lib:libicudata$secondaryArchSuffix " PROVIDES_iostreams=" boost_iostreams$secondaryArchSuffix = $portVersion + lib:libboost_iostreams$secondaryArchSuffix = $portVersion " REQUIRES_iostreams=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix " PROVIDES_locale=" boost_locale$secondaryArchSuffix = $portVersion + lib:libboost_locale$secondaryArchSuffix = $portVersion " REQUIRES_locale=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix == $portVersion - boost_system$secondaryArchSuffix == $portVersion - boost_thread$secondaryArchSuffix == $portVersion + lib:libboost_chrono$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion + lib:libboost_thread$secondaryArchSuffix == $portVersion + lib:libicuuc$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix + lib:libicudata$secondaryArchSuffix " PROVIDES_log=" boost_log$secondaryArchSuffix = $portVersion + lib:libboost_log$secondaryArchSuffix = $portVersion + lib:libboost_log_setup$secondaryArchSuffix = $portVersion " REQUIRES_log=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix == $portVersion - boost_system$secondaryArchSuffix == $portVersion - boost_date_time$secondaryArchSuffix == $portVersion - boost_thread$secondaryArchSuffix == $portVersion + lib:libboost_chrono$secondaryArchSuffix == $portVersion + lib:libboost_filesystem$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion + lib:libboost_date_time$secondaryArchSuffix == $portVersion + lib:libboost_thread$secondaryArchSuffix == $portVersion " PROVIDES_math=" boost_math$secondaryArchSuffix = $portVersion + lib:libboost_math_c99$secondaryArchSuffix = $portVersion + lib:libboost_math_c99f$secondaryArchSuffix = $portVersion + lib:libboost_math_c99l$secondaryArchSuffix = $portVersion + lib:libboost_math_tr1$secondaryArchSuffix = $portVersion + lib:libboost_math_tr1f$secondaryArchSuffix = $portVersion + lib:libboost_math_tr1l$secondaryArchSuffix = $portVersion " REQUIRES_math=" @@ -231,6 +344,7 @@ REQUIRES_math=" PROVIDES_program_options=" boost_program_options$secondaryArchSuffix = $portVersion + lib:libboost_program_options$secondaryArchSuffix = $portVersion " REQUIRES_program_options=" @@ -239,6 +353,7 @@ REQUIRES_program_options=" PROVIDES_random=" boost_random$secondaryArchSuffix = $portVersion + lib:libboost_random$secondaryArchSuffix = $portVersion " REQUIRES_random=" @@ -247,14 +362,20 @@ REQUIRES_random=" PROVIDES_regex=" boost_regex$secondaryArchSuffix = $portVersion + lib:libboost_regex$secondaryArchSuffix = $portVersion " REQUIRES_regex=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libicuuc$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix + lib:libicudata$secondaryArchSuffix " PROVIDES_serialization=" boost_serialization$secondaryArchSuffix = $portVersion + lib:libboost_serialization$secondaryArchSuffix = $portVersion + lib:libboost_wserialization$secondaryArchSuffix = $portVersion " REQUIRES_serialization=" @@ -263,6 +384,7 @@ REQUIRES_serialization=" PROVIDES_signals=" boost_signals$secondaryArchSuffix = $portVersion + lib:libboost_signals$secondaryArchSuffix = $portVersion " REQUIRES_signals=" @@ -271,6 +393,7 @@ REQUIRES_signals=" PROVIDES_system=" boost_system$secondaryArchSuffix = $portVersion + lib:libboost_system$secondaryArchSuffix = $portVersion " REQUIRES_system=" @@ -279,6 +402,8 @@ REQUIRES_system=" PROVIDES_test=" boost_test$secondaryArchSuffix = $portVersion + lib:libboost_prg_exec_monitor$secondaryArchSuffix = $portVersion +# lib:libboost_test_exec_monitor$secondaryArchSuffix = $portVersion " REQUIRES_test=" @@ -287,33 +412,44 @@ REQUIRES_test=" PROVIDES_thread=" boost_thread$secondaryArchSuffix = $portVersion + lib:libboost_thread$secondaryArchSuffix = $portVersion " REQUIRES_thread=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix == $portVersion - boost_chrono$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion " PROVIDES_timer=" boost_timer$secondaryArchSuffix = $portVersion + lib:libboost_timer$secondaryArchSuffix = $portVersion " REQUIRES_timer=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix == $portVersion - boost_system$secondaryArchSuffix == $portVersion + lib:libboost_chrono$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion + " + +PROVIDES_unit_test_framework=" + boost_unit_test_framework$secondaryArchSuffix = $portVersion + lib:libboost_unit_test_framework$secondaryArchSuffix = $portVersion + " + +REQUIRES_unit_test_framework=" + haiku$secondaryArchSuffix >= $haikuVersion " PROVIDES_wave=" boost_wave$secondaryArchSuffix = $portVersion + lib:libboost_wave$secondaryArchSuffix = $portVersion " REQUIRES_wave=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix == $portVersion - boost_date_time$secondaryArchSuffix == $portVersion - boost_filesystem$secondaryArchSuffix == $portVersion - boost_system$secondaryArchSuffix == $portVersion - boost_thread$secondaryArchSuffix == $portVersion + lib:libboost_chrono$secondaryArchSuffix == $portVersion + lib:libboost_date_time$secondaryArchSuffix == $portVersion + lib:libboost_filesystem$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion + lib:libboost_thread$secondaryArchSuffix == $portVersion " From dd8f97a9756cd3ffef2cef89eaf2b4248042a3a1 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 29 Dec 2013 18:09:23 +0000 Subject: [PATCH 203/306] Add BlogPositive 0.3 recipe --- .../blogpositive/blogpositive-0.3.0.recipe | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 haiku-apps/blogpositive/blogpositive-0.3.0.recipe diff --git a/haiku-apps/blogpositive/blogpositive-0.3.0.recipe b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe new file mode 100644 index 000000000..4ae39eebe --- /dev/null +++ b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe @@ -0,0 +1,63 @@ +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 connect to Wordpress, LiveJournal and OnSugar blogs. + " +HOMEPAGE="http://blogpositive.puckipedia.com" +SRC_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.3" +REVISION="1" + +LICENSE="MIT" +COPYRIGHT="2013 :Puck Meerburg" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +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 + for i in BlogPositivePlugins/*; do + if [ -f $i/makefile ]; then + make -C $i + fi + done + make bindcatalogs +} + +INSTALL() +{ + make install INSTALL_DIR=$appsDir + addAppDeskbarSymlink $appsDir/BlogPositive + + for i in BlogPositivePlugins/*; do + if [ -f $i/makefile ]; then + make -C $i install INSTALL_DIR=$addOnsDir/BlogPositive + fi + done +} From de5d8227ca526501f79add503b79dbb0b453bfff Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sun, 29 Dec 2013 18:32:37 +0000 Subject: [PATCH 204/306] Added CmakeHaiku recipe --- haiku-apps/cmake_haiku/cmake_haiku-git.recipe | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 haiku-apps/cmake_haiku/cmake_haiku-git.recipe diff --git a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe new file mode 100644 index 000000000..1a78ab88d --- /dev/null +++ b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe @@ -0,0 +1,45 @@ +SUMMARY="Cmake GUI with Haiku Native Widgets" +DESCRIPTION="cmake_haiku is a native GUI frontend for Cmake with features like configuring a project and generating files for other build systems like Makefiles, Ninja etc." + +HOMEPAGE="https://github.com/AdrianArroyoCalle/cmake-haiku" +SRC_URI="git+https://github.com/AdrianArroyoCalle/cmake-haiku.git#a42d55b" + +LICENSE="BSD (3-clause)" +COPYRIGHT="2012-2013 Adrián Arroyo Calle " + +REVISION="1" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + cmake_haiku = $portVersion + app:cmake_haiku = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + cmd:cmake + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:cmake + cmd:make + " + +BUILD() +{ + cmake . + make +} + +INSTALL() +{ + mkdir -p $appsDir + cp cmake-gui $appsDir/CmakeHaiku + + addAppDeskbarSymlink $appsDir/CmakeHaiku +} From c8891332288df08118628c724d5ab422691934a6 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 29 Dec 2013 20:53:25 -0800 Subject: [PATCH 205/306] Remove whitespace at end of line in gettext patch. --- sys-devel/gettext/patches/gettext-0.18.1.1.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/gettext/patches/gettext-0.18.1.1.patch b/sys-devel/gettext/patches/gettext-0.18.1.1.patch index 0250765dc..6752ab563 100644 --- a/sys-devel/gettext/patches/gettext-0.18.1.1.patch +++ b/sys-devel/gettext/patches/gettext-0.18.1.1.patch @@ -5,7 +5,7 @@ # define O_TEXT _O_TEXT #endif -#if defined __BEOS__ || defined __HAIKU__ -+#if defined __BEOS__ ++#if defined __BEOS__ /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */ # undef O_BINARY # undef O_TEXT From 76a513632690c7890255ccfd830131a548a7fd5f Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 30 Dec 2013 00:46:20 +0000 Subject: [PATCH 206/306] Added Aiksaurus 1.2.1 recipe and patch --- app-text/aiksaurus/aiksaurus-1.2.1.recipe | 84 +++++++++++++++++++ .../aiksaurus/patches/aiksaurus-1.2.1.patch | 67 +++++++++++++++ 2 files changed, 151 insertions(+) create mode 100644 app-text/aiksaurus/aiksaurus-1.2.1.recipe create mode 100644 app-text/aiksaurus/patches/aiksaurus-1.2.1.patch diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.recipe b/app-text/aiksaurus/aiksaurus-1.2.1.recipe new file mode 100644 index 000000000..8af6c678e --- /dev/null +++ b/app-text/aiksaurus/aiksaurus-1.2.1.recipe @@ -0,0 +1,84 @@ +SUMMARY="A set of libraries and applications for Thesaurus" +DESCRIPTION="Aiksaurus is a set of libraries and applications which provide a thesaurus (currently English only, based on Guttenburg's Moby thesaurus) using native GUI on several platforms: +* UNIX (GTK+ & Qt) +* Win32 & MacOSX (Cocoa). +The core library itself is platform-independent. The principal language is C++, with some use of Cocoa/ObjC++; wrappers are provided for C and Cocoa/ObjC." + +HOMEPAGE="http://aiksaurus.sourceforge.net" +SRC_URI="http://switch.dl.sourceforge.net/project/aiksaurus/aiksaurus/1.2.1/aiksaurus-1.2.1.tar.gz" +CHECKSUM_MD5="3eae03b7c49843ccc9262e52846ea6b4" + +REVISION="1" + +LICENSE="GNU GPL v2" +COPYRIGHT="2001-2002 Jared Davis + 2001 Michael D. Pritchett + " + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + aiksaurus$secondaryArchSuffix = $portVersion + lib:libAiksaurus_1.2$secondaryArchSuffix = $portVersion + cmd:aiksaurus$secondaryArchSuffix = $portVersion + cmd:caiksaurus$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +PATCHES="aiksaurus-1.2.1.patch" + +BUILD() +{ + # Automake complains about NEWS missing + touch NEWS + + libtoolize --force --copy --install + + # libtoolize is going to ask us to append the contents + # of some files to aclocal.m4 + + for i in m4/{libtool,lt{options,sugar,version,~obsolete}}.m4; do cat $i >> aclocal.m4; done + + aclocal -I m4 + autoconf + automake --add-missing + + runConfigure ./configure --without-gtk --datadir=$dataDir + make +} + +INSTALL() +{ + make install + + prepareInstalledDevelLib libAiksaurus + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + aiksaurus${secondaryArchSuffix}_devel = $portVersion + devel:aiksaurus$secondaryArchSuffix = $portVersion + devel:libAiksaurus$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + aiksaurus$secondaryArchSuffix == $portVersion base + " diff --git a/app-text/aiksaurus/patches/aiksaurus-1.2.1.patch b/app-text/aiksaurus/patches/aiksaurus-1.2.1.patch new file mode 100644 index 000000000..8121aa5d7 --- /dev/null +++ b/app-text/aiksaurus/patches/aiksaurus-1.2.1.patch @@ -0,0 +1,67 @@ +diff -ur aiksaurus-1.2.1/base/aiksaurus.t.cpp aiksaurus-1.2.1-haiku/base/aiksaurus.t.cpp +--- aiksaurus-1.2.1/base/aiksaurus.t.cpp 2003-06-27 01:44:38.003407872 +0000 ++++ aiksaurus-1.2.1-haiku/base/aiksaurus.t.cpp 2013-12-30 08:47:08.949747712 +0000 +@@ -24,6 +24,7 @@ + #include "config.h" + #include + #include ++#include + using namespace std; + using AiksaurusImpl::AsciiCompare; + +diff -ur aiksaurus-1.2.1/configure.ac aiksaurus-1.2.1-haiku/configure.ac +--- aiksaurus-1.2.1/configure.ac 2004-06-12 04:34:05.017563648 +0000 ++++ aiksaurus-1.2.1-haiku/configure.ac 2013-12-29 23:53:53.963903488 +0000 +@@ -1,5 +1,6 @@ + AC_INIT([aiksaurus],[1.2],[http://aiksaurus.sourceforge.net/]) + AC_CONFIG_SRCDIR([base/Aiksaurus.h]) ++AC_CONFIG_MACRO_DIR([m4]) + + # Aiksaurus, version 1.2.0 + +@@ -47,19 +48,19 @@ + + AC_SUBST(LT_RELEASE) + +-LT_CURRENT=`expr $AIK_MICRO_VERSION - $AIK_INTERFACE_AGE` +-LT_REVISION=$AIK_INTERFACE_AGE +-LT_AGE=`expr $AIK_BINARY_AGE - $AIK_INTERFACE_AGE` ++m4_define(LT_CURRENT,`expr $AIK_MICRO_VERSION - $AIK_INTERFACE_AGE`) ++m4_define(LT_REVISION,$AIK_INTERFACE_AGE) ++m4_define(LT_AGE,`expr $AIK_BINARY_AGE - $AIK_INTERFACE_AGE`) + +-LT_AIK_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE" ++LT_AIK_VERSION_INFO="LT_CURRENT():LT_REVISION():LT_AGE()" + + AC_SUBST(LT_AIK_VERSION_INFO) + +-LT_CURRENT=`expr $AIK_MICRO_VERSION - $AIKGTK_INTERFACE_AGE` +-LT_REVISION=$AIKGTK_INTERFACE_AGE +-LT_AGE=`expr $AIKGTK_BINARY_AGE - $AIKGTK_INTERFACE_AGE` ++m4_define(LT_CURRENT,`expr $AIK_MICRO_VERSION - $AIKGTK_INTERFACE_AGE`) ++m4_define(LT_REVISION,$AIKGTK_INTERFACE_AGE) ++m4_define(LT_AGE,`expr $AIKGTK_BINARY_AGE - $AIKGTK_INTERFACE_AGE`) + +-LT_AIKGTK_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE" ++LT_AIKGTK_VERSION_INFO="LT_CURRENT():LT_REVISION():LT_AGE()" + + AC_SUBST(LT_AIKGTK_VERSION_INFO) + +@@ -69,7 +70,7 @@ + + # Specify a configuration file + # +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AH_TOP([ + #ifndef AIKSAURUS_CONFIG_H +diff -ur aiksaurus-1.2.1/Makefile.am aiksaurus-1.2.1-haiku/Makefile.am +--- aiksaurus-1.2.1/Makefile.am 2003-06-15 10:17:42.018350080 +0000 ++++ aiksaurus-1.2.1-haiku/Makefile.am 2013-12-29 23:53:53.966000640 +0000 +@@ -27,3 +27,5 @@ + ac-helpers/pkg-config/pkg.m4 \ + aiksaurus.spec.in \ + aiksaurus.spec ++ ++ACLOCAL_AMFLAGS = -I m4 From bcaf4fa11fd4368ce0ec589ef6127fa24ebc1445 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Mon, 30 Dec 2013 12:07:35 +0100 Subject: [PATCH 207/306] Add Konfetti recipe --- haiku-apps/konfetti/konfetti-1.0.0.recipe | 44 +++++++++++++++++++ haiku-apps/konfetti/licenses/Unknown Konfetti | 1 + 2 files changed, 45 insertions(+) create mode 100644 haiku-apps/konfetti/konfetti-1.0.0.recipe create mode 100644 haiku-apps/konfetti/licenses/Unknown Konfetti diff --git a/haiku-apps/konfetti/konfetti-1.0.0.recipe b/haiku-apps/konfetti/konfetti-1.0.0.recipe new file mode 100644 index 000000000..4e0ffcb59 --- /dev/null +++ b/haiku-apps/konfetti/konfetti-1.0.0.recipe @@ -0,0 +1,44 @@ +SUMMARY="A little screensaver which draws confetti on your desktop" +DESCRIPTION=" + Konfetti is a small screensaver which draws semi-transparent confetti + on your desktop. + " +HOMEPAGE="https://github.com/HaikuArchives/Konfetti/" +SRC_URI="git://github.com/HaikuArchives/Konfetti.git#b667a6e39bc28300298c66bed6209c5141b04e71" +REVISION="1" +COPYRIGHT=" + 2001 Werner Freytag + " +LICENSE="Unknown Konfetti" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + konfetti = $portVersion + app:konfetti = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:mkdepend + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD() +{ + cd src + make +} + +INSTALL() +{ + mkdir -p $addOnsDir/Screen\ Savers + cd src + make install INSTALL_DIR=temp + mv temp/* $addOnsDir/Screen\ Savers +} diff --git a/haiku-apps/konfetti/licenses/Unknown Konfetti b/haiku-apps/konfetti/licenses/Unknown Konfetti new file mode 100644 index 000000000..e88e8d301 --- /dev/null +++ b/haiku-apps/konfetti/licenses/Unknown Konfetti @@ -0,0 +1 @@ +There is no license specified in the code, but on HaikuWare it says the license is "Freeware". From cd1659050f01403a57d214169f840b1b3225d0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 28 Dec 2013 13:01:43 +0100 Subject: [PATCH 208/306] gnu_classpath: Fix corrupted patch Seems a space got removed at start of line... --- dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch b/dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch index 0c5a9e8ae..33b7704e6 100644 --- a/dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch +++ b/dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch @@ -25,7 +25,7 @@ @@ -310,7 +310,7 @@ libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \ - $(top_builddir)/native/jni/native-lib/libclasspathnative.la \ + $(top_builddir)/native/jni/native-lib/libclasspathnative.la \ - $(LTLIBICONV) + -Wl,$(LIBICONV) From 373e8fd816b9e9a65b1e758c7e85e9ebfb07052f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 30 Dec 2013 12:45:26 +0100 Subject: [PATCH 209/306] jamvm: Forgot to pass $prefix as classpath-install-dir --- dev-java/jamvm/jamvm-1.5.4.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe index e402dfc2f..ba931b270 100644 --- a/dev-java/jamvm/jamvm-1.5.4.recipe +++ b/dev-java/jamvm/jamvm-1.5.4.recipe @@ -50,7 +50,7 @@ BUILD() aclocal autoconf runConfigure ./configure \ - --with-classpath-install-dir= + --with-classpath-install-dir=$prefix make } From 9f8594c2d7c76e28eb9f236aa63fe5f94acad3c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Mon, 30 Dec 2013 15:18:23 +0000 Subject: [PATCH 210/306] Gnash and Agg updated --- media-video/gnash/gnash-0.8.10.recipe | 47 +++++++++++++++++---------- x11-libs/agg/agg-2.5.recipe | 23 ++++++------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe index 855f94d9b..7e25bb88b 100644 --- a/media-video/gnash/gnash-0.8.10.recipe +++ b/media-video/gnash/gnash-0.8.10.recipe @@ -1,5 +1,5 @@ SUMMARY="Gnash" -DESCRIPTION="Gnash" +DESCRIPTION="Gnash is a player for the Adobe Flash technology" HOMEPAGE="http://www.gnu.org/software/gnash/" SRC_URI="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2" CHECKSUM_MD5="63e9f79c41d93d48c5a2fa94856548c4" @@ -12,6 +12,8 @@ DISABLE_SOURCE_PACKAGE=yes ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi SECONDARY_ARCHITECTURES="x86 x86_64" @@ -29,17 +31,18 @@ REQUIRES=" lib:libspeex$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libcurl$secondaryArchSuffix - boost_thread$secondaryArchSuffix - boost_program_options$secondaryArchSuffix - boost_iostreams$secondaryArchSuffix - boost_serialization$secondaryArchSuffix - boost_date_time$secondaryArchSuffix + lib:libboost_thread$secondaryArchSuffix + lib:libboost_program_options$secondaryArchSuffix + lib:libboost_iostreams$secondaryArchSuffix + lib:libboost_serialization$secondaryArchSuffix + lib:libboost_date_time$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libsdl_sound$secondaryArchSuffix lib:libagg$secondaryArchSuffix - #lib:libfreetype$secondaryArchSuffix >= 2.5.0.1 + #lib:libfreetype$secondaryArchSuffix #lib:libfontconfig$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion @@ -53,17 +56,18 @@ BUILD_REQUIRES=" devel:libexpat$secondaryArchSuffix devel:libcurl$secondaryArchSuffix boost_devel$secondaryArchSuffix - boost_thread$secondaryArchSuffix - boost_program_options$secondaryArchSuffix - boost_iostreams$secondaryArchSuffix - boost_serialization$secondaryArchSuffix - boost_date_time$secondaryArchSuffix + devel:libboost_thread$secondaryArchSuffix + devel:libboost_program_options$secondaryArchSuffix + devel:libboost_iostreams$secondaryArchSuffix + devel:libboost_serialization$secondaryArchSuffix + devel:libboost_date_time$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libsdl_sound$secondaryArchSuffix devel:libagg$secondaryArchSuffix #devel:libfontconfig$secondaryArchSuffix - #devel:libfreetype$secondaryArchSuffix >= 2.5.0.1 + #devel:libfreetype$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:pkg_config @@ -80,16 +84,25 @@ PATCHES=" " BUILD() -{ - runConfigure ./configure --enable-renderer=agg --enable-media=ffmpeg \ +{ + INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir + LIB_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir + + export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig" + + ./configure --enable-renderer=agg --enable-media=ffmpeg \ --enable-gui=sdl --enable-sound=sdl --without-gconf --disable-extensions \ - --with-agg-incl=$portPackageLinksDir/devel~libagg/develop/headers/agg \ - --with-agg-lib=$portPackageLinksDir/lib~libagg/lib/ + --with-agg-incl=$INCLUDE_DIR/agg \ + --with-agg-lib=$LIB_DIR + --includedir=$INCLUDE_DIR + --bindir=$appsDir + --libdir=$LIB_DIR make } INSTALL() { make install + addAppDeskbarSymlink $appsDir/Gnash Gnash } TEST() { diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe index a84cb6e4f..d72f98a07 100644 --- a/x11-libs/agg/agg-2.5.recipe +++ b/x11-libs/agg/agg-2.5.recipe @@ -8,24 +8,25 @@ LICENSE="GNU GPL v2" COPYRIGHT="2002-2006 Maxim Shemanarev" ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - lib:libagg = $portVersion + lib:libagg$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku >= $haikuVersion - lib:libsdl + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion - devel:libsdl + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:make cmd:autoconf cmd:automake - cmd:ld + cmd:ld$secondaryArchSuffix cmd:libtoolize " @@ -47,19 +48,19 @@ BUILD() INSTALL() { mkdir -p $libDir - mkdir -p $developDir/headers/agg + mkdir -p $includeDir/agg mkdir -p $developLibDir cp src/libagg.so $libDir cp src/libagg.so $developLibDir - cp -r include/* $developDir/headers/agg/ + cp -r include/* $includeDir/agg/ packageEntries devel \ $developDir } PROVIDES_devel=" - devel:libagg = $portVersion + devel:libagg$secondaryArchSuffix = $portVersion " REQUIRES_devel=" - lib:libagg == $portVersion base + lib:libagg$secondaryArchSuffix == $portVersion base " From 87782ca71306a31b931e85bfb435e945b16d06e1 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Mon, 30 Dec 2013 19:47:59 +0000 Subject: [PATCH 211/306] Konfetti: Set license to MIT --- haiku-apps/konfetti/konfetti-1.0.0.recipe | 6 ++---- haiku-apps/konfetti/licenses/Unknown Konfetti | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 haiku-apps/konfetti/licenses/Unknown Konfetti diff --git a/haiku-apps/konfetti/konfetti-1.0.0.recipe b/haiku-apps/konfetti/konfetti-1.0.0.recipe index 4e0ffcb59..c8d12fbc9 100644 --- a/haiku-apps/konfetti/konfetti-1.0.0.recipe +++ b/haiku-apps/konfetti/konfetti-1.0.0.recipe @@ -6,10 +6,8 @@ DESCRIPTION=" HOMEPAGE="https://github.com/HaikuArchives/Konfetti/" SRC_URI="git://github.com/HaikuArchives/Konfetti.git#b667a6e39bc28300298c66bed6209c5141b04e71" REVISION="1" -COPYRIGHT=" - 2001 Werner Freytag - " -LICENSE="Unknown Konfetti" +COPYRIGHT="2001 Werner Freytag" +LICENSE="MIT" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/haiku-apps/konfetti/licenses/Unknown Konfetti b/haiku-apps/konfetti/licenses/Unknown Konfetti deleted file mode 100644 index e88e8d301..000000000 --- a/haiku-apps/konfetti/licenses/Unknown Konfetti +++ /dev/null @@ -1 +0,0 @@ -There is no license specified in the code, but on HaikuWare it says the license is "Freeware". From d197a3424b5c8bf48ae4fd59ad0d0045e6a763e4 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 30 Dec 2013 19:53:31 +0000 Subject: [PATCH 212/306] Added ragel 6.8 recipe and patch --- dev-util/ragel/patches/ragel-6.8.patch | 23 +++++++++++ dev-util/ragel/ragel-6.8.recipe | 53 ++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 dev-util/ragel/patches/ragel-6.8.patch create mode 100644 dev-util/ragel/ragel-6.8.recipe diff --git a/dev-util/ragel/patches/ragel-6.8.patch b/dev-util/ragel/patches/ragel-6.8.patch new file mode 100644 index 000000000..756ff6a5b --- /dev/null +++ b/dev-util/ragel/patches/ragel-6.8.patch @@ -0,0 +1,23 @@ +diff -ur ragel-6.8/ragel/common.h ragel-6.8-haiku/ragel/common.h +--- ragel-6.8/ragel/common.h 2013-02-11 01:57:45.020971520 +0000 ++++ ragel-6.8-haiku/ragel/common.h 2013-12-30 19:13:12.330301440 +0000 +@@ -24,6 +24,7 @@ + + #include + #include ++#include + #include "dlist.h" + + /* Location in an input file. */ +diff -ur ragel-6.8/ragel/mlcodegen.cpp ragel-6.8-haiku/ragel/mlcodegen.cpp +--- ragel-6.8/ragel/mlcodegen.cpp 2013-02-11 01:57:45.022282240 +0000 ++++ ragel-6.8-haiku/ragel/mlcodegen.cpp 2013-12-30 19:18:36.937426944 +0000 +@@ -514,7 +514,7 @@ + { + data_prefix = string(fsmName) + "_"; + if (data_prefix.size() > 0) +- data_prefix[0] = ::tolower(data_prefix[0]); // uncapitalize ++ data_prefix[0] = tolower(data_prefix[0]); // uncapitalize + } + if ( !noPrefix ) + return data_prefix; diff --git a/dev-util/ragel/ragel-6.8.recipe b/dev-util/ragel/ragel-6.8.recipe new file mode 100644 index 000000000..5498ddc40 --- /dev/null +++ b/dev-util/ragel/ragel-6.8.recipe @@ -0,0 +1,53 @@ +SUMMARY="Ragel compiles executable finite state machines from regular languages" +DESCRIPTION=" +Ragel compiles executable finite state machines from regular languages. + +Ragel targets C, C++, Objective-C, C#, D, Java, Ruby, OCaml and Go. + +Ragel state machines can not only recognize byte sequences as regular expression machines do, but can also execute code at arbitrary points in the recognition of a regular language. +Code embedding is done using inline operators that do not disrupt the regular language syntax." + +HOMEPAGE="http://www.complang.org/ragel" +SRC_URI="http://www.complang.org/ragel/ragel-6.8.tar.gz" +CHECKSUM_MD5="1bb39745ac23da449019f9f2cb4b0d01" + +REVISION="1" + +LICENSE="GNU GPL v1" +COPYRIGHT=" + 2001-2009 Adrian Thurston + 2007 Victor Hugo Borja + 2011 Josef Goettgens + " + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + ragel = $portVersion + cmd:ragel$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + +PATCHES="ragel-6.8.patch" + +BUILD() +{ + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} From 1e46554dcc1afbebc0fb53d9d846b2c090db3319 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 12:59:47 -0800 Subject: [PATCH 213/306] Remove old hare recipe --- haiku-apps/hare/hare-beta1_git.recipe | 52 --------------------------- 1 file changed, 52 deletions(-) delete mode 100644 haiku-apps/hare/hare-beta1_git.recipe diff --git a/haiku-apps/hare/hare-beta1_git.recipe b/haiku-apps/hare/hare-beta1_git.recipe deleted file mode 100644 index d6ff3eb19..000000000 --- a/haiku-apps/hare/hare-beta1_git.recipe +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY="Hare - Haiku Audio Ripper Encoder" -DESCRIPTION="Hare - Haiku Audio Ripper Encoder, formerly known as Flip-Side A.E." -HOMEPAGE="http://github.com/HaikuArchives/Hare" -SRC_URI="git://github.com/HaikuArchives/Hare.git" -LICENSE="MIT" -COPYRIGHT="2000 FlipSide Software - 2001-2003 BeUnited.org - 2009-2013 Hare Maintainers - " - -REVISION="1" - -ARCHITECTURES="x86_gcc2 !x86 !x86_64" - -PROVIDES=" - Hare = $portVersion - app:Hare = $portVersion - " - -REQUIRES=" - haiku >= $haikuVersion -# lib:liblame -# lib:liboggenc -# lib:libflac -# lib:libgogo - lib:libtag$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - devel:libtag$secondaryArchSuffix - " - -BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:cmake - cmd:make - " - -BUILD() -{ - cmake . - make -} - -INSTALL() -{ - mkdir -p $appsDir/Hare - cp -r build/* $appsDir/Hare - addAppDeskbarSymlink $appsDir/Hare/Hare Hare -} - From ee970037522cbe2624a2fc0106997fa090c080c1 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 14:36:24 -0800 Subject: [PATCH 214/306] Update gogo_no_coda for secondaryArchSuffix --- .../gogo_no_coda/gogo_no_coda-3.13.recipe | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe index f1293900c..63dfb2fcc 100644 --- a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe +++ b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe @@ -6,26 +6,31 @@ CHECKSUM_MD5="7b3008a0aba2578a2b428ba538452e87" LICENSE="GNU LGPL v2" COPYRIGHT="2001-2003 Respective gogo-no-coda creators" REVISION="1" -ARCHITECTURES="?x86 x86_gcc2" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="gogo_no_coda-3.13.patch" PROVIDES=" gogo_enc = $portVersion compat >= 1 + cmd:gogo_enc$secondaryArchSuffix " -REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="haiku >= $haikuVersion" +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:nasm " - SOURCE_DIR="gogo-no-coda-master" BUILD() @@ -37,7 +42,6 @@ BUILD() INSTALL() { cd linux - mkdir $prefix/bin + mkdir -p $prefix/bin make install prefix=$prefix } - From b238753251e627e1b13ac366983b96eaf8a5178c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 15:08:53 -0800 Subject: [PATCH 215/306] Update gogo_no_coda-3.13 for secondaryArchSuffix --- media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe index 63dfb2fcc..9b27ed9fd 100644 --- a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe +++ b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe @@ -12,7 +12,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="gogo_no_coda-3.13.patch" PROVIDES=" - gogo_enc = $portVersion compat >= 1 + gogo_enc$secondaryArchSuffix = $portVersion compat >= 1 cmd:gogo_enc$secondaryArchSuffix " From e398b6ed217aba0222636fc36c96d9c4ddeba853 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 15:10:09 -0800 Subject: [PATCH 216/306] Update hare to 1.1.1 --- haiku-apps/hare/hare-1.1.1.recipe | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 haiku-apps/hare/hare-1.1.1.recipe diff --git a/haiku-apps/hare/hare-1.1.1.recipe b/haiku-apps/hare/hare-1.1.1.recipe new file mode 100644 index 000000000..7cc44c01e --- /dev/null +++ b/haiku-apps/hare/hare-1.1.1.recipe @@ -0,0 +1,52 @@ +SUMMARY="Hare - Haiku Audio Ripper Encoder" +DESCRIPTION="Hare - Haiku Audio Ripper Encoder, formerly known as Flip-Side A.E." +HOMEPAGE="http://github.com/HaikuArchives/Hare" +SRC_URI="git://github.com/HaikuArchives/Hare.git#af69ba7b06" +LICENSE="MIT" +COPYRIGHT="2000 FlipSide Software + 2001-2003 BeUnited.org + 2009-2013 Hare Maintainers + " + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + Hare = $portVersion + app:Hare = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:lame + cmd:oggenc$secondaryArchSuffix + cmd:flac$secondaryArchSuffix + cmd:gogo_enc$secondaryArchSuffix + lib:libtag$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libtag$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:cmake + cmd:make + " + +BUILD() +{ + cmake . + make +} + +INSTALL() +{ + mkdir -p $appsDir/Hare + cp -r build/* $appsDir/Hare + addAppDeskbarSymlink $appsDir/Hare/Hare Hare +} From 3c25a8f3d239cced170cd4f98f38281d5449c30b Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 15:14:32 -0800 Subject: [PATCH 217/306] Fix secondaryArchSuffix for ragel --- dev-util/ragel/ragel-6.8.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/ragel/ragel-6.8.recipe b/dev-util/ragel/ragel-6.8.recipe index 5498ddc40..a936560be 100644 --- a/dev-util/ragel/ragel-6.8.recipe +++ b/dev-util/ragel/ragel-6.8.recipe @@ -24,7 +24,7 @@ ARCHITECTURES="x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - ragel = $portVersion + ragel$secondaryArchSuffix = $portVersion cmd:ragel$secondaryArchSuffix = $portVersion " REQUIRES=" From d9020ec859199787ccd54a4d7cb7af5b290b2087 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 15:21:47 -0800 Subject: [PATCH 218/306] Remove old armyknife recipes --- haiku-apps/armyknife/armyknife-61.recipe | 20 -------------------- haiku-apps/armyknife/armyknife-62.recipe | 20 -------------------- 2 files changed, 40 deletions(-) delete mode 100644 haiku-apps/armyknife/armyknife-61.recipe delete mode 100644 haiku-apps/armyknife/armyknife-62.recipe diff --git a/haiku-apps/armyknife/armyknife-61.recipe b/haiku-apps/armyknife/armyknife-61.recipe deleted file mode 100644 index b0628d81b..000000000 --- a/haiku-apps/armyknife/armyknife-61.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." -HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" -SRC_URI="svn+http://svn.osdrawer.net/armyknife#61" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/taglib >= 1.6.3" -#CHECKSUM_MD5="" -BUILD() -{ - cd armyknife-61 - make -} - -INSTALL() -{ - cd armyknife-61 - make zipfile - mkdir -p ${DESTDIR}/boot/apps - unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps -} diff --git a/haiku-apps/armyknife/armyknife-62.recipe b/haiku-apps/armyknife/armyknife-62.recipe deleted file mode 100644 index b76790c4b..000000000 --- a/haiku-apps/armyknife/armyknife-62.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." -HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" -SRC_URI="svn+http://svn.osdrawer.net/armyknife#62" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/taglib >= 1.6.3" -#CHECKSUM_MD5="" -BUILD() -{ - cd armyknife-62 - make -} - -INSTALL() -{ - cd armyknife-62 - make zipfile - mkdir -p ${DESTDIR}/boot/apps - unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps -} From b0d64b94a32d6e8a95f8739ebaa2f1a73085edc7 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 18:30:03 -0800 Subject: [PATCH 219/306] Fix vorbis_tools now builds ok with gcc2 and gcc4. --- media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe | 7 ++++++- 1 file changed, 6 insertions(+), 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 997414636..0040c4d9f 100644 --- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe +++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe @@ -17,6 +17,7 @@ PROVIDES=" cmd:ogginfo$secondaryArchSuffix cmd:vcut$secondaryArchSuffix cmd:vorbiscomment$secondaryArchSuffix + cmd:ogg123$secondaryArchSuffix " REQUIRES=" @@ -30,12 +31,14 @@ REQUIRES=" lib:libcurl$secondaryArchSuffix lib:libvorbisfile$secondaryArchSuffix lib:libvorbisenc$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libvorbis$secondaryArchSuffix -# devel:libflac$secondaryArchSuffix + devel:libflac$secondaryArchSuffix devel:libspeex$secondaryArchSuffix devel:libao$secondaryArchSuffix devel:libogg$secondaryArchSuffix @@ -43,6 +46,8 @@ BUILD_REQUIRES=" devel:libcurl$secondaryArchSuffix devel:libvorbisfile$secondaryArchSuffix devel:libvorbisenc$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" From ad1ce17f8be0bab569f51f713d388021d19ab851 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 30 Dec 2013 23:14:09 -0600 Subject: [PATCH 220/306] mesa: Update Mesa 7.9.2-5 recipe to revision 5 * This revision fixes several issues including: - OpenGL screensavers not running due to a missing libGL linkage in renderer. - Build failure in recent images due to mesa not looking internally for the Haiku OpenGL kit headers. --- sys-libs/mesa/mesa-7.9.2.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index 8aa51a19d..28c637e37 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -8,9 +8,9 @@ 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="3" +SRC_URI="https://github.com/kallisti5/mesa/archive/7.9.2-5.tar.gz" +CHECKSUM_MD5="7e9aafbfffa04e14a57d450836d86bf1" +REVISION="5" ARCHITECTURES="x86_gcc2" if [ $effectiveTargetArchitecture != x86 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -43,7 +43,7 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="mesa-7.9.2-3" +SOURCE_DIR="mesa-7.9.2-5" BUILD() { From c2d2f582783d4d854265d7a265afb9f23116cf07 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 31 Dec 2013 07:17:42 +0000 Subject: [PATCH 221/306] Fixed armyknife recipe --- haiku-apps/armyknife/armyknife-66.recipe | 27 ++++++++++++++---------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/haiku-apps/armyknife/armyknife-66.recipe b/haiku-apps/armyknife/armyknife-66.recipe index 740b2f82c..87079ec1a 100644 --- a/haiku-apps/armyknife/armyknife-66.recipe +++ b/haiku-apps/armyknife/armyknife-66.recipe @@ -1,26 +1,30 @@ SUMMARY="The all-in-one metadata editor for audio files." DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." -HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" +HOMEPAGE="https://github.com/HaikuArchives/ArmyKnife" SRC_URI="git://github.com/HaikuArchives/ArmyKnife.git" COPYRIGHT="2000-2001 Jason Burgess" LICENSE="MIT" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 !x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 !x86" PROVIDES=" armyknife = $portVersion + app:ArmyKnife = $portVersion " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion - taglib${secondaryArchSuffix} + haiku$secondaryArchSuffix >= $haikuVersion + lib:libtag$secondaryArchSuffix + lib:libsanta$secondaryArchSuffix " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion taglib${secondaryArchSuffix}_devel + libsanta${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:gcc${secondaryArchSuffix} - cmd:ld${secondaryArchSuffix} + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:unzip " @@ -33,9 +37,10 @@ BUILD() INSTALL() { make zipfile - mkdir -p ${appsDir} - unzip release/ArmyKnife-*.zip -d ${appsDir} + + mkdir -p $appsDir + unzip release/ArmyKnife-*.zip -d $appsDir - addAppDeskbarSymlink ${appsDir}/ArmyKnife/ArmyKnife + addAppDeskbarSymlink $appsDir/ArmyKnife/ArmyKnife } From 1d962c748f0bbee1b1ee7a8bccbe617734c81e75 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 31 Dec 2013 02:09:18 -0800 Subject: [PATCH 222/306] Update armyknife to 4.3.0 --- .../armyknife/{armyknife-66.recipe => armyknife-4.3.0.recipe} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename haiku-apps/armyknife/{armyknife-66.recipe => armyknife-4.3.0.recipe} (92%) diff --git a/haiku-apps/armyknife/armyknife-66.recipe b/haiku-apps/armyknife/armyknife-4.3.0.recipe similarity index 92% rename from haiku-apps/armyknife/armyknife-66.recipe rename to haiku-apps/armyknife/armyknife-4.3.0.recipe index 87079ec1a..67ca2e859 100644 --- a/haiku-apps/armyknife/armyknife-66.recipe +++ b/haiku-apps/armyknife/armyknife-4.3.0.recipe @@ -1,10 +1,10 @@ SUMMARY="The all-in-one metadata editor for audio files." DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." HOMEPAGE="https://github.com/HaikuArchives/ArmyKnife" -SRC_URI="git://github.com/HaikuArchives/ArmyKnife.git" +SRC_URI="git://github.com/HaikuArchives/ArmyKnife.git#67ce56a906" COPYRIGHT="2000-2001 Jason Burgess" LICENSE="MIT" -REVISION="2" +REVISION="1" ARCHITECTURES="x86_gcc2 !x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 !x86" From 9023e25ae9b4be003c51415f6b3a3343d351b6f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 31 Dec 2013 11:15:44 +0100 Subject: [PATCH 223/306] gnu_classpath: Update recipe Not marked as tested yet, since it needs to be bootstrap before it can build it seems... --- .../gnu_classpath/gnu_classpath-0.98.recipe | 88 ++++++++++++------- 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe index 56d07ee1d..5b7be2324 100644 --- a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe +++ b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe @@ -1,42 +1,9 @@ +SUMMARY="GNU Java class library" DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language" HOMEPAGE="http://www.gnu.org/software/classpath" SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-0.98.tar.gz" REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" CHECKSUM_MD5="90c6571b8b0309e372faa0f9f6255ea9" -BUILD() -{ - cd classpath-0.98 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man \ - --infodir=$COMMON_DOCS/info \ - --disable-gtk-peer \ - --disable-alsa \ - --disable-plugin \ - --disable-gconf-peer \ - --disable-gjdoc \ - LDFLAGS="-lnetwork" - make -} - -INSTALL() -{ - cd classpath-0.98 - make install -} - -TEST() -{ - cd classpath-0.98 -# make test -# make check -} - LICENSE="GNU GPL v2 GNU GPL v2 with classpath exceptions" COPYRIGHT="1998-1999, 2001-2008 Free Software Foundation @@ -48,3 +15,56 @@ COPYRIGHT="1998-1999, 2001-2008 Free Software Foundation 2004 World Wide Web Consortium 2005 Caolan McNamara 2005 Daniel Richard G." + +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + gnu_classpath = $portVersion +" +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion +" +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:libtoolize + cmd:gcc$secondaryArchSuffix + cmd:make + # at least one java VM, for now just use jamvm + cmd:jamvm$secondaryArchSuffix +" + +SOURCE_DIR="classpath-0.98" + +PATCHES="gnu_classpath-0.98.patch" + +BUILD() +{ + libtoolize --force --copy --install + aclocal -I m4 + autoconf + runConfigure ./configure \ + --disable-gtk-peer \ + --disable-alsa \ + --disable-plugin \ + --disable-gconf-peer \ + --disable-gjdoc \ + LDFLAGS="-lnetwork" + make +} + +INSTALL() +{ + make install +} + +TEST() +{ + : +# make test +# make check +} From bf260d558b1552dddaecff875c1e80a85f527649 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 31 Dec 2013 11:38:34 +0100 Subject: [PATCH 224/306] Add Finance recipe --- haiku-apps/finance/finance-1.0.0.recipe | 53 +++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 haiku-apps/finance/finance-1.0.0.recipe diff --git a/haiku-apps/finance/finance-1.0.0.recipe b/haiku-apps/finance/finance-1.0.0.recipe new file mode 100644 index 000000000..bedc75a25 --- /dev/null +++ b/haiku-apps/finance/finance-1.0.0.recipe @@ -0,0 +1,53 @@ +SUMMARY="Manage all your finances with this easy-to-use app!" + +DESCRIPTION=" + Finance is an app made to provide all features expected from personal + finance software while using the style of Haiku. It allows for management + of multiple accounts and has graphs. + " + +HOMEPAGE="https://github.com/HaikuArchiveæs/Finance" +SRC_URI="git://github.com/puckipedia/Finance.git#329f2dac2115301f3bb9bfb054dfc398c419ccac" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT=" + 2001 Bunru Software + 2009 Pier Luigi Fiorini + " # See src/code/Finance.rdef + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + finance = $portVersion + app:finance = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:xres + cmd:gcc + cmd:jam + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +USER_SETTINGS_FILES=" + settings/BeFinancial_data + " + +BUILD() +{ + cd src + ./configure + jam +} + +INSTALL() +{ + cd src + mkdir -p $appsDir + cp generated/distro-haiku-*-release/Finance $appsDir + addAppDeskbarSymlink $appsDir/Finance +} From 8fb245a0fc1362ac9b48f04cd03fc8554a743eb7 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 31 Dec 2013 12:34:15 +0000 Subject: [PATCH 225/306] Finance: Add runConfigure, change repo --- haiku-apps/finance/finance-1.0.0.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/haiku-apps/finance/finance-1.0.0.recipe b/haiku-apps/finance/finance-1.0.0.recipe index bedc75a25..0c94dc460 100644 --- a/haiku-apps/finance/finance-1.0.0.recipe +++ b/haiku-apps/finance/finance-1.0.0.recipe @@ -6,8 +6,8 @@ DESCRIPTION=" of multiple accounts and has graphs. " -HOMEPAGE="https://github.com/HaikuArchiveæs/Finance" -SRC_URI="git://github.com/puckipedia/Finance.git#329f2dac2115301f3bb9bfb054dfc398c419ccac" +HOMEPAGE="https://github.com/HaikuArchives/Finance" +SRC_URI="git://github.com/HaikuArchives/Finance.git#c047e2da9a5e6c8cddb5ef3b430fcd43a429c2a4" REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT=" @@ -39,14 +39,14 @@ USER_SETTINGS_FILES=" BUILD() { - cd src - ./configure + cd trunk + runConfigure ./configure jam } INSTALL() { - cd src + cd trunk mkdir -p $appsDir cp generated/distro-haiku-*-release/Finance $appsDir addAppDeskbarSymlink $appsDir/Finance From 0dace48ecd592c2736a8f858d7ce03cb0403822b Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 31 Dec 2013 16:11:44 +0000 Subject: [PATCH 226/306] Fix Finance recipe, changes in repo --- haiku-apps/finance/finance-1.0.0.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/haiku-apps/finance/finance-1.0.0.recipe b/haiku-apps/finance/finance-1.0.0.recipe index 0c94dc460..ccd20c0fa 100644 --- a/haiku-apps/finance/finance-1.0.0.recipe +++ b/haiku-apps/finance/finance-1.0.0.recipe @@ -2,12 +2,14 @@ SUMMARY="Manage all your finances with this easy-to-use app!" DESCRIPTION=" Finance is an app made to provide all features expected from personal - finance software while using the style of Haiku. It allows for management - of multiple accounts and has graphs. + finance software while using the style of Haiku. + It can be used to balance multiple accounts and you can import Quicken or Money data, + reconcile statements, view spending categorization and net worth trends, + all with customizable categories and payees. " HOMEPAGE="https://github.com/HaikuArchives/Finance" -SRC_URI="git://github.com/HaikuArchives/Finance.git#c047e2da9a5e6c8cddb5ef3b430fcd43a429c2a4" +SRC_URI="git://github.com/HaikuArchives/Finance.git#33513a1c44b6f94a46ccae563f19a64440dea46a" REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT=" @@ -39,14 +41,12 @@ USER_SETTINGS_FILES=" BUILD() { - cd trunk runConfigure ./configure jam } INSTALL() { - cd trunk mkdir -p $appsDir cp generated/distro-haiku-*-release/Finance $appsDir addAppDeskbarSymlink $appsDir/Finance From ce274fdd923b4c0cfcf7dba09281a3e727039b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 31 Dec 2013 18:37:31 +0100 Subject: [PATCH 227/306] Gnash marked as broken and agg marked as untested --- media-video/gnash/gnash-0.8.10.recipe | 8 +++----- x11-libs/agg/agg-2.5.recipe | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe index 7e25bb88b..5d240f583 100644 --- a/media-video/gnash/gnash-0.8.10.recipe +++ b/media-video/gnash/gnash-0.8.10.recipe @@ -7,15 +7,13 @@ COPYRIGHT="2005-2012 Free Software Foundation" LICENSE="GNU GPL v3" REVISION="1" -DISABLE_SOURCE_PACKAGE=yes - -ARCHITECTURES="x86 x86_64" +ARCHITECTURES="!x86 !x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - ARCHITECTURES="$ARCHITECTURES x86_gcc2" + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" else ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi -SECONDARY_ARCHITECTURES="x86 x86_64" +SECONDARY_ARCHITECTURES="!x86 !x86_64" PROVIDES=" gnash$secondaryArchSuffix = $portVersion diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe index d72f98a07..866e5b574 100644 --- a/x11-libs/agg/agg-2.5.recipe +++ b/x11-libs/agg/agg-2.5.recipe @@ -7,8 +7,8 @@ CHECKSUM_MD5="0229a488bc47be10a2fee6cf0b2febd6" LICENSE="GNU GPL v2" COPYRIGHT="2002-2006 Maxim Shemanarev" -ARCHITECTURES="x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="?x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES=" lib:libagg$secondaryArchSuffix = $portVersion From d3a0b72059f8c22ccaa570c46c5ed9dbe96e325c Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 31 Dec 2013 18:44:02 +0000 Subject: [PATCH 228/306] Remove comment --- haiku-apps/finance/finance-1.0.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/finance/finance-1.0.0.recipe b/haiku-apps/finance/finance-1.0.0.recipe index ccd20c0fa..722629db1 100644 --- a/haiku-apps/finance/finance-1.0.0.recipe +++ b/haiku-apps/finance/finance-1.0.0.recipe @@ -15,7 +15,7 @@ LICENSE="GNU GPL v2" COPYRIGHT=" 2001 Bunru Software 2009 Pier Luigi Fiorini - " # See src/code/Finance.rdef + " ARCHITECTURES="x86_gcc2" From dce4691b54fb4bc1c539ae1b865fa32a6a2ef15e Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 31 Dec 2013 13:07:54 -0600 Subject: [PATCH 229/306] solarus: Add WIP recipe * Shows missing sdl_image on my system even though sdl_image is activated * Marked broken on all architectures for now --- games-engines/solarus/solarus-1.1.1.recipe | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 games-engines/solarus/solarus-1.1.1.recipe diff --git a/games-engines/solarus/solarus-1.1.1.recipe b/games-engines/solarus/solarus-1.1.1.recipe new file mode 100644 index 000000000..c28a3152c --- /dev/null +++ b/games-engines/solarus/solarus-1.1.1.recipe @@ -0,0 +1,57 @@ +SUMMARY="An ARPG game engine" +DESCRIPTION="Solarus is an open-source Zelda-like 2D game engine." +HOMEPAGE="http://solarus-games.org" +SRC_URI="http://www.solarus-games.org/downloads/solarus/solarus-1.1.1-src.tar.gz" +CHECKSUM_MD5="168894091ce4b728889069c767a1532d" +REVISION="1" +LICENSE="GNU GPL v3" +COPYRIGHT="2006-2013 Christopho, Solarus" + +ARCHITECTURES="!x86_gcc2 !x86 !x86_64" +SECONDARY_ARCHITECTURES="!x86 !x86_64" + +PROVIDES=" + solarus = $portVersion + app:solarus = $portVersion +" +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libSDL$secondaryArchSuffix + lib:sdl_ttf$secondaryArchSuffix + lib:sdl_image$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libmodplug$secondaryArchSuffix >= 0.8.0 + lib:libphysfs$secondaryArchSuffix + lib:liblua$secondaryArchSuffix + lib:libopenal$secondaryArchSuffix +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libSDL$secondaryArchSuffix + devel:sdl_ttf$secondaryArchSuffix + devel:sdl_image$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libmodplug$secondaryArchSuffix >= 0.8.0 + devel:libphysfs$secondaryArchSuffix + devel:liblua$secondaryArchSuffix + devel:libopenal$secondaryArchSuffix +" +BUILD_PREREQUIRES=" + cmd:cmake + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize +" + +BUILD() +{ + cmake -DCMAKE_BUILD_TYPE=Release . + make $jobArgs +} + +INSTALL() +{ + make install + #addAppDeskbarSymlink $binDir/solarus +} From 92677f7315b35a4a834d3239025385d13f1def0c Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 31 Dec 2013 21:30:23 +0000 Subject: [PATCH 230/306] Added MasterPiece recipe and patch --- .../masterpiece/masterpiece-r742.recipe | 58 +++++++ .../patches/masterpiece-r742.patch | 150 ++++++++++++++++++ 2 files changed, 208 insertions(+) create mode 100644 haiku-apps/masterpiece/masterpiece-r742.recipe create mode 100644 haiku-apps/masterpiece/patches/masterpiece-r742.patch diff --git a/haiku-apps/masterpiece/masterpiece-r742.recipe b/haiku-apps/masterpiece/masterpiece-r742.recipe new file mode 100644 index 000000000..d6f71833c --- /dev/null +++ b/haiku-apps/masterpiece/masterpiece-r742.recipe @@ -0,0 +1,58 @@ +DESCRIPTION=" +This is an attempt to create a new way to create documents or books. \ +It moves away from the WYSIWYG paradigm of microsoft word, openoffice, etc. etc. etc. \ +It takes a more keyboard only, thought flowing and typing markup language, object oriented approach \ +where a user who has ideas or thoughts can jot these down and have them go into a list. to build their document/book, \ +they would then order the list of thoughts, images, tables, etc. into the correct order and preview/publish their book. +" +SUMMARY="New way to create opendocument compatible books/documents" + +HOMEPAGE="http://code.google.com/p/masterpiece/" +SRC_URI="svn+http://masterpiece.googlecode.com/svn/trunk#r742" + +REVISION="1" + +LICENSE="MIT" +COPYRIGHT="2010-2012 Pasquale J. Rinaldi, Jr." + +ARCHITECTURES="x86_gcc2 !x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 !x86" + +PROVIDES=" + masterpiece = $portVersion + app:masterpiece = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsqlite3$secondaryArchSuffix + lib:liblayout + lib:libpython2.6 + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsqlite3$secondaryArchSuffix + devel:libpython2.6 + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:mkdepend + cmd:make + " + +PATCHES="masterpiece-r742.patch" + +BUILD() +{ + make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` \ + OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + + cp objects/MasterPiece $appsDir + addAppDeskbarSymlink $appsDir/MasterPiece +} diff --git a/haiku-apps/masterpiece/patches/masterpiece-r742.patch b/haiku-apps/masterpiece/patches/masterpiece-r742.patch new file mode 100644 index 000000000..664639a2f --- /dev/null +++ b/haiku-apps/masterpiece/patches/masterpiece-r742.patch @@ -0,0 +1,150 @@ +diff -Pur masterpiece/Makefile masterpiece-haiku/Makefile +--- masterpiece/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ masterpiece-haiku/Makefile 2013-12-31 20:32:00.608960512 +0000 +@@ -0,0 +1,146 @@ ++## BeOS Generic Makefile v2.5 ## ++ ++## Fill in this file to specify the project being created, and the referenced ++## makefile-engine will do all of the hard work for you. This handles both ++## Intel and PowerPC builds of the BeOS and Haiku. ++ ++## Application Specific Settings --------------------------------------------- ++ ++# specify the name of the binary ++NAME= MasterPiece ++ ++# specify the type of binary ++#        APP:        Application ++#        SHARED:        Shared library or add-on ++#        STATIC:        Static library archive ++#        DRIVER: Kernel Driver ++TYPE= APP ++ ++#         if you plan to use localization features ++#         specify the application MIME siganture ++APP_MIME_SIG= ++ ++#        add support for new Pe and Eddie features ++#        to fill in generic makefile ++ ++#%{ ++# @src->@ ++ ++#        specify the source files to use ++#        full paths or paths relative to the makefile can be included ++#         all files, regardless of directory, will have their object ++#        files created in the common object directory. ++#        Note that this means this makefile will not work correctly ++#        if two source files with the same name (source.c or source.cpp) ++#        are included from different directories. Also note that spaces ++#        in folder names do not work well with this makefile. ++SRCS= AboutWindow.cpp App.cpp BuilderButton.cpp BuilderListView.cpp \ ++CommonFunctions.cpp EditIdeaName.cpp EditorTextView.cpp HelperWindows.cpp \ ++HelpStringItem.cpp IdeaStringItem.cpp MainMenu.cpp MarkupWindow.cpp \ ++MPBuilder.cpp MPEditor.cpp MPLauncher.cpp PublishFilePanel.cpp SaveIdea.cpp ++ ++#        specify the resource definition files to use ++#        full path or a relative path to the resource file can be used. ++RDEFS= Resources.rdef ++ ++#        specify the resource files to use. ++#        full path or a relative path to the resource file can be used. ++#        both RDEFS and RSRCS can be defined in the same makefile. ++RSRCS= Resources.rsrc ++ ++# @<-src@ ++#%} ++ ++#        end support for Pe and Eddie ++ ++#        specify additional libraries to link against ++#        there are two acceptable forms of library specifications ++#        -        if your library follows the naming pattern of: ++#                libXXX.so or libXXX.a you can simply specify XXX ++#                library: libbe.so entry: be ++# ++#        -        for version-independent linking of standard C++ libraries please add ++#                $(STDCPPLIBS) instead of raw "stdc++[.r4] [supc++]" library names ++# ++#        -        for localization support add following libs: ++#                locale localestub ++#                ++#        -         if your library does not follow the standard library ++#                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=root be sqlite3 $(STDCPPLIBS) python2.6 tracker ++ ++#        specify additional paths to directories following the standard ++#        libXXX.so or libXXX.a naming scheme. You can specify full paths ++#        or paths relative to the makefile. The paths included may not ++#        be recursive, so include all of the paths where libraries can ++#        be found. Directories where source files are found are ++#        automatically included. ++LIBPATHS= ++ ++#        additional paths to look for system headers ++#        thes use the form: #include
++#        source file directories are NOT auto-included here ++SYSTEM_INCLUDE_PATHS= ++ ++#        additional paths to look for local headers ++#        thes use the form: #include "header" ++#        source file directories are automatically included ++LOCAL_INCLUDE_PATHS= ++ ++#        specify the level of optimization that you desire ++#        NONE, SOME, FULL ++OPTIMIZE= ++ ++#         specify here the codes for languages you are going ++#         to support in this application. The default "en" ++#         one must be provided too. "make catkeys" will recreate only ++#         locales/en.catkeys file. Use it as template for creating other ++#         languages catkeys. All localization files must be placed ++#         in "locales" sub-directory. ++LOCALES= ++ ++#        specify any preprocessor symbols to be defined. The symbols will not ++#        have their values set automatically; you must supply the value (if any) ++#        to use. For example, setting DEFINES to "DEBUG=1" will cause the ++#        compiler option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" ++#        would pass "-DDEBUG" on the compiler's command line. ++DEFINES= ++ ++#        specify special warning levels ++#        if unspecified default warnings will be used ++#        NONE = supress all warnings ++#        ALL = enable all warnings ++WARNINGS= ++ ++#        specify whether image symbols will be created ++#        so that stack crawls in the debugger are meaningful ++#        if TRUE symbols will be created ++SYMBOLS= ++ ++#        specify debug settings ++#        if TRUE will allow application to be run from a source-level ++#        debugger. Note that this will disable all optimzation. ++DEBUGGER= ++ ++#        specify additional compiler flags for all files ++COMPILER_FLAGS= -g ++ ++#        specify additional linker flags ++LINKER_FLAGS= ++ ++#        specify the version of this particular item ++#        (for example, -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL") ++#        This may also be specified in a resource. ++APP_VERSION= ++ ++#        (for TYPE == DRIVER only) Specify desired location of driver in the /dev ++#        hierarchy. Used by the driverinstall rule. E.g., DRIVER_PATH = video/usb will ++#        instruct the driverinstall rule to place a symlink to your driver's binary in ++#        ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will appear at ++#        /dev/video/usb when loaded. Default is "misc". ++DRIVER_PATH= ++ ++## include the makefile-engine ++include $(BUILDHOME)/etc/makefile-engine From 57e39fff0f57e33fa38d2e3fda6a73d1058b2306 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 31 Dec 2013 16:09:07 -0600 Subject: [PATCH 231/306] mesa: Update Mesa-10.0.1 to fix #10360 * These changes are awaiting review by upstream mesa --- sys-libs/mesa/mesa-10.0.1.recipe | 7 +- sys-libs/mesa/patches/mesa-10.0.1.patchset | 2719 ++++++++++++++++++++ 2 files changed, 2725 insertions(+), 1 deletion(-) diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe index cc30f8926..ad2c370b3 100644 --- a/sys-libs/mesa/mesa-10.0.1.recipe +++ b/sys-libs/mesa/mesa-10.0.1.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.1/MesaLib-10.0.1.tar.bz2" CHECKSUM_MD5="0a72ca5b36046a658bf6038326ff32ed" -REVISION="4" +REVISION="5" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -75,6 +75,11 @@ INSTALL() cp $(find $mesaBuildDir -name 'libswpipe.so') \ "$addOnsDir/opengl/Software Pipe" + # Set some nice version info + setversion "$libDir/libGL.so" -app 10 0 1 -long "Haiku OpenGL kit" + setversion "$addOnsDir/opengl/Software Rasterizer" -app 10 0 1 -long "Mesa software rasterization renderer" + setversion "$addOnsDir/opengl/Software Pipe" -app 10 0 1 -long "Gallium LLVM software pipe renderer" + # OpenGL Kit mkdir -p $includeDir/os/opengl cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ diff --git a/sys-libs/mesa/patches/mesa-10.0.1.patchset b/sys-libs/mesa/patches/mesa-10.0.1.patchset index 9aed3f820..8dbbc212a 100644 --- a/sys-libs/mesa/patches/mesa-10.0.1.patchset +++ b/sys-libs/mesa/patches/mesa-10.0.1.patchset @@ -352,3 +352,2722 @@ index 0000000..0f8503f -- 1.8.3.4 +From cc285772ce222f3672aa725dea18b52d9f94d2c2 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Mon, 30 Dec 2013 23:49:06 -0600 +Subject: [PATCH] haiku: Fix missing HaikuGL header paths + +--- + src/gallium/targets/haiku-softpipe/SConscript | 1 + + src/gallium/targets/libgl-haiku/SConscript | 1 + + src/mesa/drivers/haiku/swrast/SConscript | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript +index 40bf03c..16ce7cd 100644 +--- a/src/gallium/targets/haiku-softpipe/SConscript ++++ b/src/gallium/targets/haiku-softpipe/SConscript +@@ -21,6 +21,7 @@ env.Append(CPPPATH = [ + '#/src/mapi', + '#/src/mesa', + '#/src/mesa/main', ++ '#/include/HaikuGL', + '#/src/gallium/winsys/sw/hgl', + '/boot/system/develop/headers/private', + ]) +diff --git a/src/gallium/targets/libgl-haiku/SConscript b/src/gallium/targets/libgl-haiku/SConscript +index 2e6b628..43d15c5 100644 +--- a/src/gallium/targets/libgl-haiku/SConscript ++++ b/src/gallium/targets/libgl-haiku/SConscript +@@ -9,6 +9,7 @@ env.Append(CPPPATH = [ + '#/src/mapi', + '#/src/mesa', + '#/src/mesa/main', ++ '#/include/HaikuGL', + '/boot/system/develop/headers/private', + Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers + ]) +diff --git a/src/mesa/drivers/haiku/swrast/SConscript b/src/mesa/drivers/haiku/swrast/SConscript +index 71ce88e..ca0423e 100644 +--- a/src/mesa/drivers/haiku/swrast/SConscript ++++ b/src/mesa/drivers/haiku/swrast/SConscript +@@ -6,6 +6,7 @@ env.Append(CPPPATH = [ + '#/src/mapi', + '#/src/mesa', + '#/src/mesa/main', ++ '#/include/HaikuGL', + '/boot/system/develop/headers/private', + Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers + ]) +-- +1.8.3.4 + +From 72e0f3de1f2df3407dbf257183c78bd3f81c1a12 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Tue, 31 Dec 2013 15:39:49 -0600 +Subject: [PATCH] haiku libGL: Move from gallium target to src/hgl + +* The Haiku renderers need to link to libGL to function properly + in all usage contexts. As mesa drivers build before gallium + targets, we couldn't properly link the mesa swrast driver to + the gallium libGL target for Haiku. +* This is likely better as it mimics how glx is laid out ensuring + the Haiku libGL is better understood. +* All renderers properly link in libGL now. +--- + src/SConscript | 5 + + src/gallium/SConscript | 1 - + src/gallium/targets/haiku-softpipe/SConscript | 2 + + src/gallium/targets/libgl-haiku/GLDispatcher.cpp | 72 --- + src/gallium/targets/libgl-haiku/GLDispatcher.h | 109 ---- + src/gallium/targets/libgl-haiku/GLRenderer.cpp | 106 ---- + .../targets/libgl-haiku/GLRendererRoster.cpp | 224 ------- + src/gallium/targets/libgl-haiku/GLRendererRoster.h | 51 -- + src/gallium/targets/libgl-haiku/GLView.cpp | 643 --------------------- + src/gallium/targets/libgl-haiku/SConscript | 35 -- + src/hgl/GLDispatcher.cpp | 72 +++ + src/hgl/GLDispatcher.h | 109 ++++ + src/hgl/GLRenderer.cpp | 106 ++++ + src/hgl/GLRendererRoster.cpp | 224 +++++++ + src/hgl/GLRendererRoster.h | 51 ++ + src/hgl/GLView.cpp | 643 +++++++++++++++++++++ + src/hgl/SConscript | 36 ++ + src/mesa/drivers/haiku/swrast/SConscript | 2 + + 18 files changed, 1250 insertions(+), 1241 deletions(-) + delete mode 100644 src/gallium/targets/libgl-haiku/GLDispatcher.cpp + delete mode 100644 src/gallium/targets/libgl-haiku/GLDispatcher.h + delete mode 100644 src/gallium/targets/libgl-haiku/GLRenderer.cpp + delete mode 100644 src/gallium/targets/libgl-haiku/GLRendererRoster.cpp + delete mode 100644 src/gallium/targets/libgl-haiku/GLRendererRoster.h + delete mode 100644 src/gallium/targets/libgl-haiku/GLView.cpp + delete mode 100644 src/gallium/targets/libgl-haiku/SConscript + create mode 100644 src/hgl/GLDispatcher.cpp + create mode 100644 src/hgl/GLDispatcher.h + create mode 100644 src/hgl/GLRenderer.cpp + create mode 100644 src/hgl/GLRendererRoster.cpp + create mode 100644 src/hgl/GLRendererRoster.h + create mode 100644 src/hgl/GLView.cpp + create mode 100644 src/hgl/SConscript + +diff --git a/src/SConscript b/src/SConscript +index 1465918..a24acea 100644 +--- a/src/SConscript ++++ b/src/SConscript +@@ -18,6 +18,11 @@ if env['hostonly']: + # enable OpenGL ES support. + SConscript('mapi/glapi/gen/SConscript') + SConscript('mapi/glapi/SConscript') ++ ++# Haiku C++ libGL dispatch (renderers depend on libgl) ++if env['platform'] in ['haiku']: ++ SConscript('hgl/SConscript') ++ + SConscript('mesa/SConscript') + + SConscript('mapi/vgapi/SConscript') +diff --git a/src/gallium/SConscript b/src/gallium/SConscript +index 6e27be2..32bbdbe 100644 +--- a/src/gallium/SConscript ++++ b/src/gallium/SConscript +@@ -119,7 +119,6 @@ if not env['embedded']: + if env['platform'] == 'haiku': + SConscript([ + 'targets/haiku-softpipe/SConscript', +- 'targets/libgl-haiku/SConscript', + ]) + + if env['dri']: +diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript +index 16ce7cd..0381d05 100644 +--- a/src/gallium/targets/haiku-softpipe/SConscript ++++ b/src/gallium/targets/haiku-softpipe/SConscript +@@ -17,6 +17,8 @@ if True: + ]) + env.Prepend(LIBS = [softpipe]) + ++env.Prepend(LIBS = [libgl]) ++ + env.Append(CPPPATH = [ + '#/src/mapi', + '#/src/mesa', +diff --git a/src/gallium/targets/libgl-haiku/GLDispatcher.cpp b/src/gallium/targets/libgl-haiku/GLDispatcher.cpp +deleted file mode 100644 +index 46b91d5..0000000 +--- a/src/gallium/targets/libgl-haiku/GLDispatcher.cpp ++++ /dev/null +@@ -1,72 +0,0 @@ +-/* +- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +- * Copyright 2000-2012 Haiku, Inc. All Rights Reserved. +- * Distributed under the terms of the MIT License. +- * +- * Authors: +- * Brian Paul +- * Philippe Houdoin +- * Alexander von Gluck IV +- */ +- +- +-extern "C" { +-#include "glapi/glapi.h" +-#include "glapi/glapi_priv.h" +- +-/* +- * NOTE: this file portion implements C-based dispatch of the OpenGL entrypoints +- * (glAccum, glBegin, etc). +- * This code IS NOT USED if we're compiling on an x86 system and using +- * the glapi_x86.S assembly code. +- */ +-#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM)) +- +-#define KEYWORD1 PUBLIC +-#define KEYWORD2 +-#define NAME(func) gl##func +- +-#define DISPATCH(func, args, msg) \ +- const struct _glapi_table* dispatch; \ +- dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\ +- (dispatch->func) args +- +-#define RETURN_DISPATCH(func, args, msg) \ +- const struct _glapi_table* dispatch; \ +- dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\ +- return (dispatch->func) args +- +-#endif +-} +- +- +-/* NOTE: this file portion implement a thin OpenGL entrypoints dispatching +- C++ wrapper class +- */ +- +-#include "GLDispatcher.h" +- +-BGLDispatcher::BGLDispatcher() +-{ +-} +- +- +-BGLDispatcher::~BGLDispatcher() +-{ +-} +- +- +-status_t +-BGLDispatcher::CheckTable(const struct _glapi_table* table) +-{ +- _glapi_check_table(table ? table : _glapi_get_dispatch()); +- return B_OK; +-} +- +- +-status_t +-BGLDispatcher::SetTable(struct _glapi_table* table) +-{ +- _glapi_set_dispatch(table); +- return B_OK; +-} +diff --git a/src/gallium/targets/libgl-haiku/GLDispatcher.h b/src/gallium/targets/libgl-haiku/GLDispatcher.h +deleted file mode 100644 +index 44bca8c..0000000 +--- a/src/gallium/targets/libgl-haiku/GLDispatcher.h ++++ /dev/null +@@ -1,109 +0,0 @@ +-/* +- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +- * Copyright 2000-2012 Haiku, Inc. All Rights Reserved. +- * Distributed under the terms of the MIT License. +- * +- * Authors: +- * Brian Paul +- * Philippe Houdoin +- */ +-#ifndef GLDISPATCHER_H +-#define GLDISPATCHER_H +- +- +-#include +-#include +-#include +- +-#include "glheader.h" +- +-extern "C" { +-#include "glapi/glapi.h" +-} +- +- +-class BGLDispatcher +-{ +- // Private unimplemented copy constructors +- BGLDispatcher(const BGLDispatcher &); +- BGLDispatcher & operator=(const BGLDispatcher &); +- +- public: +- BGLDispatcher(); +- ~BGLDispatcher(); +- +- void SetCurrentContext(void* context); +- void* CurrentContext(); +- +- struct _glapi_table* Table(); +- status_t CheckTable( +- const struct _glapi_table* dispatch = NULL); +- status_t SetTable(struct _glapi_table* dispatch); +- uint32 TableSize(); +- +- const _glapi_proc operator[](const char* functionName); +- const char* operator[](uint32 offset); +- +- const _glapi_proc AddressOf(const char* functionName); +- uint32 OffsetOf(const char* functionName); +-}; +- +- +-// Inlines methods +-inline void +-BGLDispatcher::SetCurrentContext(void* context) +-{ +- _glapi_set_context(context); +-} +- +- +-inline void* +-BGLDispatcher::CurrentContext() +-{ +- return _glapi_get_context(); +-} +- +- +-inline struct _glapi_table* +-BGLDispatcher::Table() +-{ +- return _glapi_get_dispatch(); +-} +- +- +-inline uint32 +-BGLDispatcher::TableSize() +-{ +- return _glapi_get_dispatch_table_size(); +-} +- +- +-inline const _glapi_proc +-BGLDispatcher::operator[](const char* functionName) +-{ +- return _glapi_get_proc_address(functionName); +-} +- +- +-inline const char* +-BGLDispatcher::operator[](uint32 offset) +-{ +- return _glapi_get_proc_name((GLuint) offset); +-} +- +- +-inline const _glapi_proc +-BGLDispatcher::AddressOf(const char* functionName) +-{ +- return _glapi_get_proc_address(functionName); +-} +- +- +-inline uint32 +-BGLDispatcher::OffsetOf(const char* functionName) +-{ +- return (uint32) _glapi_get_proc_offset(functionName); +-} +- +- +-#endif // GLDISPATCHER_H +diff --git a/src/gallium/targets/libgl-haiku/GLRenderer.cpp b/src/gallium/targets/libgl-haiku/GLRenderer.cpp +deleted file mode 100644 +index 4573a64..0000000 +--- a/src/gallium/targets/libgl-haiku/GLRenderer.cpp ++++ /dev/null +@@ -1,106 +0,0 @@ +-/* +- * Copyright 2006-2008, Philippe Houdoin. All rights reserved. +- * Distributed under the terms of the MIT License. +- */ +- +- +-#include +- +-#include "GLRenderer.h" +- +-#include "GLDispatcher.h" +- +- +-BGLRenderer::BGLRenderer(BGLView* view, ulong glOptions, +- BGLDispatcher* dispatcher) +- : +- fRefCount(1), +- fView(view), +- fOptions(glOptions), +- fDispatcher(dispatcher) +-{ +-} +- +- +-BGLRenderer::~BGLRenderer() +-{ +- delete fDispatcher; +-} +- +- +-void +-BGLRenderer::Acquire() +-{ +- atomic_add(&fRefCount, 1); +-} +- +- +-void +-BGLRenderer::Release() +-{ +- if (atomic_add(&fRefCount, -1) < 1) +- delete this; +-} +- +- +-void +-BGLRenderer::LockGL() +-{ +-} +- +- +-void +-BGLRenderer::UnlockGL() +-{ +-} +- +- +-void +-BGLRenderer::SwapBuffers(bool VSync) +-{ +-} +- +- +-void +-BGLRenderer::Draw(BRect updateRect) +-{ +-} +- +- +-status_t +-BGLRenderer::CopyPixelsOut(BPoint source, BBitmap* dest) +-{ +- return B_ERROR; +-} +- +- +-status_t +-BGLRenderer::CopyPixelsIn(BBitmap* source, BPoint dest) +-{ +- return B_ERROR; +-} +- +- +-void +-BGLRenderer::FrameResized(float width, float height) +-{ +-} +- +- +-void +-BGLRenderer::DirectConnected(direct_buffer_info* info) +-{ +-} +- +- +-void +-BGLRenderer::EnableDirectMode(bool enabled) +-{ +-} +- +- +-status_t BGLRenderer::_Reserved_Renderer_0(int32 n, void* p) { return B_ERROR; } +-status_t BGLRenderer::_Reserved_Renderer_1(int32 n, void* p) { return B_ERROR; } +-status_t BGLRenderer::_Reserved_Renderer_2(int32 n, void* p) { return B_ERROR; } +-status_t BGLRenderer::_Reserved_Renderer_3(int32 n, void* p) { return B_ERROR; } +-status_t BGLRenderer::_Reserved_Renderer_4(int32 n, void* p) { return B_ERROR; } +diff --git a/src/gallium/targets/libgl-haiku/GLRendererRoster.cpp b/src/gallium/targets/libgl-haiku/GLRendererRoster.cpp +deleted file mode 100644 +index 1712a87..0000000 +--- a/src/gallium/targets/libgl-haiku/GLRendererRoster.cpp ++++ /dev/null +@@ -1,224 +0,0 @@ +-/* +- * Copyright 2006-2012 Haiku, Inc. All Rights Reserved. +- * Distributed under the terms of the MIT License. +- * +- * Authors: +- * Philippe Houdoin +- * Alexander von Gluck IV +- */ +- +- +-#include +-#include +- +-#include +-#include +- +-#include +-#include +-#include +-#include +-#include "GLDispatcher.h" +-#include "GLRendererRoster.h" +- +-#include +-#include +- +- +-extern "C" status_t _kern_get_safemode_option(const char* parameter, +- char* buffer, size_t* _bufferSize); +- +- +-GLRendererRoster::GLRendererRoster(BGLView* view, ulong options) +- : +- fNextID(0), +- fView(view), +- fOptions(options), +- fSafeMode(false), +- fABISubDirectory(NULL) +-{ +- char parameter[32]; +- size_t parameterLength = sizeof(parameter); +- +- if (_kern_get_safemode_option(B_SAFEMODE_SAFE_MODE, +- parameter, ¶meterLength) == B_OK) { +- if (!strcasecmp(parameter, "enabled") || !strcasecmp(parameter, "on") +- || !strcasecmp(parameter, "true") || !strcasecmp(parameter, "yes") +- || !strcasecmp(parameter, "enable") || !strcmp(parameter, "1")) +- fSafeMode = true; +- } +- +- if (_kern_get_safemode_option(B_SAFEMODE_DISABLE_USER_ADD_ONS, +- parameter, ¶meterLength) == B_OK) { +- if (!strcasecmp(parameter, "enabled") || !strcasecmp(parameter, "on") +- || !strcasecmp(parameter, "true") || !strcasecmp(parameter, "yes") +- || !strcasecmp(parameter, "enable") || !strcmp(parameter, "1")) +- fSafeMode = true; +- } +- +- // We might run in compatibility mode on a system with a different ABI. The +- // renderers matching our ABI can usually be found in respective +- // subdirectories of the opengl add-ons directories. +- system_info info; +- if (get_system_info(&info) == B_OK +- && (info.abi & B_HAIKU_ABI_MAJOR) +- != (B_HAIKU_ABI & B_HAIKU_ABI_MAJOR)) { +- switch (B_HAIKU_ABI & B_HAIKU_ABI_MAJOR) { +- case B_HAIKU_ABI_GCC_2: +- fABISubDirectory = "gcc2"; +- break; +- case B_HAIKU_ABI_GCC_4: +- fABISubDirectory = "gcc4"; +- break; +- } +- } +- +- AddDefaultPaths(); +-} +- +- +-GLRendererRoster::~GLRendererRoster() +-{ +- +-} +- +- +-BGLRenderer* +-GLRendererRoster::GetRenderer(int32 id) +-{ +- RendererMap::const_iterator iterator = fRenderers.find(id); +- if (iterator == fRenderers.end()) +- return NULL; +- +- struct renderer_item item = iterator->second; +- return item.renderer; +-} +- +- +-void +-GLRendererRoster::AddDefaultPaths() +-{ +- // add user directories first, so that they can override system renderers +- const directory_which paths[] = { +- B_USER_NONPACKAGED_ADDONS_DIRECTORY, +- B_USER_ADDONS_DIRECTORY, +- B_SYSTEM_ADDONS_DIRECTORY, +- }; +- +- for (uint32 i = fSafeMode ? 4 : 0; +- i < sizeof(paths) / sizeof(paths[0]); i++) { +- BPath path; +- status_t status = find_directory(paths[i], &path, true); +- if (status == B_OK && path.Append("opengl") == B_OK) +- AddPath(path.Path()); +- } +-} +- +- +-status_t +-GLRendererRoster::AddPath(const char* path) +-{ +- BDirectory directory(path); +- status_t status = directory.InitCheck(); +- if (status < B_OK) +- return status; +- +- // if a subdirectory for our ABI exists, use that instead +- if (fABISubDirectory != NULL) { +- BEntry entry(&directory, fABISubDirectory); +- if (entry.IsDirectory()) { +- status = directory.SetTo(&entry); +- if (status != B_OK) +- return status; +- } +- } +- +- node_ref nodeRef; +- status = directory.GetNodeRef(&nodeRef); +- if (status < B_OK) +- return status; +- +- int32 count = 0; +- int32 files = 0; +- +- entry_ref ref; +- BEntry entry; +- while (directory.GetNextRef(&ref) == B_OK) { +- entry.SetTo(&ref); +- if (entry.InitCheck() == B_OK && !entry.IsFile()) +- continue; +- +- if (CreateRenderer(ref) == B_OK) +- count++; +- +- files++; +- } +- +- if (files != 0 && count == 0) +- return B_BAD_VALUE; +- +- return B_OK; +-} +- +- +-status_t +-GLRendererRoster::AddRenderer(BGLRenderer* renderer, +- image_id image, const entry_ref* ref, ino_t node) +-{ +- renderer_item item; +- item.renderer = renderer; +- item.image = image; +- item.node = node; +- if (ref != NULL) +- item.ref = *ref; +- +- try { +- fRenderers[fNextID] = item; +- } catch (...) { +- return B_NO_MEMORY; +- } +- +- renderer->fOwningRoster = this; +- renderer->fID = fNextID++; +- return B_OK; +-} +- +- +-status_t +-GLRendererRoster::CreateRenderer(const entry_ref& ref) +-{ +- BEntry entry(&ref); +- node_ref nodeRef; +- status_t status = entry.GetNodeRef(&nodeRef); +- if (status < B_OK) +- return status; +- +- BPath path(&ref); +- image_id image = load_add_on(path.Path()); +- if (image < B_OK) +- return image; +- +- BGLRenderer* (*instantiate_renderer) +- (BGLView* view, ulong options, BGLDispatcher* dispatcher); +- +- status = get_image_symbol(image, "instantiate_gl_renderer", +- B_SYMBOL_TYPE_TEXT, (void**)&instantiate_renderer); +- if (status == B_OK) { +- BGLRenderer* renderer +- = instantiate_renderer(fView, fOptions, new BGLDispatcher()); +- if (!renderer) { +- unload_add_on(image); +- return B_UNSUPPORTED; +- } +- +- if (AddRenderer(renderer, image, &ref, nodeRef.node) != B_OK) { +- renderer->Release(); +- // this will delete the renderer +- unload_add_on(image); +- } +- return B_OK; +- } +- unload_add_on(image); +- +- return status; +-} +diff --git a/src/gallium/targets/libgl-haiku/GLRendererRoster.h b/src/gallium/targets/libgl-haiku/GLRendererRoster.h +deleted file mode 100644 +index 5c8da27..0000000 +--- a/src/gallium/targets/libgl-haiku/GLRendererRoster.h ++++ /dev/null +@@ -1,51 +0,0 @@ +-/* +- * Copyright 2006-2012, Haiku, Inc. All Rights Reserved. +- * Distributed under the terms of the MIT License. +- * +- * Authors: +- * Philippe Houdoin +- */ +-#ifndef _GLRENDERER_ROSTER_H +-#define _GLRENDERER_ROSTER_H +- +- +-#include +- +-#include +- +- +-struct renderer_item { +- BGLRenderer* renderer; +- entry_ref ref; +- ino_t node; +- image_id image; +-}; +- +-typedef std::map RendererMap; +- +- +-class GLRendererRoster { +- public: +- GLRendererRoster(BGLView* view, ulong options); +- virtual ~GLRendererRoster(); +- +- BGLRenderer* GetRenderer(int32 id = 0); +- +- private: +- void AddDefaultPaths(); +- status_t AddPath(const char* path); +- status_t AddRenderer(BGLRenderer* renderer, +- image_id image, const entry_ref* ref, ino_t node); +- status_t CreateRenderer(const entry_ref& ref); +- +- RendererMap fRenderers; +- int32 fNextID; +- BGLView* fView; +- ulong fOptions; +- bool fSafeMode; +- const char* fABISubDirectory; +- +-}; +- +- +-#endif /* _GLRENDERER_ROSTER_H */ +diff --git a/src/gallium/targets/libgl-haiku/GLView.cpp b/src/gallium/targets/libgl-haiku/GLView.cpp +deleted file mode 100644 +index 9ae5b5c..0000000 +--- a/src/gallium/targets/libgl-haiku/GLView.cpp ++++ /dev/null +@@ -1,643 +0,0 @@ +-/* +- * Copyright 2006-2012, Haiku. All rights reserved. +- * Distributed under the terms of the MIT License. +- * +- * Authors: +- * Jérôme Duval, korli@users.berlios.de +- * Philippe Houdoin, philippe.houdoin@free.fr +- * Stefano Ceccherini, burton666@libero.it +- */ +- +-#include +- +-#include +- +-#include +-#include +-#include +-#include +- +-#include +-#include +- +-#include "interface/DirectWindowPrivate.h" +-#include "GLDispatcher.h" +-#include "GLRendererRoster.h" +- +- +-struct glview_direct_info { +- direct_buffer_info* direct_info; +- bool direct_connected; +- bool enable_direct_mode; +- +- glview_direct_info(); +- ~glview_direct_info(); +-}; +- +- +-BGLView::BGLView(BRect rect, const char* name, ulong resizingMode, ulong mode, +- ulong options) +- : +- BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS), +- // | B_FULL_UPDATE_ON_RESIZE) +- fGc(NULL), +- fOptions(options), +- fDitherCount(0), +- fDrawLock("BGLView draw lock"), +- fDisplayLock("BGLView display lock"), +- fClipInfo(NULL), +- fRenderer(NULL), +- fRoster(NULL), +- fDitherMap(NULL) +-{ +- fRoster = new GLRendererRoster(this, options); +-} +- +- +-BGLView::~BGLView() +-{ +- delete fClipInfo; +- if (fRenderer) +- fRenderer->Release(); +-} +- +- +-void +-BGLView::LockGL() +-{ +- // TODO: acquire the OpenGL API lock it on this glview +- +- fDisplayLock.Lock(); +- if (fRenderer) +- fRenderer->LockGL(); +-} +- +- +-void +-BGLView::UnlockGL() +-{ +- if (fRenderer) +- fRenderer->UnlockGL(); +- fDisplayLock.Unlock(); +- +- // TODO: release the GL API lock to others glviews +-} +- +- +-void +-BGLView::SwapBuffers() +-{ +- SwapBuffers(false); +-} +- +- +-void +-BGLView::SwapBuffers(bool vSync) +-{ +- if (fRenderer) { +- _LockDraw(); +- fRenderer->SwapBuffers(vSync); +- _UnlockDraw(); +- } +-} +- +- +-BView* +-BGLView::EmbeddedView() +-{ +- return NULL; +-} +- +- +-void* +-BGLView::GetGLProcAddress(const char* procName) +-{ +- BGLDispatcher* glDispatcher = NULL; +- +- if (fRenderer) +- glDispatcher = fRenderer->GLDispatcher(); +- +- if (glDispatcher) +- return (void*)glDispatcher->AddressOf(procName); +- +- return NULL; +-} +- +- +-status_t +-BGLView::CopyPixelsOut(BPoint source, BBitmap* dest) +-{ +- if (!fRenderer) +- return B_ERROR; +- +- if (!dest || !dest->Bounds().IsValid()) +- return B_BAD_VALUE; +- +- return fRenderer->CopyPixelsOut(source, dest); +-} +- +- +-status_t +-BGLView::CopyPixelsIn(BBitmap* source, BPoint dest) +-{ +- if (!fRenderer) +- return B_ERROR; +- +- if (!source || !source->Bounds().IsValid()) +- return B_BAD_VALUE; +- +- return fRenderer->CopyPixelsIn(source, dest); +-} +- +- +-/*! Mesa's GLenum is not ulong but uint, so we can't use GLenum +- without breaking this method signature. +- Instead, we have to use the effective BeOS's SGI OpenGL GLenum type: +- unsigned long. +- */ +-void +-BGLView::ErrorCallback(unsigned long errorCode) +-{ +- char msg[32]; +- sprintf(msg, "GL: Error code $%04lx.", errorCode); +- // TODO: under BeOS R5, it call debugger(msg); +- fprintf(stderr, "%s\n", msg); +-} +- +- +-void +-BGLView::Draw(BRect updateRect) +-{ +- if (fRenderer) { +- _LockDraw(); +- fRenderer->Draw(updateRect); +- _UnlockDraw(); +- return; +- } +- // TODO: auto-size and center the string +- MovePenTo(8, 32); +- DrawString("No OpenGL renderer available!"); +-} +- +- +-void +-BGLView::AttachedToWindow() +-{ +- BView::AttachedToWindow(); +- +- fBounds = Bounds(); +- for (BView* view = this; view != NULL; view = view->Parent()) +- view->ConvertToParent(&fBounds); +- +- fRenderer = fRoster->GetRenderer(); +- if (fRenderer != NULL) { +- // Jackburton: The following code was commented because it doesn't look +- // good in "direct" mode: +- // when the window is moved, the app_server doesn't paint the view's +- // background, and the stuff behind the window itself shows up. +- // Setting the view color to black, instead, looks a bit more elegant. +-#if 0 +- // Don't paint white window background when resized +- SetViewColor(B_TRANSPARENT_32_BIT); +-#else +- SetViewColor(0, 0, 0); +-#endif +- +- // Set default OpenGL viewport: +- LockGL(); +- glViewport(0, 0, Bounds().IntegerWidth(), Bounds().IntegerHeight()); +- UnlockGL(); +- fRenderer->FrameResized(Bounds().IntegerWidth(), +- Bounds().IntegerHeight()); +- +- if (fClipInfo) { +- fRenderer->DirectConnected(fClipInfo->direct_info); +- fRenderer->EnableDirectMode(fClipInfo->enable_direct_mode); +- } +- +- return; +- } +- +- fprintf(stderr, "no renderer found! \n"); +- +- // No Renderer, no rendering. Setup a minimal "No Renderer" string drawing +- // context +- SetFont(be_bold_font); +- // SetFontSize(16); +-} +- +- +-void +-BGLView::AllAttached() +-{ +- BView::AllAttached(); +-} +- +- +-void +-BGLView::DetachedFromWindow() +-{ +- if (fRenderer) +- fRenderer->Release(); +- fRenderer = NULL; +- +- BView::DetachedFromWindow(); +-} +- +- +-void +-BGLView::AllDetached() +-{ +- BView::AllDetached(); +-} +- +- +-void +-BGLView::FrameResized(float width, float height) +-{ +- fBounds = Bounds(); +- for (BView* v = this; v; v = v->Parent()) +- v->ConvertToParent(&fBounds); +- +- if (fRenderer) { +- LockGL(); +- _LockDraw(); +- _CallDirectConnected(); +- fRenderer->FrameResized(width, height); +- _UnlockDraw(); +- UnlockGL(); +- } +- +- BView::FrameResized(width, height); +-} +- +- +-status_t +-BGLView::Perform(perform_code d, void* arg) +-{ +- return BView::Perform(d, arg); +-} +- +- +-status_t +-BGLView::Archive(BMessage* data, bool deep) const +-{ +- return BView::Archive(data, deep); +-} +- +- +-void +-BGLView::MessageReceived(BMessage* msg) +-{ +- BView::MessageReceived(msg); +-} +- +- +-void +-BGLView::SetResizingMode(uint32 mode) +-{ +- BView::SetResizingMode(mode); +-} +- +- +-void +-BGLView::GetPreferredSize(float* _width, float* _height) +-{ +- if (_width) +- *_width = 0; +- if (_height) +- *_height = 0; +-} +- +- +-void +-BGLView::Show() +-{ +- BView::Show(); +-} +- +- +-void +-BGLView::Hide() +-{ +- BView::Hide(); +-} +- +- +-BHandler* +-BGLView::ResolveSpecifier(BMessage* msg, int32 index, BMessage* specifier, +- int32 form, const char* property) +-{ +- return BView::ResolveSpecifier(msg, index, specifier, form, property); +-} +- +- +-status_t +-BGLView::GetSupportedSuites(BMessage* data) +-{ +- return BView::GetSupportedSuites(data); +-} +- +- +-void +-BGLView::DirectConnected(direct_buffer_info* info) +-{ +- if (fClipInfo == NULL) { +- fClipInfo = new (std::nothrow) glview_direct_info(); +- if (fClipInfo == NULL) +- return; +- } +- +- direct_buffer_info* localInfo = fClipInfo->direct_info; +- +- switch (info->buffer_state & B_DIRECT_MODE_MASK) { +- case B_DIRECT_START: +- fClipInfo->direct_connected = true; +- memcpy(localInfo, info, DIRECT_BUFFER_INFO_AREA_SIZE); +- _UnlockDraw(); +- break; +- +- case B_DIRECT_MODIFY: +- _LockDraw(); +- memcpy(localInfo, info, DIRECT_BUFFER_INFO_AREA_SIZE); +- _UnlockDraw(); +- break; +- +- case B_DIRECT_STOP: +- fClipInfo->direct_connected = false; +- _LockDraw(); +- break; +- } +- +- if (fRenderer) +- _CallDirectConnected(); +-} +- +- +-void +-BGLView::EnableDirectMode(bool enabled) +-{ +- if (fRenderer) +- fRenderer->EnableDirectMode(enabled); +- if (fClipInfo == NULL) { +- fClipInfo = new (std::nothrow) glview_direct_info(); +- if (fClipInfo == NULL) +- return; +- } +- +- fClipInfo->enable_direct_mode = enabled; +-} +- +- +-void +-BGLView::_LockDraw() +-{ +- if (!fClipInfo || !fClipInfo->enable_direct_mode) +- return; +- +- fDrawLock.Lock(); +-} +- +- +-void +-BGLView::_UnlockDraw() +-{ +- if (!fClipInfo || !fClipInfo->enable_direct_mode) +- return; +- +- fDrawLock.Unlock(); +-} +- +- +-void +-BGLView::_CallDirectConnected() +-{ +- if (!fClipInfo) +- return; +- +- direct_buffer_info* localInfo = fClipInfo->direct_info; +- direct_buffer_info* info = (direct_buffer_info*)malloc( +- DIRECT_BUFFER_INFO_AREA_SIZE); +- if (info == NULL) +- return; +- +- memcpy(info, localInfo, DIRECT_BUFFER_INFO_AREA_SIZE); +- +- // Collect the rects into a BRegion, then clip to the view's bounds +- BRegion region; +- for (uint32 c = 0; c < localInfo->clip_list_count; c++) +- region.Include(localInfo->clip_list[c]); +- BRegion boundsRegion = fBounds.OffsetByCopy(localInfo->window_bounds.left, +- localInfo->window_bounds.top); +- info->window_bounds = boundsRegion.RectAtInt(0); +- // window_bounds are now view bounds +- region.IntersectWith(&boundsRegion); +- +- info->clip_list_count = region.CountRects(); +- info->clip_bounds = region.FrameInt(); +- +- for (uint32 c = 0; c < info->clip_list_count; c++) +- info->clip_list[c] = region.RectAtInt(c); +- fRenderer->DirectConnected(info); +- free(info); +-} +- +- +-//---- virtual reserved methods ---------- +- +- +-void BGLView::_ReservedGLView1() {} +-void BGLView::_ReservedGLView2() {} +-void BGLView::_ReservedGLView3() {} +-void BGLView::_ReservedGLView4() {} +-void BGLView::_ReservedGLView5() {} +-void BGLView::_ReservedGLView6() {} +-void BGLView::_ReservedGLView7() {} +-void BGLView::_ReservedGLView8() {} +- +- +-// #pragma mark - +- +- +-// BeOS compatibility: contrary to others BView's contructors, +-// BGLView one wants a non-const name argument. +-BGLView::BGLView(BRect rect, char* name, ulong resizingMode, ulong mode, +- ulong options) +- : +- BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS), +- fGc(NULL), +- fOptions(options), +- fDitherCount(0), +- fDrawLock("BGLView draw lock"), +- fDisplayLock("BGLView display lock"), +- fClipInfo(NULL), +- fRenderer(NULL), +- fRoster(NULL), +- fDitherMap(NULL) +-{ +- fRoster = new GLRendererRoster(this, options); +-} +- +- +-#if 0 +-// TODO: implement BGLScreen class... +- +- +-BGLScreen::BGLScreen(char* name, ulong screenMode, ulong options, +- status_t* error, bool debug) +- : +- BWindowScreen(name, screenMode, error, debug) +-{ +-} +- +- +-BGLScreen::~BGLScreen() +-{ +-} +- +- +-void +-BGLScreen::LockGL() +-{ +-} +- +- +-void +-BGLScreen::UnlockGL() +-{ +-} +- +- +-void +-BGLScreen::SwapBuffers() +-{ +-} +- +- +-void +-BGLScreen::ErrorCallback(unsigned long errorCode) +-{ +- // Mesa's GLenum is not ulong but uint! +- char msg[32]; +- sprintf(msg, "GL: Error code $%04lx.", errorCode); +- // debugger(msg); +- fprintf(stderr, "%s\n", msg); +- return; +-} +- +- +-void +-BGLScreen::ScreenConnected(bool enabled) +-{ +-} +- +- +-void +-BGLScreen::FrameResized(float width, float height) +-{ +- return BWindowScreen::FrameResized(width, height); +-} +- +- +-status_t +-BGLScreen::Perform(perform_code d, void* arg) +-{ +- return BWindowScreen::Perform(d, arg); +-} +- +- +-status_t +-BGLScreen::Archive(BMessage* data, bool deep) const +-{ +- return BWindowScreen::Archive(data, deep); +-} +- +- +-void +-BGLScreen::MessageReceived(BMessage* msg) +-{ +- BWindowScreen::MessageReceived(msg); +-} +- +- +-void +-BGLScreen::Show() +-{ +- BWindowScreen::Show(); +-} +- +- +-void +-BGLScreen::Hide() +-{ +- BWindowScreen::Hide(); +-} +- +- +-BHandler* +-BGLScreen::ResolveSpecifier(BMessage* msg, int32 index, BMessage* specifier, +- int32 form, const char* property) +-{ +- return BWindowScreen::ResolveSpecifier(msg, index, specifier, +- form, property); +-} +- +- +-status_t +-BGLScreen::GetSupportedSuites(BMessage* data) +-{ +- return BWindowScreen::GetSupportedSuites(data); +-} +- +- +-//---- virtual reserved methods ---------- +- +-void BGLScreen::_ReservedGLScreen1() {} +-void BGLScreen::_ReservedGLScreen2() {} +-void BGLScreen::_ReservedGLScreen3() {} +-void BGLScreen::_ReservedGLScreen4() {} +-void BGLScreen::_ReservedGLScreen5() {} +-void BGLScreen::_ReservedGLScreen6() {} +-void BGLScreen::_ReservedGLScreen7() {} +-void BGLScreen::_ReservedGLScreen8() {} +-#endif +- +- +-const char* color_space_name(color_space space) +-{ +-#define C2N(a) case a: return #a +- +- switch (space) { +- C2N(B_RGB24); +- C2N(B_RGB32); +- C2N(B_RGBA32); +- C2N(B_RGB32_BIG); +- C2N(B_RGBA32_BIG); +- C2N(B_GRAY8); +- C2N(B_GRAY1); +- C2N(B_RGB16); +- C2N(B_RGB15); +- C2N(B_RGBA15); +- C2N(B_CMAP8); +- default: +- return "Unknown!"; +- }; +- +-#undef C2N +-}; +- +- +-glview_direct_info::glview_direct_info() +-{ +- // TODO: See direct_window_data() in app_server's ServerWindow.cpp +- direct_info = (direct_buffer_info*)calloc(1, DIRECT_BUFFER_INFO_AREA_SIZE); +- direct_connected = false; +- enable_direct_mode = false; +-} +- +- +-glview_direct_info::~glview_direct_info() +-{ +- free(direct_info); +-} +- +diff --git a/src/gallium/targets/libgl-haiku/SConscript b/src/gallium/targets/libgl-haiku/SConscript +deleted file mode 100644 +index 43d15c5..0000000 +--- a/src/gallium/targets/libgl-haiku/SConscript ++++ /dev/null +@@ -1,35 +0,0 @@ +-####################################################################### +-# SConscript for Haiku OpenGL kit +- +-Import('*') +- +-env = env.Clone() +- +-env.Append(CPPPATH = [ +- '#/src/mapi', +- '#/src/mesa', +- '#/src/mesa/main', +- '#/include/HaikuGL', +- '/boot/system/develop/headers/private', +- Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers +-]) +- +-env.Prepend(LIBS = [ +- glapi +-]) +- +-sources = [ +- 'GLView.cpp', +- 'GLRenderer.cpp', +- 'GLRendererRoster.cpp', +- 'GLDispatcher.cpp', +-] +- +-# libGL.so +-libgl = env.SharedLibrary( +- target ='GL', +- source = sources, +- SHLIBSUFFIX = env['SHLIBSUFFIX'], +-) +- +-env.Alias('libgl-haiku', libgl) +diff --git a/src/hgl/GLDispatcher.cpp b/src/hgl/GLDispatcher.cpp +new file mode 100644 +index 0000000..46b91d5 +--- /dev/null ++++ b/src/hgl/GLDispatcher.cpp +@@ -0,0 +1,72 @@ ++/* ++ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. ++ * Copyright 2000-2012 Haiku, Inc. All Rights Reserved. ++ * Distributed under the terms of the MIT License. ++ * ++ * Authors: ++ * Brian Paul ++ * Philippe Houdoin ++ * Alexander von Gluck IV ++ */ ++ ++ ++extern "C" { ++#include "glapi/glapi.h" ++#include "glapi/glapi_priv.h" ++ ++/* ++ * NOTE: this file portion implements C-based dispatch of the OpenGL entrypoints ++ * (glAccum, glBegin, etc). ++ * This code IS NOT USED if we're compiling on an x86 system and using ++ * the glapi_x86.S assembly code. ++ */ ++#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM)) ++ ++#define KEYWORD1 PUBLIC ++#define KEYWORD2 ++#define NAME(func) gl##func ++ ++#define DISPATCH(func, args, msg) \ ++ const struct _glapi_table* dispatch; \ ++ dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\ ++ (dispatch->func) args ++ ++#define RETURN_DISPATCH(func, args, msg) \ ++ const struct _glapi_table* dispatch; \ ++ dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\ ++ return (dispatch->func) args ++ ++#endif ++} ++ ++ ++/* NOTE: this file portion implement a thin OpenGL entrypoints dispatching ++ C++ wrapper class ++ */ ++ ++#include "GLDispatcher.h" ++ ++BGLDispatcher::BGLDispatcher() ++{ ++} ++ ++ ++BGLDispatcher::~BGLDispatcher() ++{ ++} ++ ++ ++status_t ++BGLDispatcher::CheckTable(const struct _glapi_table* table) ++{ ++ _glapi_check_table(table ? table : _glapi_get_dispatch()); ++ return B_OK; ++} ++ ++ ++status_t ++BGLDispatcher::SetTable(struct _glapi_table* table) ++{ ++ _glapi_set_dispatch(table); ++ return B_OK; ++} +diff --git a/src/hgl/GLDispatcher.h b/src/hgl/GLDispatcher.h +new file mode 100644 +index 0000000..44bca8c +--- /dev/null ++++ b/src/hgl/GLDispatcher.h +@@ -0,0 +1,109 @@ ++/* ++ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. ++ * Copyright 2000-2012 Haiku, Inc. All Rights Reserved. ++ * Distributed under the terms of the MIT License. ++ * ++ * Authors: ++ * Brian Paul ++ * Philippe Houdoin ++ */ ++#ifndef GLDISPATCHER_H ++#define GLDISPATCHER_H ++ ++ ++#include ++#include ++#include ++ ++#include "glheader.h" ++ ++extern "C" { ++#include "glapi/glapi.h" ++} ++ ++ ++class BGLDispatcher ++{ ++ // Private unimplemented copy constructors ++ BGLDispatcher(const BGLDispatcher &); ++ BGLDispatcher & operator=(const BGLDispatcher &); ++ ++ public: ++ BGLDispatcher(); ++ ~BGLDispatcher(); ++ ++ void SetCurrentContext(void* context); ++ void* CurrentContext(); ++ ++ struct _glapi_table* Table(); ++ status_t CheckTable( ++ const struct _glapi_table* dispatch = NULL); ++ status_t SetTable(struct _glapi_table* dispatch); ++ uint32 TableSize(); ++ ++ const _glapi_proc operator[](const char* functionName); ++ const char* operator[](uint32 offset); ++ ++ const _glapi_proc AddressOf(const char* functionName); ++ uint32 OffsetOf(const char* functionName); ++}; ++ ++ ++// Inlines methods ++inline void ++BGLDispatcher::SetCurrentContext(void* context) ++{ ++ _glapi_set_context(context); ++} ++ ++ ++inline void* ++BGLDispatcher::CurrentContext() ++{ ++ return _glapi_get_context(); ++} ++ ++ ++inline struct _glapi_table* ++BGLDispatcher::Table() ++{ ++ return _glapi_get_dispatch(); ++} ++ ++ ++inline uint32 ++BGLDispatcher::TableSize() ++{ ++ return _glapi_get_dispatch_table_size(); ++} ++ ++ ++inline const _glapi_proc ++BGLDispatcher::operator[](const char* functionName) ++{ ++ return _glapi_get_proc_address(functionName); ++} ++ ++ ++inline const char* ++BGLDispatcher::operator[](uint32 offset) ++{ ++ return _glapi_get_proc_name((GLuint) offset); ++} ++ ++ ++inline const _glapi_proc ++BGLDispatcher::AddressOf(const char* functionName) ++{ ++ return _glapi_get_proc_address(functionName); ++} ++ ++ ++inline uint32 ++BGLDispatcher::OffsetOf(const char* functionName) ++{ ++ return (uint32) _glapi_get_proc_offset(functionName); ++} ++ ++ ++#endif // GLDISPATCHER_H +diff --git a/src/hgl/GLRenderer.cpp b/src/hgl/GLRenderer.cpp +new file mode 100644 +index 0000000..4573a64 +--- /dev/null ++++ b/src/hgl/GLRenderer.cpp +@@ -0,0 +1,106 @@ ++/* ++ * Copyright 2006-2008, Philippe Houdoin. All rights reserved. ++ * Distributed under the terms of the MIT License. ++ */ ++ ++ ++#include ++ ++#include "GLRenderer.h" ++ ++#include "GLDispatcher.h" ++ ++ ++BGLRenderer::BGLRenderer(BGLView* view, ulong glOptions, ++ BGLDispatcher* dispatcher) ++ : ++ fRefCount(1), ++ fView(view), ++ fOptions(glOptions), ++ fDispatcher(dispatcher) ++{ ++} ++ ++ ++BGLRenderer::~BGLRenderer() ++{ ++ delete fDispatcher; ++} ++ ++ ++void ++BGLRenderer::Acquire() ++{ ++ atomic_add(&fRefCount, 1); ++} ++ ++ ++void ++BGLRenderer::Release() ++{ ++ if (atomic_add(&fRefCount, -1) < 1) ++ delete this; ++} ++ ++ ++void ++BGLRenderer::LockGL() ++{ ++} ++ ++ ++void ++BGLRenderer::UnlockGL() ++{ ++} ++ ++ ++void ++BGLRenderer::SwapBuffers(bool VSync) ++{ ++} ++ ++ ++void ++BGLRenderer::Draw(BRect updateRect) ++{ ++} ++ ++ ++status_t ++BGLRenderer::CopyPixelsOut(BPoint source, BBitmap* dest) ++{ ++ return B_ERROR; ++} ++ ++ ++status_t ++BGLRenderer::CopyPixelsIn(BBitmap* source, BPoint dest) ++{ ++ return B_ERROR; ++} ++ ++ ++void ++BGLRenderer::FrameResized(float width, float height) ++{ ++} ++ ++ ++void ++BGLRenderer::DirectConnected(direct_buffer_info* info) ++{ ++} ++ ++ ++void ++BGLRenderer::EnableDirectMode(bool enabled) ++{ ++} ++ ++ ++status_t BGLRenderer::_Reserved_Renderer_0(int32 n, void* p) { return B_ERROR; } ++status_t BGLRenderer::_Reserved_Renderer_1(int32 n, void* p) { return B_ERROR; } ++status_t BGLRenderer::_Reserved_Renderer_2(int32 n, void* p) { return B_ERROR; } ++status_t BGLRenderer::_Reserved_Renderer_3(int32 n, void* p) { return B_ERROR; } ++status_t BGLRenderer::_Reserved_Renderer_4(int32 n, void* p) { return B_ERROR; } +diff --git a/src/hgl/GLRendererRoster.cpp b/src/hgl/GLRendererRoster.cpp +new file mode 100644 +index 0000000..1712a87 +--- /dev/null ++++ b/src/hgl/GLRendererRoster.cpp +@@ -0,0 +1,224 @@ ++/* ++ * Copyright 2006-2012 Haiku, Inc. All Rights Reserved. ++ * Distributed under the terms of the MIT License. ++ * ++ * Authors: ++ * Philippe Houdoin ++ * Alexander von Gluck IV ++ */ ++ ++ ++#include ++#include ++ ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include "GLDispatcher.h" ++#include "GLRendererRoster.h" ++ ++#include ++#include ++ ++ ++extern "C" status_t _kern_get_safemode_option(const char* parameter, ++ char* buffer, size_t* _bufferSize); ++ ++ ++GLRendererRoster::GLRendererRoster(BGLView* view, ulong options) ++ : ++ fNextID(0), ++ fView(view), ++ fOptions(options), ++ fSafeMode(false), ++ fABISubDirectory(NULL) ++{ ++ char parameter[32]; ++ size_t parameterLength = sizeof(parameter); ++ ++ if (_kern_get_safemode_option(B_SAFEMODE_SAFE_MODE, ++ parameter, ¶meterLength) == B_OK) { ++ if (!strcasecmp(parameter, "enabled") || !strcasecmp(parameter, "on") ++ || !strcasecmp(parameter, "true") || !strcasecmp(parameter, "yes") ++ || !strcasecmp(parameter, "enable") || !strcmp(parameter, "1")) ++ fSafeMode = true; ++ } ++ ++ if (_kern_get_safemode_option(B_SAFEMODE_DISABLE_USER_ADD_ONS, ++ parameter, ¶meterLength) == B_OK) { ++ if (!strcasecmp(parameter, "enabled") || !strcasecmp(parameter, "on") ++ || !strcasecmp(parameter, "true") || !strcasecmp(parameter, "yes") ++ || !strcasecmp(parameter, "enable") || !strcmp(parameter, "1")) ++ fSafeMode = true; ++ } ++ ++ // We might run in compatibility mode on a system with a different ABI. The ++ // renderers matching our ABI can usually be found in respective ++ // subdirectories of the opengl add-ons directories. ++ system_info info; ++ if (get_system_info(&info) == B_OK ++ && (info.abi & B_HAIKU_ABI_MAJOR) ++ != (B_HAIKU_ABI & B_HAIKU_ABI_MAJOR)) { ++ switch (B_HAIKU_ABI & B_HAIKU_ABI_MAJOR) { ++ case B_HAIKU_ABI_GCC_2: ++ fABISubDirectory = "gcc2"; ++ break; ++ case B_HAIKU_ABI_GCC_4: ++ fABISubDirectory = "gcc4"; ++ break; ++ } ++ } ++ ++ AddDefaultPaths(); ++} ++ ++ ++GLRendererRoster::~GLRendererRoster() ++{ ++ ++} ++ ++ ++BGLRenderer* ++GLRendererRoster::GetRenderer(int32 id) ++{ ++ RendererMap::const_iterator iterator = fRenderers.find(id); ++ if (iterator == fRenderers.end()) ++ return NULL; ++ ++ struct renderer_item item = iterator->second; ++ return item.renderer; ++} ++ ++ ++void ++GLRendererRoster::AddDefaultPaths() ++{ ++ // add user directories first, so that they can override system renderers ++ const directory_which paths[] = { ++ B_USER_NONPACKAGED_ADDONS_DIRECTORY, ++ B_USER_ADDONS_DIRECTORY, ++ B_SYSTEM_ADDONS_DIRECTORY, ++ }; ++ ++ for (uint32 i = fSafeMode ? 4 : 0; ++ i < sizeof(paths) / sizeof(paths[0]); i++) { ++ BPath path; ++ status_t status = find_directory(paths[i], &path, true); ++ if (status == B_OK && path.Append("opengl") == B_OK) ++ AddPath(path.Path()); ++ } ++} ++ ++ ++status_t ++GLRendererRoster::AddPath(const char* path) ++{ ++ BDirectory directory(path); ++ status_t status = directory.InitCheck(); ++ if (status < B_OK) ++ return status; ++ ++ // if a subdirectory for our ABI exists, use that instead ++ if (fABISubDirectory != NULL) { ++ BEntry entry(&directory, fABISubDirectory); ++ if (entry.IsDirectory()) { ++ status = directory.SetTo(&entry); ++ if (status != B_OK) ++ return status; ++ } ++ } ++ ++ node_ref nodeRef; ++ status = directory.GetNodeRef(&nodeRef); ++ if (status < B_OK) ++ return status; ++ ++ int32 count = 0; ++ int32 files = 0; ++ ++ entry_ref ref; ++ BEntry entry; ++ while (directory.GetNextRef(&ref) == B_OK) { ++ entry.SetTo(&ref); ++ if (entry.InitCheck() == B_OK && !entry.IsFile()) ++ continue; ++ ++ if (CreateRenderer(ref) == B_OK) ++ count++; ++ ++ files++; ++ } ++ ++ if (files != 0 && count == 0) ++ return B_BAD_VALUE; ++ ++ return B_OK; ++} ++ ++ ++status_t ++GLRendererRoster::AddRenderer(BGLRenderer* renderer, ++ image_id image, const entry_ref* ref, ino_t node) ++{ ++ renderer_item item; ++ item.renderer = renderer; ++ item.image = image; ++ item.node = node; ++ if (ref != NULL) ++ item.ref = *ref; ++ ++ try { ++ fRenderers[fNextID] = item; ++ } catch (...) { ++ return B_NO_MEMORY; ++ } ++ ++ renderer->fOwningRoster = this; ++ renderer->fID = fNextID++; ++ return B_OK; ++} ++ ++ ++status_t ++GLRendererRoster::CreateRenderer(const entry_ref& ref) ++{ ++ BEntry entry(&ref); ++ node_ref nodeRef; ++ status_t status = entry.GetNodeRef(&nodeRef); ++ if (status < B_OK) ++ return status; ++ ++ BPath path(&ref); ++ image_id image = load_add_on(path.Path()); ++ if (image < B_OK) ++ return image; ++ ++ BGLRenderer* (*instantiate_renderer) ++ (BGLView* view, ulong options, BGLDispatcher* dispatcher); ++ ++ status = get_image_symbol(image, "instantiate_gl_renderer", ++ B_SYMBOL_TYPE_TEXT, (void**)&instantiate_renderer); ++ if (status == B_OK) { ++ BGLRenderer* renderer ++ = instantiate_renderer(fView, fOptions, new BGLDispatcher()); ++ if (!renderer) { ++ unload_add_on(image); ++ return B_UNSUPPORTED; ++ } ++ ++ if (AddRenderer(renderer, image, &ref, nodeRef.node) != B_OK) { ++ renderer->Release(); ++ // this will delete the renderer ++ unload_add_on(image); ++ } ++ return B_OK; ++ } ++ unload_add_on(image); ++ ++ return status; ++} +diff --git a/src/hgl/GLRendererRoster.h b/src/hgl/GLRendererRoster.h +new file mode 100644 +index 0000000..5c8da27 +--- /dev/null ++++ b/src/hgl/GLRendererRoster.h +@@ -0,0 +1,51 @@ ++/* ++ * Copyright 2006-2012, Haiku, Inc. All Rights Reserved. ++ * Distributed under the terms of the MIT License. ++ * ++ * Authors: ++ * Philippe Houdoin ++ */ ++#ifndef _GLRENDERER_ROSTER_H ++#define _GLRENDERER_ROSTER_H ++ ++ ++#include ++ ++#include ++ ++ ++struct renderer_item { ++ BGLRenderer* renderer; ++ entry_ref ref; ++ ino_t node; ++ image_id image; ++}; ++ ++typedef std::map RendererMap; ++ ++ ++class GLRendererRoster { ++ public: ++ GLRendererRoster(BGLView* view, ulong options); ++ virtual ~GLRendererRoster(); ++ ++ BGLRenderer* GetRenderer(int32 id = 0); ++ ++ private: ++ void AddDefaultPaths(); ++ status_t AddPath(const char* path); ++ status_t AddRenderer(BGLRenderer* renderer, ++ image_id image, const entry_ref* ref, ino_t node); ++ status_t CreateRenderer(const entry_ref& ref); ++ ++ RendererMap fRenderers; ++ int32 fNextID; ++ BGLView* fView; ++ ulong fOptions; ++ bool fSafeMode; ++ const char* fABISubDirectory; ++ ++}; ++ ++ ++#endif /* _GLRENDERER_ROSTER_H */ +diff --git a/src/hgl/GLView.cpp b/src/hgl/GLView.cpp +new file mode 100644 +index 0000000..9ae5b5c +--- /dev/null ++++ b/src/hgl/GLView.cpp +@@ -0,0 +1,643 @@ ++/* ++ * Copyright 2006-2012, Haiku. All rights reserved. ++ * Distributed under the terms of the MIT License. ++ * ++ * Authors: ++ * Jérôme Duval, korli@users.berlios.de ++ * Philippe Houdoin, philippe.houdoin@free.fr ++ * Stefano Ceccherini, burton666@libero.it ++ */ ++ ++#include ++ ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include "interface/DirectWindowPrivate.h" ++#include "GLDispatcher.h" ++#include "GLRendererRoster.h" ++ ++ ++struct glview_direct_info { ++ direct_buffer_info* direct_info; ++ bool direct_connected; ++ bool enable_direct_mode; ++ ++ glview_direct_info(); ++ ~glview_direct_info(); ++}; ++ ++ ++BGLView::BGLView(BRect rect, const char* name, ulong resizingMode, ulong mode, ++ ulong options) ++ : ++ BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS), ++ // | B_FULL_UPDATE_ON_RESIZE) ++ fGc(NULL), ++ fOptions(options), ++ fDitherCount(0), ++ fDrawLock("BGLView draw lock"), ++ fDisplayLock("BGLView display lock"), ++ fClipInfo(NULL), ++ fRenderer(NULL), ++ fRoster(NULL), ++ fDitherMap(NULL) ++{ ++ fRoster = new GLRendererRoster(this, options); ++} ++ ++ ++BGLView::~BGLView() ++{ ++ delete fClipInfo; ++ if (fRenderer) ++ fRenderer->Release(); ++} ++ ++ ++void ++BGLView::LockGL() ++{ ++ // TODO: acquire the OpenGL API lock it on this glview ++ ++ fDisplayLock.Lock(); ++ if (fRenderer) ++ fRenderer->LockGL(); ++} ++ ++ ++void ++BGLView::UnlockGL() ++{ ++ if (fRenderer) ++ fRenderer->UnlockGL(); ++ fDisplayLock.Unlock(); ++ ++ // TODO: release the GL API lock to others glviews ++} ++ ++ ++void ++BGLView::SwapBuffers() ++{ ++ SwapBuffers(false); ++} ++ ++ ++void ++BGLView::SwapBuffers(bool vSync) ++{ ++ if (fRenderer) { ++ _LockDraw(); ++ fRenderer->SwapBuffers(vSync); ++ _UnlockDraw(); ++ } ++} ++ ++ ++BView* ++BGLView::EmbeddedView() ++{ ++ return NULL; ++} ++ ++ ++void* ++BGLView::GetGLProcAddress(const char* procName) ++{ ++ BGLDispatcher* glDispatcher = NULL; ++ ++ if (fRenderer) ++ glDispatcher = fRenderer->GLDispatcher(); ++ ++ if (glDispatcher) ++ return (void*)glDispatcher->AddressOf(procName); ++ ++ return NULL; ++} ++ ++ ++status_t ++BGLView::CopyPixelsOut(BPoint source, BBitmap* dest) ++{ ++ if (!fRenderer) ++ return B_ERROR; ++ ++ if (!dest || !dest->Bounds().IsValid()) ++ return B_BAD_VALUE; ++ ++ return fRenderer->CopyPixelsOut(source, dest); ++} ++ ++ ++status_t ++BGLView::CopyPixelsIn(BBitmap* source, BPoint dest) ++{ ++ if (!fRenderer) ++ return B_ERROR; ++ ++ if (!source || !source->Bounds().IsValid()) ++ return B_BAD_VALUE; ++ ++ return fRenderer->CopyPixelsIn(source, dest); ++} ++ ++ ++/*! Mesa's GLenum is not ulong but uint, so we can't use GLenum ++ without breaking this method signature. ++ Instead, we have to use the effective BeOS's SGI OpenGL GLenum type: ++ unsigned long. ++ */ ++void ++BGLView::ErrorCallback(unsigned long errorCode) ++{ ++ char msg[32]; ++ sprintf(msg, "GL: Error code $%04lx.", errorCode); ++ // TODO: under BeOS R5, it call debugger(msg); ++ fprintf(stderr, "%s\n", msg); ++} ++ ++ ++void ++BGLView::Draw(BRect updateRect) ++{ ++ if (fRenderer) { ++ _LockDraw(); ++ fRenderer->Draw(updateRect); ++ _UnlockDraw(); ++ return; ++ } ++ // TODO: auto-size and center the string ++ MovePenTo(8, 32); ++ DrawString("No OpenGL renderer available!"); ++} ++ ++ ++void ++BGLView::AttachedToWindow() ++{ ++ BView::AttachedToWindow(); ++ ++ fBounds = Bounds(); ++ for (BView* view = this; view != NULL; view = view->Parent()) ++ view->ConvertToParent(&fBounds); ++ ++ fRenderer = fRoster->GetRenderer(); ++ if (fRenderer != NULL) { ++ // Jackburton: The following code was commented because it doesn't look ++ // good in "direct" mode: ++ // when the window is moved, the app_server doesn't paint the view's ++ // background, and the stuff behind the window itself shows up. ++ // Setting the view color to black, instead, looks a bit more elegant. ++#if 0 ++ // Don't paint white window background when resized ++ SetViewColor(B_TRANSPARENT_32_BIT); ++#else ++ SetViewColor(0, 0, 0); ++#endif ++ ++ // Set default OpenGL viewport: ++ LockGL(); ++ glViewport(0, 0, Bounds().IntegerWidth(), Bounds().IntegerHeight()); ++ UnlockGL(); ++ fRenderer->FrameResized(Bounds().IntegerWidth(), ++ Bounds().IntegerHeight()); ++ ++ if (fClipInfo) { ++ fRenderer->DirectConnected(fClipInfo->direct_info); ++ fRenderer->EnableDirectMode(fClipInfo->enable_direct_mode); ++ } ++ ++ return; ++ } ++ ++ fprintf(stderr, "no renderer found! \n"); ++ ++ // No Renderer, no rendering. Setup a minimal "No Renderer" string drawing ++ // context ++ SetFont(be_bold_font); ++ // SetFontSize(16); ++} ++ ++ ++void ++BGLView::AllAttached() ++{ ++ BView::AllAttached(); ++} ++ ++ ++void ++BGLView::DetachedFromWindow() ++{ ++ if (fRenderer) ++ fRenderer->Release(); ++ fRenderer = NULL; ++ ++ BView::DetachedFromWindow(); ++} ++ ++ ++void ++BGLView::AllDetached() ++{ ++ BView::AllDetached(); ++} ++ ++ ++void ++BGLView::FrameResized(float width, float height) ++{ ++ fBounds = Bounds(); ++ for (BView* v = this; v; v = v->Parent()) ++ v->ConvertToParent(&fBounds); ++ ++ if (fRenderer) { ++ LockGL(); ++ _LockDraw(); ++ _CallDirectConnected(); ++ fRenderer->FrameResized(width, height); ++ _UnlockDraw(); ++ UnlockGL(); ++ } ++ ++ BView::FrameResized(width, height); ++} ++ ++ ++status_t ++BGLView::Perform(perform_code d, void* arg) ++{ ++ return BView::Perform(d, arg); ++} ++ ++ ++status_t ++BGLView::Archive(BMessage* data, bool deep) const ++{ ++ return BView::Archive(data, deep); ++} ++ ++ ++void ++BGLView::MessageReceived(BMessage* msg) ++{ ++ BView::MessageReceived(msg); ++} ++ ++ ++void ++BGLView::SetResizingMode(uint32 mode) ++{ ++ BView::SetResizingMode(mode); ++} ++ ++ ++void ++BGLView::GetPreferredSize(float* _width, float* _height) ++{ ++ if (_width) ++ *_width = 0; ++ if (_height) ++ *_height = 0; ++} ++ ++ ++void ++BGLView::Show() ++{ ++ BView::Show(); ++} ++ ++ ++void ++BGLView::Hide() ++{ ++ BView::Hide(); ++} ++ ++ ++BHandler* ++BGLView::ResolveSpecifier(BMessage* msg, int32 index, BMessage* specifier, ++ int32 form, const char* property) ++{ ++ return BView::ResolveSpecifier(msg, index, specifier, form, property); ++} ++ ++ ++status_t ++BGLView::GetSupportedSuites(BMessage* data) ++{ ++ return BView::GetSupportedSuites(data); ++} ++ ++ ++void ++BGLView::DirectConnected(direct_buffer_info* info) ++{ ++ if (fClipInfo == NULL) { ++ fClipInfo = new (std::nothrow) glview_direct_info(); ++ if (fClipInfo == NULL) ++ return; ++ } ++ ++ direct_buffer_info* localInfo = fClipInfo->direct_info; ++ ++ switch (info->buffer_state & B_DIRECT_MODE_MASK) { ++ case B_DIRECT_START: ++ fClipInfo->direct_connected = true; ++ memcpy(localInfo, info, DIRECT_BUFFER_INFO_AREA_SIZE); ++ _UnlockDraw(); ++ break; ++ ++ case B_DIRECT_MODIFY: ++ _LockDraw(); ++ memcpy(localInfo, info, DIRECT_BUFFER_INFO_AREA_SIZE); ++ _UnlockDraw(); ++ break; ++ ++ case B_DIRECT_STOP: ++ fClipInfo->direct_connected = false; ++ _LockDraw(); ++ break; ++ } ++ ++ if (fRenderer) ++ _CallDirectConnected(); ++} ++ ++ ++void ++BGLView::EnableDirectMode(bool enabled) ++{ ++ if (fRenderer) ++ fRenderer->EnableDirectMode(enabled); ++ if (fClipInfo == NULL) { ++ fClipInfo = new (std::nothrow) glview_direct_info(); ++ if (fClipInfo == NULL) ++ return; ++ } ++ ++ fClipInfo->enable_direct_mode = enabled; ++} ++ ++ ++void ++BGLView::_LockDraw() ++{ ++ if (!fClipInfo || !fClipInfo->enable_direct_mode) ++ return; ++ ++ fDrawLock.Lock(); ++} ++ ++ ++void ++BGLView::_UnlockDraw() ++{ ++ if (!fClipInfo || !fClipInfo->enable_direct_mode) ++ return; ++ ++ fDrawLock.Unlock(); ++} ++ ++ ++void ++BGLView::_CallDirectConnected() ++{ ++ if (!fClipInfo) ++ return; ++ ++ direct_buffer_info* localInfo = fClipInfo->direct_info; ++ direct_buffer_info* info = (direct_buffer_info*)malloc( ++ DIRECT_BUFFER_INFO_AREA_SIZE); ++ if (info == NULL) ++ return; ++ ++ memcpy(info, localInfo, DIRECT_BUFFER_INFO_AREA_SIZE); ++ ++ // Collect the rects into a BRegion, then clip to the view's bounds ++ BRegion region; ++ for (uint32 c = 0; c < localInfo->clip_list_count; c++) ++ region.Include(localInfo->clip_list[c]); ++ BRegion boundsRegion = fBounds.OffsetByCopy(localInfo->window_bounds.left, ++ localInfo->window_bounds.top); ++ info->window_bounds = boundsRegion.RectAtInt(0); ++ // window_bounds are now view bounds ++ region.IntersectWith(&boundsRegion); ++ ++ info->clip_list_count = region.CountRects(); ++ info->clip_bounds = region.FrameInt(); ++ ++ for (uint32 c = 0; c < info->clip_list_count; c++) ++ info->clip_list[c] = region.RectAtInt(c); ++ fRenderer->DirectConnected(info); ++ free(info); ++} ++ ++ ++//---- virtual reserved methods ---------- ++ ++ ++void BGLView::_ReservedGLView1() {} ++void BGLView::_ReservedGLView2() {} ++void BGLView::_ReservedGLView3() {} ++void BGLView::_ReservedGLView4() {} ++void BGLView::_ReservedGLView5() {} ++void BGLView::_ReservedGLView6() {} ++void BGLView::_ReservedGLView7() {} ++void BGLView::_ReservedGLView8() {} ++ ++ ++// #pragma mark - ++ ++ ++// BeOS compatibility: contrary to others BView's contructors, ++// BGLView one wants a non-const name argument. ++BGLView::BGLView(BRect rect, char* name, ulong resizingMode, ulong mode, ++ ulong options) ++ : ++ BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS), ++ fGc(NULL), ++ fOptions(options), ++ fDitherCount(0), ++ fDrawLock("BGLView draw lock"), ++ fDisplayLock("BGLView display lock"), ++ fClipInfo(NULL), ++ fRenderer(NULL), ++ fRoster(NULL), ++ fDitherMap(NULL) ++{ ++ fRoster = new GLRendererRoster(this, options); ++} ++ ++ ++#if 0 ++// TODO: implement BGLScreen class... ++ ++ ++BGLScreen::BGLScreen(char* name, ulong screenMode, ulong options, ++ status_t* error, bool debug) ++ : ++ BWindowScreen(name, screenMode, error, debug) ++{ ++} ++ ++ ++BGLScreen::~BGLScreen() ++{ ++} ++ ++ ++void ++BGLScreen::LockGL() ++{ ++} ++ ++ ++void ++BGLScreen::UnlockGL() ++{ ++} ++ ++ ++void ++BGLScreen::SwapBuffers() ++{ ++} ++ ++ ++void ++BGLScreen::ErrorCallback(unsigned long errorCode) ++{ ++ // Mesa's GLenum is not ulong but uint! ++ char msg[32]; ++ sprintf(msg, "GL: Error code $%04lx.", errorCode); ++ // debugger(msg); ++ fprintf(stderr, "%s\n", msg); ++ return; ++} ++ ++ ++void ++BGLScreen::ScreenConnected(bool enabled) ++{ ++} ++ ++ ++void ++BGLScreen::FrameResized(float width, float height) ++{ ++ return BWindowScreen::FrameResized(width, height); ++} ++ ++ ++status_t ++BGLScreen::Perform(perform_code d, void* arg) ++{ ++ return BWindowScreen::Perform(d, arg); ++} ++ ++ ++status_t ++BGLScreen::Archive(BMessage* data, bool deep) const ++{ ++ return BWindowScreen::Archive(data, deep); ++} ++ ++ ++void ++BGLScreen::MessageReceived(BMessage* msg) ++{ ++ BWindowScreen::MessageReceived(msg); ++} ++ ++ ++void ++BGLScreen::Show() ++{ ++ BWindowScreen::Show(); ++} ++ ++ ++void ++BGLScreen::Hide() ++{ ++ BWindowScreen::Hide(); ++} ++ ++ ++BHandler* ++BGLScreen::ResolveSpecifier(BMessage* msg, int32 index, BMessage* specifier, ++ int32 form, const char* property) ++{ ++ return BWindowScreen::ResolveSpecifier(msg, index, specifier, ++ form, property); ++} ++ ++ ++status_t ++BGLScreen::GetSupportedSuites(BMessage* data) ++{ ++ return BWindowScreen::GetSupportedSuites(data); ++} ++ ++ ++//---- virtual reserved methods ---------- ++ ++void BGLScreen::_ReservedGLScreen1() {} ++void BGLScreen::_ReservedGLScreen2() {} ++void BGLScreen::_ReservedGLScreen3() {} ++void BGLScreen::_ReservedGLScreen4() {} ++void BGLScreen::_ReservedGLScreen5() {} ++void BGLScreen::_ReservedGLScreen6() {} ++void BGLScreen::_ReservedGLScreen7() {} ++void BGLScreen::_ReservedGLScreen8() {} ++#endif ++ ++ ++const char* color_space_name(color_space space) ++{ ++#define C2N(a) case a: return #a ++ ++ switch (space) { ++ C2N(B_RGB24); ++ C2N(B_RGB32); ++ C2N(B_RGBA32); ++ C2N(B_RGB32_BIG); ++ C2N(B_RGBA32_BIG); ++ C2N(B_GRAY8); ++ C2N(B_GRAY1); ++ C2N(B_RGB16); ++ C2N(B_RGB15); ++ C2N(B_RGBA15); ++ C2N(B_CMAP8); ++ default: ++ return "Unknown!"; ++ }; ++ ++#undef C2N ++}; ++ ++ ++glview_direct_info::glview_direct_info() ++{ ++ // TODO: See direct_window_data() in app_server's ServerWindow.cpp ++ direct_info = (direct_buffer_info*)calloc(1, DIRECT_BUFFER_INFO_AREA_SIZE); ++ direct_connected = false; ++ enable_direct_mode = false; ++} ++ ++ ++glview_direct_info::~glview_direct_info() ++{ ++ free(direct_info); ++} ++ +diff --git a/src/hgl/SConscript b/src/hgl/SConscript +new file mode 100644 +index 0000000..70db149 +--- /dev/null ++++ b/src/hgl/SConscript +@@ -0,0 +1,36 @@ ++####################################################################### ++# SConscript for Haiku OpenGL kit ++ ++Import('*') ++ ++env = env.Clone() ++ ++env.Append(CPPPATH = [ ++ '#/src/mapi', ++ '#/src/mesa', ++ '#/src/mesa/main', ++ '#/include/HaikuGL', ++ '/boot/system/develop/headers/private', ++ Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers ++]) ++ ++env.Prepend(LIBS = [ ++ glapi ++]) ++ ++sources = [ ++ 'GLView.cpp', ++ 'GLRenderer.cpp', ++ 'GLRendererRoster.cpp', ++ 'GLDispatcher.cpp', ++] ++ ++# libGL.so ++libgl = env.SharedLibrary( ++ target ='GL', ++ source = sources, ++ SHLIBSUFFIX = env['SHLIBSUFFIX'], ++) ++ ++env.Alias('libgl-haiku', libgl) ++Export('libgl') +diff --git a/src/mesa/drivers/haiku/swrast/SConscript b/src/mesa/drivers/haiku/swrast/SConscript +index ca0423e..aef7300 100644 +--- a/src/mesa/drivers/haiku/swrast/SConscript ++++ b/src/mesa/drivers/haiku/swrast/SConscript +@@ -16,6 +16,8 @@ env.Prepend(LIBS = [ + mesa, + ]) + ++env.Prepend(LIBS = [libgl]) ++ + sources = [ + 'SoftwareRast.cpp' + ] +-- +1.8.3.4 + From 9bc983287471212fb1cdbae157fb2028c485b41b Mon Sep 17 00:00:00 2001 From: Artur Jamro Date: Wed, 1 Jan 2014 17:48:29 +0000 Subject: [PATCH 232/306] Added recipe for hugen --- dev-cpp/hugen/hugen-1.recipe | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 dev-cpp/hugen/hugen-1.recipe diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe new file mode 100644 index 000000000..824875ac3 --- /dev/null +++ b/dev-cpp/hugen/hugen-1.recipe @@ -0,0 +1,36 @@ +DESCRIPTION="Hugen is a simply python script for generating code from templates." +SUMMARY="Code generator for Haiku" +HOMEPAGE="https://github.com/aldeck/hugen" +COPYRIGHT="2009 Alexandre Deckner" +LICENSE="MIT" +SRC_URI="git+https://github.com/aldeck/hugen.git#a5e42390e6d4435d9d81fe3670670e18a52dee9c" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + hugen$secondaryArchSuffix = $portVersion + cmd:hugen$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + cmd:python$secondaryArchSuffix + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + " + +BUILD() +{ + # simply do nothing + echo +} + +INSTALL() +{ + mkdir -p $binDir/hugen_app + cp -R hugen.py configs/ templates/ $binDir/hugen_app + echo python $binDir/hugen_app/hugen.py > $binDir/hugen + chmod +x $binDir/hugen +} From 49a26ba8587a80f34a3ab9b3f84c5fd2e190430c Mon Sep 17 00:00:00 2001 From: Artur Jamro Date: Wed, 1 Jan 2014 19:03:14 +0000 Subject: [PATCH 233/306] Hugen recipe: marked untested architectures as untested --- dev-cpp/hugen/hugen-1.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe index 824875ac3..d15b22fba 100644 --- a/dev-cpp/hugen/hugen-1.recipe +++ b/dev-cpp/hugen/hugen-1.recipe @@ -5,8 +5,8 @@ COPYRIGHT="2009 Alexandre Deckner" LICENSE="MIT" SRC_URI="git+https://github.com/aldeck/hugen.git#a5e42390e6d4435d9d81fe3670670e18a52dee9c" 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=" hugen$secondaryArchSuffix = $portVersion From 6f80e048dae4d36f386ff6f2c890c8ed3207424d Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Wed, 1 Jan 2014 20:31:25 +0100 Subject: [PATCH 234/306] Add BlogPositive 0.4.0 recipe --- .../blogpositive/blogpositive-0.4.0.recipe | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 haiku-apps/blogpositive/blogpositive-0.4.0.recipe diff --git a/haiku-apps/blogpositive/blogpositive-0.4.0.recipe b/haiku-apps/blogpositive/blogpositive-0.4.0.recipe new file mode 100644 index 000000000..3b400b3eb --- /dev/null +++ b/haiku-apps/blogpositive/blogpositive-0.4.0.recipe @@ -0,0 +1,63 @@ +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 connect to Wordpress, LiveJournal and OnSugar blogs. + " +HOMEPAGE="http://blogpositive.puckipedia.com" +SRC_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.4" +REVISION="1" + +LICENSE="MIT" +COPYRIGHT="2013 :Puck Meerburg" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +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 + for i in BlogPositivePlugins/*; do + if [ -f $i/makefile ]; then + make -C $i + fi + done + make bindcatalogs +} + +INSTALL() +{ + make install INSTALL_DIR=$appsDir + addAppDeskbarSymlink $appsDir/BlogPositive + + for i in BlogPositivePlugins/*; do + if [ -f $i/makefile ]; then + make -C $i install INSTALL_DIR=$addOnsDir/BlogPositive + fi + done +} From 1806528978ed3ef8d21d1a202e4bf09c075d85ea Mon Sep 17 00:00:00 2001 From: Artur Jamro Date: Wed, 1 Jan 2014 21:19:08 +0000 Subject: [PATCH 235/306] Hugen recipe: added better description --- dev-cpp/hugen/hugen-1.recipe | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe index d15b22fba..2e485f93a 100644 --- a/dev-cpp/hugen/hugen-1.recipe +++ b/dev-cpp/hugen/hugen-1.recipe @@ -1,4 +1,10 @@ -DESCRIPTION="Hugen is a simply python script for generating code from templates." +DESCRIPTION=" +Hugen is a simply python script for generating code for Haiku \ +applications. It is based on templates. You can define your own \ +one and quick generate some files with adequate names and content \ +instead creating it manually. Templates for class and simple \ +application with Makefile and Jamfile are provided by default. +" SUMMARY="Code generator for Haiku" HOMEPAGE="https://github.com/aldeck/hugen" COPYRIGHT="2009 Alexandre Deckner" From 2a7a966f5e8848cc94ece7216021dc45004359d9 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Wed, 1 Jan 2014 21:23:19 +0000 Subject: [PATCH 236/306] Remove weird line breaks (added backslash) --- haiku-apps/blogpositive/blogpositive-0.4.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/blogpositive/blogpositive-0.4.0.recipe b/haiku-apps/blogpositive/blogpositive-0.4.0.recipe index 3b400b3eb..2f20b26ef 100644 --- a/haiku-apps/blogpositive/blogpositive-0.4.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.4.0.recipe @@ -1,7 +1,7 @@ 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! + Want to blog, but WebPositive isn't quick enough? \ + Now you can use the new blog app: BlogPositive! \ It can connect to Wordpress, LiveJournal and OnSugar blogs. " HOMEPAGE="http://blogpositive.puckipedia.com" From b5ae282787b15a38e1922d6b989e859249d4cb41 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 03:41:16 +0000 Subject: [PATCH 237/306] Fix and upgrade leptonica recipe "giflib6.patch" is from the Arch Linux project. --- media-libs/leptonica/leptonica-1.68.recipe | 34 -- media-libs/leptonica/leptonica-1.69.recipe | 316 ++++++++++++++++++ media-libs/leptonica/patches/giflib6.patch | 56 ++++ .../leptonica/patches/leptonica-1.69.patch | 56 ++++ 4 files changed, 428 insertions(+), 34 deletions(-) delete mode 100644 media-libs/leptonica/leptonica-1.68.recipe create mode 100644 media-libs/leptonica/leptonica-1.69.recipe create mode 100644 media-libs/leptonica/patches/giflib6.patch create mode 100644 media-libs/leptonica/patches/leptonica-1.69.patch diff --git a/media-libs/leptonica/leptonica-1.68.recipe b/media-libs/leptonica/leptonica-1.68.recipe deleted file mode 100644 index 9006867da..000000000 --- a/media-libs/leptonica/leptonica-1.68.recipe +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="An open source C library for efficient image processing and image analysis operations." -HOMEPAGE="http://code.google.com/p/leptonica" -SRC_URI="http://www.leptonica.org/source/leptonica-1.68.tar.gz" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -CHECKSUM_MD5="5cd7092f9ff2ca7e3f3e73bfcd556403" -BUILD() -{ - cd leptonica-1.68 - libtoolize - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd leptonica-1.68 - make install -} - -TEST() -{ - cd leptonica-1.68 -# make test -# make check -} - -LICENSE="Apache v2 - GNU GPL v1" -COPYRIGHT="1985-1995 HP labs - 2011 Google Inc." diff --git a/media-libs/leptonica/leptonica-1.69.recipe b/media-libs/leptonica/leptonica-1.69.recipe new file mode 100644 index 000000000..30e0d55da --- /dev/null +++ b/media-libs/leptonica/leptonica-1.69.recipe @@ -0,0 +1,316 @@ +SUMMARY="A C library for image processing and analysis operations." +DESCRIPTION=" +A powerful open source C library for efficient image processing \ +and image analysis operations. It's long list of features includes: +* image transformations (scaling, rotation, etc.) +* change scale and pixel depth +* pixelwise masking, blending, and enhancement +* can open and save standard image formats +" +HOMEPAGE="http://code.google.com/p/leptonica" +SRC_URI="http://www.leptonica.org/source/leptonica-1.69.tar.gz" +CHECKSUM_MD5="d4085c302cbcab7f9af9d3d6f004ab22" +LICENSE="BSD (2-clause)" +COPYRIGHT="2001-2012 Dan Bloomberg" +REVISION="1" +ARCHITECTURES="x86 x86_64" +SECONDARY_ARCHITECTURES="x86" +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 + +PROVIDES=" + leptonica$secondaryArchSuffix = $portVersion + lib:leptonica$secondaryArchSuffix = 3.0.0 + lib:liblept$secondaryArchSuffix = 3.0.0 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libgif$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libwebp$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libgif$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libwebp$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:ar$secondaryArchSuffix + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:makeinfo + " + +PATCHES=" + giflib6.patch + leptonica-1.69.patch + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake -a + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs liblept + + packageEntries devel \ + $developDir + + packageEntries tools \ + $binDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + leptonica${secondaryArchSuffix}_devel = $portVersion + devel:leptonica$secondaryArchSuffix = 3.0.0 + devel:liblept$secondaryArchSuffix = 3.0.0 + " + +REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion + leptonica$secondaryArchSuffix == $portVersion base + " + +# ----- tools package ------------------------------------------------------- + +PROVIDES_tools=" + leptonica${secondaryArchSuffix}_tools = $portVersion + cmd:adaptmaptest$secondaryArchSuffix = $portVersion + cmd:adaptnorm_reg$secondaryArchSuffix = $portVersion + cmd:affine_reg$secondaryArchSuffix = $portVersion + cmd:alltests_reg$secondaryArchSuffix = $portVersion + cmd:alphaops_reg$secondaryArchSuffix = $portVersion + cmd:alphaxform_reg$secondaryArchSuffix = $portVersion + cmd:arithtest$secondaryArchSuffix = $portVersion + cmd:barcodetest$secondaryArchSuffix = $portVersion + cmd:baselinetest$secondaryArchSuffix = $portVersion + cmd:bilinear_reg$secondaryArchSuffix = $portVersion + cmd:binarize_reg$secondaryArchSuffix = $portVersion + cmd:bincompare$secondaryArchSuffix = $portVersion + cmd:binmorph1_reg$secondaryArchSuffix = $portVersion + cmd:binmorph2_reg$secondaryArchSuffix = $portVersion + cmd:binmorph3_reg$secondaryArchSuffix = $portVersion + cmd:binmorph4_reg$secondaryArchSuffix = $portVersion + cmd:binmorph5_reg$secondaryArchSuffix = $portVersion + cmd:blend_reg$secondaryArchSuffix = $portVersion + cmd:blend2_reg$secondaryArchSuffix = $portVersion + cmd:blendcmaptest$secondaryArchSuffix = $portVersion + cmd:blendtest1$secondaryArchSuffix = $portVersion + cmd:buffertest$secondaryArchSuffix = $portVersion + cmd:byteatest$secondaryArchSuffix = $portVersion + cmd:ccbordtest$secondaryArchSuffix = $portVersion + cmd:cctest1$secondaryArchSuffix = $portVersion + cmd:ccthin1_reg$secondaryArchSuffix = $portVersion + cmd:ccthin2_reg$secondaryArchSuffix = $portVersion + cmd:cmapquant_reg$secondaryArchSuffix = $portVersion + cmd:coloring_reg$secondaryArchSuffix = $portVersion + cmd:colormask_reg$secondaryArchSuffix = $portVersion + cmd:colormorphtest$secondaryArchSuffix = $portVersion + cmd:colorquant_reg$secondaryArchSuffix = $portVersion + cmd:colorseg_reg$secondaryArchSuffix = $portVersion + cmd:colorsegtest$secondaryArchSuffix = $portVersion + cmd:colorspacetest$secondaryArchSuffix = $portVersion + cmd:compare_reg$secondaryArchSuffix = $portVersion + cmd:comparepages$secondaryArchSuffix = $portVersion + cmd:comparetest$secondaryArchSuffix = $portVersion + cmd:compfilter_reg$secondaryArchSuffix = $portVersion + cmd:conncomp_reg$secondaryArchSuffix = $portVersion + cmd:contrasttest$secondaryArchSuffix = $portVersion + cmd:conversion_reg$secondaryArchSuffix = $portVersion + cmd:convertfilestopdf$secondaryArchSuffix = $portVersion + cmd:convertfilestops$secondaryArchSuffix = $portVersion + cmd:convertformat$secondaryArchSuffix = $portVersion + cmd:convertsegfilestopdf$secondaryArchSuffix = $portVersion + cmd:convertsegfilestops$secondaryArchSuffix = $portVersion + cmd:converttogray$secondaryArchSuffix = $portVersion + cmd:converttops$secondaryArchSuffix = $portVersion + cmd:convolve_reg$secondaryArchSuffix = $portVersion + cmd:convolvetest$secondaryArchSuffix = $portVersion + cmd:cornertest$secondaryArchSuffix = $portVersion + cmd:croptext$secondaryArchSuffix = $portVersion + cmd:dewarp_reg$secondaryArchSuffix = $portVersion + cmd:dewarptest1$secondaryArchSuffix = $portVersion + cmd:dewarptest2$secondaryArchSuffix = $portVersion + cmd:dewarptest3$secondaryArchSuffix = $portVersion + cmd:digitprep1$secondaryArchSuffix = $portVersion + cmd:distance_reg$secondaryArchSuffix = $portVersion + cmd:dithertest$secondaryArchSuffix = $portVersion + cmd:dna_reg$secondaryArchSuffix = $portVersion + cmd:dwalineargen$secondaryArchSuffix = $portVersion + cmd:dwamorph1_reg$secondaryArchSuffix = $portVersion + cmd:dwamorph2_reg$secondaryArchSuffix = $portVersion + cmd:edgetest$secondaryArchSuffix = $portVersion + cmd:enhance_reg$secondaryArchSuffix = $portVersion + cmd:equal_reg$secondaryArchSuffix = $portVersion + cmd:expand_reg$secondaryArchSuffix = $portVersion + cmd:extrema_reg$secondaryArchSuffix = $portVersion + cmd:falsecolortest$secondaryArchSuffix = $portVersion + cmd:fcombautogen$secondaryArchSuffix = $portVersion + cmd:fhmtauto_reg$secondaryArchSuffix = $portVersion + cmd:fhmtautogen$secondaryArchSuffix = $portVersion + cmd:fileinfo$secondaryArchSuffix = $portVersion + cmd:findpattern_reg$secondaryArchSuffix = $portVersion + cmd:findpattern1$secondaryArchSuffix = $portVersion + cmd:findpattern2$secondaryArchSuffix = $portVersion + cmd:findpattern3$secondaryArchSuffix = $portVersion + cmd:flipdetect_reg$secondaryArchSuffix = $portVersion + cmd:flipselgen$secondaryArchSuffix = $portVersion + cmd:fmorphauto_reg$secondaryArchSuffix = $portVersion + cmd:fmorphautogen$secondaryArchSuffix = $portVersion + cmd:fpix_reg$secondaryArchSuffix = $portVersion + cmd:fpixcontours$secondaryArchSuffix = $portVersion + cmd:gammatest$secondaryArchSuffix = $portVersion + cmd:genfonts$secondaryArchSuffix = $portVersion + cmd:gifio_reg$secondaryArchSuffix = $portVersion + cmd:graphicstest$secondaryArchSuffix = $portVersion + cmd:grayfill_reg$secondaryArchSuffix = $portVersion + cmd:graymorph1_reg$secondaryArchSuffix = $portVersion + cmd:graymorph2_reg$secondaryArchSuffix = $portVersion + cmd:graymorphtest$secondaryArchSuffix = $portVersion + cmd:grayquant_reg$secondaryArchSuffix = $portVersion + cmd:hardlight_reg$secondaryArchSuffix = $portVersion + cmd:heap_reg$secondaryArchSuffix = $portVersion + cmd:histotest$secondaryArchSuffix = $portVersion + cmd:inserttest$secondaryArchSuffix = $portVersion + cmd:ioformats_reg$secondaryArchSuffix = $portVersion + cmd:iotest$secondaryArchSuffix = $portVersion + cmd:jbcorrelation$secondaryArchSuffix = $portVersion + cmd:jbrankhaus$secondaryArchSuffix = $portVersion + cmd:jbwords$secondaryArchSuffix = $portVersion + cmd:kernel_reg$secondaryArchSuffix = $portVersion + cmd:lineremoval$secondaryArchSuffix = $portVersion + cmd:listtest$secondaryArchSuffix = $portVersion + cmd:livre_adapt$secondaryArchSuffix = $portVersion + cmd:livre_hmt$secondaryArchSuffix = $portVersion + cmd:livre_makefigs$secondaryArchSuffix = $portVersion + cmd:livre_orient$secondaryArchSuffix = $portVersion + cmd:livre_pageseg$secondaryArchSuffix = $portVersion + cmd:livre_seedgen$secondaryArchSuffix = $portVersion + cmd:livre_tophat$secondaryArchSuffix = $portVersion + cmd:locminmax_reg$secondaryArchSuffix = $portVersion + cmd:logicops_reg$secondaryArchSuffix = $portVersion + cmd:lowaccess_reg$secondaryArchSuffix = $portVersion + cmd:maketile$secondaryArchSuffix = $portVersion + cmd:maze_reg$secondaryArchSuffix = $portVersion + cmd:misctest1$secondaryArchSuffix = $portVersion + cmd:modifyhuesat$secondaryArchSuffix = $portVersion + cmd:morphseq_reg$secondaryArchSuffix = $portVersion + cmd:morphtest1$secondaryArchSuffix = $portVersion + cmd:mtifftest$secondaryArchSuffix = $portVersion + cmd:numa_reg$secondaryArchSuffix = $portVersion + cmd:numaranktest$secondaryArchSuffix = $portVersion + cmd:otsutest1$secondaryArchSuffix = $portVersion + cmd:otsutest2$secondaryArchSuffix = $portVersion + cmd:overlap_reg$secondaryArchSuffix = $portVersion + cmd:pagesegtest1$secondaryArchSuffix = $portVersion + cmd:pagesegtest2$secondaryArchSuffix = $portVersion + cmd:paint_reg$secondaryArchSuffix = $portVersion + cmd:paintmask_reg$secondaryArchSuffix = $portVersion + cmd:partitiontest$secondaryArchSuffix = $portVersion + cmd:pdfiotest$secondaryArchSuffix = $portVersion + cmd:pdfseg_reg$secondaryArchSuffix = $portVersion + cmd:pixa1_reg$secondaryArchSuffix = $portVersion + cmd:pixa2_reg$secondaryArchSuffix = $portVersion + cmd:pixaatest$secondaryArchSuffix = $portVersion + cmd:pixadisp_reg$secondaryArchSuffix = $portVersion + cmd:pixalloc_reg$secondaryArchSuffix = $portVersion + cmd:pixcomp_reg$secondaryArchSuffix = $portVersion + cmd:pixmem_reg$secondaryArchSuffix = $portVersion + cmd:pixserial_reg$secondaryArchSuffix = $portVersion + cmd:pixtile_reg$secondaryArchSuffix = $portVersion + cmd:plottest$secondaryArchSuffix = $portVersion + cmd:pngio_reg$secondaryArchSuffix = $portVersion + cmd:printimage$secondaryArchSuffix = $portVersion + cmd:printsplitimage$secondaryArchSuffix = $portVersion + cmd:printtiff$secondaryArchSuffix = $portVersion + cmd:projection_reg$secondaryArchSuffix = $portVersion + cmd:projective_reg$secondaryArchSuffix = $portVersion + cmd:psio_reg$secondaryArchSuffix = $portVersion + cmd:psioseg_reg$secondaryArchSuffix = $portVersion + cmd:pta_reg$secondaryArchSuffix = $portVersion + cmd:ptra1_reg$secondaryArchSuffix = $portVersion + cmd:ptra2_reg$secondaryArchSuffix = $portVersion + cmd:quadtreetest$secondaryArchSuffix = $portVersion + cmd:rank_reg$secondaryArchSuffix = $portVersion + cmd:rankbin_reg$secondaryArchSuffix = $portVersion + cmd:rankhisto_reg$secondaryArchSuffix = $portVersion + cmd:ranktest$secondaryArchSuffix = $portVersion + cmd:rasterop_reg$secondaryArchSuffix = $portVersion + cmd:rasteropip_reg$secondaryArchSuffix = $portVersion + cmd:reducetest$secondaryArchSuffix = $portVersion + cmd:removecmap$secondaryArchSuffix = $portVersion + cmd:renderfonts$secondaryArchSuffix = $portVersion + cmd:rotate1_reg$secondaryArchSuffix = $portVersion + cmd:rotate2_reg$secondaryArchSuffix = $portVersion + cmd:rotatefastalt$secondaryArchSuffix = $portVersion + cmd:rotateorth_reg$secondaryArchSuffix = $portVersion + cmd:rotateorthtest1$secondaryArchSuffix = $portVersion + cmd:rotatetest1$secondaryArchSuffix = $portVersion + cmd:runlengthtest$secondaryArchSuffix = $portVersion + cmd:scale_reg$secondaryArchSuffix = $portVersion + cmd:scaleandtile$secondaryArchSuffix = $portVersion + cmd:scaletest1$secondaryArchSuffix = $portVersion + cmd:scaletest2$secondaryArchSuffix = $portVersion + cmd:seedfilltest$secondaryArchSuffix = $portVersion + cmd:seedspread_reg$secondaryArchSuffix = $portVersion + cmd:selio_reg$secondaryArchSuffix = $portVersion + cmd:sharptest$secondaryArchSuffix = $portVersion + cmd:shear_reg$secondaryArchSuffix = $portVersion + cmd:shear2_reg$secondaryArchSuffix = $portVersion + cmd:sheartest$secondaryArchSuffix = $portVersion + cmd:showedges$secondaryArchSuffix = $portVersion + cmd:skew_reg$secondaryArchSuffix = $portVersion + cmd:skewtest$secondaryArchSuffix = $portVersion + cmd:smallpix_reg$secondaryArchSuffix = $portVersion + cmd:smoothedge_reg$secondaryArchSuffix = $portVersion + cmd:snapcolortest$secondaryArchSuffix = $portVersion + cmd:sorttest$secondaryArchSuffix = $portVersion + cmd:splitcomp_reg$secondaryArchSuffix = $portVersion + cmd:splitimage2pdf$secondaryArchSuffix = $portVersion + cmd:string_reg$secondaryArchSuffix = $portVersion + cmd:subpixel_reg$secondaryArchSuffix = $portVersion + cmd:sudokutest$secondaryArchSuffix = $portVersion + cmd:textlinemask$secondaryArchSuffix = $portVersion + cmd:threshnorm_reg$secondaryArchSuffix = $portVersion + cmd:translate_reg$secondaryArchSuffix = $portVersion + cmd:trctest$secondaryArchSuffix = $portVersion + cmd:viewertest$secondaryArchSuffix = $portVersion + cmd:warper_reg$secondaryArchSuffix = $portVersion + cmd:warpertest$secondaryArchSuffix = $portVersion + cmd:watershedtest$secondaryArchSuffix = $portVersion + cmd:wordsinorder$secondaryArchSuffix = $portVersion + cmd:writemtiff$secondaryArchSuffix = $portVersion + cmd:writetext_reg$secondaryArchSuffix = $portVersion + cmd:xformbox_reg$secondaryArchSuffix = $portVersion + cmd:xtractprotos$secondaryArchSuffix = $portVersion + cmd:xvdisp$secondaryArchSuffix = $portVersion + cmd:yuvtest$secondaryArchSuffix = $portVersion + " +REQUIRES_tools=" + haiku$secondaryArchSuffix >= $haikuVersion + leptonica$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/leptonica/patches/giflib6.patch b/media-libs/leptonica/patches/giflib6.patch new file mode 100644 index 000000000..a283e931d --- /dev/null +++ b/media-libs/leptonica/patches/giflib6.patch @@ -0,0 +1,56 @@ +diff -wbBur leptonica-1.69/src/gifio.c leptonica-1.69/src/gifio.c +--- leptonica-1.69/src/gifio.c 2012-01-22 22:29:15.000000000 +0400 ++++ leptonica-1.69/src/gifio.c 2013-07-30 18:27:19.269137200 +0400 +@@ -100,7 +100,7 @@ + _lseek(fd, 0, SEEK_SET); + #endif /* _MSC_VER */ + +- if ((gif = DGifOpenFileHandle(fd)) == NULL) ++ if ((gif = DGifOpenFileHandle(fd, NULL)) == NULL) + return (PIX *)ERROR_PTR("invalid file or file not found", + procName, NULL); + +@@ -316,7 +316,7 @@ + } + + /* Save the cmap colors in a gif_cmap */ +- if ((gif_cmap = MakeMapObject(gif_ncolor, NULL)) == NULL) { ++ if ((gif_cmap = GifMakeMapObject(gif_ncolor, NULL)) == NULL) { + pixDestroy(&pixd); + return ERROR_INT("failed to create GIF color map", procName, 1); + } +@@ -325,7 +325,7 @@ + if (ncolor > 0) { + if (pixcmapGetColor(cmap, i, &rval, &gval, &bval) != 0) { + pixDestroy(&pixd); +- FreeMapObject(gif_cmap); ++ GifFreeMapObject(gif_cmap); + return ERROR_INT("failed to get color from color map", + procName, 1); + } +@@ -337,9 +337,9 @@ + } + + /* Get the gif file handle */ +- if ((gif = EGifOpenFileHandle(fd)) == NULL) { ++ if ((gif = EGifOpenFileHandle(fd, NULL)) == NULL) { + pixDestroy(&pixd); +- FreeMapObject(gif_cmap); ++ GifFreeMapObject(gif_cmap); + return ERROR_INT("failed to create GIF image handle", procName, 1); + } + +@@ -347,11 +347,11 @@ + if (EGifPutScreenDesc(gif, w, h, gif_cmap->BitsPerPixel, 0, gif_cmap) + != GIF_OK) { + pixDestroy(&pixd); +- FreeMapObject(gif_cmap); ++ GifFreeMapObject(gif_cmap); + EGifCloseFile(gif); + return ERROR_INT("failed to write screen description", procName, 1); + } +- FreeMapObject(gif_cmap); /* not needed after this point */ ++ GifFreeMapObject(gif_cmap); /* not needed after this point */ + + if (EGifPutImageDesc(gif, 0, 0, w, h, FALSE, NULL) != GIF_OK) { + pixDestroy(&pixd); diff --git a/media-libs/leptonica/patches/leptonica-1.69.patch b/media-libs/leptonica/patches/leptonica-1.69.patch new file mode 100644 index 000000000..40db92b7b --- /dev/null +++ b/media-libs/leptonica/patches/leptonica-1.69.patch @@ -0,0 +1,56 @@ +From 0b6499e1a9868539583d776f2c0c6251b38a02e6 Mon Sep 17 00:00:00 2001 +From: Luke +Date: Thu, 26 Dec 2013 01:39:15 +0000 +Subject: [PATCH] Fix building on Haiku + +--- + configure.ac | 2 +- + src/sarray.c | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fb5ca0c..88b52c9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,7 +1,7 @@ + AC_PREREQ([2.50]) + AC_INIT([leptonica], [1.69], [dan.bloomberg@gmail.com]) + AC_CONFIG_AUX_DIR([config]) +-AM_CONFIG_HEADER([config_auto.h:config/config.h.in]) ++AC_CONFIG_HEADERS([config_auto.h:config/config.h.in]) + AC_CONFIG_SRCDIR([src/adaptmap.c]) + + AC_CONFIG_MACRO_DIR([m4]) +diff --git a/src/sarray.c b/src/sarray.c +index c21bf3b..b212bf8 100644 +--- a/src/sarray.c ++++ b/src/sarray.c +@@ -131,6 +131,7 @@ + #include + #ifndef _WIN32 + #include /* unix only */ ++#include + #endif /* ! _WIN32 */ + #include "allheaders.h" + +@@ -1831,6 +1832,7 @@ l_int32 len; + SARRAY *safiles; + DIR *pdir; + struct dirent *pdirentry; ++struct stat s; + + PROCNAME("getFilenamesInDirectory"); + +@@ -1847,7 +1849,8 @@ struct dirent *pdirentry; + * define _BSD_SOURCE in the CC command, because the DT_DIR + * flag is non-standard. */ + #if !defined(__SOLARIS__) +- if (pdirentry->d_type == DT_DIR) ++ stat(pdirentry->d_name, &s); ++ if(S_ISDIR(s.st_mode)) + continue; + #endif + +-- +1.8.3.4 + From 3015ced41ff2b43be16359723453c6e769fbffec Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 238/306] Rewrap app-admin DESCRIPTIONs --- app-admin/keepassx/keepassx-2.0a5.recipe | 28 +++++++++------------ app-admin/pwgen/pwgen-2.06.recipe | 31 +++++++++++------------- 2 files changed, 26 insertions(+), 33 deletions(-) diff --git a/app-admin/keepassx/keepassx-2.0a5.recipe b/app-admin/keepassx/keepassx-2.0a5.recipe index a8d9ddc3a..f033585f2 100644 --- a/app-admin/keepassx/keepassx-2.0a5.recipe +++ b/app-admin/keepassx/keepassx-2.0a5.recipe @@ -1,21 +1,17 @@ SUMMARY="Qt password manager" DESCRIPTION=" -KeePassX is an application for people with extremly high demands on -secure personal data management. It has a light interface, is cross -platform and published under the terms of the GNU General Public -License. - -KeePassX saves many different information e.g. user names, passwords, -urls, attachments and comments in one single database. For a better -management user-defined titles and icons can be specified for each -single entry. Furthermore the entries are sorted in groups, which are -customizable as well. The integrated search function allows to search -in a single group or the complete database. - -KeePassX offers a little utility for secure password generation. The -password generator is very customizable, fast and easy to use. -Especially someone who generates passwords frequently will appreciate -this feature. +KeePassX is an application for people with extremly high demands on secure \ +personal data management. It has a light interface, is cross platform and \ +published under the terms of the GNU General Public License. +KeePassX saves many different information e.g. user names, passwords, urls, \ +attachments and comments in one single database. For a better management \ +user-defined titles and icons can be specified for each single entry. \ +Furthermore the entries are sorted in groups, which are customizable as well. \ +The integrated search function allows to search in a single group or the \ +complete database. +KeePassX offers a little utility for secure password generation. The password \ +generator is very customizable, fast and easy to use. Especially someone who \ +generates passwords frequently will appreciate this feature. " HOMEPAGE="http://www.keepassx.org/" SRC_URI="git+https://github.com/keepassx/keepassx.git#2.0-alpha5" diff --git a/app-admin/pwgen/pwgen-2.06.recipe b/app-admin/pwgen/pwgen-2.06.recipe index 9eb2f0e34..0867248af 100644 --- a/app-admin/pwgen/pwgen-2.06.recipe +++ b/app-admin/pwgen/pwgen-2.06.recipe @@ -1,22 +1,19 @@ SUMMARY="pwgen - password generator" DESCRIPTION=" -The pwgen program generates passwords which are designed to be easily -memorized by humans, while being as secure as possible. Human- -memorable passwords are never going to be as secure as completely -completely random passwords. In particular, passwords generated by -pwgen without the -s option should not be used in places where the -password could be attacked via an off-line brute-force attack. On -the other hand, completely randomly generated passwords have a -tendency to be written down, and are subject to being compromised in -that fashion. - -The pwgen program is designed to be used both interactively, and in -shell scripts. Hence, its default behavior differs depending on -whether the standard output is a tty device or a pipe to another -program. Used interactively, pwgen will display a screenful of -passwords, allowing the user to pick a single password, and then -quickly erase the screen. This prevents someone from being able to -'shoulder surf' the user's chosen password. +The pwgen program generates passwords which are designed to be easily \ +memorized by humans, while being as secure as possible. Human- memorable \ +passwords are never going to be as secure as completely completely random \ +passwords. In particular, passwords generated by pwgen without the -s option \ +should not be used in places where the password could be attacked via an \ +off-line brute-force attack. On the other hand, completely randomly generated \ +passwords have a tendency to be written down, and are subject to being \ +compromised in that fashion. +The pwgen program is designed to be used both interactively, and in shell \ +scripts. Hence, its default behavior differs depending on whether the standard \ +output is a tty device or a pipe to another program. Used interactively, pwgen \ +will display a screenful of passwords, allowing the user to pick a single \ +password, and then quickly erase the screen. This prevents someone from being \ +able to 'shoulder surf' the user's chosen password. " HOMEPAGE="http://sourceforge.net/projects/pwgen" SRC_URI="http://sourceforge.net/projects/pwgen/files/pwgen/2.06/pwgen-2.06.tar.gz" From 28c828ad5aa7aedaff53ce2923004a44e455b209 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 239/306] Rewrap app-arch DESCRIPTIONs --- app-arch/arc/arc-5.21p.recipe | 4 ++- app-arch/bzip2/bzip2-1.0.6.recipe | 8 ++++- app-arch/cabextract/cabextract-1.4.recipe | 9 +++--- app-arch/cpio/cpio-2.11.recipe | 5 ++- app-arch/fastjar/fastjar-0.98.recipe | 9 +++--- app-arch/ha/ha-0999.recipe | 4 ++- app-arch/lha/lha-1.14i.recipe | 4 ++- app-arch/libarchive/libarchive-3.1.2.recipe | 36 ++++++++++----------- app-arch/p7zip/p7zip-9.20.1.recipe | 5 ++- app-arch/pigz/pigz-2.3.1.recipe | 13 ++++---- app-arch/sharutils/sharutils-4.14.recipe | 25 +++++++------- app-arch/tar/tar-1.26.recipe | 21 ++++++------ app-arch/unrar/unrar-4.2.4.recipe | 8 +++-- app-arch/unzip/unzip-6.0.recipe | 4 ++- app-arch/xar/xar-1.5.2.recipe | 17 +++++----- app-arch/xz_utils/xz_utils-5.0.4.recipe | 32 +++++++++++------- 16 files changed, 113 insertions(+), 91 deletions(-) diff --git a/app-arch/arc/arc-5.21p.recipe b/app-arch/arc/arc-5.21p.recipe index 0817fce70..3907001cd 100644 --- a/app-arch/arc/arc-5.21p.recipe +++ b/app-arch/arc/arc-5.21p.recipe @@ -1,5 +1,7 @@ SUMMARY="Create & extract files from DOS .ARC files" -DESCRIPTION="Create & extract files from DOS .ARC files" +DESCRIPTION=" +Create & extract files from DOS .ARC files +" HOMEPAGE="http://arc.sourceforge.net/" LICENSE="GNU GPL v2" COPYRIGHT="1985-2009 Thom Henderson" diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe index 9cdb5608f..3954ef3b3 100644 --- a/app-arch/bzip2/bzip2-1.0.6.recipe +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -1,5 +1,11 @@ SUMMARY="bzip2 data compression utilities and libraries" -DESCRIPTION="bzip2 is a patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression. bzip2 supports recovery from media errors as well. Its command line flags are similar to those of GNU Gzip." +DESCRIPTION=" +bzip2 is a patent free, high-quality data compressor. It typically compresses \ +files to within 10% to 15% of the best available techniques (the PPM family of \ +statistical compressors), whilst being around twice as fast at compression and \ +six times faster at decompression. bzip2 supports recovery from media errors \ +as well. Its command line flags are similar to those of GNU Gzip. +" HOMEPAGE="http://www.bzip.org/" LICENSE="bzip2" COPYRIGHT="1996-2010 Julian R Seward" diff --git a/app-arch/cabextract/cabextract-1.4.recipe b/app-arch/cabextract/cabextract-1.4.recipe index 0ec734853..9379fb165 100644 --- a/app-arch/cabextract/cabextract-1.4.recipe +++ b/app-arch/cabextract/cabextract-1.4.recipe @@ -1,10 +1,9 @@ SUMMARY="A program to extract Microsoft Cabinet Files" DESCRIPTION=" -cabextract is Free Software for extracting Microsoft cabinet files, -also called .CAB files. cabextract is distributed under the GPL -license. It is based on the portable LGPL libmspack library. -cabextract supports all special features and all compression formats -of Microsoft cabinet files. +cabextract is Free Software for extracting Microsoft cabinet files, also \ +called .CAB files. cabextract is distributed under the GPL license. It is \ +based on the portable LGPL libmspack library. cabextract supports all special \ +features and all compression formats of Microsoft cabinet files. " HOMEPAGE="http://www.cabextract.org.uk" LICENSE="GNU GPL v2" diff --git a/app-arch/cpio/cpio-2.11.recipe b/app-arch/cpio/cpio-2.11.recipe index cbcda6e09..6ce45212e 100644 --- a/app-arch/cpio/cpio-2.11.recipe +++ b/app-arch/cpio/cpio-2.11.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="GNU cpio copies files into or out of a cpio or tar archive. The archive can be another file on the disk, a magnetic tape, or a pipe." +DESCRIPTION=" +GNU cpio copies files into or out of a cpio or tar archive. The archive can be \ +another file on the disk, a magnetic tape, or a pipe. +" HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html" SRC_URI="http://ftp.gnu.org/gnu/cpio/cpio-2.11.tar.gz" CHECKSUM_MD5="1112bb6c45863468b5496ba128792f6c" diff --git a/app-arch/fastjar/fastjar-0.98.recipe b/app-arch/fastjar/fastjar-0.98.recipe index 6d3d98126..3b1efc106 100644 --- a/app-arch/fastjar/fastjar-0.98.recipe +++ b/app-arch/fastjar/fastjar-0.98.recipe @@ -1,10 +1,9 @@ SUMMARY="A jar(java archive) program written in C" DESCRIPTION=" -FastJar is an attempt at creating a feature-for-feature copy of Sun's -JDK's 'jar' command. Sun's jar (or Blackdown's for that matter) is -written entirely in Java which makes it dog slow. Since FastJar is -written in C, it can create the same .jar file as Sun's tool in a -fraction of the time. +FastJar is an attempt at creating a feature-for-feature copy of Sun's JDK's \ +'jar' command. Sun's jar (or Blackdown's for that matter) is written entirely \ +in Java which makes it dog slow. Since FastJar is written in C, it can create \ +the same .jar file as Sun's tool in a fraction of the time. " HOMEPAGE="https://savannah.nongnu.org/projects/fastjar" LICENSE="GNU GPL v2" diff --git a/app-arch/ha/ha-0999.recipe b/app-arch/ha/ha-0999.recipe index a6a1f0dbe..f6de020b6 100644 --- a/app-arch/ha/ha-0999.recipe +++ b/app-arch/ha/ha-0999.recipe @@ -1,5 +1,7 @@ SUMMARY="The HA archiver using the HSC compression method" -DESCRIPTION="The HA archiver using the HSC compression method" +DESCRIPTION=" +The HA archiver using the HSC compression method +" LICENSE="GNU GPL v2" COPYRIGHT="1993-1995 Harri Hirvola" HOMEPAGE="https://code.google.com/p/ak-various-projects/" diff --git a/app-arch/lha/lha-1.14i.recipe b/app-arch/lha/lha-1.14i.recipe index c00573149..43949775d 100644 --- a/app-arch/lha/lha-1.14i.recipe +++ b/app-arch/lha/lha-1.14i.recipe @@ -1,5 +1,7 @@ SUMMARY="Archive files using LZSS and Huffman compression (.lzh files)" -DESCRIPTION="Archive files using LZSS and Huffman compression (.lzh files)" +DESCRIPTION=" +Archive files using LZSS and Huffman compression (.lzh files) +" LICENSE="lha" COPYRIGHT="1991, Masaru Oki 1993-1995, Nobutaka Watazaki diff --git a/app-arch/libarchive/libarchive-3.1.2.recipe b/app-arch/libarchive/libarchive-3.1.2.recipe index ea29f56d2..87a6faefa 100644 --- a/app-arch/libarchive/libarchive-3.1.2.recipe +++ b/app-arch/libarchive/libarchive-3.1.2.recipe @@ -1,26 +1,24 @@ SUMMARY="C library and tools for working with many archive formats." DESCRIPTION=" The libarchive library features: - * Support for a variety of archive and compression formats. - * Robust automatic format detection, including archive/compression - combinations such as tar.gz. - * Zero-copy internal architecture for high performance. - * Streaming architecture eliminates all limits on size of archive, - limits on entry sizes depend on particular formats. - * Carefully factored code to minimize bloat when programs are - statically linked. - * Growing test suite ? to verify correctness of new ports. - * Works on most POSIX-like systems - * Supports Windows, including Cygwin, MinGW, and Visual Studio. - -The bsdtar and bscpio command-line utilities are feature- and +* Support for a variety of archive and compression formats. +* Robust automatic format detection, including archive/compression \ +combinations such as tar.gz. +* Zero-copy internal architecture for high performance. +* Streaming architecture eliminates all limits on size of archive, limits on \ +entry sizes depend on particular formats. +* Carefully factored code to minimize bloat when programs are statically linked. +* Growing test suite ? to verify correctness of new ports. +* Works on most POSIX-like systems +* Supports Windows, including Cygwin, MinGW, and Visual Studio. +The bsdtar and bscpio command-line utilities are feature- and \ performance-competitive with other tar and cpio implementations: - * Reads a variety of formats, including tar, pax, cpio, zip, xar, - lha, ar, cab, mtree, rar, and ISO images. - * Writes tar, pax, cpio, zip, xar, ar, ISO, mtree, and shar archives - * Automatically handles archives compressed with gzip, bzip2, lzip, - xz, lzma, or compress. - * Unique format conversion feature. +* Reads a variety of formats, including tar, pax, cpio, zip, xar, lha, ar, \ +cab, mtree, rar, and ISO images. +* Writes tar, pax, cpio, zip, xar, ar, ISO, mtree, and shar archives +* Automatically handles archives compressed with gzip, bzip2, lzip, xz, lzma, \ +or compress. +* Unique format conversion feature. " LICENSE="BSD (2-clause)" COPYRIGHT="2003-2013 Tim Kientzle" diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe index 27974a978..2be642d7a 100644 --- a/app-arch/p7zip/p7zip-9.20.1.recipe +++ b/app-arch/p7zip/p7zip-9.20.1.recipe @@ -1,5 +1,8 @@ SUMMARY="7-zip file compression program" -DESCRIPTION="p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga." +DESCRIPTION=" +p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, \ +OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga. +" HOMEPAGE="http://p7zip.sourceforge.net" SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2" CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89" diff --git a/app-arch/pigz/pigz-2.3.1.recipe b/app-arch/pigz/pigz-2.3.1.recipe index d97b59227..0e29b7284 100644 --- a/app-arch/pigz/pigz-2.3.1.recipe +++ b/app-arch/pigz/pigz-2.3.1.recipe @@ -1,14 +1,13 @@ SUMMARY="A parallel implementation of gzip for multi-processor machines" DESCRIPTION=" -pigz, which stands for Parallel Implementation of GZip, is a fully -functional replacement for gzip that exploits multiple processors and -multiple cores to the hilt when compressing data. +pigz, which stands for Parallel Implementation of GZip, is a fully functional \ +replacement for gzip that exploits multiple processors and multiple cores to \ +the hilt when compressing data. -pigz was written by Mark Adler, and uses the zlib and pthread -libraries. +pigz was written by Mark Adler, and uses the zlib and pthread libraries. -This version of pigz is written to be portable across Unix-style -operating systems that provide the zlib and pthread libraries. +This version of pigz is written to be portable across Unix-style operating \ +systems that provide the zlib and pthread libraries. " LICENSE="Zlib" COPYRIGHT="2008-2013 Mark Adler" diff --git a/app-arch/sharutils/sharutils-4.14.recipe b/app-arch/sharutils/sharutils-4.14.recipe index 1db917579..5dd3acc58 100644 --- a/app-arch/sharutils/sharutils-4.14.recipe +++ b/app-arch/sharutils/sharutils-4.14.recipe @@ -1,19 +1,16 @@ SUMMARY="sharutils" DESCRIPTION=" -GNU shar makes so-called shell archives out of many files, preparing -them for transmission by electronic mail services. A shell archive is -a collection of files that can be unpacked by /bin/sh. A wide range -of features provide extensive flexibility in manufacturing shars and -in specifying shar smartness. For example, shar may compress files, -uuencode binary files, split long files and construct multi-part -mailings, ensure correct unsharing order, and provide simplistic -checksums. - -GNU unshar scans a set of mail messages looking for the start of shell -archives. It will automatically strip off the mail headers and other -introductory text. The archive bodies are then unpacked by a copy of -the shell. unshar may also process files containing concatenated -shell archives. +GNU shar makes so-called shell archives out of many files, preparing them for \ +transmission by electronic mail services. A shell archive is a collection of \ +files that can be unpacked by /bin/sh. A wide range of features provide \ +extensive flexibility in manufacturing shars and in specifying shar smartness. \ +For example, shar may compress files, uuencode binary files, split long files \ +and construct multi-part mailings, ensure correct unsharing order, and provide \ +simplistic checksums. +GNU unshar scans a set of mail messages looking for the start of shell \ +archives. It will automatically strip off the mail headers and other \ +introductory text. The archive bodies are then unpacked by a copy of the \ +shell. unshar may also process files containing concatenated shell archives. " HOMEPAGE="http://www.gnu.org/software/sharutils/" LICENSE="GNU GPL v3" diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index 8f5dcc2a0..5e88b1770 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -1,16 +1,15 @@ SUMMARY="Saves and restores files to/from a tape or disk archive." DESCRIPTION=" - The Tar program provides the ability to create tar archives, as well as - various other kinds of manipulation. For example, you can use Tar on - previously created archives to extract files, to store additional files, - or to update or list files which were already stored. - - Initially, tar archives were used to store files conveniently on magnetic - tape. The name "Tar" comes from this use; it stands for tape archiver. - Despite the utility's name, Tar can direct its output to available - devices, files, or other programs (using pipes), it can even access remote - devices or files (as archives). - " +The Tar program provides the ability to create tar archives, as well as \ +various other kinds of manipulation. For example, you can use Tar on \ +previously created archives to extract files, to store additional files, or to \ +update or list files which were already stored. +Initially, tar archives were used to store files conveniently on magnetic \ +tape. The name "Tar" comes from this use; it stands for tape archiver. Despite \ +the utility's name, Tar can direct its output to available devices, files, or \ +other programs (using pipes), it can even access remote devices or files (as \ +archives). +" HOMEPAGE="http://www.gnu.org/software/tar/" COPYRIGHT="1990-2011 Free Software Foundation, Inc." LICENSE="GNU GPL v3" diff --git a/app-arch/unrar/unrar-4.2.4.recipe b/app-arch/unrar/unrar-4.2.4.recipe index 26e728381..00b0bf287 100644 --- a/app-arch/unrar/unrar-4.2.4.recipe +++ b/app-arch/unrar/unrar-4.2.4.recipe @@ -1,5 +1,8 @@ SUMMARY="Uncompress rar files" -DESCRIPTION="Unrar decompresses rar files. It is a powerful archive manager that can backup your data and reduce the size of email attachments. Unrar can decompress the following file formats: +DESCRIPTION=" +Unrar decompresses rar files. It is a powerful archive manager that can backup \ +your data and reduce the size of email attachments. Unrar can decompress the \ +following file formats: - RAR - ZIP - CAB @@ -14,7 +17,8 @@ DESCRIPTION="Unrar decompresses rar files. It is a powerful archive manager that - ISO - 7Z - XZ -- Z (Unix Compress)" +- Z (Unix Compress) +" HOMEPAGE="http://www.rarlab.com/" SRC_URI="http://www.rarlab.com/rar/unrarsrc-4.2.4.tar.gz" REVISION="1" diff --git a/app-arch/unzip/unzip-6.0.recipe b/app-arch/unzip/unzip-6.0.recipe index b2cd86962..7fcd94f5d 100644 --- a/app-arch/unzip/unzip-6.0.recipe +++ b/app-arch/unzip/unzip-6.0.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="unzip" +DESCRIPTION=" +unzip +" HOMEPAGE="http://www.info-zip.org/UnZip.html" SRC_URI="http://downloads.sourceforge.net/project/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz" REVISION="1" diff --git a/app-arch/xar/xar-1.5.2.recipe b/app-arch/xar/xar-1.5.2.recipe index b3a32f2ab..a0d7a1dde 100644 --- a/app-arch/xar/xar-1.5.2.recipe +++ b/app-arch/xar/xar-1.5.2.recipe @@ -1,14 +1,13 @@ SUMMARY="Easily extensible archiver" DESCRIPTION=" -The XAR project aims to provide an easily extensible archive format. -Important design decisions include an easily extensible XML table of -contents for random access to archived files, storing the toc at the -beginning of the archive to allow for efficient handling of streamed -archives, the ability to handle files of arbitrarily large sizes, the -ability to choose independent encodings for individual files in the -archive, the ability to store checksums for individual files in both -compressed and uncompressed form, and the ability to query the table -of content's rich meta-data. +The XAR project aims to provide an easily extensible archive format. Important \ +design decisions include an easily extensible XML table of contents for random \ +access to archived files, storing the toc at the beginning of the archive to \ +allow for efficient handling of streamed archives, the ability to handle files \ +of arbitrarily large sizes, the ability to choose independent encodings for \ +individual files in the archive, the ability to store checksums for individual \ +files in both compressed and uncompressed form, and the ability to query the \ +table of content's rich meta-data. " LICENSE="BSD (3-clause)" COPYRIGHT="2005 Rob Braun" diff --git a/app-arch/xz_utils/xz_utils-5.0.4.recipe b/app-arch/xz_utils/xz_utils-5.0.4.recipe index 182e5ca37..bfe52c453 100644 --- a/app-arch/xz_utils/xz_utils-5.0.4.recipe +++ b/app-arch/xz_utils/xz_utils-5.0.4.recipe @@ -96,16 +96,24 @@ TEST() make check } -DESCRIPTION="XZ Utils is free general-purpose data compression software with high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils. - -The core of the XZ Utils compression code is based on LZMA SDK, but it has been modified quite a lot to be suitable for XZ Utils. The primary compression algorithm is currently LZMA2, which is used inside the .xz container format. With typical files, XZ Utils create 30 % smaller output than gzip and 15 % smaller output than bzip2. - +DESCRIPTION=" +XZ Utils is free general-purpose data compression software with high \ +compression ratio. XZ Utils were written for POSIX-like systems, but also work \ +on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils. +The core of the XZ Utils compression code is based on LZMA SDK, but it has \ +been modified quite a lot to be suitable for XZ Utils. The primary compression \ +algorithm is currently LZMA2, which is used inside the .xz container format. \ +With typical files, XZ Utils create 30 % smaller output than gzip and 15 % \ +smaller output than bzip2. XZ Utils consist of several components: - - * liblzma is a compression library with API similar to that of zlib. - * xz is a command line tool with syntax similar to that of gzip. - * xzdec is a decompression-only tool smaller than the full-featured xz tool. - * A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to ease viewing, grepping, and comparing compressed files. - * Emulation of command line tools of LZMA Utils eases transition from LZMA Utils to XZ Utils. - -While liblzma has a zlib-like API, liblzma doesn't include any file I/O functions. A separate I/O library is planned, which would abstract handling of .gz, .bz2, and .xz files with an easy to use API." +* liblzma is a compression library with API similar to that of zlib. +* xz is a command line tool with syntax similar to that of gzip. +* xzdec is a decompression-only tool smaller than the full-featured xz tool. +* A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to \ +ease viewing, grepping, and comparing compressed files. +* Emulation of command line tools of LZMA Utils eases transition from LZMA \ +Utils to XZ Utils. +While liblzma has a zlib-like API, liblzma doesn't include any file I/O \ +functions. A separate I/O library is planned, which would abstract handling of \ +.gz, .bz2, and .xz files with an easy to use API. +" From aba12785ba5de3d410de0948c7ef565bcc35e886 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 240/306] Rewrap app-benchmarks DESCRIPTIONs --- app-benchmarks/bonnie++/bonnie++-1.03e.recipe | 32 ++++++++----------- app-benchmarks/ffsb/ffsb-6.0_rc2.recipe | 8 ++--- app-benchmarks/piozone/piozone-1.0.recipe | 4 ++- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/app-benchmarks/bonnie++/bonnie++-1.03e.recipe b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe index f9bd39b0d..a44ce176c 100644 --- a/app-benchmarks/bonnie++/bonnie++-1.03e.recipe +++ b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe @@ -1,23 +1,19 @@ SUMMARY="Bonnie++ is a benchmark and test suite for filesystems" DESCRIPTION=" -Bonnie++ is a benchmark suite that is aimed at performing a number of -simple tests of hard drive and file system performance. Then you can -decide which test is important and decide how to compare different -systems after running it. I have no plans to ever have it produce a -single number, because I don't think that a single number can be -useful when comparing such things. - -The main program tests database type access to a single file (or a set -of files if you wish to test more than 1G of storage), and it tests -creation, reading, and deleting of small files which can simulate the -usage of programs such as Squid, INN, or Maildir format email. - -The ZCAV program which I initially released as a seperate package -tests the performance of different zones of a hard drive. It does not -write any data (so you can use it on full file systems). It can show -why comparing the speed of Windows at the start of a hard drive to -Linux at the end of the hard drive (typical dual-boot scenario) isn't -a valid comparison. +Bonnie++ is a benchmark suite that is aimed at performing a number of simple \ +tests of hard drive and file system performance. Then you can decide which \ +test is important and decide how to compare different systems after running \ +it. I have no plans to ever have it produce a single number, because I don't \ +think that a single number can be useful when comparing such things. +The main program tests database type access to a single file (or a set of \ +files if you wish to test more than 1G of storage), and it tests creation, \ +reading, and deleting of small files which can simulate the usage of programs \ +such as Squid, INN, or Maildir format email. +The ZCAV program which I initially released as a seperate package tests the \ +performance of different zones of a hard drive. It does not write any data (so \ +you can use it on full file systems). It can show why comparing the speed of \ +Windows at the start of a hard drive to Linux at the end of the hard drive \ +(typical dual-boot scenario) isn't a valid comparison. " LICENSE="GNU GPL v2" COPYRIGHT="1990, Tim Bray diff --git a/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe b/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe index f8d62def4..c8aecba5b 100644 --- a/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe +++ b/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe @@ -1,9 +1,9 @@ SUMMARY="Flexible Filesystem Benchmark" DESCRIPTION=" -The Flexible Filesystem Benchmark (FFSB) is a cross-platform -filesystem performance measurement tool. It uses customizable profiles -to measure of different workloads, and it supports multiple groups of -threads across multiple filesystems. +The Flexible Filesystem Benchmark (FFSB) is a cross-platform filesystem \ +performance measurement tool. It uses customizable profiles to measure of \ +different workloads, and it supports multiple groups of threads across \ +multiple filesystems. " LICENSE="GNU GPL v2" COPYRIGHT="2001-2004 International Business Machines Corp." diff --git a/app-benchmarks/piozone/piozone-1.0.recipe b/app-benchmarks/piozone/piozone-1.0.recipe index 1530af880..9c685b1be 100644 --- a/app-benchmarks/piozone/piozone-1.0.recipe +++ b/app-benchmarks/piozone/piozone-1.0.recipe @@ -1,5 +1,7 @@ SUMMARY="Hard disk benchmarking program" -DESCRIPTION="Hard disk benchmarking program" +DESCRIPTION=" +Hard disk benchmarking program +" LICENSE="GNU GPL v2" COPYRIGHT="2002 Peter Eriksson" HOMEPAGE="http://www.lysator.se/~pen/piozone/" From e27118eae41df5e18f02078672e4aeae86264ebd Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 241/306] Rewrap app-cdr DESCRIPTIONs --- app-cdr/bchunk/bchunk-1.2.0.recipe | 10 ++++----- app-cdr/cdrtools/cdrtools-3.01~a18.recipe | 27 ++++++++++++----------- app-cdr/daa2iso/daa2iso-0.1.7e.recipe | 5 ++--- app-cdr/uif2iso/uif2iso-0.1.7c.recipe | 5 ++++- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/app-cdr/bchunk/bchunk-1.2.0.recipe b/app-cdr/bchunk/bchunk-1.2.0.recipe index a3765ed2f..6893030e7 100644 --- a/app-cdr/bchunk/bchunk-1.2.0.recipe +++ b/app-cdr/bchunk/bchunk-1.2.0.recipe @@ -1,10 +1,10 @@ SUMMARY="binchunker converts CD .bin/.cue formats to .iso and .cdr" DESCRIPTION=" -binchunker converts a CD image in a '.bin / .cue' format (sometimes -'.raw / .cue') to a set of .iso and .cdr tracks. The bin/cue format is -used by some popular non-Unix cd-writing software, but is not -supported on most other CD burning programs. A lot of CD/VCD images -distributed on the Internet are in BIN/CUE format, I've been told. +binchunker converts a CD image in a '.bin / .cue' format (sometimes '.raw / \ +.cue') to a set of .iso and .cdr tracks. The bin/cue format is used by some \ +popular non-Unix cd-writing software, but is not supported on most other CD \ +burning programs. A lot of CD/VCD images distributed on the Internet are in \ +BIN/CUE format, I've been told. " LICENSE="GNU GPL v2" COPYRIGHT="1998-2004 Heikki Hannikainen" diff --git a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe index 60aa374fd..25cb10e63 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe @@ -1,18 +1,19 @@ SUMMARY="A highly portable CD/DVD/BluRay command line recording software" -DESCRIPTION="Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay media. - +DESCRIPTION=" +Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay \ +media. The suite includes the following programs: - - cdrecord A CD/DVD/BD recording program - readcd A program to read CD/DVD/BD media with CD-clone features - cdda2wav The most evolved CD-audio extraction program with paranoia support - mkisofs A program to create hybrid ISO9660/JOLIET/HFS filesystes with optional Rock Ridge attributes - isodebug A program to print mkisofs debug information from media - isodump A program to dump ISO-9660 media - isoinfo A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems - isovfy A program to verify the ISO-9660 structures - rscsi A Remote SCSI enabling daemon - " +- cdrecord A CD/DVD/BD recording program +- readcd A program to read CD/DVD/BD media with CD-clone features +- cdda2wav The most evolved CD-audio extraction program with paranoia support +- mkisofs A program to create hybrid ISO9660/JOLIET/HFS filesystes with \ +optional Rock Ridge attributes +- isodebug A program to print mkisofs debug information from media +- isodump A program to dump ISO-9660 media +- isoinfo A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems +- isovfy A program to verify the ISO-9660 structures +- rscsi A Remote SCSI enabling daemon +" HOMEPAGE="http://cdrecord.berlios.de" COPYRIGHT=" 1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs) diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.recipe b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe index 88bd2fed2..b343809d5 100644 --- a/app-cdr/daa2iso/daa2iso-0.1.7e.recipe +++ b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe @@ -1,8 +1,7 @@ SUMMARY="A tool for converting DAA/GBI images to ISO format." DESCRIPTION=" -DAA2ISO is an open source command-line/GUI tool for converting single -and multipart DAA and GBI images to the original ISO format. - +DAA2ISO is an open source command-line/GUI tool for converting single and \ +multipart DAA and GBI images to the original ISO format. DAA/GBI files are 'Direct Access Archive' used by PowerISO and gBurner " LICENSE="GNU GPL v2" diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c.recipe b/app-cdr/uif2iso/uif2iso-0.1.7c.recipe index 0803678b7..e5d3d5fc7 100644 --- a/app-cdr/uif2iso/uif2iso-0.1.7c.recipe +++ b/app-cdr/uif2iso/uif2iso-0.1.7c.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="A command-line tool for converting single and multipart UIF images to the ISO format." +DESCRIPTION=" +A command-line tool for converting single and multipart UIF images to the ISO \ +format. +" HOMEPAGE="http://aluigi.org/mytoolz.htm#uif2iso" SRC_URI="http://aluigi.altervista.org/mytoolz/uif2iso.zip" REVISION="1" From e67a238e034a1bcd1319e5d33a3023f856c560a5 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 242/306] Rewrap app-crypt DESCRIPTIONs --- app-crypt/gnupg/gnupg-1.4.11.recipe | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app-crypt/gnupg/gnupg-1.4.11.recipe b/app-crypt/gnupg/gnupg-1.4.11.recipe index 4455dfae3..6eb199520 100644 --- a/app-crypt/gnupg/gnupg-1.4.11.recipe +++ b/app-crypt/gnupg/gnupg-1.4.11.recipe @@ -1,5 +1,12 @@ SUMMARY="GnuPG is the GNU project's free implementation of the OpenPGP standard." -DESCRIPTION="GnuPG is the GNU project's complete and free implementation of the OpenPGP standard as defined by RFC4880 . GnuPG allows to encrypt and sign your data and communication, features a versatile key management system as well as access modules for all kinds of public key directories. GnuPG, also known as GPG, is a command line tool with features for easy integration with other applications." +DESCRIPTION=" +GnuPG is the GNU project's complete and free implementation of the OpenPGP \ +standard as defined by RFC4880 . GnuPG allows to encrypt and sign your data \ +and communication, features a versatile key management system as well as \ +access modules for all kinds of public key directories. GnuPG, also known as \ +GPG, is a command line tool with features for easy integration with other \ +applications. +" HOMEPAGE="http://www.gnupg.org/" SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.11.tar.bz2" CHECKSUM_MD5="411744e1ef8ce90b87938c4203f001f1" From 687bcf06a3cdb8c95d94f174411302f4f9a85ed1 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 243/306] Rewrap app-dicts DESCRIPTIONs --- app-dicts/aspell_en/aspell_en-7.1_0.recipe | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app-dicts/aspell_en/aspell_en-7.1_0.recipe b/app-dicts/aspell_en/aspell_en-7.1_0.recipe index 747225c5a..49eedebe9 100644 --- a/app-dicts/aspell_en/aspell_en-7.1_0.recipe +++ b/app-dicts/aspell_en/aspell_en-7.1_0.recipe @@ -1,5 +1,11 @@ SUMMARY="English dictionary for aspell program/library" -DESCRIPTION="This is the English dictionary for the GNU Aspell program, an open source spell checker. Its advantage is its superiority of suggesting possible replacements for a misspelled wordx than most other spellcheck programs. Aspell is also able to maintain support for more than one langague at a time and can check documents in UTF-8." +DESCRIPTION=" +This is the English dictionary for the GNU Aspell program, an open source \ +spell checker. Its advantage is its superiority of suggesting possible \ +replacements for a misspelled wordx than most other spellcheck programs. \ +Aspell is also able to maintain support for more than one langague at a time \ +and can check documents in UTF-8. +" LICENSE="GNU GPL v2" COPYRIGHT="2000-2011 Kevin Atkinson" HOMEPAGE="http://aspell.net" From aab27f2e1ce0a899564c64930cd9b7e4dca86515 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 244/306] Rewrap app-doc DESCRIPTIONs --- app-doc/doxygen/doxygen-1.6.3.recipe | 25 +++++++++++++++++++------ app-doc/doxygen/doxygen-1.7.4.recipe | 5 ++++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe index b71b257ab..346c41bce 100644 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -1,11 +1,24 @@ SUMMARY="Generate documentation from source code" -DESCRIPTION="Doxygen is the de facto standard tool for generating documentation from annotated C++ sources, but it also supports other popular programming languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D. - +DESCRIPTION=" +Doxygen is the de facto standard tool for generating documentation from \ +annotated C++ sources, but it also supports other popular programming \ +languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba and \ +Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D. Doxygen can help you in three ways: - - 1. It can generate an on-line documentation browser (in HTML) and/or an off-line reference manual (in $\mbox{\LaTeX}$) from a set of documented source files. There is also support for generating output in RTF (MS-Word), PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The documentation is extracted directly from the sources, which makes it much easier to keep the documentation consistent with the source code. - 2. You can configure doxygen to extract the code structure from undocumented source files. This is very useful to quickly find your way in large source distributions. Doxygen can also visualize the relations between the various elements by means of include dependency graphs, inheritance diagrams, and collaboration diagrams, which are all generated automatically. - 3. You can also use doxygen for creating normal documentation (as I did for the doxygen user manual and web-site)." +1. It can generate an on-line documentation browser (in HTML) and/or an \ +off-line reference manual (in $\mbox{\LaTeX}$) from a set of documented source \ +files. There is also support for generating output in RTF (MS-Word), \ +PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The \ +documentation is extracted directly from the sources, which makes it much \ +easier to keep the documentation consistent with the source code. +2. You can configure doxygen to extract the code structure from undocumented \ +source files. This is very useful to quickly find your way in large source \ +distributions. Doxygen can also visualize the relations between the various \ +elements by means of include dependency graphs, inheritance diagrams, and \ +collaboration diagrams, which are all generated automatically. +3. You can also use doxygen for creating normal documentation (as I did for \ +the doxygen user manual and web-site). +" HOMEPAGE="http://www.doxygen.org" COPYRIGHT="1997-2010 Dimitri van Heesch" LICENSE="GNU GPL v2" diff --git a/app-doc/doxygen/doxygen-1.7.4.recipe b/app-doc/doxygen/doxygen-1.7.4.recipe index f1597e8ea..d91ec987f 100644 --- a/app-doc/doxygen/doxygen-1.7.4.recipe +++ b/app-doc/doxygen/doxygen-1.7.4.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D." +DESCRIPTION=" +Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL \ +(Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D. +" HOMEPAGE="http://www.doxygen.org" SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.4.src.tar.gz" CHECKSUM_MD5="ff908759ff7cd9464424b04ae6c68e48" From 7f99504c1c3a875e31e4c14b4f3e0d1954fcdbc8 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 245/306] Rewrap app-editors DESCRIPTIONs --- app-editors/jed/jed-0.99_19.recipe | 4 +++- app-editors/joe/joe-3.8_hg.recipe | 5 ++++- app-editors/qemacs/qemacs-0.4.0dev.recipe | 23 +++++++++++++---------- app-editors/vim/vim-7.4.recipe | 22 ++++++++++------------ app-editors/xemacs/xemacs-21.5_hg.recipe | 4 +++- 5 files changed, 33 insertions(+), 25 deletions(-) diff --git a/app-editors/jed/jed-0.99_19.recipe b/app-editors/jed/jed-0.99_19.recipe index 405e19c38..27e503e7d 100644 --- a/app-editors/jed/jed-0.99_19.recipe +++ b/app-editors/jed/jed-0.99_19.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="JED is a freely available text editor" +DESCRIPTION=" +JED is a freely available text editor +" HOMEPAGE="http://www.jedsoft.org/jed/" SRC_URI="ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-19.tar.bz2" REVISION="1" diff --git a/app-editors/joe/joe-3.8_hg.recipe b/app-editors/joe/joe-3.8_hg.recipe index a1954b5f8..9aaa44fc4 100644 --- a/app-editors/joe/joe-3.8_hg.recipe +++ b/app-editors/joe/joe-3.8_hg.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="JOE is a full featured terminal-based screen editor which is distributed under the GNU General Public License (GPL)." +DESCRIPTION=" +JOE is a full featured terminal-based screen editor which is distributed under \ +the GNU General Public License (GPL). +" HOMEPAGE="http://joe-editor.sourceforge.net/" SRC_URI="hg+http://joe-editor.hg.sourceforge.net:8000/hgroot/joe-editor/joe-editor" REVISION="2" diff --git a/app-editors/qemacs/qemacs-0.4.0dev.recipe b/app-editors/qemacs/qemacs-0.4.0dev.recipe index 1c698813c..1bdbb3697 100644 --- a/app-editors/qemacs/qemacs-0.4.0dev.recipe +++ b/app-editors/qemacs/qemacs-0.4.0dev.recipe @@ -1,14 +1,17 @@ SUMMARY="QEmacs editor" -DESCRIPTION="QEmacs (for Quick Emacs), a very small but powerful UNIX editor. - It has features that even big editors lack : - - Full screen editor with an Emacs look and feel with all Emacs common features. - - Full UTF8 support. - - WYSIWYG HTML/XML/CSS2 mode graphical editing. - - WYSIWYG DocBook. - - C mode: coloring with immediate update. Emacs like auto-indent. - - Shell mode, Hexadecimal editing... - - The provided qemacs-pe2qe script converts your Pe color settings to the Qemacs syntax." +DESCRIPTION=" +QEmacs (for Quick Emacs), a very small but powerful UNIX editor. +It has features that even big editors lack : +- Full screen editor with an Emacs look and feel with all Emacs common features. +- Full UTF8 support. +- WYSIWYG HTML/XML/CSS2 mode graphical editing. +- WYSIWYG DocBook. +- C mode: coloring with immediate update. Emacs like auto-indent. +- Shell mode, Hexadecimal editing... + +The provided qemacs-pe2qe script converts your Pe color settings to the Qemacs \ +syntax. +" HOMEPAGE="http://bellard.org/qemacs/" SRC_URI="cvs://:pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs/qemacs" #CHECKSUM_MD5="" diff --git a/app-editors/vim/vim-7.4.recipe b/app-editors/vim/vim-7.4.recipe index d4aff39d0..914d126d7 100644 --- a/app-editors/vim/vim-7.4.recipe +++ b/app-editors/vim/vim-7.4.recipe @@ -1,17 +1,15 @@ SUMMARY="Vim is highly configurable text editor." DESCRIPTION=" - Vim is a highly configurable text editor built to enable efficient text - editing. It is an improved version of the vi editor distributed with most - UNIX systems. - - Vim is often called a \"programmer's editor,\" and so useful for programming - that many consider it an entire IDE. It's not just for programmers, though. - Vim is perfect for all kinds of text editing, from composing email to editing - configuration files. - - Despite what the above comic suggests, Vim can be configured to work in a very - simple (Notepad-like) way, called evim or Easy Vim. - " +Vim is a highly configurable text editor built to enable efficient text \ +editing. It is an improved version of the vi editor distributed with most UNIX \ +systems. +Vim is often called a \"programmer's editor,\" and so useful for programming \ +that many consider it an entire IDE. It's not just for programmers, though. \ +Vim is perfect for all kinds of text editing, from composing email to editing \ +configuration files. +Despite what the above comic suggests, Vim can be configured to work in a very \ +simple (Notepad-like) way, called evim or Easy Vim. +" HOMEPAGE="http://www.vim.org" SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2" COPYRIGHT="Bram Moleenar et al." diff --git a/app-editors/xemacs/xemacs-21.5_hg.recipe b/app-editors/xemacs/xemacs-21.5_hg.recipe index 5cab78c05..81191cc87 100644 --- a/app-editors/xemacs/xemacs-21.5_hg.recipe +++ b/app-editors/xemacs/xemacs-21.5_hg.recipe @@ -1,5 +1,7 @@ SUMMARY="XEmacs editor" -DESCRIPTION="highly customizable open source text editor and application development system" +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" From bd0b785ee4f1d34b8b12f9b5e7fa851592131da3 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 246/306] Rewrap app-emulation DESCRIPTIONs --- app-emulation/aranym/aranym-0.9.15_git.recipe | 7 +++--- app-emulation/libdsk/libdsk-1.3.3.recipe | 25 +++++++++---------- app-emulation/mednafen/mednafen-0.9.26.recipe | 5 +++- .../oricutron/oricutron-1.1_svn.recipe | 4 ++- app-emulation/qemu/qemu-1.7.0.recipe | 4 ++- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/app-emulation/aranym/aranym-0.9.15_git.recipe b/app-emulation/aranym/aranym-0.9.15_git.recipe index 96c7b5286..8f151ee34 100644 --- a/app-emulation/aranym/aranym-0.9.15_git.recipe +++ b/app-emulation/aranym/aranym-0.9.15_git.recipe @@ -1,7 +1,8 @@ SUMMARY="ARAnyM (Atari Running on Any Machine)" -DESCRIPTION="ARAnyM (Atari Running on Any Machine) - is a multiplatform virtual machine for running - Atari ST/TT/Falcon operating systems and applications." +DESCRIPTION=" +ARAnyM (Atari Running on Any Machine) is a multiplatform virtual machine for \ +running Atari ST/TT/Falcon operating systems and applications. +" HOMEPAGE="http://aranym.org/" SRC_URI="git://git.code.sf.net/p/aranym/code" REVISION="1" diff --git a/app-emulation/libdsk/libdsk-1.3.3.recipe b/app-emulation/libdsk/libdsk-1.3.3.recipe index 1bfc83d9d..8d2b1cf7f 100644 --- a/app-emulation/libdsk/libdsk-1.3.3.recipe +++ b/app-emulation/libdsk/libdsk-1.3.3.recipe @@ -64,16 +64,15 @@ INSTALL() COPYRIGHT="2010 John Elliott" LICENSE="GNU GPL v2" DESCRIPTION=" - LIBDSK is a library for accessing discs and disc image files. It is - intended for use in: - - * Emulator tools - converting between real floppy discs and disc images, as - CPCTRANS / PCWTRANS do under DOS. - * Filesystem utilities - CPMTOOLS is configurable to use LIBDSK, thus - allowing the use of CPMTOOLS on emulator .DSK images. To do this, install - LIBDSK and then build CPMTOOLS, using \"./configure --with-libdsk\". For - CPMTOOLS 1.9 or 2.0, you will also need to apply this patch. - * Emulators - it is possible to use LIBDSK as part of an emulator's floppy - controller emulation, thus giving the emulator transparent access to .DSK - files or real discs. - " +LIBDSK is a library for accessing discs and disc image files. It is intended \ +for use in: +* Emulator tools - converting between real floppy discs and disc images, as \ +CPCTRANS / PCWTRANS do under DOS. +* Filesystem utilities - CPMTOOLS is configurable to use LIBDSK, thus allowing \ +the use of CPMTOOLS on emulator .DSK images. To do this, install LIBDSK and \ +then build CPMTOOLS, using \"./configure --with-libdsk\". For CPMTOOLS 1.9 or \ +2.0, you will also need to apply this patch. +* Emulators - it is possible to use LIBDSK as part of an emulator's floppy \ +controller emulation, thus giving the emulator transparent access to .DSK \ +files or real discs. +" diff --git a/app-emulation/mednafen/mednafen-0.9.26.recipe b/app-emulation/mednafen/mednafen-0.9.26.recipe index 9e33fb29e..cac70887e 100644 --- a/app-emulation/mednafen/mednafen-0.9.26.recipe +++ b/app-emulation/mednafen/mednafen-0.9.26.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="A portable, utilizing OpenGL and SDL, argument(command-line)-driven multi-system emulator" +DESCRIPTION=" +A portable, utilizing OpenGL and SDL, argument(command-line)-driven \ +multi-system emulator +" HOMEPAGE="http://mednafen.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/mednafen/files/Mednafen/0.9.26-WIP/mednafen-0.9.26-wip.tar.bz2/download" CHECKSUM_MD5="cf4eadb057e91c59b181d07bc12245f0" diff --git a/app-emulation/oricutron/oricutron-1.1_svn.recipe b/app-emulation/oricutron/oricutron-1.1_svn.recipe index 15d219af1..69a096b3b 100644 --- a/app-emulation/oricutron/oricutron-1.1_svn.recipe +++ b/app-emulation/oricutron/oricutron-1.1_svn.recipe @@ -1,5 +1,7 @@ SUMMARY="Oricutron is an emulator for the Oric series of computers." -DESCRIPTION="Oricutron is an emulator for the Oric series of computers." +DESCRIPTION=" +Oricutron is an emulator for the Oric series of computers. +" HOMEPAGE="http://code.google.com/p/oriculator/" SRC_URI="svn+http://oriculator.googlecode.com/svn/trunk" REVISION="1" diff --git a/app-emulation/qemu/qemu-1.7.0.recipe b/app-emulation/qemu/qemu-1.7.0.recipe index 76af17379..74725b0af 100644 --- a/app-emulation/qemu/qemu-1.7.0.recipe +++ b/app-emulation/qemu/qemu-1.7.0.recipe @@ -1,5 +1,7 @@ SUMMARY="QEMU is a generic and open source machine emulator and virtualizer." -DESCRIPTION="QEMU is a generic and open source machine emulator and virtualizer." +DESCRIPTION=" +QEMU is a generic and open source machine emulator and virtualizer. +" HOMEPAGE="http://wiki.qemu.org/" SRC_URI="git+https://github.com/mmlr/qemu-haiku.git#e57972be33c91222a580d47c68b135aa8fa7b4c3" COPYRIGHT="2003-2008 Fabrice Bellard" From 10c4cbeb45b087426b2da0125f3e6a6ea8539eb8 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 247/306] Rewrap app-misc DESCRIPTIONs --- app-misc/colordiff/colordiff-1.0.13.recipe | 6 +++--- app-misc/fdupes/fdupes-1.51.recipe | 9 ++++---- app-misc/getopt/getopt-1.1.5.recipe | 24 +++++++++------------- app-misc/srm/srm-1.2.12_cvs.recipe | 4 +++- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/app-misc/colordiff/colordiff-1.0.13.recipe b/app-misc/colordiff/colordiff-1.0.13.recipe index c31aa1735..222d97c9b 100644 --- a/app-misc/colordiff/colordiff-1.0.13.recipe +++ b/app-misc/colordiff/colordiff-1.0.13.recipe @@ -1,8 +1,8 @@ SUMMARY="Colorizes output of diff" DESCRIPTION=" -The Perl script colordiff is a wrapper for 'diff' and produces the -same output but with pretty 'syntax' highlighting. Colour schemes -can be customized." +The Perl script colordiff is a wrapper for 'diff' and produces the same output \ +but with pretty 'syntax' highlighting. Colour schemes can be customized. +" HOMEPAGE="http://colordiff.sourceforge.net/" SRC_URI="http://www.colordiff.org/colordiff-1.0.13.tar.gz" diff --git a/app-misc/fdupes/fdupes-1.51.recipe b/app-misc/fdupes/fdupes-1.51.recipe index c4e84a4b3..ced732e77 100644 --- a/app-misc/fdupes/fdupes-1.51.recipe +++ b/app-misc/fdupes/fdupes-1.51.recipe @@ -1,10 +1,9 @@ SUMMARY="FDUPES is a program for identifying or deleting duplicate files" DESCRIPTION=" -fdupes is a program written by Adrian Lopez to scan directories for -duplicate files, with options to list, delete or replace the files -with hardlinks pointing to the duplicate. It first compares file -sizes and MD5 signatures, and then performs a byte-by-byte check for -verification. +fdupes is a program written by Adrian Lopez to scan directories for duplicate \ +files, with options to list, delete or replace the files with hardlinks \ +pointing to the duplicate. It first compares file sizes and MD5 signatures, \ +and then performs a byte-by-byte check for verification. " HOMEPAGE="http://code.google.com/p/fdupes/" SRC_URI="http://fdupes.googlecode.com/files/fdupes-1.51.tar.gz" diff --git a/app-misc/getopt/getopt-1.1.5.recipe b/app-misc/getopt/getopt-1.1.5.recipe index 920f38b8d..609921ba4 100644 --- a/app-misc/getopt/getopt-1.1.5.recipe +++ b/app-misc/getopt/getopt-1.1.5.recipe @@ -1,19 +1,15 @@ SUMMARY="A program to help shell scripts parse command-line parameters." DESCRIPTION=" -Getopt(1) is a program to help shell scripts parse command-line -parameters. - - *It can do anything that the GNU getopt(3) routines can do. - *It can cope with spaces and shell metacharacters within - arguments. - *It can parse long parameters. - *It can shuffle parameters, so you can mix options and other - parameters on the command-line. - *It can be easily identified as an enhanced getopt(1) from within - shell scripts. - *It can report parse errors as coming from the shell script. - *It compiles cleanly with both libc-5 and glibc-2 (libc6)." - +Getopt(1) is a program to help shell scripts parse command-line parameters. +*It can do anything that the GNU getopt(3) routines can do. +*It can cope with spaces and shell metacharacters within arguments. +*It can parse long parameters. +*It can shuffle parameters, so you can mix options and other parameters on the \ +command-line. +*It can be easily identified as an enhanced getopt(1) from within shell scripts. +*It can report parse errors as coming from the shell script. +*It compiles cleanly with both libc-5 and glibc-2 (libc6). +" HOMEPAGE="http://software.frodo.looijaard.name/getopt/" SRC_URI="http://software.frodo.looijaard.name/getopt/files/getopt-1.1.5.tar.gz" CHECKSUM_MD5="546acfdb67ba16b8658a45ade9a64d5d" diff --git a/app-misc/srm/srm-1.2.12_cvs.recipe b/app-misc/srm/srm-1.2.12_cvs.recipe index 869e84fe8..db1fa7fb1 100644 --- a/app-misc/srm/srm-1.2.12_cvs.recipe +++ b/app-misc/srm/srm-1.2.12_cvs.recipe @@ -1,5 +1,7 @@ SUMMARY="srm - secure file deletion for posix systems" -DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking." +DESCRIPTION=" +A command-line compatible rm which destroys file contents before unlinking. +" HOMEPAGE="http://srm.sourceforge.net/" SRC_URI="cvs://:pserver:anonymous@srm.cvs.sourceforge.net:/cvsroot/srm/srm" REVISION="1" From 7fd3655662baaaa99678a55be4cc87faa2ba87ef Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 248/306] Rewrap app-shells DESCRIPTIONs --- app-shells/fish/fish-1.23.1_git.recipe | 4 +++- app-shells/zsh/zsh-5.0.2.recipe | 8 ++++---- 2 files changed, 7 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 7729c9a4f..b8132ea3d 100644 --- a/app-shells/fish/fish-1.23.1_git.recipe +++ b/app-shells/fish/fish-1.23.1_git.recipe @@ -1,5 +1,7 @@ SUMMARY="The friendly interactive shell" -DESCRIPTION="The friendly interactive shell" +DESCRIPTION=" +The friendly interactive shell +" HOMEPAGE="http://ridiculousfish.com/shell/" SRC_URI="git://git.gitorious.org/fish-shell/fish-shell.git" #CHECKSUM_MD5="" diff --git a/app-shells/zsh/zsh-5.0.2.recipe b/app-shells/zsh/zsh-5.0.2.recipe index b3c0a5f82..16fec8f52 100644 --- a/app-shells/zsh/zsh-5.0.2.recipe +++ b/app-shells/zsh/zsh-5.0.2.recipe @@ -1,9 +1,9 @@ SUMMARY="Zsh is a UNIX command interpreter (shell)" DESCRIPTION=" -Zsh is a shell designed for interactive use, although it is also a -powerful scripting language. Many of the useful features of bash, -ksh, and tcsh were incorporated into zsh; many original features were -added." +Zsh is a shell designed for interactive use, although it is also a powerful \ +scripting language. Many of the useful features of bash, ksh, and tcsh were \ +incorporated into zsh; many original features were added. +" HOMEPAGE="http://www.zsh.org" LICENSE="ZSH" From a404d86ef8380bea4311b0051770886005c4a795 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 249/306] Rewrap app-text DESCRIPTIONs --- app-text/aiksaurus/aiksaurus-1.2.1.recipe | 11 ++++++--- app-text/antiword/antiword-0.37.recipe | 10 ++++---- app-text/asciidoc/asciidoc-8.6.8.recipe | 10 +++++--- app-text/aspell/aspell-0.60.6.1.recipe | 19 +++++++-------- app-text/discount/discount-2.1.3.recipe | 12 +++++----- app-text/dos2unix/dos2unix-1.0.1.recipe | 6 ++++- app-text/gpp/gpp-2.4.recipe | 7 +++++- app-text/help2man/help2man-1.43.3.recipe | 13 +++++++--- app-text/htmldoc/htmldoc-1.8.27.recipe | 6 ++--- app-text/libpaper/libpaper-1.1.24.recipe | 5 +++- app-text/libwpg/libwpg-0.2.1.recipe | 5 +++- app-text/mdocml/mdocml-1.12.2.recipe | 11 +++++---- app-text/rman/rman-3.2.recipe | 6 ++--- app-text/texi2html/texi2html-1.82.recipe | 29 +++++++++++++++++++---- 14 files changed, 100 insertions(+), 50 deletions(-) diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.recipe b/app-text/aiksaurus/aiksaurus-1.2.1.recipe index 8af6c678e..ecbedbe5f 100644 --- a/app-text/aiksaurus/aiksaurus-1.2.1.recipe +++ b/app-text/aiksaurus/aiksaurus-1.2.1.recipe @@ -1,8 +1,13 @@ SUMMARY="A set of libraries and applications for Thesaurus" -DESCRIPTION="Aiksaurus is a set of libraries and applications which provide a thesaurus (currently English only, based on Guttenburg's Moby thesaurus) using native GUI on several platforms: +DESCRIPTION=" +Aiksaurus is a set of libraries and applications which provide a thesaurus \ +(currently English only, based on Guttenburg's Moby thesaurus) using native \ +GUI on several platforms: * UNIX (GTK+ & Qt) -* Win32 & MacOSX (Cocoa). -The core library itself is platform-independent. The principal language is C++, with some use of Cocoa/ObjC++; wrappers are provided for C and Cocoa/ObjC." +* Win32 & MacOSX (Cocoa) +The core library itself is platform-independent. The principal language is \ +C++, with some use of Cocoa/ObjC++; wrappers are provided for C and Cocoa/ObjC. +" HOMEPAGE="http://aiksaurus.sourceforge.net" SRC_URI="http://switch.dl.sourceforge.net/project/aiksaurus/aiksaurus/1.2.1/aiksaurus-1.2.1.tar.gz" diff --git a/app-text/antiword/antiword-0.37.recipe b/app-text/antiword/antiword-0.37.recipe index aa1b51eeb..c9c5e1c65 100644 --- a/app-text/antiword/antiword-0.37.recipe +++ b/app-text/antiword/antiword-0.37.recipe @@ -1,9 +1,9 @@ SUMMARY="Converts MS Word files to text and ps" -DESCRIPTION="Antiword is a free software reader for proprietary Microsoft - Word documents, and is available for most computer platforms. - Antiword can convert the documents from Microsoft Word version - 2, 6, 7, 97, 2000, 2002 and 2003 to plain text, PostScript, PDF, - and XML/DocBook (experimental). +DESCRIPTION=" +Antiword is a free software reader for proprietary Microsoft Word documents, \ +and is available for most computer platforms. Antiword can convert the \ +documents from Microsoft Word version 2, 6, 7, 97, 2000, 2002 and 2003 to \ +plain text, PostScript, PDF, and XML/DocBook (experimental). " HOMEPAGE="http://www.winfield.demon.nl/#Programmer" SRC_URI="http://www.winfield.demon.nl/linux/antiword-0.37.tar.gz" diff --git a/app-text/asciidoc/asciidoc-8.6.8.recipe b/app-text/asciidoc/asciidoc-8.6.8.recipe index cd4e26ef0..6689e24f0 100644 --- a/app-text/asciidoc/asciidoc-8.6.8.recipe +++ b/app-text/asciidoc/asciidoc-8.6.8.recipe @@ -1,8 +1,12 @@ SUMMARY="Highly configurable text format for writing documentation" DESCRIPTION=" - AsciiDoc is a text document format for writing notes, documentation, articles, books, ebooks, slideshows, web pages, man pages and blogs. AsciiDoc files can be translated to many formats including HTML, PDF, EPUB, man page. - - AsciiDoc is highly configurable: both the AsciiDoc source file syntax and the backend output markups (which can be almost any type of SGML/XML markup) can be customized and extended by the user." +AsciiDoc is a text document format for writing notes, documentation, articles, \ +books, ebooks, slideshows, web pages, man pages and blogs. AsciiDoc files can \ +be translated to many formats including HTML, PDF, EPUB, man page. +AsciiDoc is highly configurable: both the AsciiDoc source file syntax and the \ +backend output markups (which can be almost any type of SGML/XML markup) can \ +be customized and extended by the user. +" HOMEPAGE="http://asciidoc.org" LICENSE="GNU GPL v2" COPYRIGHT="2002-2011 Stuart Rackham" diff --git a/app-text/aspell/aspell-0.60.6.1.recipe b/app-text/aspell/aspell-0.60.6.1.recipe index 04f7afdf2..69508c645 100644 --- a/app-text/aspell/aspell-0.60.6.1.recipe +++ b/app-text/aspell/aspell-0.60.6.1.recipe @@ -1,15 +1,14 @@ SUMMARY="aspell - a free and open source spell checker" DESCRIPTION=" -GNU Aspell is a Free and Open Source spell checker designed to -eventually replace Ispell. It can either be used as a library or as -an independent spell checker. Its main feature is that it does a -superior job of suggesting possible replacements for a misspelled word -than just about any other spell checker out there for the English -language. Unlike Ispell, Aspell can also easily check documents in -UTF-8 without having to use a special dictionary. Aspell will also do -its best to respect the current locale setting. Other advantages over -Ispell include support for using multiple dictionaries at once and -intelligently handling personal dictionaries when more than one Aspell +GNU Aspell is a Free and Open Source spell checker designed to eventually \ +replace Ispell. It can either be used as a library or as an independent spell \ +checker. Its main feature is that it does a superior job of suggesting \ +possible replacements for a misspelled word than just about any other spell \ +checker out there for the English language. Unlike Ispell, Aspell can also \ +easily check documents in UTF-8 without having to use a special dictionary. \ +Aspell will also do its best to respect the current locale setting. Other \ +advantages over Ispell include support for using multiple dictionaries at once \ +and intelligently handling personal dictionaries when more than one Aspell \ process is open at once. " LICENSE="GNU LGPL v2" diff --git a/app-text/discount/discount-2.1.3.recipe b/app-text/discount/discount-2.1.3.recipe index 44a76bbae..cb36e9f49 100644 --- a/app-text/discount/discount-2.1.3.recipe +++ b/app-text/discount/discount-2.1.3.recipe @@ -1,11 +1,11 @@ SUMMARY="An implementation of John Gruber's Markdown text to html language written in C" DESCRIPTION=" -Markdown provides a library that gives you formatting functions -suitable for marking down entire documents or lines of text, a -command-line program that you can use to mark down documents -interactively or from a script, and a tiny (3 programs so far) suite -of example programs that show how to fully utilize the markdown -library." +Markdown provides a library that gives you formatting functions suitable for \ +marking down entire documents or lines of text, a command-line program that \ +you can use to mark down documents interactively or from a script, and a tiny \ +(3 programs so far) suite of example programs that show how to fully utilize \ +the markdown library. +" HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/" SRC_URI="http://www.pell.portland.or.us/~orc/Code/discount/discount-2.1.3.tar.bz2" diff --git a/app-text/dos2unix/dos2unix-1.0.1.recipe b/app-text/dos2unix/dos2unix-1.0.1.recipe index d54c2c788..705802d69 100644 --- a/app-text/dos2unix/dos2unix-1.0.1.recipe +++ b/app-text/dos2unix/dos2unix-1.0.1.recipe @@ -1,5 +1,9 @@ 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." +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" diff --git a/app-text/gpp/gpp-2.4.recipe b/app-text/gpp/gpp-2.4.recipe index 0aa221569..04c2d7d13 100644 --- a/app-text/gpp/gpp-2.4.recipe +++ b/app-text/gpp/gpp-2.4.recipe @@ -1,4 +1,9 @@ -DESCRIPTION="GPP is a general-purpose preprocessor with customizable syntax, suitable for a wide range of preprocessing tasks. Its independence from any programming language makes it much more versatile than cpp, while its syntax is lighter and more flexible than that of m4." +DESCRIPTION=" +GPP is a general-purpose preprocessor with customizable syntax, suitable for a \ +wide range of preprocessing tasks. Its independence from any programming \ +language makes it much more versatile than cpp, while its syntax is lighter \ +and more flexible than that of m4. +" HOMEPAGE="http://files.nothingisreal.com/software/gpp/gpp.html" SRC_URI="http://files.nothingisreal.com/software/gpp/gpp-2.24.tar.bz2" REVISION="1" diff --git a/app-text/help2man/help2man-1.43.3.recipe b/app-text/help2man/help2man-1.43.3.recipe index 9ccf6bb17..73b1755b3 100644 --- a/app-text/help2man/help2man-1.43.3.recipe +++ b/app-text/help2man/help2man-1.43.3.recipe @@ -1,7 +1,14 @@ SUMMARY="help2man produces simple manual pages from the ‘--help’ and ‘--version’ output of other commands." -DESCRIPTION="help2man is a tool for automatically generating simple manual pages from program output. -This program is intended to provide an easy way for software authors to include a manual page in their distribution without having to maintain that document. -Given a program which produces reasonably standard ‘--help’ and ‘--version’ outputs, help2man can re-arrange that output into something which resembles a manual page." +DESCRIPTION=" +help2man is a tool for automatically generating simple manual pages from \ +program output. +This program is intended to provide an easy way for software authors to \ +include a manual page in their distribution without having to maintain that \ +document. +Given a program which produces reasonably standard ‘--help’ and ‘--version’ \ +outputs, help2man can re-arrange that output into something which resembles a \ +manual page. +" HOMEPAGE="http://www.gnu.org/software/help2man/" SRC_URI="http://ftpmirror.gnu.org/help2man/help2man-1.43.3.tar.gz" diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe index a8849a6f8..5281111de 100644 --- a/app-text/htmldoc/htmldoc-1.8.27.recipe +++ b/app-text/htmldoc/htmldoc-1.8.27.recipe @@ -1,8 +1,8 @@ SUMMARY="HTML file processor and converter" DESCRIPTION=" - HTMLDOC converts HTML files and web pages into index HTML, Adobe - Postscript or Adobe Portable Document Format files (pdf). - " +HTMLDOC converts HTML files and web pages into index HTML, Adobe Postscript or \ +Adobe Portable Document Format files (pdf). +" HOMEPAGE="http://www.msweet.org/projects.php?Z1" LICENSE="GNU GPL v2" COPYRIGHT="1997-2006 Easy Software Products" diff --git a/app-text/libpaper/libpaper-1.1.24.recipe b/app-text/libpaper/libpaper-1.1.24.recipe index 77b2fe758..ce654f7b0 100644 --- a/app-text/libpaper/libpaper-1.1.24.recipe +++ b/app-text/libpaper/libpaper-1.1.24.recipe @@ -1,5 +1,8 @@ SUMMARY="Library for handling paper characteristics" -DESCRIPTION="The libpaper paper-handling library automates recognition of many different paper types and sizes for programs that need to deal with printed output." +DESCRIPTION=" +The libpaper paper-handling library automates recognition of many different \ +paper types and sizes for programs that need to deal with printed output. +" HOMEPAGE="http://packages.debian.org/unstable/source/libpaper" SRC_URI="http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz" CHECKSUM_MD5="5bc87d494ba470aba54f6d2d51471834" diff --git a/app-text/libwpg/libwpg-0.2.1.recipe b/app-text/libwpg/libwpg-0.2.1.recipe index 7ff6df5ed..372c8b985 100644 --- a/app-text/libwpg/libwpg-0.2.1.recipe +++ b/app-text/libwpg/libwpg-0.2.1.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="Libwpg project is a collection of library and tools to work with graphics in WPG (WordPerfect Graphics) format." +DESCRIPTION=" +Libwpg project is a collection of library and tools to work with graphics in \ +WPG (WordPerfect Graphics) format. +" HOMEPAGE="libwpg.sourceforge.net" SRC_URI="http://sourceforge.net/projects/libwpg/files/libwpg/libwpg-0.2.1/libwpg-0.2.1.tar.gz/download" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." diff --git a/app-text/mdocml/mdocml-1.12.2.recipe b/app-text/mdocml/mdocml-1.12.2.recipe index 46e834274..22bfae2c4 100644 --- a/app-text/mdocml/mdocml-1.12.2.recipe +++ b/app-text/mdocml/mdocml-1.12.2.recipe @@ -1,10 +1,11 @@ SUMMARY="A suite of tools for compiling roff and man pages." DESCRIPTION=" -mdocml is a suite of tools compiling mdoc, the roff macro package of -choice for BSD manual pages, and man, the predominant historical -package for UNIX manuals. The mission of mdocml is to deprecate -groff, the GNU troff implementation, for displaying mdoc pages whilst -providing token support for man." +mdocml is a suite of tools compiling mdoc, the roff macro package of choice \ +for BSD manual pages, and man, the predominant historical package for UNIX \ +manuals. The mission of mdocml is to deprecate groff, the GNU troff \ +implementation, for displaying mdoc pages whilst providing token support for \ +man. +" HOMEPAGE="http://mdocml.bsd.lv/" SRC_URI="http://mdocml.bsd.lv/snapshots/mdocml-1.12.2.tar.gz" diff --git a/app-text/rman/rman-3.2.recipe b/app-text/rman/rman-3.2.recipe index 22fb11fd4..0a67ec7cd 100644 --- a/app-text/rman/rman-3.2.recipe +++ b/app-text/rman/rman-3.2.recipe @@ -1,8 +1,8 @@ SUMMARY="Man page viewer and translator" DESCRIPTION=" - Parse formatted man pages and man page source from most flavors of UNIX. - Convert to HTML, ASCII, TkMan, DocBook, and other formats. - " +Parse formatted man pages and man page source from most flavors of UNIX. \ +Convert to HTML, ASCII, TkMan, DocBook, and other formats. +" HOMEPAGE="http://www.sourceforge.net/project/polyglotman" LICENSE="Artistic" COPYRIGHT="2003 Thomas A. Phelps" diff --git a/app-text/texi2html/texi2html-1.82.recipe b/app-text/texi2html/texi2html-1.82.recipe index 4c2ebd478..4315894cd 100644 --- a/app-text/texi2html/texi2html-1.82.recipe +++ b/app-text/texi2html/texi2html-1.82.recipe @@ -1,9 +1,28 @@ SUMMARY="Perl script that converts Texinfo to HTML" -DESCRIPTION="Texi2HTML is a Perl script which converts Texinfo source files to HTML output, licensed under the GNU General Public License, version 3, or any later version. - -This is an evolving version of the script originally developed by Lionel Cons and later maintained for a time by Olaf Bachmann. It now supports many advanced features, such as internationalization and extremely configurable output formats. Development of Texi2HTML moved to the GNU Texinfo repository in 2010, since it was meant to replace the makeinfo implementation in GNU Texinfo. There was no release of GNU Texinfo with makeinfo based on Texi2HTML, however, because the implementation based on Texi2HTML was abandoned in favor of the current program in GNU Texinfo, which parses the Texinfo input into a tree for processing and supports nearly all the features of Texi2HTML. Latest Texi2HTML sources are thus in the GNU Texinfo repository, although development of Texi2HTML and of the Texi2HTML based makeinfo implementation stopped in 2011. - -There are some differences between Texi2HTML and the GNU Texinfo makeinfo/texi2any implementation, even in the Texi2HTML compatibility mode, they are documented in the GNU Texinfo manual. Nevertheless, the route forward for authors is, in most cases, to alter manuals and build processes as necessary to use the new features of the makeinfo/texi2any implementation of GNU Texinfo. The Texi2HTML maintainers (one of whom is the principal author of the GNU Texinfo implementation) do not intend to make further releases of Texi2HTML. If you have difficulties using the new implementation, you could try to ask on the GNU Texinfo mailing lists." +DESCRIPTION=" +Texi2HTML is a Perl script which converts Texinfo source files to HTML output, \ +licensed under the GNU General Public License, version 3, or any later version. +This is an evolving version of the script originally developed by Lionel Cons \ +and later maintained for a time by Olaf Bachmann. It now supports many \ +advanced features, such as internationalization and extremely configurable \ +output formats. Development of Texi2HTML moved to the GNU Texinfo repository \ +in 2010, since it was meant to replace the makeinfo implementation in GNU \ +Texinfo. There was no release of GNU Texinfo with makeinfo based on Texi2HTML, \ +however, because the implementation based on Texi2HTML was abandoned in favor \ +of the current program in GNU Texinfo, which parses the Texinfo input into a \ +tree for processing and supports nearly all the features of Texi2HTML. Latest \ +Texi2HTML sources are thus in the GNU Texinfo repository, although development \ +of Texi2HTML and of the Texi2HTML based makeinfo implementation stopped in 2011. +There are some differences between Texi2HTML and the GNU Texinfo \ +makeinfo/texi2any implementation, even in the Texi2HTML compatibility mode, \ +they are documented in the GNU Texinfo manual. Nevertheless, the route forward \ +for authors is, in most cases, to alter manuals and build processes as \ +necessary to use the new features of the makeinfo/texi2any implementation of \ +GNU Texinfo. The Texi2HTML maintainers (one of whom is the principal author of \ +the GNU Texinfo implementation) do not intend to make further releases of \ +Texi2HTML. If you have difficulties using the new implementation, you could \ +try to ask on the GNU Texinfo mailing lists. +" HOMEPAGE="http://www.nongnu.org/texi2html/" COPYRIGHT="1999-2005 Patrice Dumas, Derek Price, Adrian Aichner & others." LICENSE="GNU GPL v2" From 0abe3d112f557ef565516371d2cc135bf9044f64 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 250/306] Rewrap dev-db DESCRIPTIONs --- dev-db/db/db-5.3.28.recipe | 5 ++++- dev-db/postgresql/postgresql-9.2.3.recipe | 2 +- dev-db/redis/redis-2.2.11.recipe | 6 +++++- dev-db/redis/redis-2.9.0_git.recipe | 6 +++++- dev-db/sqlite/sqlite-3.8.0.2.recipe | 11 +++++------ 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dev-db/db/db-5.3.28.recipe b/dev-db/db/db-5.3.28.recipe index afa37f969..a503e433f 100644 --- a/dev-db/db/db-5.3.28.recipe +++ b/dev-db/db/db-5.3.28.recipe @@ -1,5 +1,8 @@ SUMMARY="The Oracle Berkeley Database" -DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable databases provides developers with fast, reliable, local persistence with zero administration." +DESCRIPTION=" +The Oracle Berkeley DB family of open source, embeddable databases provides \ +developers with fast, reliable, local persistence with zero administration. +" HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html" SRC_URI="http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz" CHECKSUM_MD5="b99454564d5b4479750567031d66fe24" diff --git a/dev-db/postgresql/postgresql-9.2.3.recipe b/dev-db/postgresql/postgresql-9.2.3.recipe index 61dfce44c..e0e1cc6a0 100644 --- a/dev-db/postgresql/postgresql-9.2.3.recipe +++ b/dev-db/postgresql/postgresql-9.2.3.recipe @@ -1,4 +1,4 @@ -DESCRIPTION="PostgreSQL is a powerful, open source object-relational database system." +DESCRIPTION="A powerful, open source object-relational database system." HOMEPAGE="http://www.postgresql.org/" SRC_URI="http://ftp.postgresql.org/pub/source/v9.2.3/postgresql-9.2.3.tar.bz2" REVISION="1" diff --git a/dev-db/redis/redis-2.2.11.recipe b/dev-db/redis/redis-2.2.11.recipe index fb63186b5..59c6c1caf 100644 --- a/dev-db/redis/redis-2.2.11.recipe +++ b/dev-db/redis/redis-2.2.11.recipe @@ -1,5 +1,9 @@ HOMEPAGE="http://redis.io/" -DESCRIPTION="Redis is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets." +DESCRIPTION=" +Redis is an open source, advanced key-value store. It is often referred to as \ +a data structure server since keys can contain strings, hashes, lists, sets \ +and sorted sets. +" SRC_URI="http://redis.googlecode.com/files/redis-2.2.11.tar.gz" REVISION="1" DEPEND="" diff --git a/dev-db/redis/redis-2.9.0_git.recipe b/dev-db/redis/redis-2.9.0_git.recipe index 66322690b..1a22ad365 100644 --- a/dev-db/redis/redis-2.9.0_git.recipe +++ b/dev-db/redis/redis-2.9.0_git.recipe @@ -1,5 +1,9 @@ HOMEPAGE="http://redis.io/" -DESCRIPTION="Redis is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets." +DESCRIPTION=" +Redis is an open source, advanced key-value store. It is often referred to as \ +a data structure server since keys can contain strings, hashes, lists, sets \ +and sorted sets. +" SRC_URI="git://github.com/antirez/redis.git" REVISION="1" DEPEND="" diff --git a/dev-db/sqlite/sqlite-3.8.0.2.recipe b/dev-db/sqlite/sqlite-3.8.0.2.recipe index 255f1a9c6..ea34006c8 100644 --- a/dev-db/sqlite/sqlite-3.8.0.2.recipe +++ b/dev-db/sqlite/sqlite-3.8.0.2.recipe @@ -1,11 +1,10 @@ SUMMARY="An SQL Database Engine in a C Library" DESCRIPTION=" - SQLite is a software library that implements a self-contained, - serverless, zero-configuration, transactional SQL database engine. - - SQLite is the most widely deployed SQL database engine in the world. - The source code for SQLite is in the public domain. - " +SQLite is a software library that implements a self-contained, serverless, \ +zero-configuration, transactional SQL database engine. +SQLite is the most widely deployed SQL database engine in the world. The \ +source code for SQLite is in the public domain. +" HOMEPAGE="http://www.sqlite.org/" SRC_URI="http://www.sqlite.org/2013/sqlite-autoconf-3080002.tar.gz" CHECKSUM_MD5="6d6cc639a4da04fbbdda7b1a1a01b386" From 859a9fab4f55b5c1a8c89b41aed1acd5c2a9934a Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 251/306] Rewrap dev-games DESCRIPTIONs --- dev-games/ode/ode-0.12.recipe | 8 +++++++- dev-games/physfs/physfs-2.0.3.recipe | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index 6486eb00b..33c473aff 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -1,5 +1,11 @@ -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" +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. +" 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" diff --git a/dev-games/physfs/physfs-2.0.3.recipe b/dev-games/physfs/physfs-2.0.3.recipe index c6908c94e..b733f35f2 100644 --- a/dev-games/physfs/physfs-2.0.3.recipe +++ b/dev-games/physfs/physfs-2.0.3.recipe @@ -1,5 +1,7 @@ SUMMARY="Physfs" -DESCRIPTION="PhysicsFS is a library to provide abstract access to various archives" +DESCRIPTION=" +PhysicsFS is a library to provide abstract access to various archives. +" HOMEPAGE="http://icculus.org/physfs" SRC_URI="http://icculus.org/physfs/downloads/physfs-2.0.3.tar.bz2" CHECKSUM_MD5="c2c727a8a8deb623b521b52d0080f613" From 8010fe6a32df5df95bbdf94eaaa8246720a0bfb8 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 252/306] Rewrap dev-java DESCRIPTIONs --- dev-java/ant_core/ant_core-1.9.2.recipe | 29 ++++++++++++------- .../gnu_classpath/gnu_classpath-0.98.recipe | 5 +++- dev-java/jamvm/jamvm-1.5.4.recipe | 7 +++-- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dev-java/ant_core/ant_core-1.9.2.recipe b/dev-java/ant_core/ant_core-1.9.2.recipe index 02040e7ae..8d72981fe 100644 --- a/dev-java/ant_core/ant_core-1.9.2.recipe +++ b/dev-java/ant_core/ant_core-1.9.2.recipe @@ -1,13 +1,22 @@ -SUMMARY="Java-based build tool similar to 'make' that uses XML configuration files" -DESCRIPTION="Apache Ant is a Java library and command-line tool whose mission is to drive processes described in build files as targets and extension points dependent upon each other. The main known usage of Ant is the build of Java applications. Ant supplies a number of built-in tasks allowing to compile, assemble, test and run Java applications. Ant can also be used effectively to build non Java applications, for instance C or C++ applications. More generally, Ant can be used to pilot any type of process which can be described in terms of targets and tasks. - -Ant is written in Java. Users of Ant can develop their own "antlibs" containing Ant tasks and types, and are offered a large number of ready-made commercial or open-source "antlibs". - -Ant is extremely flexible and does not impose coding conventions or directory layouts to the Java projects which adopt it as a build tool. - -Software development projects looking for a solution combining build tool and dependency management can use Ant in combination with Apache Ivy. - -The Apache Ant project is part of the Apache Software Foundation." +SUMMARY="Java-based build tool similar to 'make'" +DESCRIPTION=" +Apache Ant is a Java library and command-line tool whose mission is to drive \ +processes described in build files as targets and extension points dependent \ +upon each other. The main known usage of Ant is the build of Java \ +applications. Ant supplies a number of built-in tasks allowing to compile, \ +assemble, test and run Java applications. Ant can also be used effectively to \ +build non Java applications, for instance C or C++ applications. More \ +generally, Ant can be used to pilot any type of process which can be described \ +in terms of targets and tasks. +Ant is written in Java. Users of Ant can develop their own "antlibs" \ +containing Ant tasks and types, and are offered a large number of ready-made \ +commercial or open-source "antlibs". +Ant is extremely flexible and does not impose coding conventions or directory \ +layouts to the Java projects which adopt it as a build tool. +Software development projects looking for a solution combining build tool and \ +dependency management can use Ant in combination with Apache Ivy. +The Apache Ant project is part of the Apache Software Foundation. +" HOMEPAGE="http://ant.apache.org/" COPYRIGHT="1999-2013 The Apache Software Foundation" LICENSE="Apache v2" diff --git a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe index 5b7be2324..ed51897d4 100644 --- a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe +++ b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe @@ -1,5 +1,8 @@ SUMMARY="GNU Java class library" -DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language" +DESCRIPTION=" +Free core class libraries for use with virtual machines and compilers for the \ +Java language +" HOMEPAGE="http://www.gnu.org/software/classpath" SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-0.98.tar.gz" REVISION="1" diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe index ba931b270..f229a9749 100644 --- a/dev-java/jamvm/jamvm-1.5.4.recipe +++ b/dev-java/jamvm/jamvm-1.5.4.recipe @@ -1,6 +1,9 @@ SUMMARY="JamVM" -DESCRIPTION="JamVM is a new Java Virtual Machine which conforms to the JVM specification version 2 (blue book). - In comparison to most other VM's (free and commercial) it is extremely small," +DESCRIPTION=" +JamVM is a new Java Virtual Machine which conforms to the JVM specification \ +version 2 (blue book). In comparison to most other VM's (free and commercial) \ +it is extremely small. +" HOMEPAGE="http://jamvm.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/jamvm/files/jamvm/JamVM%201.5.4/jamvm-1.5.4.tar.gz/download" REVISION="1" From 1fa8788a0cd0b6a3f6ad2b0aa52f8038fe34a0ff Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 253/306] Rewrap dev-lang DESCRIPTIONs --- dev-lang/fpc/fpc-2.6.0.recipe | 2 +- dev-lang/lua/lua-5.2.1.recipe | 13 ++++---- dev-lang/nasm/nasm-2.08.01.recipe | 4 ++- dev-lang/ocaml/ocaml-4.00.0.recipe | 24 +++++++------- .../openjdk/openjdk-1.7_2013_11_08.recipe | 6 ++-- dev-lang/perl/perl-5.18.1.recipe | 24 +++++++------- dev-lang/python/python-2.6.8.recipe | 14 +++++--- dev-lang/rebol/rebol-2.101.0.5.75.recipe | 4 ++- dev-lang/ruby/ruby-1.9.1.recipe | 2 +- dev-lang/swig/swig-2.0.11.recipe | 33 +++++++++---------- dev-lang/tcl/tcl-8.5.9.recipe | 15 ++++----- dev-lang/v8/v8-3.16.1.recipe | 14 ++++---- dev-lang/yasm/yasm-1.1.0.recipe | 15 ++++++--- dev-lang/yasm/yasm-1.2.0.recipe | 15 ++++++--- 14 files changed, 100 insertions(+), 85 deletions(-) diff --git a/dev-lang/fpc/fpc-2.6.0.recipe b/dev-lang/fpc/fpc-2.6.0.recipe index 137083d32..a5f26d5d6 100644 --- a/dev-lang/fpc/fpc-2.6.0.recipe +++ b/dev-lang/fpc/fpc-2.6.0.recipe @@ -1,4 +1,4 @@ -DESCRIPTION="Free Pascal Compiler - open source compiler for pascal and object pascal" +DESCRIPTION="An open source compiler for pascal and object pascal" HOMEPAGE="http://www.freepascal.org" SRC_URI="ftp://ftp.freepascal.org/pub/fpc/dist/2.6.0/source/fpc-2.6.0.source.tar.gz http://fpc.planetmirror.com/pub/fpc/dist/2.6.0/source/fpc-2.6.0.source.tar.gz diff --git a/dev-lang/lua/lua-5.2.1.recipe b/dev-lang/lua/lua-5.2.1.recipe index 91bd1e31c..39b5bba43 100644 --- a/dev-lang/lua/lua-5.2.1.recipe +++ b/dev-lang/lua/lua-5.2.1.recipe @@ -51,10 +51,9 @@ INSTALL() LICENSE="MIT" COPYRIGHT="1994-2012, Lua.org, PUC-Rio" DESCRIPTION=" - Lua combines simple procedural syntax with powerful data description - constructs based on associative arrays and extensible semantics. Lua is - dynamically typed, runs by interpreting bytecode for a register-based - virtual machine, and has automatic memory management with incremental - garbage collection, making it ideal for configuration, scripting, and rapid - prototyping. - " +Lua combines simple procedural syntax with powerful data description \ +constructs based on associative arrays and extensible semantics. Lua is \ +dynamically typed, runs by interpreting bytecode for a register-based virtual \ +machine, and has automatic memory management with incremental garbage \ +collection, making it ideal for configuration, scripting, and rapid prototyping. +" diff --git a/dev-lang/nasm/nasm-2.08.01.recipe b/dev-lang/nasm/nasm-2.08.01.recipe index 0c4664f23..4e2a133e1 100644 --- a/dev-lang/nasm/nasm-2.08.01.recipe +++ b/dev-lang/nasm/nasm-2.08.01.recipe @@ -1,5 +1,7 @@ SUMMARY="The Nasm assembler" -DESCRIPTION="The Nasm assembler" +DESCRIPTION=" +The Nasm assembler +" HOMEPAGE="http://www.nasm.us/" SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.08.01/nasm-2.08.01.tar.bz2" CHECKSUM_MD5="1e3ebc1289c2be5963571c0937b7a211" diff --git a/dev-lang/ocaml/ocaml-4.00.0.recipe b/dev-lang/ocaml/ocaml-4.00.0.recipe index 11dc33150..88e5854f7 100644 --- a/dev-lang/ocaml/ocaml-4.00.0.recipe +++ b/dev-lang/ocaml/ocaml-4.00.0.recipe @@ -1,18 +1,16 @@ SUMMARY="Implementation of the Caml language" DESCRIPTION=" -Caml is a general-purpose programming language, designed with program -safety and reliability in mind. It is very expressive, yet easy to -learn and use. Caml supports functional, imperative, and -object-oriented programming styles. It has been developed and -distributed by INRIA, a French research institute in computer science -and applied mathematics, since 1985. - -The OCaml system is the main implementation of the Caml language. It -features a powerful module system and a full-fledged object-oriented -layer. It comes with a native-code compiler that supports numerous -architectures, for high performance; a bytecode compiler, for -increased portability; and an interactive loop, for experimentation -and rapid development." +Caml is a general-purpose programming language, designed with program safety \ +and reliability in mind. It is very expressive, yet easy to learn and use. \ +Caml supports functional, imperative, and object-oriented programming styles. \ +It has been developed and distributed by INRIA, a French research institute in \ +computer science and applied mathematics, since 1985. +The OCaml system is the main implementation of the Caml language. It features \ +a powerful module system and a full-fledged object-oriented layer. It comes \ +with a native-code compiler that supports numerous architectures, for high \ +performance; a bytecode compiler, for increased portability; and an \ +interactive loop, for experimentation and rapid development. +" LICENSE="GNU LGPL v2" COPYRIGHT="1996-2012 Institut National de Recherche en Informatique et en Automatique (INRIA)." HOMEPAGE="http://caml.inria.fr/index.en.html" diff --git a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe index a3c65686b..20d49c3ff 100644 --- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe +++ b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe @@ -1,5 +1,7 @@ -SUMMARY="Open-source implementation of the Java Platform, Standard Edition" -DESCRIPTION="Open-source implementation of the Java Platform, Standard Edition." +SUMMARY="Open-source implementation of the Java Platform, SE" +DESCRIPTION=" +Open-source implementation of the Java Platform, Standard Edition. +" HOMEPAGE="http://openjdk.java.net/" COPYRIGHT="2005, 2006, Oracle and/or its affiliates" LICENSE="GNU GPL v2" diff --git a/dev-lang/perl/perl-5.18.1.recipe b/dev-lang/perl/perl-5.18.1.recipe index a1f39b5df..81efeee0f 100644 --- a/dev-lang/perl/perl-5.18.1.recipe +++ b/dev-lang/perl/perl-5.18.1.recipe @@ -1,19 +1,19 @@ SUMMARY="Larry Wall's Practical Extraction and Report Language" DESCRIPTION=" - Perl was originally developed by Larry Wall in 1987 as a general-purpose - Unix scripting language to make report processing easier. +Perl was originally developed by Larry Wall in 1987 as a general-purpose Unix \ +scripting language to make report processing easier. - Perl borrows features from other programming languages including C, shell - scripting (sh), AWK, and sed. The language provides powerful text - processing facilities without the arbitrary data-length limits of many - contemporary Unix tools, facilitating easy manipulation of text files. +Perl borrows features from other programming languages including C, shell \ +scripting (sh), AWK, and sed. The language provides powerful text processing \ +facilities without the arbitrary data-length limits of many contemporary Unix \ +tools, facilitating easy manipulation of text files. - In addition to CGI, Perl is used for graphics programming, system - administration, network programming, finance, bioinformatics, and other - applications. Perl is nicknamed 'the Swiss Army chainsaw of scripting - languages' because of its flexibility and power, and possibly also - because of its perceived 'ugliness'. - " +In addition to CGI, Perl is used for graphics programming, system \ +administration, network programming, finance, bioinformatics, and other \ +applications. Perl is nicknamed 'the Swiss Army chainsaw of scripting \ +languages' because of its flexibility and power, and possibly also because of \ +its perceived 'ugliness'. +" HOMEPAGE="http://www.perl.org/" COPYRIGHT="1993-2009 Larry Wall and others" LICENSE="GNU GPL v1 diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe index 3ed5318e0..ffa51aedd 100644 --- a/dev-lang/python/python-2.6.8.recipe +++ b/dev-lang/python/python-2.6.8.recipe @@ -1,9 +1,13 @@ SUMMARY="An interpreted, interactive, object-oriented programming language" -DESCRIPTION="Python is a programming language that lets you work more quickly and integrate your systems more effectively. You can learn to use Python and see almost immediate gains in productivity and lower maintenance costs. - -Python runs on Windows, Linux/Unix, Mac OS X, and has been ported to the Java and .NET virtual machines. - -Python is free to use, even for commercial products, because of its OSI-approved open source license." +DESCRIPTION=" +Python is a programming language that lets you work more quickly and integrate \ +your systems more effectively. You can learn to use Python and see almost \ +immediate gains in productivity and lower maintenance costs. +Python runs on Windows, Linux/Unix, Mac OS X, and has been ported to the Java \ +and .NET virtual machines. +Python is free to use, even for commercial products, because of its \ +OSI-approved open source license. +" HOMEPAGE="http://www.python.org" LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" diff --git a/dev-lang/rebol/rebol-2.101.0.5.75.recipe b/dev-lang/rebol/rebol-2.101.0.5.75.recipe index 5c5046485..51f503d36 100644 --- a/dev-lang/rebol/rebol-2.101.0.5.75.recipe +++ b/dev-lang/rebol/rebol-2.101.0.5.75.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Language with lightweight domain-specific sublanguages and micro-formats" +DESCRIPTION=" +Language with lightweight domain-specific sublanguages and micro-formats. +" HOMEPAGE="http://www.rebol.com/" SRC_URI="https://github.com/rebol/r3/archive/master.zip" CHECKSUM_MD5="b6dc765aa910ad7d7e4af649d5e35431" diff --git a/dev-lang/ruby/ruby-1.9.1.recipe b/dev-lang/ruby/ruby-1.9.1.recipe index c2e2be6dd..f1b987d43 100644 --- a/dev-lang/ruby/ruby-1.9.1.recipe +++ b/dev-lang/ruby/ruby-1.9.1.recipe @@ -1,4 +1,4 @@ -SUMMARY="A dynamic programming language focused on simplicity and productivity" +SUMMARY="A programming language focused on simplicity and productivity" DESCRIPTION=" Ruby is a dynamic, reflective, object-oriented, general-purpose programming language. It was designed and developed in the mid-1990s diff --git a/dev-lang/swig/swig-2.0.11.recipe b/dev-lang/swig/swig-2.0.11.recipe index c7a1652eb..b782d7973 100644 --- a/dev-lang/swig/swig-2.0.11.recipe +++ b/dev-lang/swig/swig-2.0.11.recipe @@ -1,22 +1,21 @@ SUMMARY="Simplified Wrapper and Interface Generator" DESCRIPTION=" -SWIG is a software development tool that connects programs written in -C and C++ with a variety of high-level programming languages. SWIG is -used with different types of target languages including common -scripting languages such as Perl, PHP, Python, Tcl and Ruby. The list -of supported languages also includes non-scripting languages such as -C#, Common Lisp (CLISP, Allegro CL, CFFI, UFFI), D, Go language, Java -including Android, Lua, Modula-3, OCAML, Octave and R. Also several -interpreted and compiled Scheme implementations (Guile, -MzScheme/Racket, Chicken) are supported. SWIG is most commonly used to -create high-level interpreted or compiled programming environments, -user interfaces, and as a tool for testing and prototyping C/C++ -software. SWIG is typically used to parse C/C++ interfaces and -generate the 'glue code' required for the above target languages to -call into the C/C++ code. SWIG can also export its parse tree in the -form of XML and Lisp s-expressions. SWIG is free software and the code -that SWIG generates is compatible with both commercial and -non-commercial projects." +SWIG is a software development tool that connects programs written in C and \ +C++ with a variety of high-level programming languages. SWIG is used with \ +different types of target languages including common scripting languages such \ +as Perl, PHP, Python, Tcl and Ruby. The list of supported languages also \ +includes non-scripting languages such as C#, Common Lisp (CLISP, Allegro CL, \ +CFFI, UFFI), D, Go language, Java including Android, Lua, Modula-3, OCAML, \ +Octave and R. Also several interpreted and compiled Scheme implementations \ +(Guile, MzScheme/Racket, Chicken) are supported. SWIG is most commonly used to \ +create high-level interpreted or compiled programming environments, user \ +interfaces, and as a tool for testing and prototyping C/C++ software. SWIG is \ +typically used to parse C/C++ interfaces and generate the 'glue code' required \ +for the above target languages to call into the C/C++ code. SWIG can also \ +export its parse tree in the form of XML and Lisp s-expressions. SWIG is free \ +software and the code that SWIG generates is compatible with both commercial \ +and non-commercial projects. +" LICENSE="SWIG" COPYRIGHT="1995-1998 University of Utah and the Regents of the University of California 1998-2005 University of Chicago diff --git a/dev-lang/tcl/tcl-8.5.9.recipe b/dev-lang/tcl/tcl-8.5.9.recipe index 442503cd5..f9ea1b1ae 100644 --- a/dev-lang/tcl/tcl-8.5.9.recipe +++ b/dev-lang/tcl/tcl-8.5.9.recipe @@ -1,12 +1,11 @@ -SUMMARY="Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language." +SUMMARY="A very powerful but easy to learn dynamic programming language" DESCRIPTION=" -Tcl (Tool Command Language) is a very powerful but easy to learn -dynamic programming language, suitable for a very wide range of uses, -including web and desktop applications, networking, administration, -testing and many more. Open source and business-friendly, Tcl is a -mature yet evolving language that is truly cross platform, easily -deployed and highly extensible." - +Tcl (Tool Command Language) is a very powerful but easy to learn dynamic \ +programming language, suitable for a very wide range of uses, including web \ +and desktop applications, networking, administration, testing and many more. \ +Open source and business-friendly, Tcl is a mature yet evolving language that \ +is truly cross platform, easily deployed and highly extensible. +" HOMEPAGE="http://www.tcl.tk" SRC_URI="http://sourceforge.net/projects/tcl/files/Tcl/8.5.9/tcl8.5.9-src.tar.gz" REVISION="1" diff --git a/dev-lang/v8/v8-3.16.1.recipe b/dev-lang/v8/v8-3.16.1.recipe index a5faef34b..df4858b8a 100644 --- a/dev-lang/v8/v8-3.16.1.recipe +++ b/dev-lang/v8/v8-3.16.1.recipe @@ -1,11 +1,11 @@ -SUMMARY="V8 is Google's open source JavaScript engine." +SUMMARY="Google's open source JavaScript engine." DESCRIPTION=" -V8 is Google's open source JavaScript engine. V8 is written in C++ -and is used in Google Chrome, the open source browser from Google. V8 -implements ECMAScript as specified in ECMA-262, 5th edition, and runs -on Windows (XP or newer), Mac OS X (10.5 or newer), and Linux systems -that use IA-32, x64, or ARM processors. V8 can run standalone, or can -be embedded into any C++ application. +V8 is Google's open source JavaScript engine. V8 is written in C++ and is used \ +in Google Chrome, the open source browser from Google. V8 implements \ +ECMAScript as specified in ECMA-262, 5th edition, and runs on Windows (XP or \ +newer), Mac OS X (10.5 or newer), and Linux systems that use IA-32, x64, or \ +ARM processors. V8 can run standalone, or can be embedded into any C++ \ +application. " LICENSE="BSD (3-clause)" COPYRIGHT="2006-2012 The V8 Project Authors" diff --git a/dev-lang/yasm/yasm-1.1.0.recipe b/dev-lang/yasm/yasm-1.1.0.recipe index 3bd64ea40..8a635213c 100644 --- a/dev-lang/yasm/yasm-1.1.0.recipe +++ b/dev-lang/yasm/yasm-1.1.0.recipe @@ -46,8 +46,13 @@ INSTALL() } -DESCRIPTION="Yasm is a complete rewrite of the NASM assembler under the “new†BSD License (some portions are under other licenses, see COPYING for details). - -Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, RDOFF2, COFF, Win32, and Win64 object formats, and generates source debugging information in STABS, DWARF 2, and CodeView 8 formats. - -Yasm can be easily integrated into Visual Studio 2005/2008 and 2010 for assembly of NASM or GAS syntax code into Win32 or Win64 object files." +DESCRIPTION=" +Yasm is a complete rewrite of the NASM assembler under the “new†BSD License \ +(some portions are under other licenses, see COPYING for details). +Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and \ +GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, \ +RDOFF2, COFF, Win32, and Win64 object formats, and generates source debugging \ +information in STABS, DWARF 2, and CodeView 8 formats. +Yasm can be easily integrated into Visual Studio 2005/2008 and 2010 for \ +assembly of NASM or GAS syntax code into Win32 or Win64 object files. +" diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe index 72376125f..089a1466c 100644 --- a/dev-lang/yasm/yasm-1.2.0.recipe +++ b/dev-lang/yasm/yasm-1.2.0.recipe @@ -51,8 +51,13 @@ INSTALL() } -DESCRIPTION="Yasm is a complete rewrite of the NASM assembler under the “new†BSD License (some portions are under other licenses, see COPYING for details). - -Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, RDOFF2, COFF, Win32, and Win64 object formats, and generates source debugging information in STABS, DWARF 2, and CodeView 8 formats. - -Yasm can be easily integrated into Visual Studio 2005/2008 and 2010 for assembly of NASM or GAS syntax code into Win32 or Win64 object files." +DESCRIPTION=" +Yasm is a complete rewrite of the NASM assembler under the “new†BSD License \ +(some portions are under other licenses, see COPYING for details). +Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and \ +GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, \ +RDOFF2, COFF, Win32, and Win64 object formats, and generates source debugging \ +information in STABS, DWARF 2, and CodeView 8 formats. +Yasm can be easily integrated into Visual Studio 2005/2008 and 2010 for \ +assembly of NASM or GAS syntax code into Win32 or Win64 object files. +" From 29263bda29ec8b1444af19054a2b211f1468d35e Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 254/306] Rewrap dev-libs DESCRIPTIONs --- dev-libs/apr/apr-1.4.6.recipe | 46 +++-- dev-libs/apr_util/apr_util-1.4.1.recipe | 46 +++-- dev-libs/boehm_gc/boehm_gc-7.2d.recipe | 13 +- dev-libs/boost/boost-1.55.0.recipe | 13 +- dev-libs/chmlib/chmlib-0.40.recipe | 4 +- dev-libs/cyassl/cyassl-2.8.0.recipe | 4 +- dev-libs/expat/expat-2.0.1.recipe | 6 +- dev-libs/fribidi/fribidi-0.19.5.recipe | 9 +- dev-libs/glib/glib-1.2.10.recipe | 8 +- dev-libs/glib/glib2-2.38.1.recipe | 8 +- dev-libs/gmp/gmp-5.1.1.recipe | 4 +- dev-libs/gnulib/gnulib-2013_12_17.recipe | 16 +- dev-libs/icu/icu-4.8.1.1.recipe | 56 ++++-- dev-libs/jansson/jansson-2.5.recipe | 10 +- dev-libs/libcss/libcss-0.2.0_git.recipe | 6 +- dev-libs/libdwarf/libdwarf-20120410.recipe | 5 +- .../libedit/libedit-2012_06_01_3.0.recipe | 7 +- dev-libs/libevent/libevent-2.0.21.recipe | 13 +- dev-libs/libffi/libffi-3.0.13.recipe | 6 +- dev-libs/libgcrypt/libgcrypt-1.5.3.recipe | 4 +- .../libgpg_error/libgpg_error-1.12.recipe | 6 +- dev-libs/libiconv/libiconv-1.13.1.recipe | 186 ++++++++---------- dev-libs/libidn/libidn-1.9.recipe | 8 +- dev-libs/liboil/liboil-0.3.17.recipe | 6 +- .../libparserutils-0.1.2_git.recipe | 6 +- dev-libs/libpcre/libpcre-8.33.recipe | 14 +- .../libpthread_stubs-0.3.recipe | 4 +- dev-libs/libsigsegv/libsigsegv-2.8.recipe | 4 +- .../libsolv-0.3.0_haiku_2013_10_01.recipe | 6 +- .../libunistring/libunistring-0.9.1.1.recipe | 5 +- .../libwapcaplet-0.2.0_git.recipe | 4 +- dev-libs/libxslt/libxslt-1.1.28.recipe | 19 +- dev-libs/libzip/libzip-0.11.2.recipe | 4 +- dev-libs/openssl/openssl-1.0.0d.recipe | 27 ++- dev-libs/openssl/openssl-1.0.0j.recipe | 27 ++- dev-libs/openssl/openssl-1.0.1e.recipe | 27 ++- dev-libs/serd/serd-0.18.0.recipe | 5 +- dev-libs/tinyxml/tinyxml-2.6.2.recipe | 5 +- dev-libs/tinyxml2/tinyxml2-2.recipe | 8 +- dev-libs/uriparser/uriparser-0.7.9.recipe | 8 +- dev-libs/xerces_c/xerces_c-3.1.1.recipe | 4 +- dev-libs/zziplib/zziplib-0.13.59.recipe | 5 +- 42 files changed, 372 insertions(+), 300 deletions(-) diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe index 12ff0d6bd..94b9e9d8c 100644 --- a/dev-libs/apr/apr-1.4.6.recipe +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -73,30 +73,28 @@ TEST() # ----- description ---------------------------------------------------------- DESCRIPTION=" - The mission of the Apache Portable Runtime (APR) project is to create - and maintain software libraries that provide a predictable and consistent - interface to underlying platform-specific implementations. The primary - goal is to provide an API to which software developers may code and be - assured of predictable if not identical behaviour regardless of the - platform on which their software is built, relieving them of the need to - code special-case conditions to work around or take advantage of - platform-specific deficiencies or features. - - To give a brief overview, the primary core subsystems of APR 1.x include - the following: - - - atomic operations - - dynamic Shared Object loading - - file I/O - - locks (mutexes, condition variables, etc) - - memory management (high performance allocators) - - memory-mapped files - - multicast Sockets - - network I/O - - shared memory - - thread and Process management - - various data structures (tables, hashes, priority queues, etc) - " +The mission of the Apache Portable Runtime (APR) project is to create and \ +maintain software libraries that provide a predictable and consistent \ +interface to underlying platform-specific implementations. The primary goal is \ +to provide an API to which software developers may code and be assured of \ +predictable if not identical behaviour regardless of the platform on which \ +their software is built, relieving them of the need to code special-case \ +conditions to work around or take advantage of platform-specific deficiencies \ +or features. +To give a brief overview, the primary core subsystems of APR 1.x include the \ +following: +- atomic operations +- dynamic Shared Object loading +- file I/O +- locks (mutexes, condition variables, etc) +- memory management (high performance allocators) +- memory-mapped files +- multicast Sockets +- network I/O +- shared memory +- thread and Process management +- various data structures (tables, hashes, priority queues, etc) +" # ----- devel package ------------------------------------------------------- diff --git a/dev-libs/apr_util/apr_util-1.4.1.recipe b/dev-libs/apr_util/apr_util-1.4.1.recipe index 0696004a9..ed1b5b8dc 100644 --- a/dev-libs/apr_util/apr_util-1.4.1.recipe +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -93,30 +93,28 @@ INSTALL() } DESCRIPTION=" - The mission of the Apache Portable Runtime (APR) project is to create - and maintain software libraries that provide a predictable and consistent - interface to underlying platform-specific implementations. The primary - goal is to provide an API to which software developers may code and be - assured of predictable if not identical behaviour regardless of the - platform on which their software is built, relieving them of the need to - code special-case conditions to work around or take advantage of - platform-specific deficiencies or features. - - To give a brief overview, the primary core subsystems of APR 1.x include - the following: - - - atomic operations - - dynamic Shared Object loading - - file I/O - - locks (mutexes, condition variables, etc) - - memory management (high performance allocators) - - memory-mapped files - - multicast Sockets - - network I/O - - shared memory - - thread and Process management - - various data structures (tables, hashes, priority queues, etc) - " +The mission of the Apache Portable Runtime (APR) project is to create and \ +maintain software libraries that provide a predictable and consistent \ +interface to underlying platform-specific implementations. The primary goal is \ +to provide an API to which software developers may code and be assured of \ +predictable if not identical behaviour regardless of the platform on which \ +their software is built, relieving them of the need to code special-case \ +conditions to work around or take advantage of platform-specific deficiencies \ +or features. +To give a brief overview, the primary core subsystems of APR 1.x include the \ +following: +- atomic operations +- dynamic Shared Object loading +- file I/O +- locks (mutexes, condition variables, etc) +- memory management (high performance allocators) +- memory-mapped files +- multicast Sockets +- network I/O +- shared memory +- thread and Process management +- various data structures (tables, hashes, priority queues, etc) +" # ----- devel package ------------------------------------------------------- diff --git a/dev-libs/boehm_gc/boehm_gc-7.2d.recipe b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe index ee03cfeca..06ea40d36 100644 --- a/dev-libs/boehm_gc/boehm_gc-7.2d.recipe +++ b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe @@ -1,12 +1,11 @@ SUMMARY="The Boehm-Demers-Weiser conservative garbage collector" DESCRIPTION=" -The Boehm-Demers-Weiser conservative garbage collector can be used as -a garbage collecting replacement for C malloc or C++ new. It allows -you to allocate memory basically as you normally would, without -explicitly deallocating memory that is no longer useful. The collector -automatically recycles memory when it determines that it can no longer -be otherwise accessed." - +The Boehm-Demers-Weiser conservative garbage collector can be used as a \ +garbage collecting replacement for C malloc or C++ new. It allows you to \ +allocate memory basically as you normally would, without explicitly \ +deallocating memory that is no longer useful. The collector automatically \ +recycles memory when it determines that it can no longer be otherwise accessed. +" HOMEPAGE="http://www.hpl.hp.com/personal/Hans_Boehm/gc/" SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2d.tar.gz" REVISION="2" diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 9ea43b1ff..9afde98a2 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -1,11 +1,10 @@ +SUMMARY="A set of libraries for the C++ programming language" 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." +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. +" HOMEPAGE="http://www.boost.org/" SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2" CHECKSUM_MD5="d6eef4b4cacb2183f2bf265a5a03a354" diff --git a/dev-libs/chmlib/chmlib-0.40.recipe b/dev-libs/chmlib/chmlib-0.40.recipe index 9182b515e..7b968a6df 100644 --- a/dev-libs/chmlib/chmlib-0.40.recipe +++ b/dev-libs/chmlib/chmlib-0.40.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="CHMLIB is a library for dealing with Microsoft ITSS/CHM format files." +DESCRIPTION=" +CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. +" HOMEPAGE="http://www.jedrea.com/chmlib/" SRC_URI="http://www.jedrea.com/chmlib/chmlib-0.40.zip" CHECKSUM_MD5="a20d86103b8ab369e5b93506d5ffa802" diff --git a/dev-libs/cyassl/cyassl-2.8.0.recipe b/dev-libs/cyassl/cyassl-2.8.0.recipe index d192dea27..5c64dbde6 100644 --- a/dev-libs/cyassl/cyassl-2.8.0.recipe +++ b/dev-libs/cyassl/cyassl-2.8.0.recipe @@ -1,5 +1,7 @@ SUMMARY="CyaSSL embedded SSL implementation" -DESCRIPTION="lightweight yet fully functional embedded SSL implementation" +DESCRIPTION=" +A lightweight yet fully functional embedded SSL implementation. +" HOMEPAGE="http://yassl.com" SRC_URI="http://yassl.com/cyassl-2.8.0.zip" REVISION="1" diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe index 551d50b5b..5d03a77c1 100644 --- a/dev-libs/expat/expat-2.0.1.recipe +++ b/dev-libs/expat/expat-2.0.1.recipe @@ -1,5 +1,9 @@ SUMMARY="XML parser toolkit" -DESCRIPTION="Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags)." +DESCRIPTION=" +Expat is an XML parser library written in C. It is a stream-oriented parser in \ +which an application registers handlers for things the parser might find in \ +the XML document (like start tags). +" HOMEPAGE="http://expat.sourceforge.net/" COPYRIGHT=" 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper diff --git a/dev-libs/fribidi/fribidi-0.19.5.recipe b/dev-libs/fribidi/fribidi-0.19.5.recipe index 350489585..178af3c17 100644 --- a/dev-libs/fribidi/fribidi-0.19.5.recipe +++ b/dev-libs/fribidi/fribidi-0.19.5.recipe @@ -1,5 +1,12 @@ SUMMARY="A free implementation of the unicode bidirectional algorithm" -DESCRIPTION="This is GNU FriBidi. The Free Implementation of the Unicode Bidirectional Algorithm. One of the missing links stopping the penetration of free software in Middle East is the lack of support for the Arabic and Hebrew alphabets. In order to have proper Arabic and Hebrew support, the BiDi algorithm should have been implemented. It is our hope that this library will stimulate more free software in the Middle Eastern countries." +DESCRIPTION=" +This is GNU FriBidi. The Free Implementation of the Unicode Bidirectional \ +Algorithm. One of the missing links stopping the penetration of free software \ +in Middle East is the lack of support for the Arabic and Hebrew alphabets. In \ +order to have proper Arabic and Hebrew support, the BiDi algorithm should have \ +been implemented. It is our hope that this library will stimulate more free \ +software in the Middle Eastern countries. +" HOMEPAGE="http://fribidi.org/" SRC_URI="http://fribidi.org/download/fribidi-0.19.5.tar.bz2" CHECKSUM_MD5="925bafb97afee8a2fc2d0470c072a155" diff --git a/dev-libs/glib/glib-1.2.10.recipe b/dev-libs/glib/glib-1.2.10.recipe index 69b10dc11..7e0a5fdaa 100644 --- a/dev-libs/glib/glib-1.2.10.recipe +++ b/dev-libs/glib/glib-1.2.10.recipe @@ -6,10 +6,10 @@ platform, thus creating GLib as a separate product. GLib was released as a \ separate library so other developers, those who did not make use of the \ GUI-related portions of GTK+, could make use of the non-GUI portions of the \ library without the overhead of depending on the entire GUI library. - -Since GLib is a cross-platform library, applications using it to interface with \ -the operating system are usually portable across different operating systems \ -without major changes" +Since GLib is a cross-platform library, applications using it to interface \ +with the operating system are usually portable across different operating \ +systems without major changes +" HOMEPAGE="http://www.gtk.org/" SRC_URI="http://ftp.gnome.org/pub/gnome/sources/glib/1.2/glib-1.2.10.tar.gz" CHECKSUM_MD5="6fe30dad87c77b91b632def29dd69ef9" diff --git a/dev-libs/glib/glib2-2.38.1.recipe b/dev-libs/glib/glib2-2.38.1.recipe index c870f6ca7..3e9165a2e 100644 --- a/dev-libs/glib/glib2-2.38.1.recipe +++ b/dev-libs/glib/glib2-2.38.1.recipe @@ -6,10 +6,10 @@ platform, thus creating GLib as a separate product. GLib was released as a \ separate library so other developers, those who did not make use of the \ GUI-related portions of GTK+, could make use of the non-GUI portions of the \ library without the overhead of depending on the entire GUI library. - -Since GLib is a cross-platform library, applications using it to interface with \ -the operating system are usually portable across different operating systems \ -without major changes" +Since GLib is a cross-platform library, applications using it to interface \ +with the operating system are usually portable across different operating \ +systems without major changes +" HOMEPAGE="http://www.gtk.org/" SRC_URI="http://ftp.gnome.org/pub/gnome/sources/glib/2.38/glib-2.38.1.tar.xz" CHECKSUM_MD5="f3f6789151c1810f2fe23fe9ebb8b828" diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe index ae82b8f71..8285d0eaa 100644 --- a/dev-libs/gmp/gmp-5.1.1.recipe +++ b/dev-libs/gmp/gmp-5.1.1.recipe @@ -1,5 +1,7 @@ SUMMARY="GMP - GNU Multiple Precision Arithmetic Library" -DESCRIPTION="GMP - GNU Multiple Precision Arithmetic Library" +DESCRIPTION=" +GMP - GNU Multiple Precision Arithmetic Library +" HOMEPAGE="http://gmplib.org/" SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.1.1/gmp-5.1.1.tar.xz" CHECKSUM_MD5="485b1296e6287fa381e6015b19767989" diff --git a/dev-libs/gnulib/gnulib-2013_12_17.recipe b/dev-libs/gnulib/gnulib-2013_12_17.recipe index a60138d83..272604b39 100644 --- a/dev-libs/gnulib/gnulib-2013_12_17.recipe +++ b/dev-libs/gnulib/gnulib-2013_12_17.recipe @@ -1,8 +1,14 @@ -DESCRIPTION="Gnulib is a source code library that provides basic functionality to programs and libraries. -Many software packages make use of Gnulib to avoid reinventing the portability wheel. -Gnulib is intended to be the canonical source for most of the important “portability†and/or common files for software projects. -These are files intended to be shared at the source level; Gnulib is not a typical library meant to be installed and linked against. Thus, unlike most projects, Gnulib does not normally generate a source tarball distribution; instead, developers grab modules directly from the source repository." -SUMMARY="Gnulib is a library of common routines intended to be shared at the source level" +SUMMARY="A library of common routines to be shared at the source level" +DESCRIPTION="Gnulib is a source code library that provides basic functionality \ +to programs and libraries. Many software packages make use of Gnulib to avoid \ +reinventing the portability wheel. +Gnulib is intended to be the canonical source for most of the important \ +“portability†and/or common files for software projects. +These are files intended to be shared at the source level; Gnulib is not a \ +typical library meant to be installed and linked against. Thus, unlike most \ +projects, Gnulib does not normally generate a source tarball distribution; \ +instead, developers grab modules directly from the source repository. +" HOMEPAGE="http://www.gnu.org/software/gnulib" SRC_URI="git+git://git.savannah.gnu.org/gnulib.git" REVISION="1" diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe index e70217151..440f6c6ad 100644 --- a/dev-libs/icu/icu-4.8.1.1.recipe +++ b/dev-libs/icu/icu-4.8.1.1.recipe @@ -85,27 +85,43 @@ TEST() make check } -DESCRIPTION="ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Java software. - -ICU is released under a nonrestrictive open source license that is suitable for use with both commercial software and with other open source or free software. - +DESCRIPTION=" +ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode \ +and Globalization support for software applications. ICU is widely portable \ +and gives applications the same results on all platforms and between C/C++ and \ +Java software. +ICU is released under a nonrestrictive open source license that is suitable \ +for use with both commercial software and with other open source or free \ +software. Here are a few highlights of the services provided by ICU: - - * Code Page Conversion: Convert text data to or from Unicode and nearly any other character set or encoding. ICU's conversion tables are based on charset data collected by IBM over the course of many decades, and is the most complete available anywhere. - - * Collation: Compare strings according to the conventions and standards of a particular language, region or country. ICU's collation is based on the Unicode Collation Algorithm plus locale-specific comparison rules from the Common Locale Data Repository, a comprehensive source for this type of data. - - * Formatting: Format numbers, dates, times and currency amounts according the conventions of a chosen locale. This includes translating month and day names into the selected language, choosing appropriate abbreviations, ordering fields correctly, etc. This data also comes from the Common Locale Data Repository. - - * Time Calculations: Multiple types of calendars are provided beyond the traditional Gregorian calendar. A thorough set of timezone calculation APIs are provided. - - * Unicode Support: ICU closely tracks the Unicode standard, providing easy access to all of the many Unicode character properties, Unicode Normalization, Case Folding and other fundamental operations as specified by the Unicode Standard. - - * Regular Expression: ICU's regular expressions fully support Unicode while providing very competitive performance. - - * Bidi: support for handling text containing a mixture of left to right (English) and right to left (Arabic or Hebrew) data. - - * Text Boundaries: Locate the positions of words, sentences, paragraphs within a range of text, or identify locations that would be suitable for line wrapping when displaying the text." +* Code Page Conversion: Convert text data to or from Unicode and nearly any \ +other character set or encoding. ICU's conversion tables are based on charset \ +data collected by IBM over the course of many decades, and is the most \ +complete available anywhere. +* Collation: Compare strings according to the conventions and standards of a \ +particular language, region or country. ICU's collation is based on the \ +Unicode Collation Algorithm plus locale-specific comparison rules from the \ +Common Locale Data Repository, a comprehensive source for this type of data. +* Formatting: Format numbers, dates, times and currency amounts according the \ +conventions of a chosen locale. This includes translating month and day names \ +into the selected language, choosing appropriate abbreviations, ordering \ +fields correctly, etc. This data also comes from the Common Locale Data \ +Repository. +* Time Calculations: Multiple types of calendars are provided beyond the \ +traditional Gregorian calendar. A thorough set of timezone calculation APIs \ +are provided. +* Unicode Support: ICU closely tracks the Unicode standard, providing easy \ +access to all of the many Unicode character properties, Unicode Normalization, \ +Case Folding and other fundamental operations as specified by the Unicode \ +Standard. +* Regular Expression: ICU's regular expressions fully support Unicode while \ +providing very competitive performance. +* Bidi: support for handling text containing a mixture of left to right \ +(English) and right to left (Arabic or Hebrew) data. +* Text Boundaries: Locate the positions of words, sentences, paragraphs within \ +a range of text, or identify locations that would be suitable for line \ +wrapping when displaying the text. +" # ----- devel package ------------------------------------------------------- diff --git a/dev-libs/jansson/jansson-2.5.recipe b/dev-libs/jansson/jansson-2.5.recipe index 731f33cf2..2bba5cfb2 100644 --- a/dev-libs/jansson/jansson-2.5.recipe +++ b/dev-libs/jansson/jansson-2.5.recipe @@ -1,6 +1,10 @@ -SUMMARY="Jansson is a C library for encoding, decoding and manipulating JSON data." -DESCRIPTION="Jansson is a C library for encoding, decoding and manipulating JSON data. -It features a simple and intuitive API and data model, comprehensive documentation, no dependencies on other libraries, full unicode support (UTF-8) and an extensive test suite." +SUMMARY="A C library for encoding, decoding and manipulating JSON data" +DESCRIPTION=" +Jansson is a C library for encoding, decoding and manipulating JSON data. It \ +features a simple and intuitive API and data model, comprehensive \ +documentation, no dependencies on other libraries, full unicode support \ +(UTF-8) and an extensive test suite. +" HOMEPAGE="http://www.digip.org/jansson/" SRC_URI="http://www.digip.org/jansson/releases/jansson-2.5.tar.gz" CHECKSUM_MD5="46ac93bec48aacf207b67b51c8fbf7f1" diff --git a/dev-libs/libcss/libcss-0.2.0_git.recipe b/dev-libs/libcss/libcss-0.2.0_git.recipe index 95c448e3b..649095dae 100644 --- a/dev-libs/libcss/libcss-0.2.0_git.recipe +++ b/dev-libs/libcss/libcss-0.2.0_git.recipe @@ -1,6 +1,8 @@ #TODO:split out _devel -SUMMARY="LibCSS is a CSS parser and selection engine" -DESCRIPTION="LibCSS is a CSS (Cascading Style Sheet) parser and selection engine" +SUMMARY="A CSS parser and selection engine" +DESCRIPTION=" +LibCSS is a CSS (Cascading Style Sheet) parser and selection engine. +" HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" SRC_URI="git://git.netsurf-browser.org/libcss.git" REVISION="1" diff --git a/dev-libs/libdwarf/libdwarf-20120410.recipe b/dev-libs/libdwarf/libdwarf-20120410.recipe index 01c895b41..695e0ef71 100644 --- a/dev-libs/libdwarf/libdwarf-20120410.recipe +++ b/dev-libs/libdwarf/libdwarf-20120410.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="libdwarf and dwarfdump - library and utility for working with DWARF Debugging Information Format" +DESCRIPTION=" +libdwarf and dwarfdump - library and utility for working with DWARF Debugging \ +Information Format. +" HOMEPAGE="http://reality.sgiweb.org/davea/dwarf.html" SRC_URI="http://reality.sgiweb.org/davea/libdwarf-20120410.tar.gz" CHECKSUM_MD5="77c8b351f11738bc9fa50474a69d5b36" diff --git a/dev-libs/libedit/libedit-2012_06_01_3.0.recipe b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe index a7ebed3d6..cc9a3966f 100644 --- a/dev-libs/libedit/libedit-2012_06_01_3.0.recipe +++ b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe @@ -1,5 +1,10 @@ SUMMARY="A BSD licensed replacement for the GNU readline library" -DESCRIPTION="This is an autotool- and libtoolized port of the NetBSD Editline library (libedit). This Berkeley-style licensed command line editor library provides generic line editing, history, and tokenization functions, similar to those found in GNU Readline." +DESCRIPTION=" +This is an autotool- and libtoolized port of the NetBSD Editline library \ +(libedit). This Berkeley-style licensed command line editor library provides \ +generic line editing, history, and tokenization functions, similar to those \ +found in GNU Readline. +" LICENSE="BSD (3-clause)" COPYRIGHT="1992-2012 The NetBSD Foundation, Inc." HOMEPAGE="http://www.thrysoee.dk/editline/" diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index e8ffed740..1694fbb76 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -1,6 +1,13 @@ -SUMMARY="Libevent - an event notification library" -DESCRIPTION="The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached. Furthermore, libevent also support callbacks due to signals or regular timeouts. -libevent is meant to replace the event loop found in event driven network servers. An application just needs to call event_dispatch() and then add or remove events dynamically without having to change the event loop." +SUMMARY="An event notification library" +DESCRIPTION=" +The libevent API provides a mechanism to execute a callback function when a \ +specific event occurs on a file descriptor or after a timeout has been \ +reached. Furthermore, libevent also support callbacks due to signals or \ +regular timeouts. +libevent is meant to replace the event loop found in event driven network \ +servers. An application just needs to call event_dispatch() and then add or \ +remove events dynamically without having to change the event loop. +" HOMEPAGE="http://www.libevent.org/" SRC_URI="https://github.com/downloads/libevent/libevent/libevent-2.0.21-stable.tar.gz" CHECKSUM_MD5="b2405cc9ebf264aa47ff615d9de527a2" diff --git a/dev-libs/libffi/libffi-3.0.13.recipe b/dev-libs/libffi/libffi-3.0.13.recipe index 015369f14..5095715a4 100644 --- a/dev-libs/libffi/libffi-3.0.13.recipe +++ b/dev-libs/libffi/libffi-3.0.13.recipe @@ -1,5 +1,7 @@ -SUMMARY="a portable, high level programming interface to various calling conventions." -DESCRIPTION="a portable, high level programming interface to various calling conventions." +SUMMARY="A portable, high level programming interface." +DESCRIPTION=" +A portable, high level programming interface to various calling conventions. +" HOMEPAGE="http://sourceware.org/libffi" SRC_URI="ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz" CHECKSUM_MD5="45f3b6dbc9ee7c7dfbbbc5feba571529" diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe b/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe index b779e6e05..dafd810d8 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe +++ b/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe @@ -1,5 +1,7 @@ -SUMMARY="Libgcrypt is GNU's basic cryptographic library" DESCRIPTION="libgcrypt" +SUMMARY=" +Libgcrypt is GNU's basic cryptographic library. +" LICENSE="GNU LGPL v3" COPYRIGHT="2000-2013 Free Software Foundation, Inc." HOMEPAGE="http://directory.fsf.org/project/libgcrypt/" diff --git a/dev-libs/libgpg_error/libgpg_error-1.12.recipe b/dev-libs/libgpg_error/libgpg_error-1.12.recipe index c0b17de5c..c36798658 100644 --- a/dev-libs/libgpg_error/libgpg_error-1.12.recipe +++ b/dev-libs/libgpg_error/libgpg_error-1.12.recipe @@ -1,8 +1,8 @@ SUMMARY="A library that defines common error values" DESCRIPTION=" -This is a library that defines common error values for all GnuPG -components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, -Libksba, DirMngr, Pinentry, SmartCard Daemon and more. +This is a library that defines common error values for all GnuPG components. \ +Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, Libksba, DirMngr, \ +Pinentry, SmartCard Daemon and more. " LICENSE="GNU LGPL v2.1" COPYRIGHT="2003-2013 g10 Code GmbH" diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe index 1a1caf534..2693709d4 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.recipe +++ b/dev-libs/libiconv/libiconv-1.13.1.recipe @@ -94,105 +94,93 @@ TEST() } DESCRIPTION=" - For historical reasons, international text is often encoded using a - language or country dependent character encoding. With the advent of the - internet and the frequent exchange of text across countries - even the - viewing of a web page from a foreign country is a \"text exchange\" in this - context -, conversions between these encodings have become important. - They have also become a problem, because many characters which are present - in one encoding are absent in many other encodings. To solve this mess, - the Unicode encoding has been created. It is a super-encoding of all - others and is therefore the default encoding for new text formats like XML. - - Still, many computers still operate in locale with a traditional (limited) - character encoding. Some programs, like mailers and web browsers, must be - able to convert between a given text encoding and the user's encoding. - Other programs internally store strings in Unicode, to facilitate internal - processing, and need to convert between internal string representation - (Unicode) and external string representation (a traditional encoding) when - they are doing I/O. GNU libiconv is a conversion library for both kinds - of applications. - - This library provides an iconv() implementation, for use on systems which - don't have one, or whose implementation cannot convert from/to Unicode. - - It provides support for the encodings: - - European languages - ASCII, ISO-8859-{1,2,3,4,5,7,9,10,13,14,15,16}, KOI8-R, KOI8-U, - KOI8-RU, CP{1250,1251,1252,1253,1254,1257}, CP{850,866,1131}, - Mac{Roman,CentralEurope,Iceland,Croatian,Romania}, - Mac{Cyrillic,Ukraine,Greek,Turkish}, Macintosh - Semitic languages - ISO-8859-{6,8}, CP{1255,1256}, CP862, Mac{Hebrew,Arabic} - Japanese - EUC-JP, SHIFT_JIS, CP932, ISO-2022-JP, ISO-2022-JP-2, ISO-2022-JP-1 - Chinese - EUC-CN, HZ, GBK, CP936, GB18030, EUC-TW, BIG5, CP950, BIG5-HKSCS, - BIG5-HKSCS:2004, BIG5-HKSCS:2001, BIG5-HKSCS:1999, ISO-2022-CN, - ISO-2022-CN-EXT - Korean - EUC-KR, CP949, ISO-2022-KR, JOHAB - Armenian - ARMSCII-8 - Georgian - Georgian-Academy, Georgian-PS - Tajik - KOI8-T - Kazakh - PT154, RK1048 - Thai - ISO-8859-11, TIS-620, CP874, MacThai - Laotian - MuleLao-1, CP1133 - Vietnamese - VISCII, TCVN, CP1258 - Platform specifics - HP-ROMAN8, NEXTSTEP - Full Unicode - UTF-8 - UCS-2, UCS-2BE, UCS-2LE - UCS-4, UCS-4BE, UCS-4LE - UTF-16, UTF-16BE, UTF-16LE - UTF-32, UTF-32BE, UTF-32LE - UTF-7 - C99, JAVA - Full Unicode, in terms of uint16_t or uint32_t (with machine dependent - endianness and alignment) - UCS-2-INTERNAL, UCS-4-INTERNAL - Locale dependent, in terms of 'char' or 'wchar_t' (with machine dependent - endianness and alignment, and with OS and locale dependent semantics) - char, wchar_t - The empty encoding name \"\" is equivalent to \"char\": it denotes the - locale dependent character encoding. - - When configured with the option --enable-extra-encodings, it also provides - support for a few extra encodings: - - European languages - CP{437,737,775,852,853,855,857,858,860,861,863,865,869,1125} - Semitic languages - CP864 - Japanese - EUC-JISX0213, Shift_JISX0213, ISO-2022-JP-3 - Chinese - BIG5-2003 (experimental) - Turkmen - TDS565 - Platform specifics - ATARIST, RISCOS-LATIN1 - - It can convert from any of these encodings to any other, through Unicode - conversion. - - It has also some limited support for transliteration, i.e. when a character - cannot be represented in the target character set, it can be approximated - through one or several similarly looking characters. Transliteration is - activated when \"//TRANSLIT\" is appended to the target encoding name. - - libiconv is for you if your application needs to support multiple character - encodings, but that support lacks from your system. - " +For historical reasons, international text is often encoded using a language \ +or country dependent character encoding. With the advent of the internet and \ +the frequent exchange of text across countries - even the viewing of a web \ +page from a foreign country is a \"text exchange\" in this context -, \ +conversions between these encodings have become important. They have also \ +become a problem, because many characters which are present in one encoding \ +are absent in many other encodings. To solve this mess, the Unicode encoding \ +has been created. It is a super-encoding of all others and is therefore the \ +default encoding for new text formats like XML. +Still, many computers still operate in locale with a traditional (limited) \ +character encoding. Some programs, like mailers and web browsers, must be able \ +to convert between a given text encoding and the user's encoding. Other \ +programs internally store strings in Unicode, to facilitate internal \ +processing, and need to convert between internal string representation \ +(Unicode) and external string representation (a traditional encoding) when \ +they are doing I/O. GNU libiconv is a conversion library for both kinds of \ +applications. +This library provides an iconv() implementation, for use on systems which \ +don't have one, or whose implementation cannot convert from/to Unicode. +It provides support for the encodings: +European languages +- ASCII, ISO-8859-{1,2,3,4,5,7,9,10,13,14,15,16}, KOI8-R, KOI8-U, KOI8-RU, \ +CP{1250,1251,1252,1253,1254,1257}, CP{850,866,1131}, \ +Mac{Roman,CentralEurope,Iceland,Croatian,Romania}, \ +Mac{Cyrillic,Ukraine,Greek,Turkish}, Macintosh +Semitic languages +- ISO-8859-{6,8}, CP{1255,1256}, CP862, Mac{Hebrew,Arabic} +Japanese +- EUC-JP, SHIFT_JIS, CP932, ISO-2022-JP, ISO-2022-JP-2, ISO-2022-JP-1 +Chinese +- EUC-CN, HZ, GBK, CP936, GB18030, EUC-TW, BIG5, CP950, BIG5-HKSCS, \ +BIG5-HKSCS:2004, BIG5-HKSCS:2001, BIG5-HKSCS:1999, ISO-2022-CN, ISO-2022-CN-EXT +Korean +- EUC-KR, CP949, ISO-2022-KR, JOHAB +Armenian +- ARMSCII-8 +Georgian +- Georgian-Academy, Georgian-PS +Tajik +- KOI8-T +Kazakh +- PT154, RK1048 +Thai +- ISO-8859-11, TIS-620, CP874, MacThai +Laotian +- MuleLao-1, CP1133 +Vietnamese +- VISCII, TCVN, CP1258 +Platform specifics +- HP-ROMAN8, NEXTSTEP +Full Unicode +- UTF-8 +- UCS-2, UCS-2BE, UCS-2LE +- UCS-4, UCS-4BE, UCS-4LE +- UTF-16, UTF-16BE, UTF-16LE +- UTF-32, UTF-32BE, UTF-32LE +- UTF-7 +- C99, JAVA +Full Unicode, in terms of uint16_t or uint32_t (with machine dependent \ +endianness and alignment) +- UCS-2-INTERNAL, UCS-4-INTERNAL +Locale dependent, in terms of 'char' or 'wchar_t' (with machine dependent \ +endianness and alignment, and with OS and locale dependent semantics) +- char, wchar_t +- The empty encoding name \"\" is equivalent to \"char\": it denotes the \ +locale dependent character encoding. +When configured with the option --enable-extra-encodings, it also provides \ +support for a few extra encodings: +European languages +- CP{437,737,775,852,853,855,857,858,860,861,863,865,869,1125} +Semitic languages +- CP864 +Japanese +- EUC-JISX0213, Shift_JISX0213, ISO-2022-JP-3 +Chinese +- BIG5-2003 (experimental) +Turkmen +- TDS565 +Platform specifics +- ATARIST, RISCOS-LATIN1 +It can convert from any of these encodings to any other, through Unicode conversion. +It has also some limited support for transliteration, i.e. when a character \ +cannot be represented in the target character set, it can be approximated \ +through one or several similarly looking characters. Transliteration is \ +activated when \"//TRANSLIT\" is appended to the target encoding name. +libiconv is for you if your application needs to support multiple character encodings, but that support lacks from your system. +" # ----- devel package ------------------------------------------------------- diff --git a/dev-libs/libidn/libidn-1.9.recipe b/dev-libs/libidn/libidn-1.9.recipe index e65e192d3..ddcd598ed 100644 --- a/dev-libs/libidn/libidn-1.9.recipe +++ b/dev-libs/libidn/libidn-1.9.recipe @@ -1,6 +1,8 @@ -SUMMARY="libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications." -DESCRIPTION="GNU Libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications. Libidn's purpose is to encode and decode internationalized domain names." - +SUMMARY="A library to encode and decode internationalized domain names" +DESCRIPTION=" +GNU Libidn is a fully documented implementation of the Stringprep, Punycode \ +and IDNA specifications. Libidn's purpose is to encode and decode internationalized domain names. +" HOMEPAGE="http://www.gnu.org/software/libidn/" SRC_URI="http://ftpmirror.gnu.org/libidn/libidn-1.9.tar.gz" CHECKSUM_MD5="f4d794639564256a367566302611224e" diff --git a/dev-libs/liboil/liboil-0.3.17.recipe b/dev-libs/liboil/liboil-0.3.17.recipe index 1ac563a5b..20d19bad5 100644 --- a/dev-libs/liboil/liboil-0.3.17.recipe +++ b/dev-libs/liboil/liboil-0.3.17.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="liboil is a library of simple functions that are optimized for various CPUs." +DESCRIPTION=" +liboil is a library of simple functions that are optimized for various CPUs. +" HOMEPAGE="http://liboil.freedesktop.org/wiki/" SRC_URI="http://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz" REVISION="1" @@ -23,4 +25,4 @@ INSTALL() } LICENSE="BSD (2-clause)" -COPYRIGHT="2002-2005 David A. Schleef, All rights reserved." \ No newline at end of file +COPYRIGHT="2002-2005 David A. Schleef, All rights reserved." diff --git a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe index 773612158..0ee101344 100644 --- a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe +++ b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe @@ -1,6 +1,8 @@ #TODO:split out _devel -SUMMARY="LibParserUtils is a library for building efficient parsers" -DESCRIPTION="LibParserUtils is a library for building efficient parsers" +SUMMARY="A library for building efficient parsers" +DESCRIPTION=" +LibParserUtils is a library for building efficient parsers. +" HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/" SRC_URI="git://git.netsurf-browser.org/libparserutils.git" REVISION="1" diff --git a/dev-libs/libpcre/libpcre-8.33.recipe b/dev-libs/libpcre/libpcre-8.33.recipe index 73e2cd869..ca108a252 100644 --- a/dev-libs/libpcre/libpcre-8.33.recipe +++ b/dev-libs/libpcre/libpcre-8.33.recipe @@ -1,12 +1,12 @@ SUMMARY="Perl5 Compatible Regular Expressions" DESCRIPTION=" - The PCRE library is a set of functions that implement regular expression - pattern matching using the same syntax and semantics as Perl 5. PCRE has - its own native API, as well as a set of wrapper functions that correspond - to the POSIX regular expression API. The PCRE library is free, even for - building proprietary software. - This package contains the native API. - " +The PCRE library is a set of functions that implement regular expression \ +pattern matching using the same syntax and semantics as Perl 5. PCRE has its \ +own native API, as well as a set of wrapper functions that correspond to the \ +POSIX regular expression API. The PCRE library is free, even for building \ +proprietary software. +This package contains the native API. +" HOMEPAGE="http://www.pcre.org/" LICENSE="PCRE" COPYRIGHT=" diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe index 73951280e..63671d025 100644 --- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe +++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe @@ -1,5 +1,7 @@ SUMMARY="libpthread-stubs" -DESCRIPTION="libpthread-stubs" +DESCRIPTION=" +libpthread-stubs +" HOMEPAGE="http://xcb.freedesktop.org/" SRC_URI="http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.gz" CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138" diff --git a/dev-libs/libsigsegv/libsigsegv-2.8.recipe b/dev-libs/libsigsegv/libsigsegv-2.8.recipe index 43ca12414..8e6e99f8b 100644 --- a/dev-libs/libsigsegv/libsigsegv-2.8.recipe +++ b/dev-libs/libsigsegv/libsigsegv-2.8.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="library for handling page faults in user mode" +DESCRIPTION=" +A library for handling page faults in user mode. +" HOMEPAGE="libsigsegv.sourceforge.net" SRC_URI="http://ftp.gnu.org/pub/gnu/libsigsegv/libsigsegv-2.8.tar.gz" REVISION="1" diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe index 46e61e7ea..1c16748c9 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe @@ -1,5 +1,7 @@ -SUMMARY="Library for solving packages and reading repositories" -DESCRIPTION="Library for solving packages and reading repositories." +SUMMARY="A library for solving packages and reading repositories" +DESCRIPTION=" +A Library for solving packages and reading repositories. +" LICENSE="BSD (3-clause)" COPYRIGHT="2007-2013, Novell Inc." HOMEPAGE="http://github.com/openSUSE/libsolv" diff --git a/dev-libs/libunistring/libunistring-0.9.1.1.recipe b/dev-libs/libunistring/libunistring-0.9.1.1.recipe index c131742e8..e99f21559 100644 --- a/dev-libs/libunistring/libunistring-0.9.1.1.recipe +++ b/dev-libs/libunistring/libunistring-0.9.1.1.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="libunistring provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard." +DESCRIPTION=" +libunistring provides functions for manipulating Unicode strings and for \ +manipulating C strings according to the Unicode standard. +" HOMEPAGE="http://www.gnu.org/software/libunistring/" SRC_URI="http://ftp.gnu.org/gnu/libunistring/libunistring-0.9.1.1.tar.gz" REVISION="1" diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe index 5dc1ad5cb..dfc4b2a7d 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe +++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe @@ -1,6 +1,8 @@ #TODO:split out _devel SUMMARY="LibWapcaplet is a string internment library" -DESCRIPTION="LibWapcaplet is a string internment library" +DESCRIPTION=" +LibWapcaplet is a string internment library. +" HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/" SRC_URI="git://git.netsurf-browser.org/libwapcaplet.git" REVISION="1" diff --git a/dev-libs/libxslt/libxslt-1.1.28.recipe b/dev-libs/libxslt/libxslt-1.1.28.recipe index 43a54f230..7ee4ccce9 100644 --- a/dev-libs/libxslt/libxslt-1.1.28.recipe +++ b/dev-libs/libxslt/libxslt-1.1.28.recipe @@ -60,16 +60,15 @@ INSTALL() } DESCRIPTION=" - Libxslt is the XSLT C library developed for the GNOME project. XSLT itself - is a an XML language to define transformation for XML. Libxslt is based on - libxml2 the XML C library developed for the GNOME project. It also - implements most of the EXSLT set of processor-portable extensions functions - and some of Saxon's evaluate and expressions extensions. - - People can either embed the library in their application or use xsltproc - the command line processing tool. This library is free software and can be - reused in commercial applications. - " +Libxslt is the XSLT C library developed for the GNOME project. XSLT itself is \ +a an XML language to define transformation for XML. Libxslt is based on \ +libxml2 the XML C library developed for the GNOME project. It also implements \ +most of the EXSLT set of processor-portable extensions functions and some of \ +Saxon's evaluate and expressions extensions. +People can either embed the library in their application or use xsltproc the \ +command line processing tool. This library is free software and can be reused \ +in commercial applications. +" PROVIDES_devel=" libxslt${secondaryArchSuffix}_devel = $portVersion diff --git a/dev-libs/libzip/libzip-0.11.2.recipe b/dev-libs/libzip/libzip-0.11.2.recipe index 9d22f1f4d..d4ae20650 100644 --- a/dev-libs/libzip/libzip-0.11.2.recipe +++ b/dev-libs/libzip/libzip-0.11.2.recipe @@ -1,5 +1,7 @@ SUMMARY="A C library for reading, creating, and modifying zip archives." -DESCRIPTION="libzip is a C library for reading, creating, and modifying zip archives." +DESCRIPTION=" +libzip is a C library for reading, creating, and modifying zip archives. +" HOMEPAGE="http://www.nih.at/libzip/" SRC_URI="http://www.nih.at/libzip/libzip-0.11.2.tar.gz" CHECKSUM_MD5="c5437df15e4825d40cdc3ec8b9b7516c" diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe index 8003a24bd..9f940cc76 100644 --- a/dev-libs/openssl/openssl-1.0.0d.recipe +++ b/dev-libs/openssl/openssl-1.0.0d.recipe @@ -1,19 +1,18 @@ SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)" DESCRIPTION=" - The OpenSSL Project is a collaborative effort to develop a robust, - commercial-grade, full-featured, and Open Source toolkit implementing the - Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) - protocols as well as a full-strength general purpose cryptography library. - The project is managed by a worldwide community of volunteers that use the - Internet to communicate, plan, and develop the OpenSSL toolkit and its - related documentation. - - OpenSSL is based on the excellent SSLeay library developed by Eric A. Young - and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style - licence, which basically means that you are free to get and use it for - commercial and non-commercial purposes subject to some simple license - conditions. - " +The OpenSSL Project is a collaborative effort to develop a robust, \ +commercial-grade, full-featured, and Open Source toolkit implementing the \ +Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) \ +protocols as well as a full-strength general purpose cryptography library. The \ +project is managed by a worldwide community of volunteers that use the \ +Internet to communicate, plan, and develop the OpenSSL toolkit and its related \ +documentation. +OpenSSL is based on the excellent SSLeay library developed by Eric A. Young \ +and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style \ +licence, which basically means that you are free to get and use it for \ +commercial and non-commercial purposes subject to some simple license \ +conditions. +" HOMEPAGE="http://www.openssl.org/" SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz" CHECKSUM_MD5="40b6ea380cc8a5bf9734c2f8bf7e701e" diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe index 95bb0cf9b..e10863f65 100644 --- a/dev-libs/openssl/openssl-1.0.0j.recipe +++ b/dev-libs/openssl/openssl-1.0.0j.recipe @@ -1,19 +1,18 @@ SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)" DESCRIPTION=" - The OpenSSL Project is a collaborative effort to develop a robust, - commercial-grade, full-featured, and Open Source toolkit implementing the - Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) - protocols as well as a full-strength general purpose cryptography library. - The project is managed by a worldwide community of volunteers that use the - Internet to communicate, plan, and develop the OpenSSL toolkit and its - related documentation. - - OpenSSL is based on the excellent SSLeay library developed by Eric A. Young - and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style - licence, which basically means that you are free to get and use it for - commercial and non-commercial purposes subject to some simple license - conditions. - " +The OpenSSL Project is a collaborative effort to develop a robust, \ +commercial-grade, full-featured, and Open Source toolkit implementing the \ +Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) \ +protocols as well as a full-strength general purpose cryptography library. The \ +project is managed by a worldwide community of volunteers that use the \ +Internet to communicate, plan, and develop the OpenSSL toolkit and its related \ +documentation. +OpenSSL is based on the excellent SSLeay library developed by Eric A. Young \ +and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style \ +licence, which basically means that you are free to get and use it for \ +commercial and non-commercial purposes subject to some simple license \ +conditions. +" HOMEPAGE="http://www.openssl.org/" SRC_URI="http://www.openssl.org/source/openssl-1.0.0j.tar.gz" CHECKSUM_MD5="cbe4ac0d8f598680f68a951e04b0996b" diff --git a/dev-libs/openssl/openssl-1.0.1e.recipe b/dev-libs/openssl/openssl-1.0.1e.recipe index 49cf202c6..4bc31bc28 100644 --- a/dev-libs/openssl/openssl-1.0.1e.recipe +++ b/dev-libs/openssl/openssl-1.0.1e.recipe @@ -1,19 +1,18 @@ SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)" DESCRIPTION=" - The OpenSSL Project is a collaborative effort to develop a robust, - commercial-grade, full-featured, and Open Source toolkit implementing the - Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) - protocols as well as a full-strength general purpose cryptography library. - The project is managed by a worldwide community of volunteers that use the - Internet to communicate, plan, and develop the OpenSSL toolkit and its - related documentation. - - OpenSSL is based on the excellent SSLeay library developed by Eric A. Young - and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style - licence, which basically means that you are free to get and use it for - commercial and non-commercial purposes subject to some simple license - conditions. - " +The OpenSSL Project is a collaborative effort to develop a robust, \ +commercial-grade, full-featured, and Open Source toolkit implementing the \ +Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) \ +protocols as well as a full-strength general purpose cryptography library. The \ +project is managed by a worldwide community of volunteers that use the \ +Internet to communicate, plan, and develop the OpenSSL toolkit and its related \ +documentation. +OpenSSL is based on the excellent SSLeay library developed by Eric A. Young \ +and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style \ +licence, which basically means that you are free to get and use it for \ +commercial and non-commercial purposes subject to some simple license \ +conditions. +" HOMEPAGE="http://www.openssl.org/" SRC_URI="http://www.openssl.org/source/openssl-1.0.1e.tar.gz" CHECKSUM_MD5="66bf6f10f060d561929de96f9dfe5b8c" diff --git a/dev-libs/serd/serd-0.18.0.recipe b/dev-libs/serd/serd-0.18.0.recipe index d48670c8d..d90817418 100644 --- a/dev-libs/serd/serd-0.18.0.recipe +++ b/dev-libs/serd/serd-0.18.0.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="Serd is a lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples." +DESCRIPTION=" +Serd is a lightweight C library for RDF syntax which supports reading and \ +writing Turtle and NTriples. +" HOMEPAGE="http://drobilla.net/software/serd/" SRC_URI="http://download.drobilla.net/serd-0.18.0.tar.bz2" REVISION="1" diff --git a/dev-libs/tinyxml/tinyxml-2.6.2.recipe b/dev-libs/tinyxml/tinyxml-2.6.2.recipe index 0bcaeec8b..751918998 100644 --- a/dev-libs/tinyxml/tinyxml-2.6.2.recipe +++ b/dev-libs/tinyxml/tinyxml-2.6.2.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="TinyXML is a simple, small, C++ XML parser that can be easily integrating into other programs" +DESCRIPTION=" +TinyXML is a simple, small, C++ XML parser that can be easily integrating into \ +other programs. +" HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html" SRC_URI="http://en.sourceforge.jp/frs/g_redir.php?m=jaist&f=%2Ftinyxml%2Ftinyxml%2F2.6.2%2Ftinyxml_2_6_2.tar.gz" CHECKSUM_MD5="c1b864c96804a10526540c664ade67f0" diff --git a/dev-libs/tinyxml2/tinyxml2-2.recipe b/dev-libs/tinyxml2/tinyxml2-2.recipe index 55a7d77a6..e87544cf0 100644 --- a/dev-libs/tinyxml2/tinyxml2-2.recipe +++ b/dev-libs/tinyxml2/tinyxml2-2.recipe @@ -1,8 +1,8 @@ +SUMMARY="A simple C++ XML parser" DESCRIPTION=" - TinyXML-2 is a simple, small, efficient, C++ XML parser that can be - easily integrated into other programs. - " -SUMMARY="TinyXML-2 is a simple C++ XML parser." +TinyXML-2 is a simple, small, efficient, C++ XML parser that can be \ +easily integrated into other programs. +" HOMEPAGE="http://www.grinninglizard.com/tinyxml2/" LICENSE="Zlib" COPYRIGHT="2011-2013 Lee Thomason" diff --git a/dev-libs/uriparser/uriparser-0.7.9.recipe b/dev-libs/uriparser/uriparser-0.7.9.recipe index 60444d9be..3bc01fff9 100644 --- a/dev-libs/uriparser/uriparser-0.7.9.recipe +++ b/dev-libs/uriparser/uriparser-0.7.9.recipe @@ -1,5 +1,7 @@ -SUMMARY="Uriparser is a strictly RFC 3986 compliant URI parsing library in C" -DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C" +SUMMARY="A strictly RFC 3986 compliant URI parsing library in C" +DESCRIPTION=" +Uriparser is a strictly RFC 3986 compliant URI parsing library in C. +" HOMEPAGE="http://uriparser.sourceforge.net/" SRC_URI="http://downloads.sourceforge.net/project/uriparser/Sources/0.7.9/uriparser-0.7.9.tar.bz2" CHECKSUM_MD5="d9189834b909df8d672ecafc34186a58" @@ -60,5 +62,3 @@ PROVIDES_devel=" REQUIRES_devel=" liburiparser == $portVersion base " - - diff --git a/dev-libs/xerces_c/xerces_c-3.1.1.recipe b/dev-libs/xerces_c/xerces_c-3.1.1.recipe index 6e0ce264f..8b26e5394 100644 --- a/dev-libs/xerces_c/xerces_c-3.1.1.recipe +++ b/dev-libs/xerces_c/xerces_c-3.1.1.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Xerces-C++ is a validating XML parser written in a portable subset of C++" +DESCRIPTION=" +Xerces-C++ is a validating XML parser written in a portable subset of C++. +" HOMEPAGE="http://xerces.apache.org/xerces-c/" SRC_URI="http://mirror.pop-sc.rnp.br/apache//xerces/c/3/sources/xerces-c-3.1.1.tar.gz" CHECKSUM_MD5="6a8ec45d83c8cfb1584c5a5345cb51ae" diff --git a/dev-libs/zziplib/zziplib-0.13.59.recipe b/dev-libs/zziplib/zziplib-0.13.59.recipe index dfa96f4ec..88deb4673 100644 --- a/dev-libs/zziplib/zziplib-0.13.59.recipe +++ b/dev-libs/zziplib/zziplib-0.13.59.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="Lightweight library used to easily extract data from files archived in a single zip file" +DESCRIPTION=" +Lightweight library used to easily extract data from files archived in a \ +single zip file. +" HOMEPAGE="http://zziplib.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/zziplib/files/zziplib13/0.13.59/zziplib-0.13.59.tar.bz2/download" REVISION="1" From bb9c2518a55bc0e2a653303095210168ab70ab59 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 255/306] Rewrap dev-lua DESCRIPTIONs --- dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe b/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe index 8e06ec0f7..9b4241b95 100644 --- a/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe +++ b/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe @@ -1,11 +1,9 @@ -SUMMARY="a Lua library for file system operations" +SUMMARY="A Lua library for file system operations" DESCRIPTION=" -LuaFileSystem is a Lua library developed to complement the set of -functions related to file systems offered by the standard Lua -distribution. - -LuaFileSystem offers a portable way to access the underlying -directory structure and file attributes. +LuaFileSystem is a Lua library developed to complement the set of functions \ +related to file systems offered by the standard Lua distribution. +LuaFileSystem offers a portable way to access the underlying directory \ +structure and file attributes. " HOMEPAGE="http://keplerproject.github.io/luafilesystem/" SRC_URI="git+https://github.com/keplerproject/luafilesystem.git#2fd989cd6c777583be1c93616018c55b2cbb1bcf" From 542d5f664ad7c6da7594a1be77a6bf6026948670 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 256/306] Rewrap dev-perl DESCRIPTIONs --- dev-perl/html_parser/html_parser-3.70.recipe | 6 +++--- dev-perl/xml_parser/xml_parser-2.36.recipe | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dev-perl/html_parser/html_parser-3.70.recipe b/dev-perl/html_parser/html_parser-3.70.recipe index 467457f6b..d6cff8476 100644 --- a/dev-perl/html_parser/html_parser-3.70.recipe +++ b/dev-perl/html_parser/html_parser-3.70.recipe @@ -39,6 +39,6 @@ INSTALL() { } DESCRIPTION=" -The HTML-Parser distribution is is a collection of perl modules that parse -and extract information from HTML documents. - " +The HTML-Parser distribution is is a collection of perl modules that parse and \ +extract information from HTML documents. +" diff --git a/dev-perl/xml_parser/xml_parser-2.36.recipe b/dev-perl/xml_parser/xml_parser-2.36.recipe index 9c02605e4..3bbd70cec 100644 --- a/dev-perl/xml_parser/xml_parser-2.36.recipe +++ b/dev-perl/xml_parser/xml_parser-2.36.recipe @@ -1,5 +1,7 @@ -SUMMARY="XML-Parser - A perl module for parsing XML documents" -DESCRIPTION="XML-Parser - A perl module for parsing XML documents" +SUMMARY="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" From 4e1ffebc1aaf2725a7afc315c5817e07c32b4c06 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 257/306] Rewrap dev-python DESCRIPTIONs --- dev-python/cnf/cnf-1.0_git.recipe | 7 ++-- dev-python/docutils/docutils-0.11.recipe | 10 +++--- dev-python/dulwich/dulwich-0.9.1.recipe | 7 ++-- dev-python/dulwich/dulwich-0.9.4.recipe | 7 ++-- dev-python/iniparse/iniparse-0.4.recipe | 34 ++++++++----------- dev-python/numpy/numpy-1.4.1.recipe | 4 ++- dev-python/numpy/numpy-1.5.0.recipe | 4 ++- dev-python/ordereddict/ordereddict-1.1.recipe | 7 ++-- dev-python/pycrypto/pycrypto-2.3.recipe | 4 ++- .../pydispatcher/pydispatcher-2.0.1.recipe | 4 ++- dev-python/pygame/pygame-1.9.1.recipe | 8 +++-- dev-python/pygments/pygments-1.6.recipe | 17 +++++----- dev-python/setuptools/setuptools-0.6.recipe | 4 ++- 13 files changed, 63 insertions(+), 54 deletions(-) diff --git a/dev-python/cnf/cnf-1.0_git.recipe b/dev-python/cnf/cnf-1.0_git.recipe index 5b0f89989..5112c48ce 100644 --- a/dev-python/cnf/cnf-1.0_git.recipe +++ b/dev-python/cnf/cnf-1.0_git.recipe @@ -1,4 +1,8 @@ -DESCRIPTION="A Script that hooks into command_not_found_handle to inform end users where to find an application if they don't have it. It can also check for typos (a feature of zsh)." +DESCRIPTION=" +A Script that hooks into command_not_found_handle to inform end users where to \ +find an application if they don't have it. It can also check for typos (a \ +feature of zsh). +" HOMEPAGE="https://github.com/jrabbit/haiku-cnf" SRC_URI="git://github.com/jrabbit/haiku-cnf.git" REVISION="1" @@ -17,4 +21,3 @@ INSTALL() } LICENSE="GNU GPL v3" COPYRIGHT="2011 Jack Laxson" - diff --git a/dev-python/docutils/docutils-0.11.recipe b/dev-python/docutils/docutils-0.11.recipe index 56bf9de62..88d45fbb0 100644 --- a/dev-python/docutils/docutils-0.11.recipe +++ b/dev-python/docutils/docutils-0.11.recipe @@ -1,10 +1,10 @@ SUMMARY="Docutils is an open-source text processing system" DESCRIPTION=" -Docutils is an open-source text processing system for processing -plaintext documentation into useful formats, such as HTML, LaTeX, -man-pages, open-document or XML. It includes reStructuredText, the -easy to read, easy to use, what-you-see-is-what-you-get plaintext -markup language." +Docutils is an open-source text processing system for processing plaintext \ +documentation into useful formats, such as HTML, LaTeX, man-pages, \ +open-document or XML. It includes reStructuredText, the easy to read, easy to \ +use, what-you-see-is-what-you-get plaintext markup language. +" HOMEPAGE="http://docutils.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/docutils/files/docutils/0.11/docutils-0.11.tar.gz" CHECKSUM_MD5="20ac380a18b369824276864d98ec0ad6" diff --git a/dev-python/dulwich/dulwich-0.9.1.recipe b/dev-python/dulwich/dulwich-0.9.1.recipe index ef14719da..c33f62c28 100644 --- a/dev-python/dulwich/dulwich-0.9.1.recipe +++ b/dev-python/dulwich/dulwich-0.9.1.recipe @@ -1,8 +1,9 @@ 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." +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.1.tar.gz" CHECKSUM_MD5="9a69b441d681e257b231321f8de6a110" diff --git a/dev-python/dulwich/dulwich-0.9.4.recipe b/dev-python/dulwich/dulwich-0.9.4.recipe index f67c89d39..5f332140b 100644 --- a/dev-python/dulwich/dulwich-0.9.4.recipe +++ b/dev-python/dulwich/dulwich-0.9.4.recipe @@ -1,8 +1,9 @@ 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." +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" diff --git a/dev-python/iniparse/iniparse-0.4.recipe b/dev-python/iniparse/iniparse-0.4.recipe index a2dd71549..a0b0d0378 100644 --- a/dev-python/iniparse/iniparse-0.4.recipe +++ b/dev-python/iniparse/iniparse-0.4.recipe @@ -1,25 +1,19 @@ -SUMMARY="iniparse is a INI parser for Python" +SUMMARY="An INI parser for Python" DESCRIPTION=" iniparse is a INI parser for Python which is: - -* Compatiable with ConfigParser: Backward compatible implementations - of ConfigParser, RawConfigParser, and SafeConfigParser are included - that are API-compatible with the Python standard library. They pass - all the unit tests included with Python. - -* Preserves structure of INI files: Order of sections & options, - indentation, comments, and blank lines are preserved as far as - possible when data is updated. - -* More convenient: Values can be accessed using dotted notation - (cfg.user.name), or using container syntax (cfg['user']['name']). - -* It is very useful for config files that are updated both by users - and by programs, since it is very disorienting for a user to have - her config file completely rearranged whenever a program changes - it. iniparse also allows making the order of entries in a config - file significant, which is desirable in applications like image - galleries. +* Compatiable with ConfigParser: Backward compatible implementations of \ +ConfigParser, RawConfigParser, and SafeConfigParser are included that are \ +API-compatible with the Python standard library. They pass all the unit tests \ +included with Python. +* Preserves structure of INI files: Order of sections & options, indentation, \ +comments, and blank lines are preserved as far as possible when data is updated. +* More convenient: Values can be accessed using dotted notation \ +(cfg.user.name), or using container syntax (cfg['user']['name']). +* It is very useful for config files that are updated both by users and by \ +programs, since it is very disorienting for a user to have her config file \ +completely rearranged whenever a program changes it. iniparse also allows \ +making the order of entries in a config file significant, which is desirable \ +in applications like image galleries. " HOMEPAGE="http://code.google.com/p/iniparse/" SRC_URI="http://iniparse.googlecode.com/files/iniparse-0.4.tar.gz" diff --git a/dev-python/numpy/numpy-1.4.1.recipe b/dev-python/numpy/numpy-1.4.1.recipe index 776c39a1b..0d1e71bb3 100644 --- a/dev-python/numpy/numpy-1.4.1.recipe +++ b/dev-python/numpy/numpy-1.4.1.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="NumPy is the fundamental package needed for scientific computing with Python." +DESCRIPTION=" +NumPy is the fundamental package needed for scientific computing with Python. +" HOMEPAGE="http://numpy.scipy.org/" SRC_URI="http://sourceforge.net/projects/numpy/files/NumPy/1.4.1/numpy-1.4.1.tar.gz/download?" CHECKSUM_MD5="5c7b5349dc3161763f7f366ceb96516b" diff --git a/dev-python/numpy/numpy-1.5.0.recipe b/dev-python/numpy/numpy-1.5.0.recipe index 59be61f97..e68eea85b 100644 --- a/dev-python/numpy/numpy-1.5.0.recipe +++ b/dev-python/numpy/numpy-1.5.0.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="NumPy is the fundamental package needed for scientific computing with Python." +DESCRIPTION=" +NumPy is the fundamental package needed for scientific computing with Python. +" HOMEPAGE="http://numpy.scipy.org/" SRC_URI="http://sourceforge.net/projects/numpy/files/NumPy/1.5.0/numpy-1.5.0.tar.gz/download?" CHECKSUM_MD5="3a8bfdc434df782d647161c48943ee09" diff --git a/dev-python/ordereddict/ordereddict-1.1.recipe b/dev-python/ordereddict/ordereddict-1.1.recipe index 113e0e55e..e29d3c18d 100644 --- a/dev-python/ordereddict/ordereddict-1.1.recipe +++ b/dev-python/ordereddict/ordereddict-1.1.recipe @@ -1,9 +1,8 @@ SUMMARY="A substitute for Py2.7's collections.OrderedDict for Python 2.4-2.6." DESCRIPTION=" -Drop-in substitute for Py2.7's new collections.OrderedDict. The -recipe has big-oh performance that matches regular dictionaries -(amortized O(1) insertion/deletion/lookup and O(n) -iteration/repr/copy/equality_testing). +Drop-in substitute for Py2.7's new collections.OrderedDict. The recipe has \ +big-oh performance that matches regular dictionaries (amortized O(1) \ +insertion/deletion/lookup and O(n) iteration/repr/copy/equality_testing). " HOMEPAGE="https://pypi.python.org/pypi/ordereddict" SRC_URI="https://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.1.tar.gz" diff --git a/dev-python/pycrypto/pycrypto-2.3.recipe b/dev-python/pycrypto/pycrypto-2.3.recipe index 70209d8cb..9eee1d88c 100644 --- a/dev-python/pycrypto/pycrypto-2.3.recipe +++ b/dev-python/pycrypto/pycrypto-2.3.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Download, build, install, upgrade, and uninstall Python packages -- easily!" +DESCRIPTION=" +Download, build, install, upgrade, and uninstall Python packages -- easily! +" HOMEPAGE="http://pypi.python.org/pypi/pycrypto/2.3" SRC_URI="http://pypi.python.org/packages/source/p/pycrypto/pycrypto-2.3.tar.gz" REVISION="1" diff --git a/dev-python/pydispatcher/pydispatcher-2.0.1.recipe b/dev-python/pydispatcher/pydispatcher-2.0.1.recipe index 48c54d4f0..7afa525cf 100644 --- a/dev-python/pydispatcher/pydispatcher-2.0.1.recipe +++ b/dev-python/pydispatcher/pydispatcher-2.0.1.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism in python" +DESCRIPTION=" +Multi-producer-multi-consumer signal dispatching mechanism in python. +" HOMEPAGE="http://pydispatcher.sourceforge.net/" SRC_URI="http://downloads.sourceforge.net/project/pydispatcher/pydispatcher/2.0.1/PyDispatcher-2.0.1.tar.gz" REVISION="1" diff --git a/dev-python/pygame/pygame-1.9.1.recipe b/dev-python/pygame/pygame-1.9.1.recipe index eb266e8ba..545dbeeff 100644 --- a/dev-python/pygame/pygame-1.9.1.recipe +++ b/dev-python/pygame/pygame-1.9.1.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="pygame - python bindings to sdl and other libs that facilitate game production" +DESCRIPTION=" +pygame - python bindings to sdl and other libs that facilitate game production. +" HOMEPAGE="http://www.pygame.org" SRC_URI="http://www.pygame.org/ftp/pygame-1.9.1release.tar.gz" CHECKSUM_MD5="1c4cdc708d17c8250a2d78ef997222fc" @@ -26,5 +28,5 @@ COPYRIGHT="2000-2004, 2007 Pete Shinners 2004 Takafumi Mizuno 2006-2007 Rene Dudfield 2007 Richard Goedeken - 2007-2008 Marcus von Appen" - + 2007-2008 Marcus von Appen + " diff --git a/dev-python/pygments/pygments-1.6.recipe b/dev-python/pygments/pygments-1.6.recipe index 13cdcfea6..63f48b4f1 100644 --- a/dev-python/pygments/pygments-1.6.recipe +++ b/dev-python/pygments/pygments-1.6.recipe @@ -1,15 +1,14 @@ SUMMARY="a generic syntax highlighter for general use" DESCRIPTION=" -It is a generic syntax highlighter for general use in all kinds of -software such as forum systems, wikis or other applications that need -to prettify source code. Highlights are: +It is a generic syntax highlighter for general use in all kinds of software \ +such as forum systems, wikis or other applications that need to prettify \ +source code. Highlights are: * a wide range of common languages and markup formats is supported -* special attention is paid to details that increase highlighting - quality -* support for new languages and formats are added easily; most - languages use a simple regex-based lexing mechanism -* a number of output formats is available, among them HTML, RTF, LaTeX - and ANSI sequences +* special attention is paid to details that increase highlighting quality +* support for new languages and formats are added easily; most languages use a \ +simple regex-based lexing mechanism +* a number of output formats is available, among them HTML, RTF, LaTeX and \ +ANSI sequences * it is usable as a command-line tool and as a library * ... and it highlights even Brainf*ck! " diff --git a/dev-python/setuptools/setuptools-0.6.recipe b/dev-python/setuptools/setuptools-0.6.recipe index 1f274cae1..36e7f49f0 100644 --- a/dev-python/setuptools/setuptools-0.6.recipe +++ b/dev-python/setuptools/setuptools-0.6.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Download, build, install, upgrade, and uninstall Python packages -- easily!" +DESCRIPTION=" +Download, build, install, upgrade, and uninstall Python packages -- easily! +" HOMEPAGE="http://pypi.python.org/pypi/setuptools" SRC_URI="http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c11.tar.gz" REVISION="1" From 226b144fd87b516aeee8acaf2e4acd0c970219dc Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 258/306] Rewrap dev-qt DESCRIPTIONs --- dev-qt/qtcore/qtcore-4.8.5.git.recipe | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dev-qt/qtcore/qtcore-4.8.5.git.recipe b/dev-qt/qtcore/qtcore-4.8.5.git.recipe index 41b5fbf3e..ba6599176 100644 --- a/dev-qt/qtcore/qtcore-4.8.5.git.recipe +++ b/dev-qt/qtcore/qtcore-4.8.5.git.recipe @@ -1,12 +1,10 @@ SUMMARY="A comprehensive C++ application development framework" DESCRIPTION=" -Qt is a cross-platform application and UI framework for developers -using C++ or QML, a CSS & JavaScript like language. Qt Creator is the -supporting Qt IDE. - -Qt, Qt Quick and the supporting tools are developed as an open source -project governed by an inclusive meritocratic model. Qt can be used -under open source (LGPL v2.1) or commercial terms. +Qt is a cross-platform application and UI framework for developers using C++ \ +or QML, a CSS & JavaScript like language. Qt Creator is the supporting Qt IDE. +Qt, Qt Quick and the supporting tools are developed as an open source project \ +governed by an inclusive meritocratic model. Qt can be used under open source \ +(LGPL v2.1) or commercial terms. " HOMEPAGE="http://qt-haiku.ru" SRC_URI="git://gitorious.org/+qt-haiku/qt/qt-haiku-port.git" From 991482ea96175d861a7cec4cadc5a1c355e74093 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 259/306] Rewrap dev-scheme DESCRIPTIONs --- dev-scheme/chicken/chicken-4.8.0.5.recipe | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dev-scheme/chicken/chicken-4.8.0.5.recipe b/dev-scheme/chicken/chicken-4.8.0.5.recipe index a79f72325..7847f64ca 100644 --- a/dev-scheme/chicken/chicken-4.8.0.5.recipe +++ b/dev-scheme/chicken/chicken-4.8.0.5.recipe @@ -1,5 +1,10 @@ -SUMMARY="Chicken is a Scheme interpreter and native Scheme to C compiler" -DESCRIPTION="CHICKEN is a compiler for the Scheme programming language. CHICKEN produces portable and efficient C, supports almost all of the R5RS Scheme language standard, and includes many enhancements and extensions. CHICKEN runs on Linux, MacOS X, Windows, and many Unix flavours." +SUMMARY="A Scheme interpreter and native Scheme to C compiler" +DESCRIPTION=" +CHICKEN is a compiler for the Scheme programming language. CHICKEN produces \ +portable and efficient C, supports almost all of the R5RS Scheme language \ +standard, and includes many enhancements and extensions. CHICKEN runs on \ +Linux, MacOS X, Windows, and many Unix flavours. +" HOMEPAGE="http://www.call-cc.org/" SRC_URI="http://code.call-cc.org/releases/4.8.0/chicken-4.8.0.5.tar.gz" CHECKSUM_MD5="a63d8a0b6bc58a97ec5cc4c4a19b308a" From f4b61c7fd6fd27c260c718c6bb2df44bd95b0639 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:56 -0500 Subject: [PATCH 260/306] Rewrap dev-util DESCRIPTIONs --- .../abi_compliance_checker-1.98.3.recipe | 5 ++- dev-util/astyle/astyle-2.03.recipe | 7 ++-- dev-util/bakefile/bakefile-0.2.8.recipe | 8 ++-- dev-util/ccache/ccache-3.1.9.recipe | 8 +++- dev-util/cmake/cmake-2.8.11.2.recipe | 13 +++--- dev-util/cmake/cmake-2.8.5.recipe | 9 ++++- dev-util/cscope/cscope-15.7a.recipe | 18 ++++----- dev-util/ctags/ctags-5.8.recipe | 6 ++- dev-util/fastdep/fastdep-0.16.recipe | 8 +++- dev-util/global/global-6.2.9.recipe | 19 +++++---- dev-util/gperf/gperf-3.0.4.recipe | 16 +++++--- dev-util/idutils/idutils-4.6.recipe | 23 +++++------ dev-util/indent/indent-2.2.11.recipe | 4 +- dev-util/intltool/intltool-0.40.6.recipe | 24 +++++------ .../netsurf_buildsystem-1.0_git.recipe | 4 +- dev-util/ninja/ninja-1.4.0.recipe | 36 ++++++++--------- dev-util/patchutils/patchutils-0.3.3.recipe | 40 +++++++++---------- dev-util/pkgconfig/pkgconfig-0.27.1.recipe | 9 ++++- .../posixtestsuite-1.5.2.recipe | 5 ++- dev-util/ragel/ragel-6.8.recipe | 11 ++--- dev-util/scons/scons-2.2.0.recipe | 8 +++- 21 files changed, 155 insertions(+), 126 deletions(-) diff --git a/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe b/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe index 3befe3f31..9638dace9 100644 --- a/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe +++ b/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="tool for checking backward binary and source-level compatibility of a C/C++ library." +DESCRIPTION=" +tool for checking backward binary and source-level compatibility of a C/C++ \ +library. +" HOMEPAGE="ispras.linuxbase.org/index.php/ABI_compliance_checker" SRC_URI="https://github.com/downloads/lvc/abi-compliance-checker/abi-compliance-checker-1.98.3.tar.gz" REVISION="1" diff --git a/dev-util/astyle/astyle-2.03.recipe b/dev-util/astyle/astyle-2.03.recipe index 86dd95272..fe6b7776f 100644 --- a/dev-util/astyle/astyle-2.03.recipe +++ b/dev-util/astyle/astyle-2.03.recipe @@ -1,9 +1,8 @@ SUMMARY="A source code formatter and beautifier for C, C++, C# and Java" DESCRIPTION=" -Artistic Style is a filter written in C++ that automatically -re-indents and re-formats C / C++ / C# / Java source files. It can be -used from a command line, or it can be incorporated as classes in -another C++ program. +Artistic Style is a filter written in C++ that automatically re-indents and \ +re-formats C / C++ / C# / Java source files. It can be used from a command \ +line, or it can be incorporated as classes in another C++ program. " HOMEPAGE="http://astyle.sourceforge.net" SRC_URI="http://sourceforge.net/projects/astyle/files/astyle/astyle%202.03/astyle_2.03_linux.tar.gz" diff --git a/dev-util/bakefile/bakefile-0.2.8.recipe b/dev-util/bakefile/bakefile-0.2.8.recipe index afc67e5d7..f6cf041a0 100644 --- a/dev-util/bakefile/bakefile-0.2.8.recipe +++ b/dev-util/bakefile/bakefile-0.2.8.recipe @@ -1,8 +1,8 @@ SUMMARY="Native makefiles generator" -DESCRIPTION="Bakefile is cross-platform, cross-compiler native makefiles - generator. It takes compiler-independent description of build - tasks as input and generates native makefile (autoconf's - Makefile.in, Visual C++ project, bcc makefile etc.). +DESCRIPTION=" +Bakefile is cross-platform, cross-compiler native makefiles generator. It \ +takes compiler-independent description of build tasks as input and generates \ +native makefile (autoconf's Makefile.in, Visual C++ project, bcc makefile etc.). " HOMEPAGE="http://www.bakefile.org" SRC_URI="http://sourceforge.net/projects/bakefile/files/bakefile/0.2.8/bakefile-0.2.8.tar.gz/download" diff --git a/dev-util/ccache/ccache-3.1.9.recipe b/dev-util/ccache/ccache-3.1.9.recipe index 0cc56695c..e9f64a9ad 100644 --- a/dev-util/ccache/ccache-3.1.9.recipe +++ b/dev-util/ccache/ccache-3.1.9.recipe @@ -1,5 +1,9 @@ -SUMMARY="ccache is a fast compiler cache." -DESCRIPTION="ccache is a compiler cache. It speeds up recompilation by caching previous compilations and detecting when same compilation is being done again. Supported languages are C, C++, Objective-C and Objective-C++." +SUMMARY="A fast compiler cache" +DESCRIPTION=" +ccache is a compiler cache. It speeds up recompilation by caching previous \ +compilations and detecting when same compilation is being done again. \ +Supported languages are C, C++, Objective-C and Objective-C++. +" HOMEPAGE="http://ccache.samba.org/" SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.9.tar.bz2" REVISION="1" diff --git a/dev-util/cmake/cmake-2.8.11.2.recipe b/dev-util/cmake/cmake-2.8.11.2.recipe index 800db74f5..68144b690 100644 --- a/dev-util/cmake/cmake-2.8.11.2.recipe +++ b/dev-util/cmake/cmake-2.8.11.2.recipe @@ -1,10 +1,11 @@ SUMMARY="Cross platform Make" -DESCRIPTION="CMake is a cross-platform, open-source build system. It is a - family of tools designed to build, test and package software. CMake is used - to control the software compilation process using simple platform and - compiler independent configuration files. CMake generates native makefiles - and workspaces that can be used in the compiler environment of your choice. - " +DESCRIPTION=" +CMake is a cross-platform, open-source build system. It is a family of tools \ +designed to build, test and package software. CMake is used to control the \ +software compilation process using simple platform and compiler independent \ +configuration files. CMake generates native makefiles and workspaces that can \ +be used in the compiler environment of your choice. +" HOMEPAGE="http://www.cmake.org" LICENSE="CMake" COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe index 1aeea4b7c..0466d90ad 100644 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -1,5 +1,10 @@ -SUMMARY="Cross platform Make" -DESCRIPTION="CMake is a cross-platform, open-source build system. It is a family of tools designed to build, test and package software. CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice." +DESCRIPTION=" +CMake is a cross-platform, open-source build system. It is a family of tools \ +designed to build, test and package software. CMake is used to control the \ +software compilation process using simple platform and compiler independent \ +configuration files. CMake generates native makefiles and workspaces that can \ +be used in the compiler environment of your choice. +" HOMEPAGE="http://www.cmake.org" LICENSE="CMake" COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cscope/cscope-15.7a.recipe b/dev-util/cscope/cscope-15.7a.recipe index 8636e606d..3f01d4781 100644 --- a/dev-util/cscope/cscope-15.7a.recipe +++ b/dev-util/cscope/cscope-15.7a.recipe @@ -1,14 +1,14 @@ -SUMMARY="Cscope is a developer's tool for browsing source code." +SUMMARY="A developer's tool for browsing source code" DESCRIPTION=" Allows searching code for: - * all references to a symbol - * global definitions - * functions called by a function - * functions calling a function - * text string - * regular expression pattern - * a file - * files including a file +* all references to a symbol +* global definitions +* functions called by a function +* functions calling a function +* text string +* regular expression pattern +* a file +* files including a file " HOMEPAGE="http://cscope.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/cscope/files/cscope/15.7a/cscope-15.7a.tar.bz2" diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe index 2316e3d98..1ff3cd91a 100644 --- a/dev-util/ctags/ctags-5.8.recipe +++ b/dev-util/ctags/ctags-5.8.recipe @@ -1,5 +1,7 @@ -SUMMARY="Exuberant Ctags creates tags files for code browsing in editors" -DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors." +SUMMARY="A tool that creates tags files for code browsing in editors" +DESCRIPTION=" +Exuberant Ctags creates tags files for code browsing in editors. +" HOMEPAGE="http://ctags.sourceforge.net/" COPYRIGHT="1996-2009, Darren Hiebert" LICENSE="GNU GPL v2" diff --git a/dev-util/fastdep/fastdep-0.16.recipe b/dev-util/fastdep/fastdep-0.16.recipe index 27460178e..6d925cb0d 100644 --- a/dev-util/fastdep/fastdep-0.16.recipe +++ b/dev-util/fastdep/fastdep-0.16.recipe @@ -1,5 +1,9 @@ -SUMMARY="fastdep is a fast dependency generator for C/C++ files." -DESCRIPTION="fastdep is a preprocessor which generates dependency information suitable for Makefile inclusion from C or C++ source files. Meant to run on slower hardware, it is several orders of magnitude faster than gcc." +SUMMARY="A fast dependency generator for C/C++ files." +DESCRIPTION=" +fastdep is a preprocessor which generates dependency information suitable for \ +Makefile inclusion from C or C++ source files. Meant to run on slower \ +hardware, it is several orders of magnitude faster than gcc. +" HOMEPAGE="http://www.irule.be/bvh/c++/fastdep/" SRC_URI="http://ports-space.haiku-files.org/dev-util/source/fastdep-0.16.tar.gz" REVISION="1" diff --git a/dev-util/global/global-6.2.9.recipe b/dev-util/global/global-6.2.9.recipe index e6ea3dc58..9b809a063 100644 --- a/dev-util/global/global-6.2.9.recipe +++ b/dev-util/global/global-6.2.9.recipe @@ -1,14 +1,13 @@ -SUMMARY="GNU Global is a source code tagging system." +SUMMARY="A source code tagging system." DESCRIPTION=" -GNU GLOBAL is a source code tagging system that works the same way -across diverse environments (emacs, vi, less, bash, web browser, etc). -You can locate symbols in source files and move there easily. It is -useful for hacking a large project containing many sub-directories, -many #ifdef and many main() functions. It is similar to ctags or -etags but is different from them at the point of independence of any -editor. It runs on a UNIX(POSIX) compatible operating system like GNU -and BSD." - +GNU GLOBAL is a source code tagging system that works the same way across \ +diverse environments (emacs, vi, less, bash, web browser, etc). You can locate \ +symbols in source files and move there easily. It is useful for hacking a \ +large project containing many sub-directories, many #ifdef and many main() \ +functions. It is similar to ctags or etags but is different from them at the \ +point of independence of any editor. It runs on a UNIX(POSIX) compatible \ +operating system like GNU and BSD. +" HOMEPAGE="http://www.gnu.org/software/global/" SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-6.2.9.tar.gz" CHECKSUM_MD5="39a1dd6e537929b66600b9e54aae1a6b" diff --git a/dev-util/gperf/gperf-3.0.4.recipe b/dev-util/gperf/gperf-3.0.4.recipe index 309ff1491..b8707394d 100644 --- a/dev-util/gperf/gperf-3.0.4.recipe +++ b/dev-util/gperf/gperf-3.0.4.recipe @@ -1,9 +1,15 @@ SUMMARY="GNU perfect hash function generator" -DESCRIPTION="GNU gperf is a perfect hash function generator. For a given list of strings, it produces a hash function and hash table, in form of C or C++ code, for looking up a value depending on the input string. The hash function is perfect, which means that the hash table has no collisions, and the hash table lookup needs a single string comparison only. - -GNU gperf is highly customizable. There are options for generating C or C++ code, for emitting switch statements or nested ifs instead of a hash table, and for tuning the algorithm employed by gperf. - -Online Manual is available at www.gnu.org/software/gperf/manual/gperf.html" +DESCRIPTION=" +GNU gperf is a perfect hash function generator. For a given list of strings, \ +it produces a hash function and hash table, in form of C or C++ code, for \ +looking up a value depending on the input string. The hash function is \ +perfect, which means that the hash table has no collisions, and the hash table \ +lookup needs a single string comparison only. +GNU gperf is highly customizable. There are options for generating C or C++ \ +code, for emitting switch statements or nested ifs instead of a hash table, \ +and for tuning the algorithm employed by gperf. +Online Manual is available at www.gnu.org/software/gperf/manual/gperf.html +" HOMEPAGE="http://www.gnu.org/software/gperf/" COPYRIGHT="1989-1998, 2000-2004, 2006-2009 Free Software Foundation, Inc." LICENSE="GNU GPL v3" diff --git a/dev-util/idutils/idutils-4.6.recipe b/dev-util/idutils/idutils-4.6.recipe index 0f120bac7..70391fe32 100644 --- a/dev-util/idutils/idutils-4.6.recipe +++ b/dev-util/idutils/idutils-4.6.recipe @@ -1,18 +1,15 @@ SUMMARY="Fast, high-capacity, identifier database tool." DESCRIPTION=" -An 'ID database' is a binary file containing a list of file names, a -list of tokens, and a sparse matrix indicating which tokens appear -in which files. - -With this database and some tools to query it, many text-searching -tasks become simpler and faster. For example, you can list all -files that reference a particular #include' file throughout a huge -source hierarchy, search for all the memos containing references to a -project, or automatically invoke an editor on all files containing -references to some function or variable. Anyone with a large -software project to maintain, or a large set of text files to -organize, can benefit from the ID utilities." - +An 'ID database' is a binary file containing a list of file names, a list of \ +tokens, and a sparse matrix indicating which tokens appear in which files. +With this database and some tools to query it, many text-searching tasks \ +become simpler and faster. For example, you can list all files that reference \ +a particular #include' file throughout a huge source hierarchy, search for all \ +the memos containing references to a project, or automatically invoke an \ +editor on all files containing references to some function or variable. Anyone \ +with a large software project to maintain, or a large set of text files to \ +organize, can benefit from the ID utilities. +" HOMEPAGE="http://www.gnu.org/software/idutils/" SRC_URI="http://ftp.gnu.org/gnu/idutils/idutils-4.6.tar.xz" CHECKSUM_MD5="99b572536377fcddb4d38e86a3c215fd" diff --git a/dev-util/indent/indent-2.2.11.recipe b/dev-util/indent/indent-2.2.11.recipe index aebc21acc..bcc2e7068 100644 --- a/dev-util/indent/indent-2.2.11.recipe +++ b/dev-util/indent/indent-2.2.11.recipe @@ -35,5 +35,5 @@ COPYRIGHT="1999-2000 Carlo Wood. All rights reserved 1992, 2002, 2008 Free Software Foundation, Inc. All rights reserved. 1985 Sun Microsystems, Inc. 1980 The Regents of the University of California. - 1976 Board of Trustees of the University of Illinois. All rights reserved." - + 1976 Board of Trustees of the University of Illinois. All rights reserved. + " diff --git a/dev-util/intltool/intltool-0.40.6.recipe b/dev-util/intltool/intltool-0.40.6.recipe index c1864ceb3..230613971 100644 --- a/dev-util/intltool/intltool-0.40.6.recipe +++ b/dev-util/intltool/intltool-0.40.6.recipe @@ -1,17 +1,15 @@ -SUMMARY="intltool is a set of tools to centralize translation of file formats." -DESCRIPTION="intltool is a set of tools to centralize translation of many different file formats using GNU gettext-compatible PO files. - +SUMMARY="A set of tools to centralize translation of file formats." +DESCRIPTION=" +intltool is a set of tools to centralize translation of many different file \ +formats using GNU gettext-compatible PO files. The intltool collection can be used to do these things: - -* Extract translatable strings from various source files (.xml.in, -glade, .desktop.in, .server.in, .oaf.in). - -* Collect the extracted strings together with messages from traditional -source files (.c, .h) in po/PACKAGE.pot. - -* Merge back the translations from .po files into .xml, .desktop and -oaf files. This merge step will happen at build resp. installation time." - +* Extract translatable strings from various source files (.xml.in, glade, \ +.desktop.in, .server.in, .oaf.in). +* Collect the extracted strings together with messages from traditional source \ +files (.c, .h) in po/PACKAGE.pot. +* Merge back the translations from .po files into .xml, .desktop and oaf \ +files. This merge step will happen at build resp. installation time. +" HOMEPAGE="http://freedesktop.org/wiki/Software/intltool" SRC_URI="ftp://ftp.gnome.org/pub/gnome/sources/intltool/0.40/intltool-0.40.6.tar.gz" CHECKSUM_MD5="8e40f9d1c7308eddbfd24b22cd540631" diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe index 7ecec7633..00f6e381a 100644 --- a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe +++ b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe @@ -1,5 +1,7 @@ SUMMARY="NetSurf build framework" -DESCRIPTION="NetSurf build framework for compiling some of their libraries" +DESCRIPTION=" +NetSurf build framework for compiling some of their libraries. +" HOMEPAGE="http://www.netsurf-browser.org/" SRC_URI="git://git.netsurf-browser.org/buildsystem.git" REVISION="1" diff --git a/dev-util/ninja/ninja-1.4.0.recipe b/dev-util/ninja/ninja-1.4.0.recipe index dad0224b6..dbf3f63b1 100644 --- a/dev-util/ninja/ninja-1.4.0.recipe +++ b/dev-util/ninja/ninja-1.4.0.recipe @@ -39,23 +39,19 @@ INSTALL() } DESCRIPTION=" - Ninja is a small build system with a focus on speed. It differs from other - build systems in two major respects: it is designed to have its input files - generated by a higher-level build system, and it is designed to run builds - as fast as possible. - - Why yet another build system? - Where other build systems are high-level languages Ninja aims to be an - assembler. - - Ninja build files are human-readable but not especially convenient to write - by hand. (See the generated build file used to build Ninja itself.) These - constrained build files allow Ninja to evaluate incremental builds quickly. - For the Chrome browser on Linux (the motivating project behind Ninja), - Ninja is under a second for a no-op build where the equivalent Makefiles - took over ten seconds. - - Ninja's low-level approach makes it perfect for embedding into more - featureful build systems. Via gyp it can build Chrome and v8 and node.js - etc.; via CMake it can build LLVM and KDE and Blender etc. - " +Ninja is a small build system with a focus on speed. It differs from other \ +build systems in two major respects: it is designed to have its input files \ +generated by a higher-level build system, and it is designed to run builds as \ +fast as possible. +Why yet another build system? Where other build systems are high-level \ +languages Ninja aims to be an assembler. +Ninja build files are human-readable but not especially convenient to write by \ +hand. (See the generated build file used to build Ninja itself.) These \ +constrained build files allow Ninja to evaluate incremental builds quickly. \ +For the Chrome browser on Linux (the motivating project behind Ninja), Ninja \ +is under a second for a no-op build where the equivalent Makefiles took over \ +ten seconds. +Ninja's low-level approach makes it perfect for embedding into more featureful \ +build systems. Via gyp it can build Chrome and v8 and node.js etc.; via CMake \ +it can build LLVM and KDE and Blender etc. +" diff --git a/dev-util/patchutils/patchutils-0.3.3.recipe b/dev-util/patchutils/patchutils-0.3.3.recipe index 9dcb4698c..85c76391e 100644 --- a/dev-util/patchutils/patchutils-0.3.3.recipe +++ b/dev-util/patchutils/patchutils-0.3.3.recipe @@ -1,27 +1,23 @@ -SUMMARY="A small collection of programs that operate on patch files." +SUMMARY="A small collection of programs that operate on patch files" DESCRIPTION=" - *Interdiff generates an incremental patch from two patches - against a common source. - *Combinediff generates a single patch from two incremental - patches, allowing you to merge patches together. - *Filterdiff will select the portions of a patch file that apply - to files matching (or, alternatively, not matching) a shell - wildcard. - *Fixcvsdiff is for correcting the output of ‘cvs diff’. - *Rediff corrects hand-edited patches, by comparing the original - patch with the modified one and adjusting the offsets and - counts. - *Lsdiff displays a short listing of affected files in a patch - file, along with (optionally) the line numbers of the start of - each patch. - *Splitdiff separates out patches from a patch file so that each - new patch file only alters any given file once. - *Grepdiff displays a list of the files modified by a patch where - the patch contains a given regular expression. - *Recountdiff fixes up counts and offsets in a unified diff. - *Unwrapdiff fixes word-wrapped unified diffs. +*Interdiff generates an incremental patch from two patches against a common \ +source. +*Combinediff generates a single patch from two incremental patches, allowing \ +you to merge patches together. +*Filterdiff will select the portions of a patch file that apply to files \ +matching (or, alternatively, not matching) a shell wildcard. +*Fixcvsdiff is for correcting the output of ‘cvs diff’. +*Rediff corrects hand-edited patches, by comparing the original patch with the \ +modified one and adjusting the offsets and counts. +*Lsdiff displays a short listing of affected files in a patch file, along with \ +(optionally) the line numbers of the start of each patch. +*Splitdiff separates out patches from a patch file so that each new patch file \ +only alters any given file once. +*Grepdiff displays a list of the files modified by a patch where the patch \ +contains a given regular expression. +*Recountdiff fixes up counts and offsets in a unified diff. +*Unwrapdiff fixes word-wrapped unified diffs. " - HOMEPAGE="http://cyberelk.net/tim/patchutils/" SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.3.tar.xz" CHECKSUM_MD5="b640b6b8af6183f83eacf7bd6d2460cb" diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe index 852955849..0baa93963 100644 --- a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe +++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe @@ -1,5 +1,12 @@ SUMMARY="Helper tool for compiling applications and libraries" -DESCRIPTION="pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the correct compiler options on the command line so an application can use gcc -o test test.cpkg-config --libs --cflags glib-2.0 for instance, rather than hard-coding values on where to find glib (or other libraries). It is language-agnostic, so it can be used for defining the location of documentation tools, for instance." +DESCRIPTION=" +pkg-config is a helper tool used when compiling applications and libraries. It \ +helps you insert the correct compiler options on the command line so an \ +application can use gcc -o test test.cpkg-config --libs --cflags glib-2.0 for \ +instance, rather than hard-coding values on where to find glib (or other \ +libraries). It is language-agnostic, so it can be used for defining the \ +location of documentation tools, for instance. +" HOMEPAGE="http://pkg-config.freedesktop.org/wiki/" LICENSE="GNU GPL v2" COPYRIGHT="1998, 2001-2006 Red Hat Inc." diff --git a/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe index 3a9eda09b..dbd5694e5 100644 --- a/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe +++ b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="The Open POSIX Test Suite is a test suite for POSIX 2001 APIs, not tied to specific implementations." +DESCRIPTION=" +The Open POSIX Test Suite is a test suite for POSIX 2001 APIs, not tied to \ +specific implementations. +" HOMEPAGE="http://posixtest.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/posixtest/files/posixtest/posixtestsuite-1.5.2/posixtestsuite-1.5.2.tar.gz/download" CHECKSUM_MD5="9a8e6516585c886fddc257270061b59c" diff --git a/dev-util/ragel/ragel-6.8.recipe b/dev-util/ragel/ragel-6.8.recipe index a936560be..dc9cdeac4 100644 --- a/dev-util/ragel/ragel-6.8.recipe +++ b/dev-util/ragel/ragel-6.8.recipe @@ -1,12 +1,13 @@ SUMMARY="Ragel compiles executable finite state machines from regular languages" DESCRIPTION=" Ragel compiles executable finite state machines from regular languages. - Ragel targets C, C++, Objective-C, C#, D, Java, Ruby, OCaml and Go. - -Ragel state machines can not only recognize byte sequences as regular expression machines do, but can also execute code at arbitrary points in the recognition of a regular language. -Code embedding is done using inline operators that do not disrupt the regular language syntax." - +Ragel state machines can not only recognize byte sequences as regular \ +expression machines do, but can also execute code at arbitrary points in the \ +recognition of a regular language. +Code embedding is done using inline operators that do not disrupt the regular \ +language syntax. +" HOMEPAGE="http://www.complang.org/ragel" SRC_URI="http://www.complang.org/ragel/ragel-6.8.tar.gz" CHECKSUM_MD5="1bb39745ac23da449019f9f2cb4b0d01" diff --git a/dev-util/scons/scons-2.2.0.recipe b/dev-util/scons/scons-2.2.0.recipe index 000be6c55..e8a1e94ab 100644 --- a/dev-util/scons/scons-2.2.0.recipe +++ b/dev-util/scons/scons-2.2.0.recipe @@ -1,5 +1,11 @@ SUMMARY="Open Source software construction tool" -DESCRIPTION="SCons is an Open Source software construction tool—that is, a next-generation build tool. Think of SCons as an improved, cross-platform substitute for the classic Make utility with integrated functionality similar to autoconf/automake and compiler caches such as ccache. In short, SCons is an easier, more reliable and faster way to build software." +DESCRIPTION=" +SCons is an Open Source software construction tool—that is, a next-generation \ +build tool. Think of SCons as an improved, cross-platform substitute for the \ +classic Make utility with integrated functionality similar to \ +autoconf/automake and compiler caches such as ccache. In short, SCons is an \ +easier, more reliable and faster way to build software. +" HOMEPAGE="http://www.scons.org/" LICENSE="MIT" COPYRIGHT="2001-2012 The SCons Foundation" From 4676e4dca2352267afff232012e49580f469c1c8 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 261/306] Rewrap dev-vcs DESCRIPTIONs --- dev-vcs/bzr/bzr-2.6.0.recipe | 13 +++--- dev-vcs/cvs/cvs-1.12.13.1.recipe | 45 +++++++++++++++------ dev-vcs/fossil/fossil-1.27.recipe | 6 ++- dev-vcs/git/git-1.7.10.2.recipe | 16 ++++---- dev-vcs/git/git-1.8.3.4.recipe | 16 ++++---- dev-vcs/mercurial/mercurial-2.2.2.recipe | 4 +- dev-vcs/mercurial/mercurial-2.8.1.recipe | 4 +- dev-vcs/subversion/subversion-1.6.15.recipe | 13 +++--- dev-vcs/subversion/subversion-1.6.18.recipe | 13 +++--- 9 files changed, 75 insertions(+), 55 deletions(-) diff --git a/dev-vcs/bzr/bzr-2.6.0.recipe b/dev-vcs/bzr/bzr-2.6.0.recipe index edadadeb4..5b231d99d 100644 --- a/dev-vcs/bzr/bzr-2.6.0.recipe +++ b/dev-vcs/bzr/bzr-2.6.0.recipe @@ -1,11 +1,10 @@ -SUMMARY="Bazaar is a friendly powerful distributed version control system" +SUMMARY="A friendly powerful distributed version control system" DESCRIPTION=" -Bazaar is a version control system that helps you track project -history over time and to collaborate easily with others. Whether -you're a single developer, a co-located team or a community of -developers scattered across the world, Bazaar scales and adapts to -meet your needs. Part of the GNU Project, Bazaar is free software -sponsored by Canonical. +Bazaar is a version control system that helps you track project history over \ +time and to collaborate easily with others. Whether you're a single developer, \ +a co-located team or a community of developers scattered across the world, \ +Bazaar scales and adapts to meet your needs. Part of the GNU Project, Bazaar \ +is free software sponsored by Canonical. " HOMEPAGE="http://bazaar.canonical.com" SRC_URI="https://launchpadlibrarian.net/145980211/bzr-2.6.0.tar.gz" diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index 86927afbf..fed41739f 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -1,16 +1,37 @@ SUMMARY="Concurrent Versions System" -DESCRIPTION="CVS is a version control system, an important component of Source Configuration Management (SCM). Using it, you can record the history of sources files, and documents. It fills a similar role to the free software RCS, PRCS, and Aegis packages. - -CVS is a production quality system in wide use around the world, including many free software projects. - -While CVS stores individual file history in the same format as RCS, it offers the following significant advantages over RCS: - - * It can run scripts which you can supply to log CVS operations or enforce site-specific polices. - * Client/server CVS enables developers scattered by geography or slow modems to function as a single team. The version history is stored on a single central server and the client machines have a copy of all the files that the developers are working on. Therefore, the network between the client and the server must be up to perform CVS operations (such as checkins or updates) but need not be up to edit or manipulate the current versions of the files. Clients can perform all the same operations which are available locally. - * In cases where several developers or teams want to each maintain their own version of the files, because of geography and/or policy, CVS's vendor branches can import a version from another team (even if they don't use CVS), and then CVS can merge the changes from the vendor branch with the latest files if that is what is desired. - * Unreserved checkouts, allowing more than one developer to work on the same files at the same time. - * CVS provides a flexible modules database that provides a symbolic mapping of names to components of a larger software distribution. It applies names to collections of directories and files. A single command can manipulate the entire collection. - * CVS servers run on most unix variants, and clients for Windows NT/95, OS/2 and VMS are also available. CVS will also operate in what is sometimes called server mode against local repositories on Windows 95/NT." +DESCRIPTION=" +CVS is a version control system, an important component of Source \ +Configuration Management (SCM). Using it, you can record the history of \ +sources files, and documents. It fills a similar role to the free software \ +RCS, PRCS, and Aegis packages. +CVS is a production quality system in wide use around the world, including \ +many free software projects. +While CVS stores individual file history in the same format as RCS, it offers \ +the following significant advantages over RCS: +* It can run scripts which you can supply to log CVS operations or enforce \ +site-specific polices. +* Client/server CVS enables developers scattered by geography or slow modems \ +to function as a single team. The version history is stored on a single \ +central server and the client machines have a copy of all the files that the \ +developers are working on. Therefore, the network between the client and the \ +server must be up to perform CVS operations (such as checkins or updates) but \ +need not be up to edit or manipulate the current versions of the files. \ +Clients can perform all the same operations which are available locally. +* In cases where several developers or teams want to each maintain their own \ +version of the files, because of geography and/or policy, CVS's vendor \ +branches can import a version from another team (even if they don't use CVS), \ +and then CVS can merge the changes from the vendor branch with the latest \ +files if that is what is desired. +* Unreserved checkouts, allowing more than one developer to work on the same \ +files at the same time. +* CVS provides a flexible modules database that provides a symbolic mapping of \ +names to components of a larger software distribution. It applies names to \ +collections of directories and files. A single command can manipulate the \ +entire collection. +* CVS servers run on most unix variants, and clients for Windows NT/95, OS/2 \ +and VMS are also available. CVS will also operate in what is sometimes called \ +server mode against local repositories on Windows 95/NT. +" HOMEPAGE="http://www.nongnu.org/cvs/" COPYRIGHT="1986-2005 Free Software Foundation, Inc." LICENSE="GNU GPL v1 diff --git a/dev-vcs/fossil/fossil-1.27.recipe b/dev-vcs/fossil/fossil-1.27.recipe index a1f1184d1..f18d63f07 100644 --- a/dev-vcs/fossil/fossil-1.27.recipe +++ b/dev-vcs/fossil/fossil-1.27.recipe @@ -1,5 +1,7 @@ -SUMMARY="Simple, high-reliability, distributed software configuration management" -DESCRIPTION="Simple, high-reliability, distributed software configuration management" +SUMMARY="Simple, high-reliability, distributed software configuration management" +DESCRIPTION=" +Simple, high-reliability, distributed software configuration management +" HOMEPAGE="http://www.fossil-scm.org/" SRC_URI="http://www.fossil-scm.org/download/fossil-src-20130911114349.tar.gz" CHECKSUM_MD5="fa4ea3eb25d2a8cfb0edbd0c30c268b9" diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe index 1f4011927..2cc4a79f3 100644 --- a/dev-vcs/git/git-1.7.10.2.recipe +++ b/dev-vcs/git/git-1.7.10.2.recipe @@ -1,14 +1,12 @@ SUMMARY="Fast, scalable, distributed revision control system" DESCRIPTION=" - Git is a free and open source distributed version control system designed - to handle everything from small to very large projects with speed and - efficiency. - - Git is easy to learn and has a tiny footprint with lightning fast - performance. It outclasses SCM tools like Subversion, CVS, Perforce, - and ClearCase with features like cheap local branching, convenient - staging areas, and multiple workflows. - " +Git is a free and open source distributed version control system designed to \ +handle everything from small to very large projects with speed and efficiency. +Git is easy to learn and has a tiny footprint with lightning fast performance. \ +It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with \ +features like cheap local branching, convenient staging areas, and multiple \ +workflows. +" HOMEPAGE="http://git-scm.com/" LICENSE="GNU GPL v2" COPYRIGHT="2005-2012 Git Authors (see git web site for list)" diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe index a49785a80..e9a4b9a69 100644 --- a/dev-vcs/git/git-1.8.3.4.recipe +++ b/dev-vcs/git/git-1.8.3.4.recipe @@ -1,14 +1,12 @@ SUMMARY="Fast, scalable, distributed revision control system" DESCRIPTION=" - Git is a free and open source distributed version control system designed - to handle everything from small to very large projects with speed and - efficiency. - - Git is easy to learn and has a tiny footprint with lightning fast - performance. It outclasses SCM tools like Subversion, CVS, Perforce, - and ClearCase with features like cheap local branching, convenient - staging areas, and multiple workflows. - " +Git is a free and open source distributed version control system designed to \ +handle everything from small to very large projects with speed and efficiency. +Git is easy to learn and has a tiny footprint with lightning fast performance. \ +It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with \ +features like cheap local branching, convenient staging areas, and multiple \ +workflows. +" HOMEPAGE="http://git-scm.com/" LICENSE="GNU GPL v2" COPYRIGHT="2005-2012 Git Authors (see git web site for list)" diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index 67e316361..a601086c3 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -1,5 +1,7 @@ SUMMARY="Free, distributed source control management tool" -DESCRIPTION="Mercurial is a free, distributed source control management tool." +DESCRIPTION=" +Mercurial is a free, distributed source control management tool. +" HOMEPAGE="http://mercurial.selenic.com/" COPYRIGHT="2005-2012 Matt Mackall et al." LICENSE="GNU GPL v2" diff --git a/dev-vcs/mercurial/mercurial-2.8.1.recipe b/dev-vcs/mercurial/mercurial-2.8.1.recipe index 46ea1cb8c..8b4b88559 100644 --- a/dev-vcs/mercurial/mercurial-2.8.1.recipe +++ b/dev-vcs/mercurial/mercurial-2.8.1.recipe @@ -1,5 +1,7 @@ SUMMARY="Free, distributed source control management tool" -DESCRIPTION="Mercurial is a free, distributed source control management tool." +DESCRIPTION=" +Mercurial is a free, distributed source control management tool. +" HOMEPAGE="http://mercurial.selenic.com/" COPYRIGHT="2005-2012 Matt Mackall et al." LICENSE="GNU GPL v2" diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe index 0fe86df65..4b9a18eba 100644 --- a/dev-vcs/subversion/subversion-1.6.15.recipe +++ b/dev-vcs/subversion/subversion-1.6.15.recipe @@ -1,12 +1,11 @@ SUMMARY="Open source version control system" DESCRIPTION=" - Subversion exists to be universally recognized and adopted as an - open-source, centralized version control system characterized by its - reliability as a safe haven for valuable data; the simplicity of its - model and usage; and its ability to support the needs of a wide - variety of users and projects, from individuals to large-scale enterprise - operations. - " +Subversion exists to be universally recognized and adopted as an open-source, \ +centralized version control system characterized by its reliability as a safe \ +haven for valuable data; the simplicity of its model and usage; and its \ +ability to support the needs of a wide variety of users and projects, from \ +individuals to large-scale enterprise operations. +" HOMEPAGE="http://subversion.apache.org" LICENSE="Apache-Subversion" COPYRIGHT="2010 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index b8f994d95..f103e0369 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -1,12 +1,11 @@ SUMMARY="Open source version control system" DESCRIPTION=" - Subversion exists to be universally recognized and adopted as an - open-source, centralized version control system characterized by its - reliability as a safe haven for valuable data; the simplicity of its - model and usage; and its ability to support the needs of a wide - variety of users and projects, from individuals to large-scale enterprise - operations. - " +Subversion exists to be universally recognized and adopted as an open-source, \ +centralized version control system characterized by its reliability as a safe \ +haven for valuable data; the simplicity of its model and usage; and its \ +ability to support the needs of a wide variety of users and projects, from \ +individuals to large-scale enterprise operations. +" HOMEPAGE="http://subversion.apache.org" LICENSE="Apache-Subversion" COPYRIGHT="2010 The Apache Software Foundation" From bf4ec3816ffda5dd7108f73d7cdae3a1ec910744 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 262/306] Rewrap games-action DESCRIPTIONs --- games-action/quake3/quake3-0.6.1.recipe | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/games-action/quake3/quake3-0.6.1.recipe b/games-action/quake3/quake3-0.6.1.recipe index 6580d17fd..c4c316d83 100644 --- a/games-action/quake3/quake3-0.6.1.recipe +++ b/games-action/quake3/quake3-0.6.1.recipe @@ -1,11 +1,12 @@ SUMMARY="A multiplayer-focused first-person shooter" -DESCRIPTION="Quake 3 (also known as Q3A or Q3) is a fast paced - first-person shooter based. - - Warning: While the Quake 3 game engine was released under the - GPL, this version requires a valid Quake 3 license code and - the original Quake 3 CD (placed into ~/.q3a/baseq3 or - ~/.q3a/demota depending on which Quake 3 media you have)" +DESCRIPTION=" +Quake 3 (also known as Q3A or Q3) is a fast paced first-person shooter based. + +Warning: While the Quake 3 game engine was released under the GPL, this \ +version requires a valid Quake 3 license code and the original Quake 3 CD \ +(placed into ~/.q3a/baseq3 or ~/.q3a/demota depending on which Quake 3 media \ +you have). +" HOMEPAGE="http://www.idsoftware.com" COPYRIGHT="Copyright (C) 1999-2005 Id Software, Inc." LICENSE="GNU GPL v2" From 27c67fdb32a00f9a934a74ca933b5b970973b853 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 263/306] Rewrap games-arcade DESCRIPTIONs --- games-arcade/sdlscavenger/sdlscavenger-145.1.recipe | 6 +++--- games-arcade/supertux/supertux-0.1.3.recipe | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe b/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe index d30f920e2..8d8629d82 100644 --- a/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe +++ b/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe @@ -45,6 +45,6 @@ INSTALL() # ----- DESCRIPTION ----------------------------------------------------------- DESCRIPTION=" -Grab all the diamonds, but don't get caught! Escape or trap ennemies by digging -holes in the ground, climb ladders and ropes, and, or course, run fast! - " +Grab all the diamonds, but don't get caught! Escape or trap ennemies by \ +digging holes in the ground, climb ladders and ropes, and, or course, run fast! +" diff --git a/games-arcade/supertux/supertux-0.1.3.recipe b/games-arcade/supertux/supertux-0.1.3.recipe index ecd275ffe..169162f3b 100644 --- a/games-arcade/supertux/supertux-0.1.3.recipe +++ b/games-arcade/supertux/supertux-0.1.3.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="SuperTux is a classic 2D jump'n run sidescroller game in a style similar to the original Super Mario games." +DESCRIPTION=" +SuperTux is a classic 2D jump'n run sidescroller game in a style similar to \ +the original Super Mario games. +" HOMEPAGE="http://supertux.lethargik.org/" SRC_URI="http://supertux.googlecode.com/files/supertux-0.1.3.tar.bz2" STATUS_HAIKU="unstable" From fd513f2100bf84d0fe008c3db5bfad041c8593ed Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 264/306] Rewrap games-emulation DESCRIPTIONs --- games-emulation/dosbox/dosbox-0.74.recipe | 28 +++++++++---------- .../visualboyadvance-1.8.recipe | 6 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe index fe2437e90..80b46d765 100644 --- a/games-emulation/dosbox/dosbox-0.74.recipe +++ b/games-emulation/dosbox/dosbox-0.74.recipe @@ -1,18 +1,16 @@ -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." +SUMMARY="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" diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe index 65440f416..7a3a78eb6 100644 --- a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe +++ b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe @@ -1,5 +1,7 @@ -SUMMARY="VisualBoyAdvance, a GBA Emulator" -DESCRIPTION="VisualBoyAdvance is a Game Boy Advance emulator which runs your prefered ROMS" +SUMMARY="A Game Boy Advance 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" From 6b4faafd699ef9faef7cfa372c82a6ddb8858a77 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 265/306] Rewrap games-engines DESCRIPTIONs --- games-engines/scummvm/scummvm-1.6.0.recipe | 7 ++++++- games-engines/solarus/solarus-1.1.1.recipe | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe index 35eb39b2b..8436356b1 100644 --- a/games-engines/scummvm/scummvm-1.6.0.recipe +++ b/games-engines/scummvm/scummvm-1.6.0.recipe @@ -1,5 +1,10 @@ SUMMARY="Script Creation Utility for Maniac Mansion Virtual Machine" -DESCRIPTION="ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed! +DESCRIPTION=" +ScummVM is a program which allows you to run certain classic graphical \ +point-and-click adventure games, provided you already have their data files. \ +The clever part about this: ScummVM just replaces the executables shipped with \ +the games, allowing you to play them on systems for which they were never \ +designed! " HOMEPAGE="http://scummvm.org" SRC_URI="http://prdownloads.sourceforge.net/scummvm/scummvm-1.6.0.tar.bz2?download" diff --git a/games-engines/solarus/solarus-1.1.1.recipe b/games-engines/solarus/solarus-1.1.1.recipe index c28a3152c..84e660388 100644 --- a/games-engines/solarus/solarus-1.1.1.recipe +++ b/games-engines/solarus/solarus-1.1.1.recipe @@ -1,5 +1,7 @@ SUMMARY="An ARPG game engine" -DESCRIPTION="Solarus is an open-source Zelda-like 2D game engine." +DESCRIPTION=" +Solarus is an open-source Zelda-like 2D game engine. +" HOMEPAGE="http://solarus-games.org" SRC_URI="http://www.solarus-games.org/downloads/solarus/solarus-1.1.1-src.tar.gz" CHECKSUM_MD5="168894091ce4b728889069c767a1532d" From d7a0fd1a52187155829edb3db8a4d883b51f273c Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 266/306] Rewrap games-kids DESCRIPTIONs --- games-kids/dragonmemory/dragonmemory-1.recipe | 7 +++++-- games-kids/pipepanic/pipepanic-0.1.3.recipe | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/games-kids/dragonmemory/dragonmemory-1.recipe b/games-kids/dragonmemory/dragonmemory-1.recipe index d8f734df7..04658d7c2 100644 --- a/games-kids/dragonmemory/dragonmemory-1.recipe +++ b/games-kids/dragonmemory/dragonmemory-1.recipe @@ -1,5 +1,8 @@ -DESCRIPTION="Dragon Memory is a simple but fun memory game with very detailed graphics and addictive gameplay." -SUMMARY="Dragon Memory is a memory game with addictive gameplay." +SUMMARY="A memory game with addictive gameplay" +DESCRIPTION=" +Dragon Memory is a simple but fun memory game with very detailed graphics and \ +addictive gameplay. +" HOMEPAGE="http://sourceforge.net/projects/dragonmemory/" SRC_URI="http://cznic.dl.sourceforge.net/project/dragonmemory/DragonMemory-source.tgz" SRC_URI2="http://heanet.dl.sourceforge.net/project/dragonmemory/DragonMemory-source.tgz" diff --git a/games-kids/pipepanic/pipepanic-0.1.3.recipe b/games-kids/pipepanic/pipepanic-0.1.3.recipe index 5324ca060..b91b68689 100644 --- a/games-kids/pipepanic/pipepanic-0.1.3.recipe +++ b/games-kids/pipepanic/pipepanic-0.1.3.recipe @@ -1,5 +1,8 @@ SUMMARY="A pipe connecting game." -DESCRIPTION="Pipepanic is a pipe connecting game using libSDL. Connect as many different shaped pipes together as possible within the time given. " +DESCRIPTION=" +Pipepanic is a pipe connecting game using libSDL. Connect as many different \ +shaped pipes together as possible within the time given. +" HOMEPAGE="http://www.users.waitrose.com/~thunor/pipepanic/" SRC_URI="http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-0.1.3-source.tar.gz" CHECKSUM_MD5="99b68e990012b2f58c184b8ba9e4fb4d" @@ -42,4 +45,4 @@ INSTALL() mkdir -p $appsDir/Pipepanic cp pipepanic ascii15.bmp ascii30.bmp digits24.bmp digits48.bmp tiles24.bmp tiles48.bmp $appsDir/Pipepanic/ addAppDeskbarSymlink $appsDir/Pipepanic/pipepanic "Pipepanic" -} \ No newline at end of file +} From 51d82f5b74fd9cca5a3549d52530d71a5cb939e6 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 267/306] Rewrap games-puzzle DESCRIPTIONs --- games-puzzle/gemz/gemz-0.97.0.recipe | 12 +++++++++--- games-puzzle/gnurobbo/gnurobbo-0.65.recipe | 5 ++++- games-puzzle/neverball/neverball-1.5.4.recipe | 9 ++++----- .../numptyphysics/numptyphysics-0.2_157.recipe | 4 +++- games-puzzle/rezerwar/rezerwar-0.4.2.recipe | 14 ++++++++++---- games-puzzle/sdllopan/sdllopan-10.recipe | 4 ++-- 6 files changed, 32 insertions(+), 16 deletions(-) diff --git a/games-puzzle/gemz/gemz-0.97.0.recipe b/games-puzzle/gemz/gemz-0.97.0.recipe index 012b8e9e4..a36062743 100644 --- a/games-puzzle/gemz/gemz-0.97.0.recipe +++ b/games-puzzle/gemz/gemz-0.97.0.recipe @@ -1,6 +1,12 @@ -SUMMARY="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. +SUMMARY="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" diff --git a/games-puzzle/gnurobbo/gnurobbo-0.65.recipe b/games-puzzle/gnurobbo/gnurobbo-0.65.recipe index 9e96c5ba6..3db62d4ee 100644 --- a/games-puzzle/gnurobbo/gnurobbo-0.65.recipe +++ b/games-puzzle/gnurobbo/gnurobbo-0.65.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="GNU Robbo is a free open source reimplementation of Janusz Pelc's Robbo for the Atari XE/XL which was distributed by LK Avalon in 1989." +DESCRIPTION=" +GNU Robbo is a free open source reimplementation of Janusz Pelc's Robbo for \ +the Atari XE/XL which was distributed by LK Avalon in 1989. +" HOMEPAGE="http://gnurobbo.sourceforge.net/" SRC_URI="http://mirrors.ludost.net/gentoo/distfiles/gnurobbo-0.65.6-source.tar.gz" CHECKSUM_MD5="bb7d2bc1282429ac5c0b89966b07e0cc" diff --git a/games-puzzle/neverball/neverball-1.5.4.recipe b/games-puzzle/neverball/neverball-1.5.4.recipe index 0320cce4a..1853b7096 100644 --- a/games-puzzle/neverball/neverball-1.5.4.recipe +++ b/games-puzzle/neverball/neverball-1.5.4.recipe @@ -1,9 +1,8 @@ -DESCRIPTION=" - Neverball is part puzzle game, part action game, and entirely a test - of skill. Tilt the floor to roll a ball through an obstacle course - before time runs out. - " SUMMARY="Tilt the floor to roll a ball through an course before time runs out." +DESCRIPTION=" +Neverball is part puzzle game, part action game, and entirely a test of skill. \ +Tilt the floor to roll a ball through an obstacle course before time runs out. +" HOMEPAGE="http://neverball.org" COPYRIGHT="2002-2010 The Neverball Team" LICENSE="GNU GPL v2" diff --git a/games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe b/games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe index 66901eda6..2dd1e71fc 100644 --- a/games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe +++ b/games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Numpty Physics is a drawing puzzle game in the spirit of Crayon Physics" +DESCRIPTION=" +Numpty Physics is a drawing puzzle game in the spirit of Crayon Physics. +" HOMEPAGE="http://numptyphysics.garage.maemo.org" SRC_URI="svn+https://vcs.maemo.org/svn/numptyphysics/trunk/#157" #CHECKSUM_MD5="" diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe index 8f9e51990..66a8f1365 100644 --- a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe +++ b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe @@ -1,7 +1,13 @@ -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. +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" diff --git a/games-puzzle/sdllopan/sdllopan-10.recipe b/games-puzzle/sdllopan/sdllopan-10.recipe index f0795e116..c466fc629 100644 --- a/games-puzzle/sdllopan/sdllopan-10.recipe +++ b/games-puzzle/sdllopan/sdllopan-10.recipe @@ -44,6 +44,6 @@ INSTALL() # ----- DESCRIPTION ----------------------------------------------------------- DESCRIPTION=" -The well known Lopan (Mah Jongg) game. Find pair and try to remove all 144 +The well known Lopan (Mah Jongg) game. Find pair and try to remove all 144 \ tiles before getting locked. - " +" From be600cdc25d43a67d95ab88c5d13c8a27ee66989 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 268/306] Rewrap gnome-base DESCRIPTIONs --- gnome-base/gnome_common/gnome_common-2.28.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnome-base/gnome_common/gnome_common-2.28.recipe b/gnome-base/gnome_common/gnome_common-2.28.recipe index e3a6aa65d..bb66e9288 100644 --- a/gnome-base/gnome_common/gnome_common-2.28.recipe +++ b/gnome-base/gnome_common/gnome_common-2.28.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="A module that is required only when building GNOME from the repository" +DESCRIPTION=" +A module that is required only when building GNOME from the repository. +" HOMEPAGE="http://git.gnome.org/browse/gnome-common/" SRC_URI="git+git://git.gnome.org/gnome-common" REVISION="1" From a08a763e6f041efaef756c0510f5e2a557521c61 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 269/306] Rewrap haiku-apps DESCRIPTIONs --- haiku-apps/a_book/a_book-1.1.recipe | 9 +++--- .../aalibtranslator-0.0.1.recipe | 5 ++-- haiku-apps/album/album-0.9.2.recipe | 20 ++++++------- haiku-apps/aplayer/aplayer-4.0.1.recipe | 9 ++++-- haiku-apps/aplayer/aplayer-4.0_svn.recipe | 7 +++-- haiku-apps/armyknife/armyknife-4.3.0.recipe | 7 +++-- haiku-apps/backup/backup-0.0.1.recipe | 4 ++- haiku-apps/bafx/bafx-0.0.1.recipe | 4 ++- haiku-apps/bdhcalc/bdhcalc-1.1.recipe | 14 ++++----- haiku-apps/beae/beae-1.2.recipe | 7 +++-- haiku-apps/beam/beam-1.2alpha.recipe | 2 +- haiku-apps/becasso/becasso-2.0.recipe | 7 +++-- haiku-apps/beezer/beezer-0.99.hg.recipe | 14 ++++----- haiku-apps/beget/beget-1.2.3.recipe | 6 ++-- haiku-apps/behappy/behappy-1.06e_git.recipe | 6 ++-- .../beindexed/beindexed-0.2.0_alpha.recipe | 11 +++---- haiku-apps/belife/belife-1.0.0.recipe | 16 +++++----- .../bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe | 11 ++++--- .../bescreencapture-1.9.2.recipe | 13 ++++---- .../bescreencapture-1.9.3.recipe | 13 ++++---- .../binary_clock/binary_clock-2.0.recipe | 10 +++---- .../blogpositive/blogpositive-0.1.0.recipe | 7 ++--- .../blogpositive/blogpositive-0.2.0.recipe | 7 ++--- .../blogpositive/blogpositive-0.3.0.recipe | 7 ++--- .../blogpositive/blogpositive-0.4.0.recipe | 7 ++--- haiku-apps/burnitnow/burnitnow-trunk.recipe | 4 ++- haiku-apps/capitalbe/capitalbe-1.0.recipe | 10 ++++--- haiku-apps/caya/caya-2013.07.31.recipe | 6 ++-- .../caya_gpl_protocols-36.recipe | 7 ++--- .../cherry_blossom/cherry_blossom-1.0.recipe | 8 +++-- haiku-apps/clockwerk/clockwerk-78.recipe | 5 ++-- haiku-apps/clockwerk/clockwerk-80.recipe | 5 ++-- haiku-apps/cmake_haiku/cmake_haiku-git.recipe | 7 +++-- .../converttolf/converttolf-0.0.0.recipe | 11 ++++--- haiku-apps/dockbert/dockbert-1.0.2b1.recipe | 6 +++- .../documentviewer-0.3.2.recipe | 6 ++-- haiku-apps/filecropper/filecropper-1.recipe | 7 +++-- haiku-apps/filer/filer-1.0.0beta3.recipe | 20 ++++++------- haiku-apps/filwip/filwip-1.0.0.recipe | 11 ++++--- haiku-apps/finance/finance-1.0.0.recipe | 14 ++++----- .../foldershaper/foldershaper-1.0.recipe | 9 ++++-- haiku-apps/fontboy/fontboy-0.9.7.recipe | 10 +++---- haiku-apps/fortuna/fortuna-1.0.0.recipe | 14 ++++----- haiku-apps/friss/friss-0.8beta.recipe | 4 ++- haiku-apps/ftppositive/ftppositive-1.0.recipe | 4 ++- haiku-apps/hare/hare-1.1.1.recipe | 6 ++-- haiku-apps/jammin/jammin-0.1.0.recipe | 11 +++---- .../keymapswitcher-1.2.7.10.recipe | 6 +++- .../keymapswitcher-1.2.7.11.recipe | 6 +++- .../keymapswitcher-1.2.7.9.recipe | 6 +++- haiku-apps/konfetti/konfetti-1.0.0.recipe | 6 ++-- haiku-apps/launchpad/launchpad-1.3.recipe | 4 ++- .../masterpiece/masterpiece-r742.recipe | 17 ++++++----- .../minimizeall/minimizeall-1.0.0.recipe | 11 ++++--- haiku-apps/mkdepend/mkdepend-1.7.recipe | 5 +++- haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe | 6 ++-- .../nightandday/nightsandday-0.1.2.recipe | 17 +++++------ .../optipngtranslator-0.0.1.recipe | 6 ++-- haiku-apps/organizer/organizer-0.1.recipe | 6 ++-- haiku-apps/paladin/paladin-1.3.recipe | 5 +++- haiku-apps/paladin/paladin-1.3_hg.recipe | 5 +++- haiku-apps/pe/pe-2.4.3_hg602.recipe | 6 +++- haiku-apps/pe/pe-2.4.3_hg606.recipe | 6 +++- haiku-apps/pe/pe-2.4.3_hg610.recipe | 6 +++- haiku-apps/pe/pe-2.4.3_hg611.recipe | 6 +++- haiku-apps/pe/pe-2.4.3_hg614.recipe | 6 +++- haiku-apps/pe/pe-2.4.3_hg615.recipe | 8 +++-- haiku-apps/phantomlimb/phantomlimb-1.recipe | 22 +++++++------- haiku-apps/ppviewer/ppviewer-1.0.0.recipe | 6 ++-- .../querywatcher/querywatcher-1.4.recipe | 8 ++--- .../quicklaunch/quicklaunch-0.9.6.recipe | 13 ++++---- .../randomizer/randomizer-1.0.0b1.recipe | 11 ++++--- haiku-apps/recibe/recibe-1.0b1.recipe | 7 ++--- .../remotecontrol/remotecontrol-1.1.recipe | 11 ++++--- haiku-apps/resourcer/resourcer-1.0.recipe | 10 +++---- .../runprogram/runprogram-1.0rc1.recipe | 12 ++++---- haiku-apps/sawteeth/sawteeth-1.3.recipe | 6 +++- haiku-apps/sum_it/sum_it-0.2beta.recipe | 8 ++--- haiku-apps/systeminfo/systeminfo-2.recipe | 15 ++++++---- haiku-apps/takenotes/takenotes-1.0.0.recipe | 18 +++++------ .../thememanager/thememanager-1.0_git.recipe | 12 ++++---- haiku-apps/tolmach/tolmach-1.1.0.recipe | 6 +++- haiku-apps/trackergrep/trackergrep-5.1.recipe | 11 +++---- haiku-apps/ubertuber/ubertuber-0.9.7.recipe | 12 ++++++-- haiku-apps/ubertuber/ubertuber-0.9.8.recipe | 30 ++++++++----------- haiku-apps/vision/vision-0.9.7.r947.recipe | 4 ++- haiku-apps/waveview/waveview-1.0.recipe | 4 ++- haiku-apps/whisper/whisper-1.2.recipe | 5 +++- .../wonderbrush/wonderbrush-2.1.2.recipe | 24 ++++++++++++--- haiku-apps/yab/yab-1.6.recipe | 6 +++- haiku-apps/yab/yab-1.7.recipe | 5 +++- 91 files changed, 467 insertions(+), 351 deletions(-) diff --git a/haiku-apps/a_book/a_book-1.1.recipe b/haiku-apps/a_book/a_book-1.1.recipe index 6beaec2c8..2309d3f6b 100644 --- a/haiku-apps/a_book/a_book-1.1.recipe +++ b/haiku-apps/a_book/a_book-1.1.recipe @@ -1,9 +1,10 @@ SUMMARY="A small calendar application with reminders." DESCRIPTION=" -A small calendar application with reminders. You can use this app to -organize your time. The application supports the addition to each day -tasks with the appropriate hours and browse all of them. Your job will -be saved to a file when the application is closed." +A small calendar application with reminders. You can use this app to organize \ +your time. The application supports the addition to each day tasks with the \ +appropriate hours and browse all of them. Your job will be saved to a file \ +when the application is closed. +" HOMEPAGE="https://github.com/HaikuArchives/A-Book" SRC_URI="git+https://github.com/HaikuArchives/A-Book.git#fe6c66c631" REVISION="2" diff --git a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe index d9d540f8a..a584cd1ee 100644 --- a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe +++ b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe @@ -1,8 +1,7 @@ SUMMARY="Save image files as ASCII text art" DESCRIPTION=" - The AalibTranslator for Haiku allows you to save image files as - ASCII text art. - " +The AalibTranslator for Haiku allows you to save image files as ASCII text art. +" HOMEPAGE="https://github.com/noryb009/AalibTranslator/" SRC_URI="git://github.com/noryb009/AalibTranslator.git#e69df6765106af986454611fa2c960e0ecdb1562" LICENSE="MIT" diff --git a/haiku-apps/album/album-0.9.2.recipe b/haiku-apps/album/album-0.9.2.recipe index 284b0c929..8543edd40 100644 --- a/haiku-apps/album/album-0.9.2.recipe +++ b/haiku-apps/album/album-0.9.2.recipe @@ -1,14 +1,14 @@ -SUMMARY="An image viewer/organiser designed for BeOS-compatible systems." +SUMMARY="An image viewer/organiser designed for BeOS-compatible systems" DESCRIPTION=" -Album is a file browsing and tagging utility for BeOS and compatibles. -It started out with a goal of the ultimate image organiser (code -named Aberration), but ended up as something much more modest and -BeOS-specific. The idea is to have a work pad for pictures from -different locations where they can be previewed and tagged in one -place. The program is not limited to picture files and BFS (Be File -System) volumes, although that further limits whatever the usefulness -since much of the functionality has to do with file -attributes." +Album is a file browsing and tagging utility for BeOS and compatibles. It \ +started out with a goal of the ultimate image organiser (code named \ +Aberration), but ended up as something much more modest and BeOS-specific. The \ +idea is to have a work pad for pictures from different locations where they \ +can be previewed and tagged in one place. The program is not limited to \ +picture files and BFS (Be File System) volumes, although that further limits \ +whatever the usefulness since much of the functionality has to do with file \ +attributes. +" HOMEPAGE="http://users.volja.net/mkovac1/proj/album/" SRC_URI="git://github.com/HaikuArchives/Album#64aa3371a9" LICENSE="MIT" diff --git a/haiku-apps/aplayer/aplayer-4.0.1.recipe b/haiku-apps/aplayer/aplayer-4.0.1.recipe index a6be885ac..632910dbf 100644 --- a/haiku-apps/aplayer/aplayer-4.0.1.recipe +++ b/haiku-apps/aplayer/aplayer-4.0.1.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="APlayer is a module player and can play a lot of different music file formats, from Amiga and elsewhere." +DESCRIPTION=" +APlayer is a module player and can play a lot of different music file formats, \ +from Amiga and elsewhere. +" HOMEPAGE="http://pulkomandy.tk/projects/APlayer" SRC_URI="svn://pulkomandy.tk/APlayer/trunk/" REVISION="1" @@ -19,5 +22,5 @@ INSTALL() LICENSE="Artistic Licence" COPYRIGHT="1994-2002 Polycode - 2011-2012 Adrien Destugues" - + 2011-2012 Adrien Destugues + " diff --git a/haiku-apps/aplayer/aplayer-4.0_svn.recipe b/haiku-apps/aplayer/aplayer-4.0_svn.recipe index d886efaa0..795e6d1a6 100644 --- a/haiku-apps/aplayer/aplayer-4.0_svn.recipe +++ b/haiku-apps/aplayer/aplayer-4.0_svn.recipe @@ -1,5 +1,8 @@ -SUMMARY="APlayer is a module player and can play a lot of different music file formats, from Amiga and elsewhere." -DESCRIPTION="APlayer is a module player and can play a lot of different music file formats, from Amiga and elsewhere." +SUMMARY="A module player that can play a lot of music file formats" +DESCRIPTION=" +APlayer is a module player and can play a lot of different music file formats, \ +from Amiga and elsewhere. +" HOMEPAGE="http://pulkomandy.tk/projects/APlayer" SRC_URI="svn://pulkomandy.tk/APlayer/trunk" REVISION="1" diff --git a/haiku-apps/armyknife/armyknife-4.3.0.recipe b/haiku-apps/armyknife/armyknife-4.3.0.recipe index 67ca2e859..7a1f5a111 100644 --- a/haiku-apps/armyknife/armyknife-4.3.0.recipe +++ b/haiku-apps/armyknife/armyknife-4.3.0.recipe @@ -1,5 +1,7 @@ -SUMMARY="The all-in-one metadata editor for audio files." -DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." +SUMMARY="The all-in-one metadata editor for audio files" +DESCRIPTION=" +ArmyKnife is an application that lets you edit the metadata of audio files. +" HOMEPAGE="https://github.com/HaikuArchives/ArmyKnife" SRC_URI="git://github.com/HaikuArchives/ArmyKnife.git#67ce56a906" COPYRIGHT="2000-2001 Jason Burgess" @@ -43,4 +45,3 @@ INSTALL() addAppDeskbarSymlink $appsDir/ArmyKnife/ArmyKnife } - diff --git a/haiku-apps/backup/backup-0.0.1.recipe b/haiku-apps/backup/backup-0.0.1.recipe index 7d4fbfc7e..841dd9abb 100644 --- a/haiku-apps/backup/backup-0.0.1.recipe +++ b/haiku-apps/backup/backup-0.0.1.recipe @@ -1,5 +1,7 @@ -DESCRIPTION="A backup application for Haiku" SUMMARY="A backup application for Haiku" +DESCRIPTION=" +A backup application for Haiku. +" COPYRIGHT="2013 Alexander von Gluck IV" LICENSE="MIT" HOMEPAGE="https://github.com/kallisti5/backup" diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.0.1.recipe index 329a3494f..41a4dda7f 100644 --- a/haiku-apps/bafx/bafx-0.0.1.recipe +++ b/haiku-apps/bafx/bafx-0.0.1.recipe @@ -1,5 +1,7 @@ -DESCRIPTION="BAfx is a file manager for Haiku." SUMMARY="A file manager for Haiku." +DESCRIPTION=" +BAfx is a file manager for Haiku. +" HOMEPAGE="https://github.com/marbocub/BAfx" SRC_URI="git+https://github.com/marbocub/BAfx#4b14a8ba4c" COPYRIGHT="2012 @marbocub" diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe index 2e7cf9ce0..552321b93 100644 --- a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe +++ b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe @@ -1,11 +1,11 @@ SUMMARY="Fully functunal 64bit calculator" -DESCRIPTION="BDH Calc is a fully functional 64bit calculator, supporting - common arithmetic operations like adding, subtracting, dividing and - multiplying as well as bitwise operators. You can choose the word - size and whether the sign is considered to simulate any integral - data type. Moreover the calculator supports binary, decimal and - hexadecimal conversion. - " +DESCRIPTION=" +BDH Calc is a fully functional 64bit calculator, supporting common arithmetic \ +operations like adding, subtracting, dividing and multiplying as well as \ +bitwise operators. You can choose the word size and whether the sign is \ +considered to simulate any integral data type. Moreover the calculator \ +supports binary, decimal and hexadecimal conversion. +" HOMEPAGE="http://haikuware.com/directory/view-details/science-math/calculators/bdh-calc-for-haiku" SRC_URI="git://github.com/ThomasCompix/BDH-Calc.git#4a6865932ae0e95244ed0149b6e8c4f437ea742a" REVISION="1" diff --git a/haiku-apps/beae/beae-1.2.recipe b/haiku-apps/beae/beae-1.2.recipe index b96c1d93c..a450f3119 100644 --- a/haiku-apps/beae/beae-1.2.recipe +++ b/haiku-apps/beae/beae-1.2.recipe @@ -1,5 +1,8 @@ -DESCRIPTION="BeAE is an audio editor for Haiku, with features like silencing, fading in/out, analyzing etc." -SUMMARY="Well featured audio editor for Haiku" +SUMMARY="Well featured audio editor for Haiku" +DESCRIPTION=" +BeAE is an audio editor for Haiku, with features like silencing, fading \ +in/out, analyzing etc. +" HOMEPAGE="http://developer.berlios.de/projects/beae" SRC_URI="git+https://github.com/HaikuArchives/BeAE.git#b4e8a39e0d" REVISION="1" diff --git a/haiku-apps/beam/beam-1.2alpha.recipe b/haiku-apps/beam/beam-1.2alpha.recipe index 042bc9e34..c49195fbc 100644 --- a/haiku-apps/beam/beam-1.2alpha.recipe +++ b/haiku-apps/beam/beam-1.2alpha.recipe @@ -48,6 +48,6 @@ INSTALL() LICENSE="GNU GPL v2" COPYRIGHT="2000-2012 Oliver Tappe" DESCRIPTION=" -Beam (BEware, Another Mailer) is an open source e-mail client for BeOS (R5 and +Beam (BEware, Another Mailer) is an open source e-mail client for BeOS (R5 and \ onwards) that aims to be fast, stable and feature-complete. " diff --git a/haiku-apps/becasso/becasso-2.0.recipe b/haiku-apps/becasso/becasso-2.0.recipe index df73df1cc..38c3b0905 100644 --- a/haiku-apps/becasso/becasso-2.0.recipe +++ b/haiku-apps/becasso/becasso-2.0.recipe @@ -1,5 +1,8 @@ -DESCRIPTION="BeCasso - Paint and imaging software for Haiku, originally written for BeOS by Sum Software." -SUMMARY="Paint and imaging software for Haiku, originally written for BeOS by Sum Software." +SUMMARY="Paint and imaging software for Haiku" +DESCRIPTION=" +BeCasso - Paint and imaging software for Haiku, originally written for BeOS by \ +Sum Software. +" HOMEPAGE="https://github.com/orangejua/Becasso" SRC_URI="git+https://github.com/orangejua/Becasso" REVISION="1" diff --git a/haiku-apps/beezer/beezer-0.99.hg.recipe b/haiku-apps/beezer/beezer-0.99.hg.recipe index 833eb3d04..3256f108e 100644 --- a/haiku-apps/beezer/beezer-0.99.hg.recipe +++ b/haiku-apps/beezer/beezer-0.99.hg.recipe @@ -1,12 +1,10 @@ -SUMMARY="Beezer is an archive manager for Haiku, similar to winzip" +SUMMARY="An archive manager for Haiku, similar to winzip" DESCRIPTION=" - Beezer is an archive manager for Haiku. It can extract and browse, - create and add to archive files. In addition, Beezer can split and rejoin - files. - - It can extract 7zip, arj, bzip2, gzip, lha, rar, tar, xz and zip files. - It can create 7zip, bzip2, gzip, tar and zip files. - " +Beezer is an archive manager for Haiku. It can extract and browse, create and \ +add to archive files. In addition, Beezer can split and rejoin files. +It can extract 7zip, arj, bzip2, gzip, lha, rar, tar, xz and zip files. +It can create 7zip, bzip2, gzip, tar and zip files. +" HOMEPAGE="https://bitbucket.org/cpr/beezer" SRC_URI="hg+https://bitbucket.org/cpr/beezer" LICENSE="BSD (3-clause)" diff --git a/haiku-apps/beget/beget-1.2.3.recipe b/haiku-apps/beget/beget-1.2.3.recipe index 945cc8ed0..3b43424b7 100644 --- a/haiku-apps/beget/beget-1.2.3.recipe +++ b/haiku-apps/beget/beget-1.2.3.recipe @@ -1,8 +1,8 @@ SUMMARY="A GUI frontend to the command-line downloader wget" DESCRIPTION=" -BeGet is a easy-to-use download manager for the popular command line -tool wget. BeGet can also accept more than one link at the same time. -BeGet saves your downloaded files to /home/Downloads +BeGet is a easy-to-use download manager for the popular command line tool \ +wget. BeGet can also accept more than one link at the same time. BeGet saves \ +your downloaded files to /home/Downloads " HOMEPAGE="http://github.com/HaikuArchives/BeGet" SRC_URI="git://github.com/HaikuArchives/BeGet#fe8db7ccb6" diff --git a/haiku-apps/behappy/behappy-1.06e_git.recipe b/haiku-apps/behappy/behappy-1.06e_git.recipe index 511d9c711..3a1c4f0a9 100644 --- a/haiku-apps/behappy/behappy-1.06e_git.recipe +++ b/haiku-apps/behappy/behappy-1.06e_git.recipe @@ -1,5 +1,7 @@ -SUMMARY="HTML documentation viewer" -DESCRIPTION="HTML documentation viewer" +SUMMARY="An HTML documentation viewer" +DESCRIPTION=" +HTML documentation viewer +" HOMEPAGE="http://www.becoz.org/beos-en/behappy" SRC_URI="git+https://github.com/HaikuArchives/BeHappy.git" REVISION="1" diff --git a/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe b/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe index 2ac0c14bd..fe19629d4 100644 --- a/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe +++ b/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe @@ -1,12 +1,9 @@ SUMMARY="Search through your files with ease!" - DESCRIPTION=" - BeIndexed searches all your files and builds a database with - their content. You can then search for files by content, - like on Google etc. Index files with Indexer, Find files with - Finder. - " - +BeIndexed searches all your files and builds a database with their content. \ +You can then search for files by content, like on Google etc. Index files with \ +Indexer, Find files with Finder. +" HOMEPAGE="https://github.com/HaikuArchives/BeIndexed" #Or web.archive.org and eiman.tv/BeIndexed SRC_URI="git://github.com/HaikuArchives/BeIndexed.git#4bbd3e9709d7288ffefbc215ab41a152a24a2276" diff --git a/haiku-apps/belife/belife-1.0.0.recipe b/haiku-apps/belife/belife-1.0.0.recipe index dbd3a60ef..d5934879a 100644 --- a/haiku-apps/belife/belife-1.0.0.recipe +++ b/haiku-apps/belife/belife-1.0.0.recipe @@ -1,14 +1,12 @@ 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. - " +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" diff --git a/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe index cf30e99b3..9b9a6f314 100644 --- a/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe +++ b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe @@ -1,11 +1,10 @@ SUMMARY="A PDF viewer" DESCRIPTION=" - BePDF is a PDF viewer for the BeOS, Haiku & Zeta. - - Besides viewing, it supports annotating and user-defined bookmarking for - unencrypted PDFs. It's fully localized for 20 languages at the moment - with additional languages being easily added via text files. - " +BePDF is a PDF viewer for the BeOS, Haiku & Zeta. +Besides viewing, it supports annotating and user-defined bookmarking for \ +unencrypted PDFs. It's fully localized for 20 languages at the moment with \ +additional languages being easily added via text files. +" HOMEPAGE="http://bepdf.sourceforge.net/" SRC_URI="cvs://:pserver:anonymous@bepdf.cvs.sourceforge.net:/cvsroot/bepdf/BePDF#04/28/13" COPYRIGHT=" diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe index 15214bdd1..573b37ebc 100644 --- a/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe +++ b/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe @@ -1,12 +1,11 @@ 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. - " +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="git://github.com/jackburton79/bescreencapture.git#fb7de7c5dec3768509072e3f3ee2a433bc9285bb" LICENSE=" diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe index b75375062..dae0bc81a 100644 --- a/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe +++ b/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe @@ -1,12 +1,11 @@ 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. - " +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=" diff --git a/haiku-apps/binary_clock/binary_clock-2.0.recipe b/haiku-apps/binary_clock/binary_clock-2.0.recipe index ea7108c12..47a38e20e 100644 --- a/haiku-apps/binary_clock/binary_clock-2.0.recipe +++ b/haiku-apps/binary_clock/binary_clock-2.0.recipe @@ -1,9 +1,9 @@ SUMMARY="A binary clock application and screensaver" -DESCRIPTION="What Is This: -A Binary Clock. And yes, you really can use this to tell time! I -have found it quite enjoyable to reprogram my brain to learn to read -it at a glance. It just takes a little getting used to. Detailed -directions on how to read it are included at the end of this file." +DESCRIPTION=" +A Binary Clock. And yes, you really can use this to tell time! I have found it \ +quite enjoyable to reprogram my brain to learn to read it at a glance. It just \ +takes a little getting used to. +" HOMEPAGE="http://github.com/HaikuArchives/BinaryClock" SRC_URI="git://github.com/HaikuArchives/BinaryClock#5d04da1137" REVISION="2" diff --git a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe index d923b261d..1c8f94142 100644 --- a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe @@ -1,9 +1,8 @@ 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 - " +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="2" diff --git a/haiku-apps/blogpositive/blogpositive-0.2.0.recipe b/haiku-apps/blogpositive/blogpositive-0.2.0.recipe index 27407e6ca..bd923a629 100644 --- a/haiku-apps/blogpositive/blogpositive-0.2.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.2.0.recipe @@ -1,9 +1,8 @@ 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 connect to Wordpress and LiveJournal blogs for now. - " +Want to blog, but WebPositive isn't quick enough? Now you can use the new blog \ +app: BlogPositive! It can connect to Wordpress and LiveJournal blogs for now. +" HOMEPAGE="http://blogpositive.puckipedia.com" SRC_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.2.0" REVISION="1" diff --git a/haiku-apps/blogpositive/blogpositive-0.3.0.recipe b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe index 4ae39eebe..43fb7e597 100644 --- a/haiku-apps/blogpositive/blogpositive-0.3.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe @@ -1,9 +1,8 @@ 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 connect to Wordpress, LiveJournal and OnSugar blogs. - " +Want to blog, but WebPositive isn't quick enough? Now you can use the new blog \ +app: BlogPositive! It can connect to Wordpress, LiveJournal and OnSugar blogs. +" HOMEPAGE="http://blogpositive.puckipedia.com" SRC_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.3" REVISION="1" diff --git a/haiku-apps/blogpositive/blogpositive-0.4.0.recipe b/haiku-apps/blogpositive/blogpositive-0.4.0.recipe index 2f20b26ef..364240bd5 100644 --- a/haiku-apps/blogpositive/blogpositive-0.4.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.4.0.recipe @@ -1,9 +1,8 @@ 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 connect to Wordpress, LiveJournal and OnSugar blogs. - " +Want to blog, but WebPositive isn't quick enough? Now you can use the new blog \ +app: BlogPositive! It can connect to Wordpress, LiveJournal and OnSugar blogs. +" HOMEPAGE="http://blogpositive.puckipedia.com" SRC_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.4" REVISION="1" diff --git a/haiku-apps/burnitnow/burnitnow-trunk.recipe b/haiku-apps/burnitnow/burnitnow-trunk.recipe index e772c93fa..8ab792f81 100644 --- a/haiku-apps/burnitnow/burnitnow-trunk.recipe +++ b/haiku-apps/burnitnow/burnitnow-trunk.recipe @@ -1,5 +1,7 @@ SUMMARY="A utility for burning CD" -DESCRIPTION="BurnItNow is a CD burning utility application for Haiku" +DESCRIPTION=" +BurnItNow is a CD burning utility application for Haiku. +" HOMEPAGE="https://github.com/HaikuArchives/BurnItNow" SRC_URI="git+https://github.com/HaikuArchives/BurnItNow.git#a790db9a87" REVISION="1" diff --git a/haiku-apps/capitalbe/capitalbe-1.0.recipe b/haiku-apps/capitalbe/capitalbe-1.0.recipe index 5ea70bdf6..1653073a8 100644 --- a/haiku-apps/capitalbe/capitalbe-1.0.recipe +++ b/haiku-apps/capitalbe/capitalbe-1.0.recipe @@ -1,8 +1,10 @@ SUMMARY="A finance manager" -DESCRIPTION="Capital Be is a finance manager for Haiku. Easily track where your - money is going. View reports, reconcile accounts and more! Like other - programs published by the same author, Capital Be focuses on keeping easy - jobs easy and making tough ones easier." +DESCRIPTION=" +Capital Be is a finance manager for Haiku. Easily track where your money is \ +going. View reports, reconcile accounts and more! Like other programs \ +published by the same author, Capital Be focuses on keeping easy jobs easy and \ +making tough ones easier. +" HOMEPAGE="http://github.com/HaikuArchives/CapitalBe" SRC_URI="git://github.com/HaikuArchives/CapitalBe.git#eb8d7f92bbaa1594dddeb07c64f90442de106a3e" REVISION="1" diff --git a/haiku-apps/caya/caya-2013.07.31.recipe b/haiku-apps/caya/caya-2013.07.31.recipe index 541f9ac21..02f7a0ff5 100644 --- a/haiku-apps/caya/caya-2013.07.31.recipe +++ b/haiku-apps/caya/caya-2013.07.31.recipe @@ -68,6 +68,6 @@ COPYRIGHT=" 2011-2012 Casalinuovo Dario " DESCRIPTION=" - Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, - google talk, and facebook. - " +Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, \ +google talk, and facebook. +" diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe index cb9dd4d2c..f0f3cf544 100644 --- a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe +++ b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe @@ -45,7 +45,6 @@ COPYRIGHT="2010-2011 Casalinuovo Dario 2009-2011 Pierluigi Fiorini 2010-2011 Oliver Ruiz Dorantes" DESCRIPTION=" - Caya is a multi-protocol IM client. - This package enables support for XMPP (jabber, google talk, facebook) - and MSN protocols. - " +Caya is a multi-protocol IM client. This package enables support for XMPP \ +(jabber, google talk, facebook) and MSN protocols. +" diff --git a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe index 545814d11..39bd17c49 100644 --- a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe +++ b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe @@ -1,5 +1,9 @@ -DESCRIPTION="Cherry Blossom is a 100% native application. Cherry Blossom uses Haiku specific API’s for handling media, so if Haiku can play your media files, then Cherry Blossom will also be able to play your files." -SUMMARY="Cherry Blossom is media player for the Haiku Operating System." +SUMMARY="Cherry Blossom is media player for the Haiku Operating System" +DESCRIPTION=" +Cherry Blossom is a 100% native application. Cherry Blossom uses Haiku \ +specific API’s for handling media, so if Haiku can play your media files, then \ +Cherry Blossom will also be able to play your files. +" HOMEPAGE="http://gitorious.org/cherry-blossom/" SRC_URI="git+http://gitorious.org/cherry-blossom/cherry-blossom.git" REVISION="1" diff --git a/haiku-apps/clockwerk/clockwerk-78.recipe b/haiku-apps/clockwerk/clockwerk-78.recipe index 85399a2e8..8a47f0b94 100644 --- a/haiku-apps/clockwerk/clockwerk-78.recipe +++ b/haiku-apps/clockwerk/clockwerk-78.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Clockwerk is a multi-track audio/video compositing and animation software." +DESCRIPTION=" +Clockwerk is a multi-track audio/video compositing and animation software. +" HOMEPAGE="http://dev.osdrawer.net/projects/clockwerk" SRC_URI="svn+http://svn.osdrawer.net/clockwerk#78" REVISION="1" @@ -22,4 +24,3 @@ LICENSE="GNU GPL v2" COPYRIGHT="2002-2010 Stephan Aßmus 2005-2006 Axel Dörfler 2006-2009 Ingo Weinhold" - diff --git a/haiku-apps/clockwerk/clockwerk-80.recipe b/haiku-apps/clockwerk/clockwerk-80.recipe index b0fdc9f33..f01c3cb30 100644 --- a/haiku-apps/clockwerk/clockwerk-80.recipe +++ b/haiku-apps/clockwerk/clockwerk-80.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Clockwerk is a multi-track audio/video compositing and animation software." +DESCRIPTION=" +Clockwerk is a multi-track audio/video compositing and animation software. +" HOMEPAGE="http://dev.osdrawer.net/projects/clockwerk" SRC_URI="svn+http://svn.osdrawer.net/clockwerk#80" REVISION="1" @@ -22,4 +24,3 @@ LICENSE="GNU GPL v2" COPYRIGHT="2002-2012 Stephan Aßmus 2005-2006 Axel Dörfler 2006-2009 Ingo Weinhold" - diff --git a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe index 1a78ab88d..a620da366 100644 --- a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe +++ b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe @@ -1,6 +1,9 @@ SUMMARY="Cmake GUI with Haiku Native Widgets" -DESCRIPTION="cmake_haiku is a native GUI frontend for Cmake with features like configuring a project and generating files for other build systems like Makefiles, Ninja etc." - +DESCRIPTION=" +cmake_haiku is a native GUI frontend for Cmake with features like configuring \ +a project and generating files for other build systems like Makefiles, Ninja \ +etc. +" HOMEPAGE="https://github.com/AdrianArroyoCalle/cmake-haiku" SRC_URI="git+https://github.com/AdrianArroyoCalle/cmake-haiku.git#a42d55b" diff --git a/haiku-apps/converttolf/converttolf-0.0.0.recipe b/haiku-apps/converttolf/converttolf-0.0.0.recipe index e24a0eec9..ca03f5469 100644 --- a/haiku-apps/converttolf/converttolf-0.0.0.recipe +++ b/haiku-apps/converttolf/converttolf-0.0.0.recipe @@ -1,11 +1,10 @@ SUMMARY="A small tool to turn CRLF into LF without fuss!" DESCRIPTION=" - ConvertToLF is a filter that removes the carriage returns used in the - end of file markers on some operating systems. Haiku uses just a line - feed to mark the end of line, and gcc, the Haiku compiler and StyledEdit - don't function properly with carriage returns in source code / text files. - " # Taken from the homepage - +ConvertToLF is a filter that removes the carriage returns used in the end of \ +file markers on some operating systems. Haiku uses just a line feed to mark \ +the end of line, and gcc, the Haiku compiler and StyledEdit don't function \ +properly with carriage returns in source code / text files. +" # Taken from the homepage HOMEPAGE="https://github.com/HaikuArchives/ConvertToLF/" SRC_URI="git://github.com/HaikuArchives/ConvertToLF.git#d8ec50f92a65d9fd1058adf98fe2515fbafa243c" diff --git a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe index 9dd4a60ef..12496574d 100644 --- a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe +++ b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe @@ -1,5 +1,9 @@ -DESCRIPTION="DockBert is a Deskbar modification. It adds a dock to your deskbar where you may have shortcuts organized in "tabs", a tab of the running apps and some other general eyecandy." SUMMARY="DockBert adds a dock to your deskbar" +DESCRIPTION=" +DockBert is a Deskbar modification. It adds a dock to your deskbar where you \ +may have shortcuts organized in "tabs", a tab of the running apps and some \ +other general eyecandy. +" HOMEPAGE="https://github.com/HaikuArchives/DockBert" SRC_URI="git+https://github.com/HaikuArchives/DockBert#057c54674d" COPYRIGHT="2005 yellowTAB GmbH" diff --git a/haiku-apps/documentviewer/documentviewer-0.3.2.recipe b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe index 439e422c4..58d662cf4 100644 --- a/haiku-apps/documentviewer/documentviewer-0.3.2.recipe +++ b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe @@ -1,5 +1,7 @@ -SUMMARY="DocumentViewer is a Viewer supporting PDF and DJVU Files." -DESCRIPTION="DocumentViewer is a Viewer supporting PDF and DJVU Files." +SUMMARY="A viewer supporting PDF and DJVU Files" +DESCRIPTION=" +DocumentViewer is a Viewer supporting PDF and DJVU Files. +" LICENSE="MIT" COPYRIGHT="2010-2012 Haiku, Inc" HOMEPAGE="http://haiku.bplaced.net/" diff --git a/haiku-apps/filecropper/filecropper-1.recipe b/haiku-apps/filecropper/filecropper-1.recipe index 421a5d542..07e5512c3 100644 --- a/haiku-apps/filecropper/filecropper-1.recipe +++ b/haiku-apps/filecropper/filecropper-1.recipe @@ -1,7 +1,8 @@ -DESCRIPTION="About FileCropper: -Truncates files of any kind. Cuts off everything from a given offset -(bytes) to the end of the file. (GUI app)." SUMMARY="Truncates files of any kind." +DESCRIPTION=" +FileCropper is a GUI app which truncates files of any kind. It Cuts off \ +everything from a given offset (bytes) to the end of the file. +" COPYRIGHT="2002 Maurice Michalski" LICENSE="MIT" HOMEPAGE="https://github.com/HaikuArchives/FileCropper" diff --git a/haiku-apps/filer/filer-1.0.0beta3.recipe b/haiku-apps/filer/filer-1.0.0beta3.recipe index 8d4257244..22957c0c8 100644 --- a/haiku-apps/filer/filer-1.0.0beta3.recipe +++ b/haiku-apps/filer/filer-1.0.0beta3.recipe @@ -1,14 +1,14 @@ -SUMMARY="An automated file management system to copy, rename, move and modify files in an automated fashion" - +SUMMARY="An automated file management system" DESCRIPTION=" - The Filer is a powerful, flexible automatic file organizer. It is an implementation of the - Sorting Chute idea conceived on the Glass Elevator mailing list for Haiku. - Just drag and drop files onto its icon, use the Terminal, or send it files via the Open With menu. - It can even automatically file items in folders you specify. Simple enough for the novice user, - powerful enough for developers. It automates file management according to a set of rules you determine - and is pretty much limited only by your imagination. Powerful on its own, it can also be extended by shell scripting. - " # Taken from homepage - +The Filer is a powerful, flexible automatic file organizer. It is an \ +implementation of the Sorting Chute idea conceived on the Glass Elevator \ +mailing list for Haiku. Just drag and drop files onto its icon, use the \ +Terminal, or send it files via the Open With menu. It can even automatically \ +file items in folders you specify. Simple enough for the novice user, powerful \ +enough for developers. It automates file management according to a set of \ +rules you determine and is pretty much limited only by your imagination. \ +Powerful on its own, it can also be extended by shell scripting. +" # Taken from homepage HOMEPAGE="http://darkwyrm.beemulated.net/apps/filer.htm" SRC_URI="git://github.com/HaikuArchives/Filer.git#4618b2ae9d7238254860cf3633701dd4f52dad37" REVISION="1" diff --git a/haiku-apps/filwip/filwip-1.0.0.recipe b/haiku-apps/filwip/filwip-1.0.0.recipe index 948658a13..52297e72e 100644 --- a/haiku-apps/filwip/filwip-1.0.0.recipe +++ b/haiku-apps/filwip/filwip-1.0.0.recipe @@ -1,11 +1,10 @@ SUMMARY="An app to clean all temporary and unwanted files" - DESCRIPTION=" - It cleans your hard disk of all unwanted files such as left-over temporary files, - cache files of internet sessions, logs, history files and the like. It works with - easy to write text files that include information about where the files to delete are. - " - +It cleans your hard disk of all unwanted files such as left-over temporary \ +files, cache files of internet sessions, logs, history files and the like. It \ +works with easy to write text files that include information about where the \ +files to delete are. +" HOMEPAGE="https://sites.google.com/site/appfilwip/home" SRC_URI="git://github.com/HaikuArchives/FilWip.git#8ec265e771019d31ed63be69cb8cc0d8a271f19b" REVISION="2" diff --git a/haiku-apps/finance/finance-1.0.0.recipe b/haiku-apps/finance/finance-1.0.0.recipe index 722629db1..e6318511c 100644 --- a/haiku-apps/finance/finance-1.0.0.recipe +++ b/haiku-apps/finance/finance-1.0.0.recipe @@ -1,13 +1,11 @@ SUMMARY="Manage all your finances with this easy-to-use app!" - DESCRIPTION=" - Finance is an app made to provide all features expected from personal - finance software while using the style of Haiku. - It can be used to balance multiple accounts and you can import Quicken or Money data, - reconcile statements, view spending categorization and net worth trends, - all with customizable categories and payees. - " - +Finance is an app made to provide all features expected from personal finance \ +software while using the style of Haiku. It can be used to balance multiple \ +accounts and you can import Quicken or Money data, reconcile statements, view \ +spending categorization and net worth trends, all with customizable categories \ +and payees. +" HOMEPAGE="https://github.com/HaikuArchives/Finance" SRC_URI="git://github.com/HaikuArchives/Finance.git#33513a1c44b6f94a46ccae563f19a64440dea46a" REVISION="1" diff --git a/haiku-apps/foldershaper/foldershaper-1.0.recipe b/haiku-apps/foldershaper/foldershaper-1.0.recipe index 164d110b9..c93c0ccb5 100644 --- a/haiku-apps/foldershaper/foldershaper-1.0.recipe +++ b/haiku-apps/foldershaper/foldershaper-1.0.recipe @@ -1,7 +1,10 @@ SUMMARY="A tool to retro-fit looks and layout of existing folders" -DESCRIPTION="If you want your folders to have a certain icon, set of columns, backgrounds, pergaps even some default content, -FolderShaper lets you chnage all that in a snap. Create a perfect folder, add it as a foldershaper template, then drop your -folders on FolderShaper and select the template from the pop-up menu." +DESCRIPTION=" +If you want your folders to have a certain icon, set of columns, backgrounds, \ +pergaps even some default content, FolderShaper lets you chnage all that in a \ +snap. Create a perfect folder, add it as a foldershaper template, then drop \ +your folders on FolderShaper and select the template from the pop-up menu. +" HOMEPAGE="https://github.com/HaikuArchives/FolderShaper" SRC_URI="git://github.com/HaikuArchives/FolderShaper.git" REVISION="1" diff --git a/haiku-apps/fontboy/fontboy-0.9.7.recipe b/haiku-apps/fontboy/fontboy-0.9.7.recipe index dea22c075..0157ffcc5 100644 --- a/haiku-apps/fontboy/fontboy-0.9.7.recipe +++ b/haiku-apps/fontboy/fontboy-0.9.7.recipe @@ -1,10 +1,10 @@ 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. - " +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/HaikuArchives/FontBoy" SRC_URI="git://github.com/HaikuArchives/FontBoy.git#2195924e69096a5e7a9774cfaec8fdc277045ecf" REVISION="1" diff --git a/haiku-apps/fortuna/fortuna-1.0.0.recipe b/haiku-apps/fortuna/fortuna-1.0.0.recipe index f7ce8092e..89cac231c 100644 --- a/haiku-apps/fortuna/fortuna-1.0.0.recipe +++ b/haiku-apps/fortuna/fortuna-1.0.0.recipe @@ -1,13 +1,11 @@ SUMMARY="A small GUI for showing the well known fortunes" - DESCRIPTION=" - Fortuna is a nice-looking graphical program which displays a fortune when you open it. - Yeah, sure, there is already a fortune program, but it only shows from the command line, - you'll get a lot of repeats, it's quite a bit of work to install more, - and you have to muck around with your UserBootScript. Lots of messing around. - Then again, you can use Fortuna, which has none of this. - " # Taken from homepage - +Fortuna is a nice-looking graphical program which displays a fortune when you \ +open it. Yeah, sure, there is already a fortune program, but it only shows \ +from the command line, you'll get a lot of repeats, it's quite a bit of work \ +to install more, and you have to muck around with your UserBootScript. Lots of \ +messing around. Then again, you can use Fortuna, which has none of this. +" # Taken from homepage HOMEPAGE="http://darkwyrm.beemulated.net/apps/fortuna.htm" SRC_URI="git://github.com/HaikuArchives/Fortuna.git#9e0cd6c1e6" REVISION="1" diff --git a/haiku-apps/friss/friss-0.8beta.recipe b/haiku-apps/friss/friss-0.8beta.recipe index d20750b08..912d38b00 100644 --- a/haiku-apps/friss/friss-0.8beta.recipe +++ b/haiku-apps/friss/friss-0.8beta.recipe @@ -1,5 +1,7 @@ SUMMARY="RSS and ATOM feeds reader" -DESCRIPTION="FRiSS is a viewer for atom/rss/rdf feeds that can be run as a replicant" +DESCRIPTION=" +FRiSS is a viewer for atom/rss/rdf feeds that can be run as a replicant. +" HOMEPAGE="http://pulkomandy.tk/projects/friss" SRC_URI="svn://pulkomandy.tk/friss/src#44" REVISION="1" diff --git a/haiku-apps/ftppositive/ftppositive-1.0.recipe b/haiku-apps/ftppositive/ftppositive-1.0.recipe index 9ad712d8e..264cc8299 100644 --- a/haiku-apps/ftppositive/ftppositive-1.0.recipe +++ b/haiku-apps/ftppositive/ftppositive-1.0.recipe @@ -1,5 +1,7 @@ -DESCRIPTION="FtpPositive is a simple graphical FTP client." SUMMARY="A simple graphical FTP client" +DESCRIPTION=" +FtpPositive is a simple graphical FTP client. +" HOMEPAGE="https://github.com/HaikuArchives/FtpPositive" SRC_URI="git+https://github.com/HaikuArchives/FtpPositive#442f47a22f" COPYRIGHT="2007 momoziro" diff --git a/haiku-apps/hare/hare-1.1.1.recipe b/haiku-apps/hare/hare-1.1.1.recipe index 7cc44c01e..57b23bb34 100644 --- a/haiku-apps/hare/hare-1.1.1.recipe +++ b/haiku-apps/hare/hare-1.1.1.recipe @@ -1,5 +1,7 @@ -SUMMARY="Hare - Haiku Audio Ripper Encoder" -DESCRIPTION="Hare - Haiku Audio Ripper Encoder, formerly known as Flip-Side A.E." +SUMMARY="Haiku Audio Ripper Encoder" +DESCRIPTION=" +Hare - Haiku Audio Ripper Encoder, formerly known as Flip-Side A.E. +" HOMEPAGE="http://github.com/HaikuArchives/Hare" SRC_URI="git://github.com/HaikuArchives/Hare.git#af69ba7b06" LICENSE="MIT" diff --git a/haiku-apps/jammin/jammin-0.1.0.recipe b/haiku-apps/jammin/jammin-0.1.0.recipe index 920ae8ccd..5a906c8a5 100644 --- a/haiku-apps/jammin/jammin-0.1.0.recipe +++ b/haiku-apps/jammin/jammin-0.1.0.recipe @@ -1,9 +1,10 @@ -DESCRIPTION="The JamMin manages your jamfiles. -Jamfiles are the thing that is most important to the user, bacause -they declare the targets that should be built. Jamfiles are also used -for organizing targets— each Jamfile is a separate project that can be -built independently from the other projects." SUMMARY="The Jamfile Administrator" +DESCRIPTION=" +The JamMin manages your jamfiles. Jamfiles are the thing that is most \ +important to the user, bacause they declare the targets that should be built. \ +Jamfiles are also used for organizing targets— each Jamfile is a separate \ +project that can be built independently from the other projects. +" HOMEPAGE="https://github.com/HaikuArchives/JamMin" SRC_URI="git+https://github.com/HaikuArchives/JamMin.git#681e87d6d4" REVISION="2" diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe index 6411277fe..03e09df07 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe @@ -1,5 +1,9 @@ SUMMARY="Easy to use Keymap Switcher for Haiku" -DESCRIPTION="This is a keymap switcher for Haiku. It is very similar to what you used to have in windows to change the keymap with hotkeys, but has some additional features (and lacks some, for sure)." +DESCRIPTION=" +This is a keymap switcher for Haiku. It is very similar to what you used to \ +have in windows to change the keymap with hotkeys, but has some additional \ +features (and lacks some, for sure). +" HOMEPAGE="http://www.sf.net/projects/switcher" COPYRIGHT="1999-2003 Stas Maximov" LICENSE="BSD (4-clause)" diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe index 682fca82e..391a83c43 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe @@ -1,5 +1,9 @@ SUMMARY="Easy to use Keymap Switcher for Haiku" -DESCRIPTION="This is a keymap switcher for Haiku. It is very similar to what you used to have in windows to change the keymap with hotkeys, but has some additional features (and lacks some, for sure)." +DESCRIPTION=" +This is a keymap switcher for Haiku. It is very similar to what you used to \ +have in windows to change the keymap with hotkeys, but has some additional \ +features (and lacks some, for sure). +" HOMEPAGE="http://www.sf.net/projects/switcher" COPYRIGHT="1999-2003 Stas Maximov" LICENSE="BSD (4-clause)" diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe index aa7ce58fe..e94097d48 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe @@ -1,5 +1,9 @@ SUMMARY="Easy to use Keymap Switcher for Haiku" -DESCRIPTION="This is a keymap switcher for Haiku. It is very similar to what you used to have in windows to change the keymap with hotkeys, but has some additional features (and lacks some, for sure)." +DESCRIPTION=" +This is a keymap switcher for Haiku. It is very similar to what you used to \ +have in windows to change the keymap with hotkeys, but has some additional \ +features (and lacks some, for sure). +" HOMEPAGE="http://www.sf.net/projects/switcher" COPYRIGHT="1999-2003 Stas Maximov" LICENSE="BSD (4-clause)" diff --git a/haiku-apps/konfetti/konfetti-1.0.0.recipe b/haiku-apps/konfetti/konfetti-1.0.0.recipe index c8d12fbc9..da1418473 100644 --- a/haiku-apps/konfetti/konfetti-1.0.0.recipe +++ b/haiku-apps/konfetti/konfetti-1.0.0.recipe @@ -1,8 +1,8 @@ SUMMARY="A little screensaver which draws confetti on your desktop" DESCRIPTION=" - Konfetti is a small screensaver which draws semi-transparent confetti - on your desktop. - " +Konfetti is a small screensaver which draws semi-transparent confetti on your \ +desktop. +" HOMEPAGE="https://github.com/HaikuArchives/Konfetti/" SRC_URI="git://github.com/HaikuArchives/Konfetti.git#b667a6e39bc28300298c66bed6209c5141b04e71" REVISION="1" diff --git a/haiku-apps/launchpad/launchpad-1.3.recipe b/haiku-apps/launchpad/launchpad-1.3.recipe index 3f3501eb0..318d2ae6c 100644 --- a/haiku-apps/launchpad/launchpad-1.3.recipe +++ b/haiku-apps/launchpad/launchpad-1.3.recipe @@ -1,5 +1,7 @@ SUMMARY="A simple BeOS application/file/folder launcher" -DESCRIPTION="A simple BeOS application/file/folder launcher" +DESCRIPTION=" +A simple BeOS application/file/folder launcher. +" HOMEPAGE="http://sourceforge.net/projects/launchpad" SRC_URI="http://launchpad.cvs.sourceforge.net/viewvc/launchpad/buta/LaunchPad/?view=tar" #CHECKSUM_MD5="9001e130b7ceb90aaef9791b8fac1afb" diff --git a/haiku-apps/masterpiece/masterpiece-r742.recipe b/haiku-apps/masterpiece/masterpiece-r742.recipe index d6f71833c..8d523a3cf 100644 --- a/haiku-apps/masterpiece/masterpiece-r742.recipe +++ b/haiku-apps/masterpiece/masterpiece-r742.recipe @@ -1,12 +1,13 @@ -DESCRIPTION=" -This is an attempt to create a new way to create documents or books. \ -It moves away from the WYSIWYG paradigm of microsoft word, openoffice, etc. etc. etc. \ -It takes a more keyboard only, thought flowing and typing markup language, object oriented approach \ -where a user who has ideas or thoughts can jot these down and have them go into a list. to build their document/book, \ -they would then order the list of thoughts, images, tables, etc. into the correct order and preview/publish their book. -" SUMMARY="New way to create opendocument compatible books/documents" - +DESCRIPTION=" +This is an attempt to create a new way to create documents or books. It moves \ +away from the WYSIWYG paradigm of microsoft word, openoffice, etc. etc. etc. \ +It takes a more keyboard only, thought flowing and typing markup language, \ +object oriented approach where a user who has ideas or thoughts can jot these \ +down and have them go into a list. to build their document/book, they would \ +then order the list of thoughts, images, tables, etc. into the correct order \ +and preview/publish their book. +" HOMEPAGE="http://code.google.com/p/masterpiece/" SRC_URI="svn+http://masterpiece.googlecode.com/svn/trunk#r742" diff --git a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe index 9d7ddc1bd..74aaee786 100644 --- a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe +++ b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe @@ -1,11 +1,10 @@ SUMMARY="Minimize all your apps with the press of a button!" DESCRIPTION=" - MinimizeAll is a small app that minimizes all your apps with - the press of a button on the Deskbar, or with a keypress. - The app contains two parts: A standalone app that minimizes the whole app, - and a replicant for your Deskbar. Both do the same: Minimize all your apps! - " - +MinimizeAll is a small app that minimizes all your apps with the press of a \ +button on the Deskbar, or with a keypress. The app contains two parts: A \ +standalone app that minimizes the whole app, and a replicant for your Deskbar. \ +Both do the same: Minimize all your apps! +" HOMEPAGE="https://github.com/HaikuArchives/MinimizeAll/" SRC_URI="git://github.com/HaikuArchives/MinimizeAll.git#12fefdf26131375f695693a680bf01edb35d57a9" diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe index d3caf177a..7fa822c5f 100644 --- a/haiku-apps/mkdepend/mkdepend-1.7.recipe +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -1,5 +1,8 @@ SUMMARY="MkDepend for BeOS" -DESCRIPTION="MkDepend scans C-source files recursively for includes and writes the found dependency trees into an existing makefile." +DESCRIPTION=" +MkDepend scans C-source files recursively for includes and writes the found \ +dependency trees into an existing makefile. +" HOMEPAGE="http://www.bearnip.com/lars/be/mkdepend.html" LICENSE="MIT" COPYRIGHT="1995-2001 Lars Düning. All Rights Reserved" diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe index 1b18547e3..c5aa54163 100644 --- a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe +++ b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe @@ -1,6 +1,8 @@ SUMMARY="Easy to use powerful contact manager for haiku" -DESCRIPTION="MrPeeps is an app for managing People files that has more - features than other contact managers. For more info read README file" +DESCRIPTION=" +MrPeeps is an app for managing People files that has more features than other \ +contact managers. For more info read the README file. +" HOMEPAGE="https://github.com/HaikuArchives/MrPeeps" SRC_URI="git+https://github.com/HaikuArchives/MrPeeps#ce2e65" LICENSE="MIT" diff --git a/haiku-apps/nightandday/nightsandday-0.1.2.recipe b/haiku-apps/nightandday/nightsandday-0.1.2.recipe index 63abe693d..324793d85 100644 --- a/haiku-apps/nightandday/nightsandday-0.1.2.recipe +++ b/haiku-apps/nightandday/nightsandday-0.1.2.recipe @@ -1,13 +1,12 @@ -DESCRIPTION=" -This program was inspired by the 'TaveDesktop' program by the Tave -Software Group. I think that 'TaveDesktop' was a good idea, but I -wanted to be able to choose my own colors, since the 'TaveDesktop' -colors looks bad on an 8bpp display. - -This program should be self-explanatory. You'll find a small Popup -menu when clicking the small screen at the top-right corner of the -window." SUMMARY="Automatic desktop color changer" +DESCRIPTION=" +This program was inspired by the 'TaveDesktop' program by the Tave Software \ +Group. I think that 'TaveDesktop' was a good idea, but I wanted to be able to \ +choose my own colors, since the 'TaveDesktop' colors looks bad on an 8bpp \ +display. +This program should be self-explanatory. You'll find a small Popup menu when \ +clicking the small screen at the top-right corner of the window. +" COPYRIGHT="1998-1999 Jean-Baptiste M. Queru" LICENSE="GNU GPL v2" HOMEPAGE="https://github.com/HaikuArchives/NightAndDay" diff --git a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe index bb58c9542..523fed676 100644 --- a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe +++ b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe @@ -1,8 +1,8 @@ SUMMARY="Save optimized PNG files" DESCRIPTION=" - The OptiPNGTranslator for Haiku allows you to save images as - PNG files which have been optimized by OptiPNG. - " +The OptiPNGTranslator for Haiku allows you to save images as PNG files which \ +have been optimized by OptiPNG. +" HOMEPAGE="https://github.com/noryb009/OptiPNGTranslator/" SRC_URI="git://github.com/noryb009/OptiPNGTranslator.git#8e3996a92d840f3c097cf954e001d4f371265161" LICENSE="MIT" diff --git a/haiku-apps/organizer/organizer-0.1.recipe b/haiku-apps/organizer/organizer-0.1.recipe index bb3d4e6ac..58b4e480a 100644 --- a/haiku-apps/organizer/organizer-0.1.recipe +++ b/haiku-apps/organizer/organizer-0.1.recipe @@ -1,5 +1,7 @@ -DESCRIPTION="An organizer that helps you keep track on your appointments, notes and stuff." -SUMMARY="An organizer that helps you keep track on your appointments, notes and stuff." +SUMMARY="An organizer to keep track on your appointments, notes and stuff" +DESCRIPTION=" +An organizer that helps you keep track on your appointments, notes and stuff. +" COPYRIGHT="2013 Marius Stene" LICENSE="Public Domain" HOMEPAGE="https://github.com/HaikuArchives/Organizer" diff --git a/haiku-apps/paladin/paladin-1.3.recipe b/haiku-apps/paladin/paladin-1.3.recipe index 7095700d1..685f27d32 100644 --- a/haiku-apps/paladin/paladin-1.3.recipe +++ b/haiku-apps/paladin/paladin-1.3.recipe @@ -1,5 +1,8 @@ SUMMARY="Paladin is a open source integrated development environment (IDE)" -DESCRIPTION="Paladin is an open source integrated development environment (IDE) modeled after BeOS' BeIDE." +DESCRIPTION=" +Paladin is an open source integrated development environment (IDE) modeled \ +after BeOS' BeIDE. +" HOMEPAGE="http://paladin.sourceforge.net" SRC_URI="http://sourceforge.net/projects/paladin/files/Paladin-1.3.src.zip/download" REVISION="2" diff --git a/haiku-apps/paladin/paladin-1.3_hg.recipe b/haiku-apps/paladin/paladin-1.3_hg.recipe index e107fa3fc..a9b2dff1f 100644 --- a/haiku-apps/paladin/paladin-1.3_hg.recipe +++ b/haiku-apps/paladin/paladin-1.3_hg.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="Paladin is an open source integrated development environment (IDE) modeled after BeOS' BeIDE." +DESCRIPTION=" +Paladin is an open source integrated development environment (IDE) modeled \ +after BeOS' BeIDE. +" HOMEPAGE="http://paladin.sourceforge.net" SRC_URI="hg+http://paladin.hg.sourceforge.net:8000/hgroot/paladin/paladin" REVISION="1" diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe index 7b63d0768..90d1cb793 100644 --- a/haiku-apps/pe/pe-2.4.3_hg602.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -1,5 +1,9 @@ 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) diff --git a/haiku-apps/pe/pe-2.4.3_hg606.recipe b/haiku-apps/pe/pe-2.4.3_hg606.recipe index 03276a6b2..9d880d602 100644 --- a/haiku-apps/pe/pe-2.4.3_hg606.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg606.recipe @@ -1,5 +1,9 @@ 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) diff --git a/haiku-apps/pe/pe-2.4.3_hg610.recipe b/haiku-apps/pe/pe-2.4.3_hg610.recipe index 8d59f898a..51f7ae6d3 100644 --- a/haiku-apps/pe/pe-2.4.3_hg610.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg610.recipe @@ -1,5 +1,9 @@ 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) diff --git a/haiku-apps/pe/pe-2.4.3_hg611.recipe b/haiku-apps/pe/pe-2.4.3_hg611.recipe index 170f6020e..12a2d9662 100644 --- a/haiku-apps/pe/pe-2.4.3_hg611.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg611.recipe @@ -1,5 +1,9 @@ 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) diff --git a/haiku-apps/pe/pe-2.4.3_hg614.recipe b/haiku-apps/pe/pe-2.4.3_hg614.recipe index 7a18426da..19da91e5f 100644 --- a/haiku-apps/pe/pe-2.4.3_hg614.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg614.recipe @@ -1,5 +1,9 @@ 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) diff --git a/haiku-apps/pe/pe-2.4.3_hg615.recipe b/haiku-apps/pe/pe-2.4.3_hg615.recipe index 07ebbf5b8..b73c027e7 100644 --- a/haiku-apps/pe/pe-2.4.3_hg615.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg615.recipe @@ -1,7 +1,9 @@ SUMMARY="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." +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) diff --git a/haiku-apps/phantomlimb/phantomlimb-1.recipe b/haiku-apps/phantomlimb/phantomlimb-1.recipe index df0ba729c..e3f991cf9 100644 --- a/haiku-apps/phantomlimb/phantomlimb-1.recipe +++ b/haiku-apps/phantomlimb/phantomlimb-1.recipe @@ -1,15 +1,15 @@ -SUMMARY="PhantomLimb is a little program to generate tones, and test your discrimination of frequency deltas." +SUMMARY="A program to generate tones, and test your discrimination of frequency deltas" DESCRIPTION=" -PhantomLimb is a little program to generate tones, and test your -discrimination of frequency deltas. I wrote it for a friend of mine -who is suffering from tinnitus ('ringing in the ears') due to an ear -infection. (the infection destroyed some nerve cells in his inner -ear, and the lack of signals from the destroyed nerve cells is what -causes the ringing--similar to the 'phantom limb' sensations -experienced by amputees. Hence the name of this program) By -practicing discriminating between the sound of the tinnitus and -'nearby' sounds, he hopes to be able to train his brain to -discriminate between the 'phantom' sound and other, real sounds." +PhantomLimb is a little program to generate tones, and test your \ +discrimination of frequency deltas. I wrote it for a friend of mine who is \ +suffering from tinnitus ('ringing in the ears') due to an ear infection. \ +(the infection destroyed some nerve cells in his inner ear, and the lack of \ +signals from the destroyed nerve cells is what causes the ringing--similar to \ +the 'phantom limb' sensations experienced by amputees. Hence the name of this \ +program) By practicing discriminating between the sound of the tinnitus and \ +'nearby' sounds, he hopes to be able to train his brain to discriminate \ +between the 'phantom' sound and other, real sounds. +" COPYRIGHT=" 2001 Ben Loftis 2013 Jeremy Friesner" diff --git a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe index 73d33f369..2ba0dc1ec 100644 --- a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe +++ b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe @@ -1,8 +1,8 @@ SUMMARY="Decrypts your PowerPacker encrypted files" DESCRIPTION=" - Decrypts PowerPacker encrypted files using Stuart Caie's - ppcrack 0.1 decrypting routines. - " +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/HaikuArchives/PPViewer#ce572506ca6e69c888898abf5b958701e068122b" REVISION="1" diff --git a/haiku-apps/querywatcher/querywatcher-1.4.recipe b/haiku-apps/querywatcher/querywatcher-1.4.recipe index b7df8c79b..67f9bf7f2 100644 --- a/haiku-apps/querywatcher/querywatcher-1.4.recipe +++ b/haiku-apps/querywatcher/querywatcher-1.4.recipe @@ -1,8 +1,8 @@ -SUMMARY="An application that monitors Tracker queries." +SUMMARY="An application that monitors Tracker queries" DESCRIPTION=" -This is a tiny little GUI application that monitors any regular -Tracker queries and displays miniature indicator lights for the -presence of results." +This is a tiny little GUI application that monitors any regular Tracker \ +queries and displays miniature indicator lights for the presence of results. +" HOMEPAGE="https://github.com/HaikuArchives/QueryWatcher" SRC_URI="git://github.com/HaikuArchives/QueryWatcher.git#64b66ee9e9" LICENSE="Public Domain" diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe index 2c7d52b42..7d54e77f1 100644 --- a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe +++ b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe @@ -1,12 +1,11 @@ SUMMARY="A tool to quickly start any installed application" DESCRIPTION=" - QuickLaunch is a small launcher tool that helps you to quickly start - any installed application. - Simply start to enter the name of an application and QuickLaunch will - find all programs matching these initial letters and show them in a list. - You choose an app from that list with the CursorUp/Down keys and launch - it by hitting Return. Escape quits QuickLaunch. - " +QuickLaunch is a small launcher tool that helps you to quickly start any \ +installed application. Simply start to enter the name of an application and \ +QuickLaunch will find all programs matching these initial letters and show \ +them in a list. You choose an app from that list with the CursorUp/Down keys \ +and launch it by hitting Return. Escape quits QuickLaunch. +" HOMEPAGE="http://sourceforge.net/projects/quicklaunch-h/" SRC_URI="git://git.code.sf.net/p/quicklaunch-h/code#c88a50516f3154b86efb4ae58ac8daaa3e45f675" LICENSE="MIT" diff --git a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe index 544b91c46..1cbcbc3f4 100644 --- a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe +++ b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe @@ -1,11 +1,10 @@ SUMMARY="A random symbol sequence generator" DESCRIPTION=" - Randomizer is a random symbol sequence generator. You can create - sequences of any given length, and control what characters are used. - - This program can be used for many purposes, such as for generating - random passwords or random numbers. - " +Randomizer is a random symbol sequence generator. You can create sequences of \ +any given length, and control what characters are used. +This program can be used for many purposes, such as for generating random \ +passwords or random numbers. +" HOMEPAGE="https://code.google.com/p/randomizer/" SRC_URI="svn+http://randomizer.googlecode.com/svn/trunk/@r12" LICENSE="MIT" diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe index aa060dc2f..5e7d89033 100644 --- a/haiku-apps/recibe/recibe-1.0b1.recipe +++ b/haiku-apps/recibe/recibe-1.0b1.recipe @@ -1,9 +1,8 @@ SUMMARY="A cooking recipe manager" DESCRIPTION=" - Recibe, written by DarkWyrm, is a cooking recipe manager. The - included database contains around 52,000 different recipes for - you to try. - " +Recibe, written by DarkWyrm, is a cooking recipe manager. The included \ +database contains around 52,000 different recipes for you to try. +" HOMEPAGE="https://github.com/HaikuArchives/Recibe" SRC_URI="git://github.com/HaikuArchives/Recibe.git#c1d5a57264d8964a2592bc9b43588b3430bd48ad" SRC_URI_2="http://ports-space.haiku-files.org/recibe/recipes.db.zip#noarchive" diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe index 24a2c4370..7a78c17ee 100644 --- a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe +++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe @@ -1,11 +1,10 @@ SUMMARY="Remote control your Haiku machines with ease!" DESCRIPTION=" - With the Remote Control app, you can control another Haiku computer also - running the Remote Control app, no matter where it is. - The app is able to just view what's on the screen, or also control the computer. - This package contains the RCClient client and RCServer server. - Both are to be run in the terminal. - " +With the Remote Control app, you can control another Haiku computer also \ +running the Remote Control app, no matter where it is. The app is able to just \ +view what's on the screen, or also control the computer. This package contains \ +the RCClient client and RCServer server. Both are to be run in the terminal. +" HOMEPAGE="http://thomas.thiriez.free.fr/beos/RemoteControl/index.html" SRC_URI="git://github.com/HaikuArchives/RemoteControl#c59e89e3643e4693a75e5b5456596533d068cc29" REVISION="1" diff --git a/haiku-apps/resourcer/resourcer-1.0.recipe b/haiku-apps/resourcer/resourcer-1.0.recipe index 17ea2d7e2..e6ca5b750 100644 --- a/haiku-apps/resourcer/resourcer-1.0.recipe +++ b/haiku-apps/resourcer/resourcer-1.0.recipe @@ -1,9 +1,9 @@ -SUMMARY="A resource and attribute editor with a full-featured interface editor." +SUMMARY="A resource and attribute editor with an interface editor" DESCRIPTION=" -Resourcer is an all-purpose resource and attribute editor with a -full-featured interface editor. It also contains plug-in editors for -31 other data types, including images, cursors, sounds, movies, text, -and icons." +Resourcer is an all-purpose resource and attribute editor with a full-featured \ +interface editor. It also contains plug-in editors for 31 other data types, \ +including images, cursors, sounds, movies, text, and icons. +" COPYRIGHT="2000 Nathan Whitehorn" LICENSE="BSD (3-clause)" HOMEPAGE="https://gitorious.org/desknotes/resourcer" diff --git a/haiku-apps/runprogram/runprogram-1.0rc1.recipe b/haiku-apps/runprogram/runprogram-1.0rc1.recipe index 7f3a50bc7..c16026d68 100644 --- a/haiku-apps/runprogram/runprogram-1.0rc1.recipe +++ b/haiku-apps/runprogram/runprogram-1.0rc1.recipe @@ -1,12 +1,10 @@ SUMMARY="A simple program for running a quick terminal command" DESCRIPTION=" - Run Program, written by DarkWyrm, is a simple program that - runs a command. It can autocomplete commands as you type, - and is case insensitive. - - If bound to a key combination via Shortcuts, commands can be - run without even touching the mouse. - " +Run Program, written by DarkWyrm, is a simple program that runs a command. It \ +can autocomplete commands as you type, and is case insensitive. +If bound to a key combination via Shortcuts, commands can be run without even \ +touching the mouse. +" HOMEPAGE="https://github.com/HaikuArchives/RunProgram" SRC_URI="git+git://github.com/HaikuArchives/RunProgram.git#a8fe29319e8dde884d8634a0c5a82838a3706563" LICENSE="MIT" diff --git a/haiku-apps/sawteeth/sawteeth-1.3.recipe b/haiku-apps/sawteeth/sawteeth-1.3.recipe index ef0d7ce6c..28dc054a4 100644 --- a/haiku-apps/sawteeth/sawteeth-1.3.recipe +++ b/haiku-apps/sawteeth/sawteeth-1.3.recipe @@ -1,4 +1,8 @@ -DESCRIPTION="Sawteeth is a soft-synth (with tracker) for BeOS and Haiku, meant to either create cool synthsounds to use in cubase and such, or cute chip-tunes. It uses no samples but only generated waveforms" +DESCRIPTION=" +Sawteeth is a soft-synth (with tracker) for BeOS and Haiku, meant to either \ +create cool synthsounds to use in cubase and such, or cute chip-tunes. It uses \ +no samples but only generated waveforms. +" HOMEPAGE="http://pulkomandy.tk/projects/sawteeth/wiki" SRC_URI="svn://pulkomandy.lexinfo.fr/sawteeth/" REVISION="1" diff --git a/haiku-apps/sum_it/sum_it-0.2beta.recipe b/haiku-apps/sum_it/sum_it-0.2beta.recipe index a16aaf719..c73cc4c8e 100644 --- a/haiku-apps/sum_it/sum_it-0.2beta.recipe +++ b/haiku-apps/sum_it/sum_it-0.2beta.recipe @@ -1,8 +1,8 @@ -SUMMARY="Sum-It is a native spreadsheet for BeOS" +SUMMARY="Sum-It is a native spreadsheet for BeOS" DESCRIPTION=" -Sum-It is a spreadsheet for BeOS (Download BeOS for free). This is Open Sum-It, -the open source version of Maarten Hekkelman's Sum-It application. -Sum-It has many features, including a plug-in architecture for formulas and +Sum-It is a spreadsheet for BeOS (Download BeOS for free). This is Open \ +Sum-It, the open source version of Maarten Hekkelman's Sum-It application. \ +Sum-It has many features, including a plug-in architecture for formulas and \ graphs. This product includes software developed by Hekkelman Programmatuur B.V. " LICENSE="BSD (4-clause)" diff --git a/haiku-apps/systeminfo/systeminfo-2.recipe b/haiku-apps/systeminfo/systeminfo-2.recipe index 145a760c7..fb03b72f1 100644 --- a/haiku-apps/systeminfo/systeminfo-2.recipe +++ b/haiku-apps/systeminfo/systeminfo-2.recipe @@ -1,11 +1,14 @@ SUMMARY="A system monitor for Haiku" -DESCRIPTION="It is an little application through which we can see some statistics about our system. +DESCRIPTION=" +It is an little application through which we can see some statistics about our \ +system. It currently only shows: --CPU 0 usage --CPU 1 usage (this is omitted if you have 1 cpu of course) --Memory usage --Boot disk used space --Uptime" +- CPU 0 usage +- CPU 1 usage (this is omitted if you have 1 cpu of course) +- Memory usage +- Boot disk used space +- Uptime +" COPYRIGHT=" 2002 Brent Miszalski 2012 Disreali" diff --git a/haiku-apps/takenotes/takenotes-1.0.0.recipe b/haiku-apps/takenotes/takenotes-1.0.0.recipe index 0be698752..97380a848 100644 --- a/haiku-apps/takenotes/takenotes-1.0.0.recipe +++ b/haiku-apps/takenotes/takenotes-1.0.0.recipe @@ -1,14 +1,14 @@ SUMMARY="A note taking application" DESCRIPTION=" - With this application you can: - - Write a note - - Edit the font family, color and size - - Change the color of your note - - Move your note on the desktop - - Link a note to a particular application - - Tag your note for easy search - - Set an alarm to reminds you date, appointments and so on - " +With this application you can: +- Write a note +- Edit the font family, color and size +- Change the color of your note +- Move your note on the desktop +- Link a note to a particular application +- Tag your note for easy search +- Set an alarm to reminds you date, appointments and so on +" COPYRIGHT="Copyright 2009, Ilio Catallo, Stefano Celentano, Eleonora Ciceri, all rights reserved" LICENSE="GNU GPL v2" HOMEPAGE="https://github.com/HaikuArchives/TakeNotes" diff --git a/haiku-apps/thememanager/thememanager-1.0_git.recipe b/haiku-apps/thememanager/thememanager-1.0_git.recipe index b3ba3e182..29835e5af 100644 --- a/haiku-apps/thememanager/thememanager-1.0_git.recipe +++ b/haiku-apps/thememanager/thememanager-1.0_git.recipe @@ -1,8 +1,10 @@ -SUMMARY="Manages Haiku themes." -DESCRIPTION="The Haiku Theme Manager is compatible with the one -that shipped with ZETA. Users can choose which part of a theme to apply or -save. It can also import BeTheme themes, and to some degree, MS Plus -themes. It is add-ons based, so it can be extended." +SUMMARY="Manages Haiku themes" +DESCRIPTION=" +The Haiku Theme Manager is compatible with the one that shipped with ZETA. \ +Users can choose which part of a theme to apply or save. It can also import \ +BeTheme themes, and to some degree, MS Plus themes. It is add-ons based, so it \ +can be extended. +" HOMEPAGE="https://github.com/HaikuArchives/HaikuThemeManager" SRC_URI="git://github.com/HaikuArchives/HaikuThemeManager.git#400a0ff17173a2510e24bf737df0bb218a9c531c" # 20 October 2013 commit diff --git a/haiku-apps/tolmach/tolmach-1.1.0.recipe b/haiku-apps/tolmach/tolmach-1.1.0.recipe index 110916f4c..a4d855328 100644 --- a/haiku-apps/tolmach/tolmach-1.1.0.recipe +++ b/haiku-apps/tolmach/tolmach-1.1.0.recipe @@ -1,5 +1,9 @@ -DESCRIPTION="This program is a BeOS port of KDictionary translation program for Linux by Ivan V. Murasko. It follows the main concept of original linux program but mainly is a real BeOS program." SUMMARY="A dictionary for Haiku" +DESCRIPTION=" +This program is a BeOS port of KDictionary translation program for Linux by \ +Ivan V. Murasko. It follows the main concept of original linux program but \ +mainly is a real BeOS program. +" COPYRIGHT="1999 Ivan V. Murasko" LICENSE="GNU GPL v2" HOMEPAGE="https://gitorious.org/desknotes/tolmach" diff --git a/haiku-apps/trackergrep/trackergrep-5.1.recipe b/haiku-apps/trackergrep/trackergrep-5.1.recipe index 4f9bd20b2..aa35d1f21 100644 --- a/haiku-apps/trackergrep/trackergrep-5.1.recipe +++ b/haiku-apps/trackergrep/trackergrep-5.1.recipe @@ -1,10 +1,11 @@ SUMMARY="A simple Tracker add-on that lets you search through text files." DESCRIPTION=" -Tracker Grep is a simple Tracker add-on that lets you search through -text files. Haiku already comes with a tool that lets you do that, -grep, but you need to use it from a Terminal window. Gone are those -days of command-line trouble, because from now on Tracker Grep lets -you run grep directly from the Tracker." +Tracker Grep is a simple Tracker add-on that lets you search through text \ +files. Haiku already comes with a tool that lets you do that, grep, but you \ +need to use it from a Terminal window. Gone are those days of command-line \ +trouble, because from now on Tracker Grep lets you run grep directly from the \ +Tracker. +" HOMEPAGE="https://github.com/HaikuArchives/TrackerGrep/" SRC_URI="git://github.com/HaikuArchives/TrackerGrep.git#001a0b68be" REVISION="2" diff --git a/haiku-apps/ubertuber/ubertuber-0.9.7.recipe b/haiku-apps/ubertuber/ubertuber-0.9.7.recipe index 60b874083..b536dc221 100644 --- a/haiku-apps/ubertuber/ubertuber-0.9.7.recipe +++ b/haiku-apps/ubertuber/ubertuber-0.9.7.recipe @@ -1,7 +1,15 @@ SUMMARY="A tool to play back online videos in MediaPlayer" DESCRIPTION=" -UberTuber grabs clips from various sites and opens them in your media -player while they're being downloaded. +UberTuber grabs clips from various sites and opens them in your media player \ +while they're being downloaded. The Python script youtube-dl downloads the \ +video file to the temporary folder. From there it is eitherplayed back while \ +it gets downloaded or moved to another location determined in a file dialog. +UberTuber monitors the system clipboard for URLs pointing to the supported \ +websites and automatically inserts them into its URL text field. +At this moment there is support for clips from: +YouTube, Google video, MetaCafe, DailyMotion, Yahoo video, Photobucket, \ +DepositFiles, Vimeo.com, blip.tv, Facebook video and Escapist magazine. +It may also work on videos from other sites... " HOMEPAGE="http://sourceforge.net/projects/ubertuber/" SRC_URI="git://git.code.sf.net/p/ubertuber/code#7971df0e58a145d7357261600442116321257065" diff --git a/haiku-apps/ubertuber/ubertuber-0.9.8.recipe b/haiku-apps/ubertuber/ubertuber-0.9.8.recipe index 09696f18b..d05c0e3fd 100644 --- a/haiku-apps/ubertuber/ubertuber-0.9.8.recipe +++ b/haiku-apps/ubertuber/ubertuber-0.9.8.recipe @@ -1,22 +1,16 @@ SUMMARY="A tool to play back online videos in MediaPlayer" DESCRIPTION=" - UberTuber grabs clips from various sites and opens them in your media - player while they're being downloaded. The Python script youtube-dl - downloads the video file to the temporary folder. - From there it is either played back while it gets downloaded or moved to - another location determined in a file dialog. - - UberTuber monitors the system clipboard for URLs pointing to the supported - websites and automatically inserts them into its URL text field. - - At this moment there is support for clips from: - - YouTube, Google video, MetaCafe, DailyMotion, Yahoo video, - Photobucket, DepositFiles, Vimeo.com, blip.tv, Facebook video - and Escapist magazine. - - It may also work on videos from other sites... - " +UberTuber grabs clips from various sites and opens them in your media player \ +while they're being downloaded. The Python script youtube-dl downloads the \ +video file to the temporary folder. From there it is eitherplayed back while \ +it gets downloaded or moved to another location determined in a file dialog. +UberTuber monitors the system clipboard for URLs pointing to the supported \ +websites and automatically inserts them into its URL text field. +At this moment there is support for clips from: +YouTube, Google video, MetaCafe, DailyMotion, Yahoo video, Photobucket, \ +DepositFiles, Vimeo.com, blip.tv, Facebook video and Escapist magazine. +It may also work on videos from other sites... +" HOMEPAGE="http://sourceforge.net/projects/ubertuber/" SRC_URI="git://git.code.sf.net/p/ubertuber/code#9d33e8525806a581ed5229b213e81be9ecd29252" LICENSE="MIT" @@ -60,4 +54,4 @@ INSTALL() cp -r images $ubertuberDir addAppDeskbarSymlink $ubertuberDir/UberTuber -} \ No newline at end of file +} diff --git a/haiku-apps/vision/vision-0.9.7.r947.recipe b/haiku-apps/vision/vision-0.9.7.r947.recipe index 3143c09b1..9fcdd7f18 100644 --- a/haiku-apps/vision/vision-0.9.7.r947.recipe +++ b/haiku-apps/vision/vision-0.9.7.r947.recipe @@ -1,5 +1,7 @@ SUMMARY="IRC client for Haiku" -DESCRIPTION="Vision is an IRC client for Haiku." +DESCRIPTION=" +Vision is an IRC client for Haiku. +" HOMEPAGE="http://vision.sourceforge.net/" SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#947" LICENSE="MPL v1.1" diff --git a/haiku-apps/waveview/waveview-1.0.recipe b/haiku-apps/waveview/waveview-1.0.recipe index 58593cb72..48c05bbdc 100644 --- a/haiku-apps/waveview/waveview-1.0.recipe +++ b/haiku-apps/waveview/waveview-1.0.recipe @@ -1,5 +1,7 @@ SUMMARY="A simple audio wave viewer" -DESCRIPTION="simple audio wave viewer" +DESCRIPTION=" +Waveview is a simple audio wave viewer. +" HOMEPAGE="https://github.com/aldeck/waveview" LICENSE="MIT" COPYRIGHT="2011 Alexandre Deckner (alex@zappotek.com)" diff --git a/haiku-apps/whisper/whisper-1.2.recipe b/haiku-apps/whisper/whisper-1.2.recipe index 8616204e1..88765ec77 100644 --- a/haiku-apps/whisper/whisper-1.2.recipe +++ b/haiku-apps/whisper/whisper-1.2.recipe @@ -1,5 +1,8 @@ -DESCRIPTION="Whisper BeNet aims to provide a VoIP solution to the Haiku Platform. It was ported from ZETA." SUMMARY="VoIP for Haiku" +DESCRIPTION=" +Whisper BeNet aims to provide a VoIP solution to the Haiku Platform. It was \ +ported from ZETA. +" COPYRIGHT=" 1998-2001 the BeNet team 2004-2006 Bernd Korz & Oliver Ruiz Dorantes oliver.ruiz.dorantes@gmail.com diff --git a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe index beeb1f90d..933a9a6fb 100644 --- a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe +++ b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe @@ -1,8 +1,24 @@ SUMMARY="Native editor for bitmap graphics" -DESCRIPTION="WonderBrush is an editor for bitmap graphics. The main window holds any number of documents, which are called Canvas. A canvas has an associated name and pixel resolution as well as some other properties. It also references up to two files, which represent it on disk, one is a file in some export format (ie. an SVG document, a flat Translator bitmap or soure code), the other a full-featured project file. -Each canvas can have any number of Layers, currently arranged as a list. Each layer represents an individual bitmap in the size of the canvas. Depending on each layers blending mode, they are composed on top of each other to form the final canvas bitmap. -Each layer can contain any number of Objects, which are created by WonderBrushs tools. Each object has a set of properties which define the unique appearance of the object on the layer. -At any time, it is possible to reorder the layers, or the objects they contain. This could be called non-linear editing. It is also possible to change most of an objects properties later on. This could be called non-destructive editing, because adding another object (like a filter) does not actually destroy any pixel data." +DESCRIPTION=" +WonderBrush is an editor for bitmap graphics. The main window holds any number \ +of documents, which are called Canvas. A canvas has an associated name and \ +pixel resolution as well as some other properties. It also references up to \ +two files, which represent it on disk, one is a file in some export format \ +(ie. an SVG document, a flat Translator bitmap or soure code), the other a \ +full-featured project file. +Each canvas can have any number of Layers, currently arranged as a list. Each \ +layer represents an individual bitmap in the size of the canvas. Depending on \ +each layers blending mode, they are composed on top of each other to form the \ +final canvas bitmap. +Each layer can contain any number of Objects, which are created by \ +WonderBrush's tools. Each object has a set of properties which define the \ +unique appearance of the object on the layer. +At any time, it is possible to reorder the layers, or the objects they \ +contain. This could be called non-linear editing. It is also possible to \ +change most of an objects properties later on. This could be called \ +non-destructive editing, because adding another object (like a filter) does \ +not actually destroy any pixel data. +" HOMEPAGE="http://yellowbites.com/wonderbrush.html" LICENSE="WonderBrush" COPYRIGHT="2005, Stephan Aßmus und Ingo Weinhold GbR" diff --git a/haiku-apps/yab/yab-1.6.recipe b/haiku-apps/yab/yab-1.6.recipe index 3cf2e5014..3fcda61c9 100644 --- a/haiku-apps/yab/yab-1.6.recipe +++ b/haiku-apps/yab/yab-1.6.recipe @@ -1,4 +1,8 @@ -DESCRIPTION="yab is an extended version of yabasic, a BASIC programming language, with special commands designed for BeOS, Haiku and Zeta." +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/haiku-apps/source/yab-1.6.zip" REVISION="1" diff --git a/haiku-apps/yab/yab-1.7.recipe b/haiku-apps/yab/yab-1.7.recipe index f2a6efff2..f31cbf46b 100644 --- a/haiku-apps/yab/yab-1.7.recipe +++ b/haiku-apps/yab/yab-1.7.recipe @@ -1,5 +1,8 @@ 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." +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" From cbf189bec386a11eb5bdfd08767a49e032e3b16b Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 270/306] Rewrap haiku-data DESCRIPTIONs --- .../ca_root_certificates-2012_12_29.recipe | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe b/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe index 68ce3cddf..815ebd115 100644 --- a/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe +++ b/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe @@ -34,15 +34,13 @@ INSTALL() } DESCRIPTION=" - Certificate data from Mozilla as of: Sat Dec 29 20:03:40 2012 - - This is a bundle of X.509 certificates of public Certificate Authorities - (CA). These were automatically extracted from Mozilla's root certificates - file (certdata.txt). This file can be found in the mozilla source tree: - http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1 - - It contains the certificates in PEM format and therefore - can be directly used with curl / libcurl / php_curl, or with - an Apache+mod_ssl webserver for SSL client authentication. - Just configure this file as the SSLCACertificateFile. - " +Certificate data from Mozilla as of: Sat Dec 29 20:03:40 2012 +This is a bundle of X.509 certificates of public Certificate Authorities (CA). \ +These were automatically extracted from Mozilla's root certificates file \ +(certdata.txt). This file can be found in the mozilla source tree: \ +http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1 +It contains the certificates in PEM format and therefore can be directly used \ +with curl / libcurl / php_curl, or with an Apache+mod_ssl webserver for SSL \ +client authentication. +Just configure this file as the SSLCACertificateFile. +" From af6faa74175b6e38f14744eca734731141af0c34 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 271/306] Rewrap haiku-games DESCRIPTIONs --- haiku-games/becheckers/becheckers-1.0.1.recipe | 7 +++---- haiku-games/bevexed/bevexed-1.1.recipe | 6 ++++-- haiku-games/guitarmaster/guitarmaster-r21.recipe | 9 ++++----- haiku-games/puri/puri-0.3.9.1.recipe | 9 ++++----- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/haiku-games/becheckers/becheckers-1.0.1.recipe b/haiku-games/becheckers/becheckers-1.0.1.recipe index c7f5117c7..525258e52 100644 --- a/haiku-games/becheckers/becheckers-1.0.1.recipe +++ b/haiku-games/becheckers/becheckers-1.0.1.recipe @@ -1,9 +1,8 @@ SUMMARY="A simple checkers game for two players" DESCRIPTION=" - BeCheckers is a simple checkers game for two players. - It follows almost all American Checker Federation (ACF) - rules. - " +BeCheckers is a simple checkers game for two players. It follows almost all \ +American Checker Federation (ACF) rules. +" HOMEPAGE="https://github.com/HaikuArchives/BeCheckers" SRC_URI="git://github.com/HaikuArchives/BeCheckers.git#930d3e37339c4570d58e59c3300dba7d69dd4439" LICENSE="MIT" diff --git a/haiku-games/bevexed/bevexed-1.1.recipe b/haiku-games/bevexed/bevexed-1.1.recipe index d4e925d93..25ab71ea5 100644 --- a/haiku-games/bevexed/bevexed-1.1.recipe +++ b/haiku-games/bevexed/bevexed-1.1.recipe @@ -1,6 +1,8 @@ SUMMARY="A maddeningly-addictive puzzle game." -DESCRIPTION="A maddeningly-addictive puzzle game. -The concept is simple: put the tiles in the grid on the left such that the numbers match wherever 2 tiles touch." +DESCRIPTION=" +A maddeningly-addictive puzzle game. The concept is simple: put the tiles in \ +the grid on the left such that the numbers match wherever 2 tiles touch. +" HOMEPAGE="https://github.com/HaikuArchives/BeVexed" SRC_URI="git+https://github.com/HaikuArchives/BeVexed#3a45d8f364" REVISION="1" diff --git a/haiku-games/guitarmaster/guitarmaster-r21.recipe b/haiku-games/guitarmaster/guitarmaster-r21.recipe index 4f082b9aa..ceaf4fdfa 100644 --- a/haiku-games/guitarmaster/guitarmaster-r21.recipe +++ b/haiku-games/guitarmaster/guitarmaster-r21.recipe @@ -1,10 +1,9 @@ SUMMARY="A game of musical skill and fast fingers" DESCRIPTION=" - Guitar Master is a Frets on Fire clone made for Haiku. It uses - low-resolution graphics in order to run on Haiku's software-GL. - - Usage: GuitarMaster [/path/to/songsDirectory] - " +Guitar Master is a Frets on Fire clone made for Haiku. It uses low-resolution \ +graphics in order to run on Haiku's software-GL. +Usage: GuitarMaster [/path/to/songsDirectory] +" HOMEPAGE="http://code.google.com/p/guitarmaster/" SRC_URI="svn+http://guitarmaster.googlecode.com/svn/trunk/@21" LICENSE="MIT" diff --git a/haiku-games/puri/puri-0.3.9.1.recipe b/haiku-games/puri/puri-0.3.9.1.recipe index 1ee54bf89..1a99d4213 100644 --- a/haiku-games/puri/puri-0.3.9.1.recipe +++ b/haiku-games/puri/puri-0.3.9.1.recipe @@ -1,8 +1,8 @@ -SUMMARY="Puri is a 2D and 3D chess game." +SUMMARY="Puri is a 2D and 3D chess game" DESCRIPTION=" - Puri is a 2D and 3D chess game. You can play against a computer, - or play online against other people. - " +Puri is a 2D and 3D chess game. You can play against a computer, or play \ +online against other people. +" HOMEPAGE="https://gitorious.org/puri-master-of-chess/puri/" SRC_URI="https://gitorious.org/puri-master-of-chess/puri/archive/59b5db4b337fc432b64a7d099f7b7e0fc8ece3c7.tar.gz" CHECKSUM_MD5="467d00355e3450e9d3b1d126afcf06a6" @@ -62,4 +62,3 @@ INSTALL() cp -R Engines $appsDir/Puri/Engines chmod 755 $appsDir/Puri/Engines/stockfish } - From 0c0d7af66f6c9127b9d754ccbb677822b9b47401 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 272/306] Rewrap haiku-libs DESCRIPTIONs --- haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe | 7 ++++++- haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe | 7 ++++++- haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe | 7 ++++++- haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe | 7 ++++++- haiku-libs/libprefs/libprefs-1.2.5.recipe | 4 +++- haiku-libs/libsanta/libsanta-0.0.1.recipe | 5 ++++- haiku-libs/libwalter/libwalter-97.recipe | 5 ++++- 7 files changed, 35 insertions(+), 7 deletions(-) diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe index 6e30ea577..7c044ab71 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe @@ -1,5 +1,10 @@ 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." +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=" diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe index d9ffa6c1f..247dc8f8b 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe @@ -1,5 +1,10 @@ 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." +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=" diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe index 686c49e20..4684c66ad 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe @@ -1,5 +1,10 @@ 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." +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=" diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe index dad4f7182..5c0452b39 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe @@ -1,5 +1,10 @@ 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." +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=" diff --git a/haiku-libs/libprefs/libprefs-1.2.5.recipe b/haiku-libs/libprefs/libprefs-1.2.5.recipe index 17b83ea82..dd7217fdc 100644 --- a/haiku-libs/libprefs/libprefs-1.2.5.recipe +++ b/haiku-libs/libprefs/libprefs-1.2.5.recipe @@ -1,5 +1,7 @@ SUMMARY="Shared library to take care your preferences" -DESCRIPTION="Shared library to take care your preferences" +DESCRIPTION=" +Shared library to take care your preferences. +" HOMEPAGE="ftp://ftp.icm.edu.pl/vol/rzm1/beos/contrib/libraries" SRC_URI="ftp://ftp.icm.edu.pl/vol/rzm1/beos/contrib/libraries/libprefs125.zip" CHECKSUM_MD5="890f1fc84b7402505ac2536f4d1c5075" diff --git a/haiku-libs/libsanta/libsanta-0.0.1.recipe b/haiku-libs/libsanta/libsanta-0.0.1.recipe index ad72ff1f9..9738762df 100644 --- a/haiku-libs/libsanta/libsanta-0.0.1.recipe +++ b/haiku-libs/libsanta/libsanta-0.0.1.recipe @@ -1,5 +1,8 @@ SUMMARY="Custom widget library" -DESCRIPTION="libsanta has some useful custom widgets (color picker, column list view, scroll view etc.)" +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" diff --git a/haiku-libs/libwalter/libwalter-97.recipe b/haiku-libs/libwalter/libwalter-97.recipe index e90d86b06..c9b5f6720 100644 --- a/haiku-libs/libwalter/libwalter-97.recipe +++ b/haiku-libs/libwalter/libwalter-97.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="LibWalter is a supplementary collection of class and controls not present in the standard Haiku API" +DESCRIPTION=" +LibWalter is a supplementary collection of class and controls not present in \ +the standard Haiku API. +" HOMEPAGE="http://dev.osdrawer.net/projects/libwalter" SRC_URI="svn+http://svn.osdrawer.net/libwalter#97" REVISION="1" From 5e2898a56cfdbaa22a97983da19365ac5cd8798a Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 273/306] Rewrap kde-misc DESCRIPTIONs --- kde-misc/kdiff3/kdiff3-0.9.97.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kde-misc/kdiff3/kdiff3-0.9.97.recipe b/kde-misc/kdiff3/kdiff3-0.9.97.recipe index 5824352bc..7fad1ae2c 100644 --- a/kde-misc/kdiff3/kdiff3-0.9.97.recipe +++ b/kde-misc/kdiff3/kdiff3-0.9.97.recipe @@ -1,12 +1,12 @@ SUMMARY="KDiff3 is a diff and merge program" DESCRIPTION=" -KDiff3 is a diff and merge program that +KDiff3 is a diff and merge program that: * compares or merges two or three text input files or directories, * shows the differences line by line and character by character (!), * provides an automatic merge-facility and * an integrated editor for comfortable solving of merge-conflicts, -* supports Unicode, UTF-8 and other codecs, autodetection via - byte-order-mark 'BOM' +* supports Unicode, UTF-8 and other codecs, autodetection via byte-order-mark \ +'BOM' * supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.), * Printing of differences, * Manual alignment of lines, From 0abcb2cb475f504e72be899fdd873b5a8d794276 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 274/306] Rewrap media-fonts DESCRIPTIONs --- .../anonymous_pro-1.002.001.recipe | 7 +++++- .../arabeyes_fonts/arabeyes_fonts-1.1.recipe | 9 +++++-- media-fonts/cantarell/cantarell-0.0.7.recipe | 10 +++++++- media-fonts/cardo/cardo-1.04.recipe | 8 ++++++- .../courier_prime/courier_prime-1.0.recipe | 9 +++++-- media-fonts/droid/droid-113.recipe | 9 +++++-- media-fonts/droid/droid-4.3_r2.2.recipe | 9 +++++-- media-fonts/humor_sans/humor_sans-1.0.recipe | 5 +++- .../liberation_fonts-1.06.0.20100721.recipe | 5 +++- media-fonts/lohit/lohit-2.3.8.recipe | 10 +++++++- .../nafees_nastaleeq-1.02.recipe | 5 +++- .../nafees_riqa/nafees_riqa-1.00.recipe | 4 +++- media-fonts/nanumfont/nanumfont-2.0.recipe | 4 +++- media-fonts/roboto/roboto-1.2.recipe | 24 +++++++++---------- .../scheherazade_font-1.005.recipe | 6 +++-- .../ubuntu_font_family-0.80.recipe | 7 +++++- media-fonts/vollkorn/vollkorn-2.1.recipe | 7 +++++- .../wqy_microhei-0.2.0~beta.recipe | 4 +++- .../wqy_zenhei/wqy_zenhei-0.9.45.recipe | 4 +++- .../x_series_fonts/x_series_fonts-2.0.recipe | 6 ++++- 20 files changed, 116 insertions(+), 36 deletions(-) diff --git a/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe b/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe index 051b15f02..3bcd70549 100644 --- a/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe +++ b/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe @@ -1,5 +1,10 @@ SUMMARY="The Anonymous Pro Font Family" -DESCRIPTION="Anonymous Pro is a family of fixed-width fonts. It was designed especially for coding - characers that could be mistaken for one another (e. g. O and 0) have distinct shapes. It supports most of the Latin-based Western and Central European languages, as well as Greek and Cyrillic." +DESCRIPTION=" +Anonymous Pro is a family of fixed-width fonts. It was designed especially for \ +coding - characers that could be mistaken for one another (e. g. O and 0) have \ +distinct shapes. It supports most of the Latin-based Western and Central \ +European languages, as well as Greek and Cyrillic. +" HOMEPAGE="http://www.marksimonson.com/fonts/view/anonymous-pro" SRC_URI="http://www.marksimonson.com/assets/content/fonts/AnonymousPro-1.002.zip" CHECKSUM_MD5="bb5141b20b9d69b3190be03e5706c8b7" diff --git a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe index ce25c8d8e..180a1911c 100644 --- a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe +++ b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe @@ -1,5 +1,10 @@ -SUMMARY="Arabeyes Arabic TrueType fonts" -DESCRIPTION="Arabeyes is a Meta project that is aimed at fully supporting the Arabic language in the Unix/Linux environment. It is designed to be a central location to standardize the Arabization process. Arabeyes relies on voluntary contributions." +SUMMARY="Arabeyes Arabic TrueType fonts" +DESCRIPTION=" +Arabeyes is a Meta project that is aimed at fully supporting the Arabic \ +language in the Unix/Linux environment. It is designed to be a central \ +location to standardize the Arabization process. Arabeyes relies on voluntary \ +contributions. +" HOMEPAGE="http://projects.arabeyes.org/project.php?proj=Khotot" SRC_URI="http://sourceforge.net/projects/arabeyes/files/Fonts/ae_fonts/ae_fonts1_ttf_1.1.tar.bz2" REVISION="1" diff --git a/media-fonts/cantarell/cantarell-0.0.7.recipe b/media-fonts/cantarell/cantarell-0.0.7.recipe index ef6f7210f..d0f36a012 100644 --- a/media-fonts/cantarell/cantarell-0.0.7.recipe +++ b/media-fonts/cantarell/cantarell-0.0.7.recipe @@ -1,5 +1,13 @@ SUMMARY="The Cantarell Font Family" -DESCRIPTION="The Cantarell font family is a contemporary humanistic sans serif. It was designed by Dave Crossland for on-screen reading - in particular for reading web pages on the author's HTC mobile phone. Since 2010 it's the default typaface of Gnome, the popular graphical user interface. Currently it fully supports Basic Latin, Western European, Catalan, Baltic, Turkish, Central European, Dutch and Afrikaans writing systems. The Cantarell typeface is included in Google Fonts too." +DESCRIPTION=" +The Cantarell font family is a contemporary humanistic sans serif. It was \ +designed by Dave Crossland for on-screen reading - in particular for reading \ +web pages on the author's HTC mobile phone. Since 2010 it's the default \ +typaface of Gnome, the popular graphical user interface. Currently it fully \ +supports Basic Latin, Western European, Catalan, Baltic, Turkish, Central \ +European, Dutch and Afrikaans writing systems. The Cantarell typeface is \ +included in Google Fonts too. +" HOMEPAGE="http://wiki.gnome.org/CantarellFonts" SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.7.tar.bz2" CHECKSUM_MD5="6202c98fd65faab44cdabcaf4947ca5f" diff --git a/media-fonts/cardo/cardo-1.04.recipe b/media-fonts/cardo/cardo-1.04.recipe index e5174180b..8fea9105b 100644 --- a/media-fonts/cardo/cardo-1.04.recipe +++ b/media-fonts/cardo/cardo-1.04.recipe @@ -1,5 +1,11 @@ SUMMARY="Font for classicists, medievalists and linguists" -DESCRIPTION="Cardo is a large Unicode font specifically designed for the needs of classicists, Biblical scholars, medievalists, and linguists.  Since it may be used to prepare materials for publication, it also contains features that are required for high-quality typography, such as ligatures, text figures, true small capitals and a variety of punctuation and space characters." +DESCRIPTION=" +Cardo is a large Unicode font specifically designed for the needs of \ +classicists, Biblical scholars, medievalists, and linguists. Since it may be \ +used to prepare materials for publication, it also contains features that are \ +required for high-quality typography, such as ligatures, text figures, true \ +small capitals and a variety of punctuation and space characters. +" HOMEPAGE="http://scholarsfonts.net/cardofnt.html" SRC_URI="http://scholarsfonts.net/cardo104.zip" CHECKSUM_MD5="e48dadccd31a74667b0369d7e98e660f" diff --git a/media-fonts/courier_prime/courier_prime-1.0.recipe b/media-fonts/courier_prime/courier_prime-1.0.recipe index c33be46f1..581007de6 100644 --- a/media-fonts/courier_prime/courier_prime-1.0.recipe +++ b/media-fonts/courier_prime/courier_prime-1.0.recipe @@ -1,5 +1,10 @@ -SUMMARY="It's Courier, just better." -DESCRIPTION="Courier Prime was designed to replace the legendary Courier - especially in screenwriting. It’s Courier, just better. Courier Prime is optimized for 12 point size, and matches the metrics of Courier and Courier Final Draft, so you can (mostly) swap it out one-for-one and your page count should not change." +SUMMARY="It's Courier, just better" +DESCRIPTION="Courier Prime was designed to replace the legendary Courier \ +especially in screenwriting. It's Courier, just better. Courier Prime is \ +optimized for 12 point size, and matches the metrics of Courier and Courier \ +Final Draft, so you can (mostly) swap it out one-for-one and your page count \ +should not change. +" HOMEPAGE="http://quoteunquoteapps.com/courierprime/" SRC_URI="http://quoteunquoteapps.com/downloads/courier-prime.zip" REVISION="1" diff --git a/media-fonts/droid/droid-113.recipe b/media-fonts/droid/droid-113.recipe index 86eb4f9ce..127930829 100644 --- a/media-fonts/droid/droid-113.recipe +++ b/media-fonts/droid/droid-113.recipe @@ -1,5 +1,10 @@ -SUMMARY="Font family from Google's Android project" -DESCRIPTION="The Droid family of fonts was designed by Ascender's Steve Matteson beginning in the fall of 2006. The goal was to provide optimal quality and reading comfort on a mobile handset. The Droid fonts were optimized for use in application menus, web browsers and for other screen text." +SUMMARY="Font family from Google's Android project" +DESCRIPTION=" +The Droid family of fonts was designed by Ascender's Steve Matteson beginning \ +in the fall of 2006. The goal was to provide optimal quality and reading \ +comfort on a mobile handset. The Droid fonts were optimized for use in \ +application menus, web browsers and for other screen text. +" HOMEPAGE="http://www.droidfonts.com" SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-113.tar.gz" CHECKSUM_MD5="4e11069eedc2ceda6b1cec7fd5939039" diff --git a/media-fonts/droid/droid-4.3_r2.2.recipe b/media-fonts/droid/droid-4.3_r2.2.recipe index 1bf34711d..144f6ff0f 100644 --- a/media-fonts/droid/droid-4.3_r2.2.recipe +++ b/media-fonts/droid/droid-4.3_r2.2.recipe @@ -1,5 +1,10 @@ -SUMMARY="Font family from Google's Android project" -DESCRIPTION="The Droid family of fonts was designed by Ascender's Steve Matteson beginning in the fall of 2006. The goal was to provide optimal quality and reading comfort on a mobile handset. The Droid fonts were optimized for use in application menus, web browsers and for other screen text." +SUMMARY="Font family from Google's Android project" +DESCRIPTION=" +The Droid family of fonts was designed by Ascender's Steve Matteson beginning \ +in the fall of 2006. The goal was to provide optimal quality and reading \ +comfort on a mobile handset. The Droid fonts were optimized for use in \ +application menus, web browsers and for other screen text. +" HOMEPAGE="http://www.droidfonts.com" # source zip extracted from git clone https://android.googlesource.com/platform/frameworks/base tag android-4.3_r2.2 /data/fonts SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-4.3_r2.2.zip" diff --git a/media-fonts/humor_sans/humor_sans-1.0.recipe b/media-fonts/humor_sans/humor_sans-1.0.recipe index e56559b55..83265443b 100644 --- a/media-fonts/humor_sans/humor_sans-1.0.recipe +++ b/media-fonts/humor_sans/humor_sans-1.0.recipe @@ -1,5 +1,8 @@ SUMMARY="The Human-Sans font" -DESCRIPTION="A sanserif typeface in the style of xkcd. Xkcd is a popular webcomics with focus on computer science or everything else." +DESCRIPTION=" +A sanserif typeface in the style of xkcd. Xkcd is a popular webcomics with \ +focus on computer science or everything else. +" HOMEPAGE="http://antiyawn.com/uploads/humorsans.html" SRC_URI="http://antiyawn.com/uploads/Humor-Sans-1.0.ttf" CHECKSUM_MD5="acdc29df52454684fe8f3184f6477290" diff --git a/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe b/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe index 226727d72..57da7e16c 100644 --- a/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe +++ b/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="The Liberation(tm) Fonts is a font family which aims at metric compatibility with Arial, Times New Roman, and Courier New. It is sponsored by Red Hat" +DESCRIPTION=" +The Liberation(tm) Fonts is a font family which aims at metric compatibility \ +with Arial, Times New Roman, and Courier New. It is sponsored by Red Hat. +" HOMEPAGE="https://fedorahosted.org/liberation-fonts" SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/liberation-fonts-1.06.0.20100721.tar.gz" REVISION="1" diff --git a/media-fonts/lohit/lohit-2.3.8.recipe b/media-fonts/lohit/lohit-2.3.8.recipe index 522356402..a2194be41 100644 --- a/media-fonts/lohit/lohit-2.3.8.recipe +++ b/media-fonts/lohit/lohit-2.3.8.recipe @@ -1,5 +1,13 @@ SUMMARY="The Lohit family of Indic fonts" -DESCRIPTION="Lohit, which means 'red' in Sanskrit, is a family of Indic fonts. It was firts released by Red Hat in 2004 but now it's developed by Fedora Project. The font family currently supports 21 Indian languages: Assamese, Bengali, Devanagari (Hindi, Kashmiri, Konkani, Maithili, Marathi, Nepali, Sindhi, Santali, Bodo, Dogri), Gujarati, Kannada, Malayalam, Manipuri, Oriya, Punjabi, Tamil, and Telugu. The fonts are used as web fonts for Wikipedia and some other Wikimedia Foundation sites." +DESCRIPTION=" +Lohit, which means 'red' in Sanskrit, is a family of Indic fonts. It was first \ +released by Red Hat in 2004 but now it's developed by Fedora Project. The \ +font family currently supports 21 Indian languages: Assamese, Bengali, \ +Devanagari (Hindi, Kashmiri, Konkani, Maithili, Marathi, Nepali, Sindhi, \ +Santali, Bodo, Dogri), Gujarati, Kannada, Malayalam, Manipuri, Oriya, \ +Punjabi, Tamil, and Telugu. The fonts are used as web fonts for Wikipedia and \ +some other Wikimedia Foundation sites. +" HOMEPAGE="http://fedorahosted.org/lohit" SRC_URI="http://rbhalera.fedorapeople.org/released/lohit/lohit-fonts-2.3.8.tar.gz" CHECKSUM_MD5="f3b5c3cd8e370f1669d44cec3eab1f2b" diff --git a/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe index fc56440a3..38f5396b4 100644 --- a/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe +++ b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="Urdu language font developed according to calligraphic rules, following the style of one of the finest calligraphers of Pakistan (Nafees Raqam)" +DESCRIPTION=" +Urdu language font developed according to calligraphic rules, following the \ +style of one of the finest calligraphers of Pakistan (Nafees Raqam). +" HOMEPAGE="http://www.crulp.org/software/localization/Fonts/nafeesNastaleeq.html" SRC_URI="http://www.crulp.org/Downloads/localization/fonts/NafeesNastaleeq/Nafees_Nastaleeq_v1.02.zip" REVISION="1" diff --git a/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe index ca16a2cf9..7ec14d2d5 100644 --- a/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe +++ b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Open Type Font for writng Urdu in Riqa script based on Unicode standard" +DESCRIPTION=" +Open Type Font for writng Urdu in Riqa script based on Unicode standard. +" HOMEPAGE="http://www.crulp.org/software/localization/Fonts/nafeesRiqa.html" SRC_URI="http://www.crulp.org/Downloads/localization/fonts/NafeesRiqa/Nafees_Riqa_v1.0.zip" REVISION="1" diff --git a/media-fonts/nanumfont/nanumfont-2.0.recipe b/media-fonts/nanumfont/nanumfont-2.0.recipe index afa82f449..957a28fe2 100644 --- a/media-fonts/nanumfont/nanumfont-2.0.recipe +++ b/media-fonts/nanumfont/nanumfont-2.0.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Korean monospace font distributed by NHN" +DESCRIPTION=" +Korean monospace font distributed by NHN. +" HOMEPAGE="http://dev.naver.com/projects/nanumfont" SRC_URI="http://dev.naver.com/frs/download.php/441/NanumGothicCoding-2.0.zip" REVISION="1" diff --git a/media-fonts/roboto/roboto-1.2.recipe b/media-fonts/roboto/roboto-1.2.recipe index fb110102a..a26b34920 100644 --- a/media-fonts/roboto/roboto-1.2.recipe +++ b/media-fonts/roboto/roboto-1.2.recipe @@ -1,16 +1,16 @@ -SUMMARY="The Android Roboto font." +SUMMARY="The Android Roboto font" DESCRIPTION=" - The Android design language relies on traditional typographic tools such as - scale, space, rhythm, and alignment with an underlying grid. Successful - deployment of these tools is essential to help users quickly understand a - screen of information. To support such use of typography, Ice Cream Sandwich - introduced a new type family named Roboto, created specifically for the - requirements of UI and high-resolution screens. - The current TextView framework offers Roboto in thin, light, regular and - bold weights, along with an italic style for each weight. The framework also - offers the Roboto Condensed variant in regular and bold weights, along with - an italic style for each weight. - " +The Android design language relies on traditional typographic tools such as \ +scale, space, rhythm, and alignment with an underlying grid. Successful \ +deployment of these tools is essential to help users quickly understand a \ +screen of information. To support such use of typography, Ice Cream Sandwich \ +introduced a new type family named Roboto, created specifically for the \ +requirements of UI and high-resolution screens. +The current TextView framework offers Roboto in thin, light, regular and bold \ +weights, along with an italic style for each weight. The framework also offers \ +the Roboto Condensed variant in regular and bold weights, along with an italic \ +style for each weight. +" HOMEPAGE="http://www.google.com/fonts/specimen/Roboto" SRC_URI="http://developer.android.com/downloads/design/roboto-1.2.zip" CHECKSUM_MD5="45bfbcd71a74d73c6d2c97994abb7e00" diff --git a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe index 2d438f87a..68b702406 100644 --- a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe +++ b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Arabic script font" +DESCRIPTION=" +Arabic script font. +" HOMEPAGE="http://scripts.sil.org/ArabicFonts_Download" SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Scheherazade_OT_1_005&filename=ScherazadeRegOT-1.005.zip" REVISION="1" @@ -19,4 +21,4 @@ INSTALL() } LICENSE="SIL Open Font License v1.1" -COPYRIGHT="2004-2011 SIL International" \ No newline at end of file +COPYRIGHT="2004-2011 SIL International" diff --git a/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe index d23f007b9..b2f6ff263 100644 --- a/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe +++ b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe @@ -1,5 +1,10 @@ SUMMARY="Font family from Ubuntu operating system" -DESCRIPTION="The Ubuntu Font Family belongs to sans-serif typeface. It's set as default font for the current releases of Ubuntu, one of the most popular Linux-based operating systems. It was designed by Dalton Maag in 2010 and now it covers 200-250 languages. The Ubuntu Font Family is included in Google Fonts too." +DESCRIPTION=" +The Ubuntu Font Family belongs to sans-serif typeface. It's set as default \ +font for the current releases of Ubuntu, one of the most popular Linux-based \ +operating systems. It was designed by Dalton Maag in 2010 and now it covers \ +200-250 languages. The Ubuntu Font Family is included in Google Fonts too. +" HOMEPAGE="http://font.ubuntu.com" SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip" CHECKSUM_MD5="a1fc70f5a5b1d096ab8310886cddaa1c" diff --git a/media-fonts/vollkorn/vollkorn-2.1.recipe b/media-fonts/vollkorn/vollkorn-2.1.recipe index 7b486e6c3..34ccf77f6 100644 --- a/media-fonts/vollkorn/vollkorn-2.1.recipe +++ b/media-fonts/vollkorn/vollkorn-2.1.recipe @@ -1,5 +1,10 @@ SUMMARY="The typeface for bread and butter use" -DESCRIPTION="Vollkorn means wholemeal in German. The Vollkorn typeface is free and healthy typeface for bread and butter use. It intends to be a quiet, modest and well working text face. It might be used. It might be used as body type as well as for headlines and titles." +DESCRIPTION=" +Vollkorn means wholemeal in German. The Vollkorn typeface is free and healthy \ +typeface for bread and butter use. It intends to be a quiet, modest and well \ +working text face. It might be used. It might be used as body type as well as \ +for headlines and titles. +" HOMEPAGE="http://friedrichalthausen.de/vollkorn/" SRC_URI="http://friedrichalthausen.de/wp-content/plugins/cimy-counter/cc_redirect.php?cc=Vollkorn%202.0&fn=http://friedrichalthausen.de/Vollkorn-2.1.zip" CHECKSUM_MD5="dd38725c293bc73774ff77744674fe13" diff --git a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe index 7e945a544..c9293868e 100644 --- a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe +++ b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe @@ -1,5 +1,7 @@ SUMMARY="A droid derived Sans-Serif style CJK font" -DESCRIPTION="A droid derived Sans-Serif style CJK font." +DESCRIPTION=" +A droid derived Sans-Serif style CJK font. +" HOMEPAGE="http://wenq.org/wqy2/index.cgi?Home" SRC_URI="http://sourceforge.net/projects/wqy/files/wqy-microhei/0.2.0-beta/wqy-microhei-0.2.0-beta.tar.gz" CHECKSUM_MD5="a124c5c6606f4f3b733d3477380e9d2f" diff --git a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe index 07f31932c..b0237ab2d 100644 --- a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe +++ b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe @@ -1,5 +1,7 @@ SUMMARY="WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font" -DESCRIPTION="WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font." +DESCRIPTION=" +WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font. +" HOMEPAGE="http://wenq.org/wqy2/index.cgi?Home" SRC_URI="http://sourceforge.net/projects/wqy/files/wqy-zenhei/0.9.45%20%28Fighting-state%20RC1%29/wqy-zenhei-0.9.45.tar.gz" CHECKSUM_MD5="4c6c3f4e902dd5ee0a121e8c41d040bd" diff --git a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe index c63036006..f4ac36b1b 100644 --- a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe +++ b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe @@ -1,4 +1,8 @@ -DESCRIPTION="X Series 2 fonts are built on freely available fonts and extended to support Persian, Arabic, Urdu, Pashto, Dari, Uzbek, Kurdish, Uighur, old Turkish (Ottoman) and modern Turkish (Roman)." +DESCRIPTION=" +X Series 2 fonts are built on freely available fonts and extended to support \ +Persian, Arabic, Urdu, Pashto, Dari, Uzbek, Kurdish, Uighur, old Turkish \ +(Ottoman) and modern Turkish (Roman). +" HOMEPAGE="http://wiki.irmug.com/index.php/X_Series_2" SRC_URI="http://irmug.com/downloads/dl.php?id=21" REVISION="1" From 74e0e1dca075495f5a373eca61c3b1dbd4ca5792 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 275/306] Rewrap media-gfx DESCRIPTIONs --- media-gfx/graphviz/graphviz-2.26.3.recipe | 16 +++++++++++++--- media-gfx/hqx/hqx-1.1.recipe | 5 ++++- media-gfx/optipng/optipng-0.7.4.recipe | 9 ++++----- media-gfx/pngcrush/pngcrush-1.7.67.recipe | 17 ++++++++--------- media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe | 6 ++++-- 5 files changed, 33 insertions(+), 20 deletions(-) diff --git a/media-gfx/graphviz/graphviz-2.26.3.recipe b/media-gfx/graphviz/graphviz-2.26.3.recipe index db569ac21..195ab55f2 100644 --- a/media-gfx/graphviz/graphviz-2.26.3.recipe +++ b/media-gfx/graphviz/graphviz-2.26.3.recipe @@ -1,7 +1,17 @@ SUMMARY="Open Source Graph Visualization Software" -DESCRIPTION="Graphviz is open source graph visualization software. Graph visualization is a way of representing structural information as diagrams of abstract graphs and networks. It has important applications in networking, bioinformatics, software engineering, database and web design, machine learning, and in visual interfaces for other technical domains. - -The Graphviz layout programs take descriptions of graphs in a simple text language, and make diagrams in useful formats, such as images and SVG for web pages, PDF or Postscript for inclusion in other documents; or display in an interactive graph browser. (Graphviz also supports GXL, an XML dialect.) Graphviz has many useful features for concrete diagrams, such as options for colors, fonts, tabular node layouts, line styles, hyperlinks, rolland custom shapes." +DESCRIPTION="Graphviz is open source graph visualization software. Graph \ +visualization is a way of representing structural information as diagrams of \ +abstract graphs and networks. It has important applications in networking, \ +bioinformatics, software engineering, database and web design, machine \ +learning, and in visual interfaces for other technical domains. +The Graphviz layout programs take descriptions of graphs in a simple text \ +language, and make diagrams in useful formats, such as images and SVG for web \ +pages, PDF or Postscript for inclusion in other documents; or display in an \ +interactive graph browser. (Graphviz also supports GXL, an XML dialect.) \ +Graphviz has many useful features for concrete diagrams, such as options for \ +colors, fonts, tabular node layouts, line styles, hyperlinks, rolland custom \ +shapes. +" HOMEPAGE="http://www.graphviz.org/" LICENSE="CPL v1.0" COPYRIGHT="1994-2010 AT&T Corp." diff --git a/media-gfx/hqx/hqx-1.1.recipe b/media-gfx/hqx/hqx-1.1.recipe index 83976d146..1046e5c58 100644 --- a/media-gfx/hqx/hqx-1.1.recipe +++ b/media-gfx/hqx/hqx-1.1.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="hqx ('hq' stands for 'high quality' and 'x' stands for magnification) is one of the pixel art scaling algorithms developed by Maxim Stepin" +DESCRIPTION=" +hqx ('hq' stands for 'high quality' and 'x' stands for magnification) is one \ +of the pixel art scaling algorithms developed by Maxim Stepin. +" HOMEPAGE="http://code.google.com/p/hqx/" SRC_URI="http://hqx.googlecode.com/files/hqx-1.1.tar.gz" REVISION="1" diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.4.recipe index 1c7d493a2..70904deb4 100644 --- a/media-gfx/optipng/optipng-0.7.4.recipe +++ b/media-gfx/optipng/optipng-0.7.4.recipe @@ -1,10 +1,9 @@ SUMMARY="A PNG optimizer, making PNG files smaller" DESCRIPTION=" - OptiPNG is a PNG optimizer, recompressing PNG files so they - become smaller, without losing any information. Additionally, - OptiPNG can convert other image formats, such as BMP, - GIF, PNM and TIFF, to PNG files. - " +OptiPNG is a PNG optimizer, recompressing PNG files so they become smaller, \ +without losing any information. Additionally, OptiPNG can convert other image \ +formats, such as BMP, GIF, PNM and TIFF, to PNG files. +" HOMEPAGE="http://optipng.sourceforge.net/" SRC_URI="http://prdownloads.sourceforge.net/optipng/optipng-0.7.4.tar.gz" CHECKSUM_MD5="8853d89aaf859065e95dcdf98b6bed73" diff --git a/media-gfx/pngcrush/pngcrush-1.7.67.recipe b/media-gfx/pngcrush/pngcrush-1.7.67.recipe index e1e8590a9..d22d55e7a 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.67.recipe +++ b/media-gfx/pngcrush/pngcrush-1.7.67.recipe @@ -1,13 +1,12 @@ -SUMMARY="Pngcrush is an optimizer for PNG (Portable Network Graphics) files." +SUMMARY="Pngcrush is an optimizer for PNG files" DESCRIPTION=" -Pngcrush is an optimizer for PNG (Portable Network Graphics) files. -It can be run from a commandline in an MSDOS window, or from a UNIX -or LINUX commandline. Its main purpose is to reduce the size of the -PNG IDAT datastream by trying various compression levels and PNG -filter methods. It also can be used to remove unwanted ancillary -chunks, or to add certain chunks including gAMA, tRNS, iCCP, and -textual chunks." - +Pngcrush is an optimizer for PNG (Portable Network Graphics) files. It can be \ +run from a commandline in an MSDOS window, or from a UNIX or LINUX \ +commandline. Its main purpose is to reduce the size of the PNG IDAT datastream \ +by trying various compression levels and PNG filter methods. It also can be \ +used to remove unwanted ancillary chunks, or to add certain chunks including \ +gAMA, tRNS, iCCP, and textual chunks. +" HOMEPAGE="http://pmt.sourceforge.net/pngcrush/" SRC_URI="http://sourceforge.net/projects/pmt/files/pngcrush/1.7.67/pngcrush-1.7.67-nolib.tar.xz" CHECKSUM_MD5="682318b86be2e01056b8dba7b90dee01" diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe index 094fa4e0a..380eaa8f1 100644 --- a/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe +++ b/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe @@ -1,5 +1,7 @@ -SUMMARY="tuxpaint - Drawing program designed for young children" -DESCRIPTION="tuxpaint - Drawing program designed for young children" +SUMMARY="Drawing program designed for young children" +DESCRIPTION=" +tuxpaint - Drawing program designed for young children. +" HOMEPAGE="http://www.tuxpaint.org/" #SRC_URI="cvs://:pserver:anonymous@tuxpaint.cvs.sourceforge.net:/cvsroot/tuxpaint/tuxpaint" SRC_URI="http://ports-space.haiku-files.org/source/tuxpaint-snapshot-2013-11-06.zip" From 477ce26f377c59e674088685349ae2f78647493b Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 276/306] Rewrap media-libs DESCRIPTIONs --- media-libs/a52dec/a52dec-0.7.4.recipe | 4 +- media-libs/aalib/aalib-1.4rc4.recipe | 8 ++-- media-libs/allegro/allegro-4.4.1.1.recipe | 6 ++- media-libs/allegro/allegro-4.4.2.recipe | 23 +++++---- media-libs/djvulibre/djvulibre-3.5.25.recipe | 7 ++- media-libs/faac/faac-1.28.recipe | 4 +- media-libs/fitz/fitz-1.1.recipe | 11 +++-- media-libs/flac/flac-1.3.0.recipe | 9 +++- .../fontconfig/fontconfig-2.11.0.recipe | 6 ++- media-libs/freetype/freetype-2.4.9.recipe | 6 ++- media-libs/freetype/freetype-2.5.0.1.recipe | 6 ++- media-libs/giflib/giflib-5.0.5.recipe | 4 +- media-libs/glew/glew-1.10.0.recipe | 7 ++- media-libs/guilib/guilib-1.2.1.recipe | 7 ++- media-libs/im/im-3.8.recipe | 27 +++++++---- media-libs/jasper/jasper-1.900.1.recipe | 7 ++- media-libs/jbig2dec/jbig2dec-0.11.recipe | 13 ++--- media-libs/jpeg/jpeg-8d.recipe | 19 ++++---- media-libs/jpeg/jpeg-9.recipe | 19 ++++---- media-libs/lcms/lcms-2.5.recipe | 11 ++++- media-libs/leptonica/leptonica-1.69.recipe | 2 +- media-libs/libao/libao-1.0.0.recipe | 10 +++- .../libart_lgpl/libart_lgpl-2.3.21.recipe | 11 ++++- .../libcoverart/libcoverart-1.0.0.recipe | 5 +- media-libs/libdvdcss/libdvdcss-1.2.12.recipe | 5 +- media-libs/libdvdnav/libdvdnav-4.2.0.recipe | 8 ++-- media-libs/libdvdread/libdvdread-4.2.0.recipe | 12 +++-- .../libiptcdata/libiptcdata-1.0.4.recipe | 8 +++- media-libs/libmad/libmad-0.15.1b.recipe | 7 ++- media-libs/libmikmod/libmikmod-3.1.14.recipe | 4 +- media-libs/libmikmod/libmikmod-3.3.3.recipe | 4 +- media-libs/libmkv/libmkv-0.6.5.1.recipe | 6 ++- media-libs/libmng/libmng-1.0.10.recipe | 5 +- .../libmodplug/libmodplug-0.8.8.4.recipe | 48 ++++++++++--------- media-libs/libmp4v2/libmp4v2-2.0.0.recipe | 6 ++- media-libs/libmpeg2/libmpeg2-0.5.1.recipe | 6 ++- media-libs/libogg/libogg-1.3.0.recipe | 23 ++++++--- media-libs/libpng/libpng-1.5.12.recipe | 5 +- media-libs/libsdl/libsdl-1.2.15.recipe | 6 ++- media-libs/libsdl2/libsdl2-2.0.0.recipe | 7 ++- media-libs/libsdl2/libsdl2-2.0.1.recipe | 7 ++- media-libs/libtheora/libtheora-1.1.1.recipe | 18 +++++-- media-libs/libvorbis/libvorbis-1.3.2.recipe | 14 ++++-- media-libs/libvpx/libvpx-1.0.0.recipe | 11 +++-- media-libs/libwebp/libwebp-0.3.1.recipe | 4 +- media-libs/loadpng/loadpng-1.5.recipe | 5 +- media-libs/mediainfo/mediainfo-0.7.61.recipe | 5 +- media-libs/openal/openal-1.13.0.recipe | 6 ++- media-libs/openjpeg/openjpeg-1.5.0.recipe | 16 +++---- media-libs/portaudio/portaudio-19.recipe | 6 ++- media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe | 8 +++- media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe | 7 ++- media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe | 16 +++---- media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe | 8 +++- media-libs/sdl_image/sdl_image-1.2.12.recipe | 13 +++-- media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 7 ++- media-libs/sdl_net/sdl_net-1.2.8.recipe | 6 ++- media-libs/sdl_sound/sdl_sound-1.0.3.recipe | 8 +++- media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe | 16 +++---- media-libs/sge/sge-030809.recipe | 4 +- media-libs/smjpeg/smjpeg-0.2.1.recipe | 7 ++- media-libs/smpeg/smpeg-0.4.5.recipe | 7 ++- media-libs/speex/speex-1.2~rc1.recipe | 9 +++- media-libs/taglib/taglib-1.7.2.recipe | 9 +++- media-libs/taglib/taglib-1.9.1.recipe | 6 ++- media-libs/tiff/tiff-3.9.6.recipe | 6 ++- media-libs/tiff/tiff-4.0.2.recipe | 6 ++- 67 files changed, 427 insertions(+), 200 deletions(-) diff --git a/media-libs/a52dec/a52dec-0.7.4.recipe b/media-libs/a52dec/a52dec-0.7.4.recipe index 55d062582..4ae118226 100644 --- a/media-libs/a52dec/a52dec-0.7.4.recipe +++ b/media-libs/a52dec/a52dec-0.7.4.recipe @@ -1,5 +1,7 @@ SUMMARY="A ATSC A/52 decoding library used on streams in DVD's" -DESCRIPTION="A library for decoding ATSC A/52 streams used in DVD's" +DESCRIPTION=" +A library for decoding ATSC A/52 streams used in DVD's. +" HOMEPAGE="http://liba52.sourceforge.net/" SRC_URI="http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz" CHECKSUM_MD5="caa9f5bc44232dc8aeea773fea56be80" diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe index 74bf61761..207b18b92 100644 --- a/media-libs/aalib/aalib-1.4rc4.recipe +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -1,7 +1,8 @@ SUMMARY="aalib is an ASCII rendering 2D library" -DESCRIPTION="aalib is a software library which allows applications to - automatically convert still and moving images into ASCII art. - " +DESCRIPTION=" +aalib is a software library which allows applications to automatically convert \ +still and moving images into ASCII art. +" HOMEPAGE="http://aa-project.sourceforge.net/aalib/" SRC_URI="http://prdownloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz" SOURCE_DIR="aalib-1.4.0" @@ -82,4 +83,3 @@ PROVIDES_devel=" REQUIRES_devel=" aalib$secondaryArchSuffix == $portVersion base " - diff --git a/media-libs/allegro/allegro-4.4.1.1.recipe b/media-libs/allegro/allegro-4.4.1.1.recipe index ed1972baf..1af7266cd 100644 --- a/media-libs/allegro/allegro-4.4.1.1.recipe +++ b/media-libs/allegro/allegro-4.4.1.1.recipe @@ -1,5 +1,7 @@ -SUMMARY="Allegro game programming library" -DESCRIPTION="Allegro game programming library" +SUMMARY="Allegro game programming library" +DESCRIPTION=" +Allegro game programming library. +" HOMEPAGE="http://alleg.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/alleg/files/allegro/4.4.1.1/allegro-4.4.1.1.tar.gz/download" CHECKSUM_MD5="0f1cfff8f2cf88e5c91a667d9fd386ec" diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe index 3394bc282..87e9171da 100644 --- a/media-libs/allegro/allegro-4.4.2.recipe +++ b/media-libs/allegro/allegro-4.4.2.recipe @@ -1,18 +1,17 @@ -SUMMARY="Allegro game programming library" +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. +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 +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" diff --git a/media-libs/djvulibre/djvulibre-3.5.25.recipe b/media-libs/djvulibre/djvulibre-3.5.25.recipe index 737e0f67b..6417992af 100644 --- a/media-libs/djvulibre/djvulibre-3.5.25.recipe +++ b/media-libs/djvulibre/djvulibre-3.5.25.recipe @@ -1,5 +1,8 @@ -SUMMARY="web-centric format for distributing documents and images" -DESCRIPTION="DjVu is a web-centric format and software platform for distributing documents and images" +SUMMARY="Web-centric format for distributing documents and images" +DESCRIPTION=" +DjVu is a web-centric format and software platform for distributing documents \ +and images. +" HOMEPAGE="http://djvulibre.sourceforge.net/" LICENSE="GNU GPL v2" COPYRIGHT="2002 Leon Bottou and Yann Le Cun. diff --git a/media-libs/faac/faac-1.28.recipe b/media-libs/faac/faac-1.28.recipe index 8825706b9..939e75850 100644 --- a/media-libs/faac/faac-1.28.recipe +++ b/media-libs/faac/faac-1.28.recipe @@ -1,5 +1,7 @@ SUMMARY="An MPEG-4 and MPEG-2 AAC encoder" -DESCRIPTION="FAAC is an MPEG-4 and MPEG-2 AAC encoder" +DESCRIPTION=" +FAAC is an MPEG-4 and MPEG-2 AAC encoder. +" HOMEPAGE="http://www.audiocoding.com/" SRC_URI="http://downloads.sourceforge.net/faac/faac-1.28.tar.bz2" CHECKSUM_MD5="c5dde68840cefe46532089c9392d1df0" diff --git a/media-libs/fitz/fitz-1.1.recipe b/media-libs/fitz/fitz-1.1.recipe index c0160cd15..9fbaf4f3d 100644 --- a/media-libs/fitz/fitz-1.1.recipe +++ b/media-libs/fitz/fitz-1.1.recipe @@ -1,9 +1,10 @@ -SUMMARY="Fitz is a PDF library that is part of MuPDF." +SUMMARY="A PDF library that is part of MuPDF" DESCRIPTION=" -Fitz is a library that is part of MuPDF. The renderer in MuPDF is -tailored for high quality anti-aliased graphics. It renders text with -metrics and spacing accurate to within fractions of a pixel for the -highest fidelity in reproducing the look of a printed page on screen." +Fitz is a library that is part of MuPDF. The renderer in MuPDF is tailored for \ +high quality anti-aliased graphics. It renders text with metrics and spacing \ +accurate to within fractions of a pixel for the highest fidelity in \ +reproducing the look of a printed page on screen. +" HOMEPAGE="http://code.google.com/p/mupdf/" LICENSE="GNU GPL v3" COPYRIGHT="2007 Free Software Foundation, Inc." diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.0.recipe index 2248eaf26..f46946f73 100644 --- a/media-libs/flac/flac-1.3.0.recipe +++ b/media-libs/flac/flac-1.3.0.recipe @@ -1,5 +1,12 @@ SUMMARY="flac - Free Lossless Audio Codec" -DESCRIPTION="FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio, and you can play back compressed FLAC files in your favorite player (or your car or home stereo) just like you would an MP3 file." +DESCRIPTION=" +FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but \ +lossless, meaning that audio is compressed in FLAC without any loss in \ +quality. This is similar to how Zip works, except with FLAC you will get much \ +better compression because it is designed specifically for audio, and you can \ +play back compressed FLAC files in your favorite player (or your car or home \ +stereo) just like you would an MP3 file. +" HOMEPAGE="http://flac.sourceforge.net/" SRC_URI="http://downloads.xiph.org/releases/flac/flac-1.3.0.tar.xz" CHECKSUM_MD5="13b5c214cee8373464d3d65dee362cdd" diff --git a/media-libs/fontconfig/fontconfig-2.11.0.recipe b/media-libs/fontconfig/fontconfig-2.11.0.recipe index 187a6d46a..65b7f1ff4 100644 --- a/media-libs/fontconfig/fontconfig-2.11.0.recipe +++ b/media-libs/fontconfig/fontconfig-2.11.0.recipe @@ -1,5 +1,7 @@ -SUMMARY="Fontconfig is a library for font customization and configuration." -DESCRIPTION="Fontconfig is a library for font customization and configuration." +SUMMARY="A library for font customization and configuration" +DESCRIPTION=" +Fontconfig is a library for font customization and configuration. +" HOMEPAGE="http://www.freedesktop.org/wiki/Software/fontconfig" SRC_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.11.0.tar.bz2" CHECKSUM_MD5="000bd4baf7aefa828e03414d0c8c7dc5" diff --git a/media-libs/freetype/freetype-2.4.9.recipe b/media-libs/freetype/freetype-2.4.9.recipe index 1f3d233d6..dba3da6f5 100644 --- a/media-libs/freetype/freetype-2.4.9.recipe +++ b/media-libs/freetype/freetype-2.4.9.recipe @@ -1,5 +1,9 @@ SUMMARY="A Free, High-Quality, and Portable Font Engine" -DESCRIPTION="FreeType is written in C, designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output (glyph images) of most vector and bitmap font formats." +DESCRIPTION=" +FreeType is written in C, designed to be small, efficient, highly \ +customizable, and portable while capable of producing high-quality output \ +(glyph images) of most vector and bitmap font formats. +" HOMEPAGE="http://www.freetype.org" LICENSE="FreeType" COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/freetype-2.5.0.1.recipe b/media-libs/freetype/freetype-2.5.0.1.recipe index 4ee897bd3..fd71afdfc 100644 --- a/media-libs/freetype/freetype-2.5.0.1.recipe +++ b/media-libs/freetype/freetype-2.5.0.1.recipe @@ -1,5 +1,9 @@ SUMMARY="A Free, High-Quality, and Portable Font Engine" -DESCRIPTION="FreeType is written in C, designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output (glyph images) of most vector and bitmap font formats." +DESCRIPTION=" +FreeType is written in C, designed to be small, efficient, highly \ +customizable, and portable while capable of producing high-quality output \ +(glyph images) of most vector and bitmap font formats. +" HOMEPAGE="http://www.freetype.org" LICENSE="FreeType" COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/giflib/giflib-5.0.5.recipe b/media-libs/giflib/giflib-5.0.5.recipe index 30752e828..27efbc318 100644 --- a/media-libs/giflib/giflib-5.0.5.recipe +++ b/media-libs/giflib/giflib-5.0.5.recipe @@ -1,5 +1,7 @@ DESCRIPTION="giflib - A library for processing GIFs" -SUMMARY="giflib - A library for processing GIFs" +SUMMARY=" +giflib - A library for processing GIFs. +" HOMEPAGE="http://sourceforge.net/projects/giflib/" SRC_URI="http://sourceforge.net/projects/giflib/files/giflib-5.x/giflib-5.0.5.tar.bz2/download" CHECKSUM_MD5="c3262ba0a3dad31ba876fb5ba1d71a02" diff --git a/media-libs/glew/glew-1.10.0.recipe b/media-libs/glew/glew-1.10.0.recipe index eaf3766ce..8de973375 100644 --- a/media-libs/glew/glew-1.10.0.recipe +++ b/media-libs/glew/glew-1.10.0.recipe @@ -1,6 +1,9 @@ SUMMARY="The OpenGL Extension Wrangler Library" -DESCRIPTION="The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. - GLEW provides efficient run-time mechanisms for determining which OpenGL extensions are supported on the target platform." +DESCRIPTION=" +The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source \ +C/C++ extension loading library. GLEW provides efficient run-time mechanisms \ +for determining which OpenGL extensions are supported on the target platform. +" LICENSE="BSD (3-clause)" COPYRIGHT="2007 The Kronos Group Inc. 2002-2007 Milan Ikits diff --git a/media-libs/guilib/guilib-1.2.1.recipe b/media-libs/guilib/guilib-1.2.1.recipe index 0fc94f49c..d3c519a4a 100644 --- a/media-libs/guilib/guilib-1.2.1.recipe +++ b/media-libs/guilib/guilib-1.2.1.recipe @@ -1,5 +1,8 @@ -SUMMARY="GUIlib is a simple GUI framework for SDL" -DESCRIPTION="This is a very simple GUI library for SDL. It provides some general widgets like button, scrollbar, image." +SUMMARY="A simple GUI framework for SDL" +DESCRIPTION=" +GUIlib is a very simple GUI library for SDL. It provides some general widgets \ +like button, scrollbar, and image. +" HOMEPAGE="http://www.libsdl.org/projects/GUIlib/" SRC_URI="http://www.libsdl.org/projects/GUIlib/src/GUIlib-1.2.1.tar.gz" CHECKSUM_MD5="a0114b925d79d6c66161e24cbeaa88b1" diff --git a/media-libs/im/im-3.8.recipe b/media-libs/im/im-3.8.recipe index 24d3f10a9..699806d6f 100644 --- a/media-libs/im/im-3.8.recipe +++ b/media-libs/im/im-3.8.recipe @@ -111,15 +111,22 @@ REQUIRES_devel=" LICENSE="MIT" COPYRIGHT="1994-2012 Tecgraf, PUC-Rio." -DESCRIPTION="IM is a toolkit for Digital Imaging. IM is based on 4 concepts: Image Representation, Storage, Processing and Capture. Image Visualization is a task that it is left for a graphics library. - -It provides support for image capture, several image file formats and many image processing operations. The most popular file formats are supported: TIFF, BMP, PNG, JPEG, GIF and AVI. - -Image representation includes scientific data types (like IEEE floating point data) and attributes (or metadata like GeoTIFF and Exif tags). Animation, video and volumes are supported as image sequences, but there is no digital audio support. - -The main goal of the library is to provide a simple API and abstraction of images for scientific applications. - -The toolkit API is written in C. The core library source code is implemented in C++ and it is very portable, it can be compiled in Windows and UNIX with no modifications. New image processing operations can be implemented in C or in C++. - +DESCRIPTION=" +IM is a toolkit for Digital Imaging. IM is based on 4 concepts: Image \ +Representation, Storage, Processing and Capture. Image Visualization is a task \ +that it is left for a graphics library. +It provides support for image capture, several image file formats and many \ +image processing operations. The most popular file formats are supported: \ +TIFF, BMP, PNG, JPEG, GIF and AVI. +Image representation includes scientific data types (like IEEE floating point \ +data) and attributes (or metadata like GeoTIFF and Exif tags). Animation, \ +video and volumes are supported as image sequences, but there is no digital \ +audio support. +The main goal of the library is to provide a simple API and abstraction of \ +images for scientific applications. +The toolkit API is written in C. The core library source code is implemented \ +in C++ and it is very portable, it can be compiled in Windows and UNIX with no \ +modifications. New image processing operations can be implemented in C or in \ +C++. IM is free software, can be used for public and commercial applications. " diff --git a/media-libs/jasper/jasper-1.900.1.recipe b/media-libs/jasper/jasper-1.900.1.recipe index 780d42167..55fccc3b5 100644 --- a/media-libs/jasper/jasper-1.900.1.recipe +++ b/media-libs/jasper/jasper-1.900.1.recipe @@ -1,5 +1,10 @@ -DESCRIPTION="The JasPer Project is an open-source initiative to provide a free software-based reference implementation of the codec specified in the JPEG-2000 Part-1 standard. More details about this software can be found in the JasPer Software Reference Manual." SUMMARY="Implementation of the codec specified in the JPEG-2000 Part-1 standard." +DESCRIPTION=" +The JasPer Project is an open-source initiative to provide a free \ +software-based reference implementation of the codec specified in the \ +JPEG-2000 Part-1 standard. More details about this software can be found in \ +the JasPer Software Reference Manual. +" HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/" SRC_URI="http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip" REVISION="1" diff --git a/media-libs/jbig2dec/jbig2dec-0.11.recipe b/media-libs/jbig2dec/jbig2dec-0.11.recipe index 54bcc05b4..61ad9bbf1 100644 --- a/media-libs/jbig2dec/jbig2dec-0.11.recipe +++ b/media-libs/jbig2dec/jbig2dec-0.11.recipe @@ -1,10 +1,11 @@ -SUMMARY="jbig2dec is a decoder implementation of the JBIG2 image format" +SUMMARY="A decoder implementation of the JBIG2 image format" DESCRIPTION=" -jbig2dec is a decoder implementation of the JBIG2 image compression -format. JBIG2 is designed for lossy or lossless encoding of -'bilevel' (1-bit monochrome) images at moderately high resolution, and -in particular scanned paper documents. In this domain it is very -efficient, offering compression ratios on the order of 100:1." +jbig2dec is a decoder implementation of the JBIG2 image compression format. \ +JBIG2 is designed for lossy or lossless encoding of 'bilevel' (1-bit \ +monochrome) images at moderately high resolution, and in particular scanned \ +paper documents. In this domain it is very efficient, offering compression \ +ratios on the order of 100:1. +" HOMEPAGE="http://jbig2dec.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/jbig2dec/files/jbig2dec/0.11/jbig2dec-0.11.tar.gz" CHECKSUM_MD5="1f61e144852c86563fee6e5ddced63f1" diff --git a/media-libs/jpeg/jpeg-8d.recipe b/media-libs/jpeg/jpeg-8d.recipe index d1dcfe14c..8b4856a45 100644 --- a/media-libs/jpeg/jpeg-8d.recipe +++ b/media-libs/jpeg/jpeg-8d.recipe @@ -1,13 +1,14 @@ SUMMARY="JPEG image compression library and tools" -DESCRIPTION="This package contains C software to implement JPEG image encoding, decoding, -and transcoding. JPEG is a standardized compression method for full-color -and gray-scale images. - -The distributed programs provide conversion between JPEG "JFIF" format and -image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats. The -core compression and decompression library can easily be reused in other -programs, such as image viewers. The package is highly portable C code; -we have tested it on many machines ranging from PCs to Crays." +DESCRIPTION=" +This package contains C software to implement JPEG image encoding, decoding, \ +and transcoding. JPEG is a standardized compression method for full-color and \ +gray-scale images. +The distributed programs provide conversion between JPEG "JFIF" format and \ +image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats. The core \ +compression and decompression library can easily be reused in other programs, \ +such as image viewers. The package is highly portable C code; we have tested \ +it on many machines ranging from PCs to Crays. +" HOMEPAGE="http://www.ijg.org" LICENSE="JPEG" COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding. All Rights Reserved" diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe index 7f9645aed..9c7591b4f 100644 --- a/media-libs/jpeg/jpeg-9.recipe +++ b/media-libs/jpeg/jpeg-9.recipe @@ -1,13 +1,14 @@ SUMMARY="JPEG image compression library and tools" -DESCRIPTION="This package contains C software to implement JPEG image encoding, decoding, -and transcoding. JPEG is a standardized compression method for full-color -and gray-scale images. - -The distributed programs provide conversion between JPEG "JFIF" format and -image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats. The -core compression and decompression library can easily be reused in other -programs, such as image viewers. The package is highly portable C code; -we have tested it on many machines ranging from PCs to Crays." +DESCRIPTION=" +This package contains C software to implement JPEG image encoding, decoding, \ +and transcoding. JPEG is a standardized compression method for full-color and \ +gray-scale images. +The distributed programs provide conversion between JPEG "JFIF" format and \ +image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats. The core \ +compression and decompression library can easily be reused in other programs, \ +such as image viewers. The package is highly portable C code; we have tested \ +it on many machines ranging from PCs to Crays. +" HOMEPAGE="http://www.ijg.org" LICENSE="JPEG" COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding. All Rights Reserved" diff --git a/media-libs/lcms/lcms-2.5.recipe b/media-libs/lcms/lcms-2.5.recipe index 6bde06ecd..a433a71bd 100644 --- a/media-libs/lcms/lcms-2.5.recipe +++ b/media-libs/lcms/lcms-2.5.recipe @@ -1,5 +1,12 @@ -SUMMARY="lcms - Little cms intends to be a small-footprint, speed optimized color management engine" -DESCRIPTION="Little CMS intends to be an OPEN SOURCE small-footprint color management engine, with special focus on accuracy and performance. It uses the International Color Consortium standard (ICC), which is the modern standard when regarding to color management. The ICC specification is widely used and is referred to in many International and other de-facto standards. It was approved as an International Standard, ISO 15076-1, in 2005." +SUMMARY="A small-footprint, speed optimized color management engine" +DESCRIPTION=" +Little CMS intends to be an open source small-footprint color management \ +engine, with special focus on accuracy and performance. It uses the \ +International Color Consortium standard (ICC), which is the modern standard \ +when regarding to color management. The ICC specification is widely used and \ +is referred to in many International and other de-facto standards. It was \ +approved as an International Standard, ISO 15076-1, in 2005. +" HOMEPAGE="http://littlecms.com/" SRC_URI="http://downloads.sourceforge.net/project/lcms/lcms/2.5/lcms2-2.5.tar.gz" CHECKSUM_MD5="396d106600251441ff195fcaa277d10b" diff --git a/media-libs/leptonica/leptonica-1.69.recipe b/media-libs/leptonica/leptonica-1.69.recipe index 30e0d55da..8686430c7 100644 --- a/media-libs/leptonica/leptonica-1.69.recipe +++ b/media-libs/leptonica/leptonica-1.69.recipe @@ -1,4 +1,4 @@ -SUMMARY="A C library for image processing and analysis operations." +SUMMARY="A C library for image processing and analysis operations" DESCRIPTION=" A powerful open source C library for efficient image processing \ and image analysis operations. It's long list of features includes: diff --git a/media-libs/libao/libao-1.0.0.recipe b/media-libs/libao/libao-1.0.0.recipe index 0606c79d4..117a0d370 100644 --- a/media-libs/libao/libao-1.0.0.recipe +++ b/media-libs/libao/libao-1.0.0.recipe @@ -1,5 +1,11 @@ -SUMMARY="libao is a cross platform audio library" -DESCRIPTION="Libao is a cross-platform audio library that allows programs to output audio using a simple API on a wide variety of platforms. It currently supports Null output, WAV files, AU files, RAW files, OSS, ALSA, aRts, PulseAudio, esd, Mac OS X, Windows, AIX, Sun/NetBSD/OpenBSD, IRIX, NAS, RoarAudio and OpenBSD's sndio" +SUMMARY="A cross platform audio library" +DESCRIPTION=" +Libao is a cross-platform audio library that allows programs to output audio \ +using a simple API on a wide variety of platforms. It currently supports Null \ +output, WAV files, AU files, RAW files, OSS, ALSA, aRts, PulseAudio, esd, Mac \ +OS X, Windows, AIX, Sun/NetBSD/OpenBSD, IRIX, NAS, RoarAudio and OpenBSD's \ +sndio. +" HOMEPAGE="http://xiph.org/ao/" SRC_URI="http://downloads.xiph.org/releases/ao/libao-1.0.0.tar.gz" CHECKSUM_MD5="08283fbe1f587619053a156254afecec" diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe index 6f7fd5535..8c2cf2c7c 100644 --- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe +++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe @@ -1,5 +1,14 @@ SUMMARY="Libart is a library for high-performance 2D graphics" -DESCRIPTION="Libart is free software (all components are either GPL or LGPL). Libart is also available for commercial licensing. Libart supports a very powerful imaging model, basically the same as SVG and the Java 2D API. It includes all PostScript imaging operations, and adds antialiasing and alpha-transparency. Libart is also highly tuned for incremental rendering. It contains data structures and algorithms suited to rapid, precise computation of Region of Interest, as well as a two-phase rendering pipeline optimized for interactive display." +DESCRIPTION=" +Libart is free software (all components are either GPL or LGPL). Libart is \ +also available for commercial licensing. Libart supports a very powerful \ +imaging model, basically the same as SVG and the Java 2D API. It includes all \ +PostScript imaging operations, and adds antialiasing and alpha-transparency. \ +Libart is also highly tuned for incremental rendering. It contains data \ +structures and algorithms suited to rapid, precise computation of Region of \ +Interest, as well as a two-phase rendering pipeline optimized for interactive \ +display. +" HOMEPAGE="http://www.levien.com/libart/" SRC_URI="http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.tar.gz" CHECKSUM_MD5="722471ec8ae084af4293126d06b60880" diff --git a/media-libs/libcoverart/libcoverart-1.0.0.recipe b/media-libs/libcoverart/libcoverart-1.0.0.recipe index 21ecc5edc..0bb5dd5bb 100644 --- a/media-libs/libcoverart/libcoverart-1.0.0.recipe +++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe @@ -1,5 +1,8 @@ SUMMARY="Library for handling cover art for audio files" -DESCRIPTION="Development library geared towards developers who wish to add cover art capabilites to their applications." +DESCRIPTION=" +Development library geared towards developers who wish to add cover art \ +capabilites to their applications. +" HOMEPAGE="http://musicbrainz.org/doc/libcoverart" SRC_URI="https://github.com/downloads/metabrainz/libcoverart/libcoverart-1.0.0.tar.gz" CHECKSUM_MD5="6380056bb4bc1a69790e706b4d506f50" diff --git a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe index 9797b55fb..ef479fbcd 100644 --- a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe +++ b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe @@ -1,5 +1,8 @@ -DESCRIPTION="libdvdcss is a simple library designed for accessing DVDs like a block device without having to bother about the decryption." SUMMARY="libdvdcss" +DESCRIPTION=" +libdvdcss is a simple library designed for accessing DVDs like a block device \ +without having to bother about the decryption. +" HOMEPAGE="http://www.videolan.org/developers/libdvdcss.html" LICENSE="GNU GPL v2" COPYRIGHT="Copyright (C) 1998-2008 VideoLAN" diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe index 6fc8559d5..7692b7c50 100644 --- a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe +++ b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe @@ -1,6 +1,8 @@ -SUMMARY="Easy use of sophisticated DVD navigation features." -DESCRIPTION="libdvdnav allows easy use of sophisticated DVD navigation features such as DVD menus, - multiangle playback and even interactive DVD games." +SUMMARY="Easy use of sophisticated DVD navigation features" +DESCRIPTION=" +libdvdnav allows easy use of sophisticated DVD navigation features such as \ +DVD menus, multiangle playback and even interactive DVD games. +" HOMEPAGE="http://dvdnav.mplayerhq.hu/" LICENSE="GNU GPL v2" COPYRIGHT="2000 Rich Wareham diff --git a/media-libs/libdvdread/libdvdread-4.2.0.recipe b/media-libs/libdvdread/libdvdread-4.2.0.recipe index a12d094a5..1b3bbc56a 100644 --- a/media-libs/libdvdread/libdvdread-4.2.0.recipe +++ b/media-libs/libdvdread/libdvdread-4.2.0.recipe @@ -1,8 +1,10 @@ -SUMMARY="A simple foundation for reading DVD video disks." -DESCRIPTION="libdvdread provides a simple foundation for reading DVD video disks. - It provides the functionality that is required to access many DVDs. - libdvdread parses IFO files, reads NAV-blocks, and performs CSS authentication - and descrambling (if an external libdvdcss library is installed)." +SUMMARY="A simple foundation for reading DVD video disks" +DESCRIPTION=" +libdvdread provides a simple foundation for reading DVD video disks. It \ +provides the functionality that is required to access many DVDs. libdvdread \ +parses IFO files, reads NAV-blocks, and performs CSS authentication and \ +descrambling (if an external libdvdcss library is installed). +" HOMEPAGE="http://dvdnav.mplayerhq.hu" LICENSE="GNU GPL v2" COPYRIGHT="1998-1999 Eric Smith diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4.recipe b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe index 072e6f95e..19d59fc75 100644 --- a/media-libs/libiptcdata/libiptcdata-1.0.4.recipe +++ b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe @@ -1,5 +1,11 @@ SUMMARY="Library for IPTC metadata manipulation" -DESCRIPTION="libiptcdata is a library, written in C, for manipulating the International Press Telecommunications Council (IPTC) metadata stored within multimedia files such as images. This metadata can include captions and keywords, often used by popular photo management applications. The library provides routines for parsing, viewing, modifying, and saving this metadata." +DESCRIPTION=" +libiptcdata is a library, written in C, for manipulating the International \ +Press Telecommunications Council (IPTC) metadata stored within multimedia \ +files such as images. This metadata can include captions and keywords, often \ +used by popular photo management applications. The library provides routines \ +for parsing, viewing, modifying, and saving this metadata. +" HOMEPAGE="http://libiptcdata.sourceforge.net/" COPYRIGHT=" 2005 David Moore diff --git a/media-libs/libmad/libmad-0.15.1b.recipe b/media-libs/libmad/libmad-0.15.1b.recipe index 04dae38d0..1bb2dc0aa 100644 --- a/media-libs/libmad/libmad-0.15.1b.recipe +++ b/media-libs/libmad/libmad-0.15.1b.recipe @@ -1,5 +1,10 @@ SUMMARY="Mpeg Audio Decoder library" -DESCRIPTION="MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1 and the MPEG-2 extension to lower sampling frequencies, as well as the de facto MPEG 2.5 format. All three audio layers -- Layer I, Layer II, and Layer III (i.e. MP3) -- are fully implemented." +DESCRIPTION=" +MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1 and the \ +MPEG-2 extension to lower sampling frequencies, as well as the de facto MPEG \ +2.5 format. All three audio layers -- Layer I, Layer II, and Layer III (i.e. \ +MP3) -- are fully implemented. +" HOMEPAGE="http://mad.sourceforge.net/" SRC_URI="ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz" CHECKSUM_MD5="1be543bc30c56fb6bea1d7bf6a64e66c" diff --git a/media-libs/libmikmod/libmikmod-3.1.14.recipe b/media-libs/libmikmod/libmikmod-3.1.14.recipe index e0ed19c9d..608ebdb56 100644 --- a/media-libs/libmikmod/libmikmod-3.1.14.recipe +++ b/media-libs/libmikmod/libmikmod-3.1.14.recipe @@ -1,5 +1,7 @@ SUMMARY="libmikmod is a lib for playing mod files" -DESCRIPTION="libmikmod is a library supporting many formats, including mod, s3m, it, and xm." +DESCRIPTION=" +libmikmod is a library supporting many formats, including mod, s3m, it, and xm. +" HOMEPAGE="http://mikmod.sourceforge.net" SRC_URI="http://sourceforge.net/projects/mikmod/files/libmikmod/3.1.14/libmikmod-3.1.14.tar.gz" CHECKSUM_MD5="825af2c81348d0934b8a730427e7038b" diff --git a/media-libs/libmikmod/libmikmod-3.3.3.recipe b/media-libs/libmikmod/libmikmod-3.3.3.recipe index 9df23963c..778d62c29 100644 --- a/media-libs/libmikmod/libmikmod-3.3.3.recipe +++ b/media-libs/libmikmod/libmikmod-3.3.3.recipe @@ -1,5 +1,7 @@ SUMMARY="libmikmod is a lib for playing mod files" -DESCRIPTION="libmikmod is a library supporting many formats, including mod, s3m, it, and xm." +DESCRIPTION=" +libmikmod is a library supporting many formats, including mod, s3m, it, and xm. +" HOMEPAGE="http://mikmod.sourceforge.net" SRC_URI="http://sourceforge.net/projects/mikmod/files/libmikmod/3.3.3/libmikmod-3.3.3.tar.gz" CHECKSUM_MD5="0e0f9bce8f8e598ca292b41e0ae385c8" diff --git a/media-libs/libmkv/libmkv-0.6.5.1.recipe b/media-libs/libmkv/libmkv-0.6.5.1.recipe index b7e0c7c4c..463b7dd5d 100644 --- a/media-libs/libmkv/libmkv-0.6.5.1.recipe +++ b/media-libs/libmkv/libmkv-0.6.5.1.recipe @@ -1,5 +1,7 @@ -SUMMARY="A lightweight Matroska muxer written for HandBrake." -DESCRIPTION="A lightweight Matroska muxer written for HandBrake." +SUMMARY="A lightweight Matroska muxer written for HandBrake" +DESCRIPTION=" +A lightweight Matroska muxer written for HandBrake. +" HOMEPAGE="https://github.com/saintdev/libmkv" COPYRIGHT="Copyright (C) 2007 libmkv" LICENSE="GNU GPL v2" diff --git a/media-libs/libmng/libmng-1.0.10.recipe b/media-libs/libmng/libmng-1.0.10.recipe index 044b8cf1d..2d4f7e16b 100644 --- a/media-libs/libmng/libmng-1.0.10.recipe +++ b/media-libs/libmng/libmng-1.0.10.recipe @@ -1,5 +1,8 @@ SUMMARY="A PNG-like Image Format Supporting Multiple Image, Animation and Transparent JPEG" -DESCRIPTION="A PNG-like Image Format Supporting Multiple Image, Animation and Transparent JPEG" +DESCRIPTION=" +A PNG-like Image Format Supporting Multiple Image, Animation and Transparent \ +JPEG. +" HOMEPAGE="http://www.libmng.com" COPYRIGHT="2000-2007 Gerard Juyn" LICENSE="LIBMNG" diff --git a/media-libs/libmodplug/libmodplug-0.8.8.4.recipe b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe index 849df8f12..3f41da654 100644 --- a/media-libs/libmodplug/libmodplug-0.8.8.4.recipe +++ b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe @@ -1,27 +1,29 @@ SUMMARY="libmodplug is a lib for playing mod files" -DESCRIPTION="Olivier Lapicque, author of Modplug, which is arguably the best quality -MOD-playing software available, has placed his sound rendering code in the -public domain. This library and plugin is based on that code. -- Plays 22 different mod formats, including: - MOD, S3M, XM, IT, 669, AMF (both of them), AMS, DBM, DMF, DSM, FAR, - MDL, MED, MTM, OKT, PTM, STM, ULT, UMX, MT2, PSM -- Plays zip, rar, gzip, and bzip2 compressed mods. The following - extensions are recognized: - zip: MDZ, S3Z, XMZ, ITZ - rar: MDR, S3R, XMR, ITR - gzip: MDGZ, S3GZ, XMGZ, ITGZ - You can also load plain old ZIP, RAR, and GZ files. If ModPlug finds - a mod in them, it will play it. - Note: To play these formats, you need to have the associated - decompression utilities (unzip, gunzip, unrar) installed. - Note(2): The format of the mod is NOT determined from the extension on - compressed mods. For example, if you zipped a UMX mod and gave it the - extension MDZ, it would work fine. -- plays timidity's GUS patch files (*.pat): - a multi sample pat file with n samples can be played with a Frere Jacques - canon with n voices. -- plays all types of MIDI files (*.mid): - uses the timidity .pat files for samples (when available)" +DESCRIPTION=" +Olivier Lapicque, author of Modplug, which is arguably the best quality \ +MOD-playing software available, has placed his sound rendering code in the \ +public domain. This library and plugin is based on that code. +Plays 22 different mod formats, including: +- MOD, S3M, XM, IT, 669, AMF (both of them), AMS, DBM, DMF, DSM, FAR, MDL, \ +MED, MTM, OKT, PTM, STM, ULT, UMX, MT2, PSM +Plays zip, rar, gzip, and bzip2 compressed mods. The following extensions are \ +recognized: +- zip: MDZ, S3Z, XMZ, ITZ +- rar: MDR, S3R, XMR, ITR +- gzip: MDGZ, S3GZ, XMGZ, ITGZ +- You can also load plain old ZIP, RAR, and GZ files. If ModPlug finds a mod \ +in them, it will play it. +- Note: To play these formats, you need to have the associated decompression \ +utilities (unzip, gunzip, unrar) installed. +- Note(2): The format of the mod is NOT determined from the extension on \ +compressed mods. For example, if you zipped a UMX mod and gave it the \ +extension MDZ, it would work fine. +Plays timidity's GUS patch files (*.pat): +- a multi sample pat file with n samples can be played with a Frere Jacques \ +canon with n voices. +Plays all types of MIDI files (*.mid): +- uses the timidity .pat files for samples (when available) +" HOMEPAGE="http://modplug-xmms.sourceforge.net" SRC_URI="http://sourceforge.net/projects/modplug-xmms/files/libmodplug/0.8.8.4/libmodplug-0.8.8.4.tar.gz" CHECKSUM_MD5="fddc3c704c5489de2a3cf0fedfec59db" diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe index aeac873c4..fb647883e 100644 --- a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe +++ b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe @@ -1,5 +1,7 @@ -DESCRIPTION="A library that provides functions to read, create, and modify mp4 files" -SUMMARY="A library that provides functions to read, create, and modify mp4 files" +SUMMARY="A library that provides functions to read, create, and modify mp4 files" +DESCRIPTION=" +A library that provides functions to read, create, and modify mp4 files. +" HOMEPAGE="https://code.google.com/p/mp4v2/" LICENSE="MPL v1.1" COPYRIGHT="Kona Blend, Copyright (C) 2008." diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe index db59078c8..ae67dade9 100644 --- a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe +++ b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe @@ -1,5 +1,7 @@ -DESCRIPTION="library for decoding mpeg-2 and mpeg-1 video" -SUMMARY="library for decoding mpeg-2 and mpeg-1 video" +SUMMARY="A library for decoding mpeg-2 and mpeg-1 video" +DESCRIPTION=" +A library for decoding mpeg-2 and mpeg-1 video. +" HOMEPAGE="http://www.libmpeg2.sourceforge.net" LICENSE="GNU GPL v2" COPYRIGHT=" diff --git a/media-libs/libogg/libogg-1.3.0.recipe b/media-libs/libogg/libogg-1.3.0.recipe index 5cc057bbf..2f2eb42e1 100644 --- a/media-libs/libogg/libogg-1.3.0.recipe +++ b/media-libs/libogg/libogg-1.3.0.recipe @@ -1,11 +1,20 @@ SUMMARY="Ogg multimedia container format library" -DESCRIPTION="Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs. As with all Xiph.org technology is it an open format free for anyone to use. - -As with most container formats it encapsulates raw compressed data and allows the interleaving of audio and video data inside a single convient format. Other examples of container formats are Quicktime .mov, the MPEG program stream, and AVI. - -In addition to encapsulation and interleave of multiple data streams, Ogg provides packet framing, error detection, and periodic timestamps for seeking, and in a small, bounded percentage bitrate overhead. - -Ogg is a stream oriented container, meaning it can be written and read in one pass, making it a natural fit for internet streaming and use in processing pipelines. This stream orientation is the major design difference over other file-based container formats." +DESCRIPTION=" +Ogg is a multimedia container format, and the native file and stream format \ +for the Xiph.org multimedia codecs. As with all Xiph.org technology is it an \ +open format free for anyone to use. +As with most container formats it encapsulates raw compressed data and allows \ +the interleaving of audio and video data inside a single convient format. \ +Other examples of container formats are Quicktime .mov, the MPEG program \ +stream, and AVI. +In addition to encapsulation and interleave of multiple data streams, Ogg \ +provides packet framing, error detection, and periodic timestamps for seeking, \ +and in a small, bounded percentage bitrate overhead. +Ogg is a stream oriented container, meaning it can be written and read in one \ +pass, making it a natural fit for internet streaming and use in processing \ +pipelines. This stream orientation is the major design difference over other \ +file-based container formats. +" HOMEPAGE="http://www.xiph.org" LICENSE="BSD (3-clause)" COPYRIGHT="1994-2011 Xiph.Org Foundation" diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.12.recipe index 15d1b0e83..82bca83a2 100644 --- a/media-libs/libpng/libpng-1.5.12.recipe +++ b/media-libs/libpng/libpng-1.5.12.recipe @@ -1,5 +1,8 @@ SUMMARY="Portable Network Graphics library" -DESCRIPTION="libpng is the official PNG reference library. It supports almost all PNG features, is extensible, and has been extensively tested for over 17 years." +DESCRIPTION=" +libpng is the official PNG reference library. It supports almost all PNG \ +features, is extensible, and has been extensively tested for over 17 years +" HOMEPAGE="http://www.libpng.org" COPYRIGHT=" 1998-2011 Glenn Randers-Pehrson diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index 2fbd2668e..8c6e5657e 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -1,5 +1,9 @@ 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." +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/libsdl2/libsdl2-2.0.0.recipe b/media-libs/libsdl2/libsdl2-2.0.0.recipe index 54eb28a40..717587889 100644 --- a/media-libs/libsdl2/libsdl2-2.0.0.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.0.recipe @@ -1,5 +1,10 @@ SUMMARY="Simple Direct Media Layer 2.0" -DESCRIPTION="Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D. It is used by video playback software, emulators, and popular games." +DESCRIPTION=" +Simple DirectMedia Layer is a cross-platform development library designed to \ +provide low level access to audio, keyboard, mouse, joystick, and graphics \ +hardware via OpenGL and Direct3D. It is used by video playback software, \ +emulators, and popular games. +" HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL2-2.0.0.tar.gz" CHECKSUM_MD5="beec89afb6edcc6f0abc4114f2e6bcf7" diff --git a/media-libs/libsdl2/libsdl2-2.0.1.recipe b/media-libs/libsdl2/libsdl2-2.0.1.recipe index 2b00bcefe..abbaff6d7 100644 --- a/media-libs/libsdl2/libsdl2-2.0.1.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.1.recipe @@ -1,5 +1,10 @@ SUMMARY="Simple Direct Media Layer 2.0" -DESCRIPTION="Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D. It is used by video playback software, emulators, and popular games." +DESCRIPTION=" +Simple DirectMedia Layer is a cross-platform development library designed to \ +provide low level access to audio, keyboard, mouse, joystick, and graphics \ +hardware via OpenGL and Direct3D. It is used by video playback software, \ +emulators, and popular games. +" HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL2-2.0.1.tar.gz" CHECKSUM_MD5="0eb97039488bf463e775295f7b18b227" diff --git a/media-libs/libtheora/libtheora-1.1.1.recipe b/media-libs/libtheora/libtheora-1.1.1.recipe index 684117a3e..d4e0ecb13 100644 --- a/media-libs/libtheora/libtheora-1.1.1.recipe +++ b/media-libs/libtheora/libtheora-1.1.1.recipe @@ -1,9 +1,17 @@ SUMMARY="Theora video compression format library" -DESCRIPTION="Theora is a free and open video compression format from the Xiph.org Foundation. Like all our multimedia technology it can be used to distribute film and video online and on disc without the licensing and royalty fees or vendor lock-in associated with other formats. - -Theora scales from postage stamp to HD resolution, and is considered particularly competitive at low bitrates. It is in the same class as MPEG-4/DiVX, and like the Vorbis audio codec it has lots of room for improvement as encoder technology develops. - -Theora is in full public release as of November 3, 2008. The bitstream format for Theora I was frozen Thursday, 2004 July 1. All bitstreams encoded since that date will remain compatible with future releases." +DESCRIPTION=" +Theora is a free and open video compression format from the Xiph.org \ +Foundation. Like all our multimedia technology it can be used to distribute \ +film and video online and on disc without the licensing and royalty fees or \ +vendor lock-in associated with other formats. +Theora scales from postage stamp to HD resolution, and is considered \ +particularly competitive at low bitrates. It is in the same class as \ +MPEG-4/DiVX, and like the Vorbis audio codec it has lots of room for \ +improvement as encoder technology develops. +Theora is in full public release as of November 3, 2008. The bitstream format \ +for Theora I was frozen Thursday, 2004 July 1. All bitstreams encoded since \ +that date will remain compatible with future releases. +" HOMEPAGE="http://www.theora.org/" LICENSE="BSD (3-clause)" COPYRIGHT="2002-2009 Xiph.Org Foundation" diff --git a/media-libs/libvorbis/libvorbis-1.3.2.recipe b/media-libs/libvorbis/libvorbis-1.3.2.recipe index ab7e7da9f..91e28d8bf 100644 --- a/media-libs/libvorbis/libvorbis-1.3.2.recipe +++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe @@ -1,7 +1,15 @@ SUMMARY="Ogg Vorbis audio compression format library" -DESCRIPTION="Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, general-purpose compressed audio format for mid to high quality (8kHz-48.0kHz, 16+ bit, polyphonic) audio and music at fixed and variable bitrates from 16 to 128 kbps/channel. This places Vorbis in the same competitive class as audio representations such as MPEG-4 (AAC), and similar to, but higher performance than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ), WMA and PAC. - -The bitstream format for Vorbis I was frozen Monday, May 8th 2000. All bitstreams encoded since will remain compatible with all future releases of Vorbis." +DESCRIPTION=" +Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, \ +general-purpose compressed audio format for mid to high quality (8kHz-48.0kHz, \ +16+ bit, polyphonic) audio and music at fixed and variable bitrates from 16 to \ +128 kbps/channel. This places Vorbis in the same competitive class as audio \ +representations such as MPEG-4 (AAC), and similar to, but higher performance \ +than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ), WMA and PAC. +The bitstream format for Vorbis I was frozen Monday, May 8th 2000. All \ +bitstreams encoded since will remain compatible with all future releases of \ +Vorbis. +" HOMEPAGE="http://www.xiph.org/vorbis/" LICENSE="BSD (3-clause)" COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libvpx/libvpx-1.0.0.recipe b/media-libs/libvpx/libvpx-1.0.0.recipe index 796faa0ab..e0f70756b 100644 --- a/media-libs/libvpx/libvpx-1.0.0.recipe +++ b/media-libs/libvpx/libvpx-1.0.0.recipe @@ -1,9 +1,12 @@ SUMMARY="WebM VP8 video codec library" -DESCRIPTION="The WebM VP8 SDK allows you to integrate your applications with the VP8 video codec, a high quality, royalty free, open source codec deployed on millions of computers and devices worldwide. - +DESCRIPTION=" +The WebM VP8 SDK allows you to integrate your applications with the VP8 video \ +codec, a high quality, royalty free, open source codec deployed on millions of \ +computers and devices worldwide. This distribution of the WebM VP8 Codec SDK includes the following support: - * WebM VP8 Encoder - * WebM VP8 Decoder" +* WebM VP8 Encoder +* WebM VP8 Decoder +" HOMEPAGE="http://www.webmproject.org" LICENSE="BSD (3-clause)" COPYRIGHT="2009-2012 Google Inc., diff --git a/media-libs/libwebp/libwebp-0.3.1.recipe b/media-libs/libwebp/libwebp-0.3.1.recipe index 675253702..8e7009719 100644 --- a/media-libs/libwebp/libwebp-0.3.1.recipe +++ b/media-libs/libwebp/libwebp-0.3.1.recipe @@ -1,5 +1,7 @@ -DESCRIPTION="library for encoding and decoding WebP image files" SUMMARY="library for encoding and decoding WebP image files" +DESCRIPTION=" +A library for encoding and decoding WebP image files. +" HOMEPAGE="http://code.google.com/p/webp" SRC_URI="http://webp.googlecode.com/files/libwebp-0.3.1.tar.gz" CHECKSUM_MD5="dc862bb4006d819b7587767a9e83d31f" diff --git a/media-libs/loadpng/loadpng-1.5.recipe b/media-libs/loadpng/loadpng-1.5.recipe index 005b91d34..b9d5d2965 100644 --- a/media-libs/loadpng/loadpng-1.5.recipe +++ b/media-libs/loadpng/loadpng-1.5.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="loadpng is some glue that makes it easy to use libpng to load and save bitmaps from Allegro programs." +DESCRIPTION=" +loadpng is some glue that makes it easy to use libpng to load and save bitmaps \ +from Allegro programs. +" HOMEPAGE="http://tjaden.strangesoft.net/loadpng/" SRC_URI="http://tjaden.strangesoft.net/loadpng/loadpng-1.5.tar.gz" REVISION="1" diff --git a/media-libs/mediainfo/mediainfo-0.7.61.recipe b/media-libs/mediainfo/mediainfo-0.7.61.recipe index 5c0ddf1c4..34f9fd6a3 100644 --- a/media-libs/mediainfo/mediainfo-0.7.61.recipe +++ b/media-libs/mediainfo/mediainfo-0.7.61.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files." +DESCRIPTION=" +MediaInfo is a convenient unified display of the most relevant technical and \ +tag data for video and audio files. +" HOMEPAGE="http://mediainfo.sourceforge.net/" SRC_URI="http://mediaarea.net/download/binary/mediainfo/0.7.61/MediaInfo_CLI_0.7.61_GNU_FromSource.tar.bz2" CHECKSUM_MD5="20adddbf70fb947799955ebc21132849" diff --git a/media-libs/openal/openal-1.13.0.recipe b/media-libs/openal/openal-1.13.0.recipe index 22422c081..e585a8c10 100644 --- a/media-libs/openal/openal-1.13.0.recipe +++ b/media-libs/openal/openal-1.13.0.recipe @@ -1,5 +1,7 @@ -SUMMARY="OpenAL - A software implementation of the OpenAL 3D audio API" -DESCRIPTION="OpenAL - A software implementation of the OpenAL 3D audio API" +SUMMARY="A software implementation of the OpenAL 3D audio API" +DESCRIPTION=" +OpenAL - A software implementation of the OpenAL 3D audio API. +" HOMEPAGE="http://kcat.strangesoft.net/openal.html" SRC_URI="http://kcat.strangesoft.net/openal-releases/openal-soft-1.13.tar.bz2" CHECKSUM_MD5="58b7d2809790c70681b825644c5f3614" diff --git a/media-libs/openjpeg/openjpeg-1.5.0.recipe b/media-libs/openjpeg/openjpeg-1.5.0.recipe index fb85dd93b..abef1970b 100644 --- a/media-libs/openjpeg/openjpeg-1.5.0.recipe +++ b/media-libs/openjpeg/openjpeg-1.5.0.recipe @@ -1,13 +1,13 @@ SUMMARY="OpenJPEG is an open-source C-Library for JPEG 2000" DESCRIPTION=" -The OpenJPEG library is an open-source JPEG 2000 codec written in C -language. It has been developed in order to promote the use of JPEG -2000, the new still-image compression standard from the Joint -Photographic Experts Group (JPEG). In addition to the basic codec, -various other features are under development, among them the JP2 and -MJ2 (Motion JPEG 2000) file formats, an indexing tool useful for the -JPIP protocol, JPWL-tools for error-resilience, a Java-viewer for -j2k-images, ..." +The OpenJPEG library is an open-source JPEG 2000 codec written in C language. \ +It has been developed in order to promote the use of JPEG 2000, the new \ +still-image compression standard from the Joint Photographic Experts Group \ +(JPEG). In addition to the basic codec, various other features are under \ +development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an \ +indexing tool useful for the JPIP protocol, JPWL-tools for error-resilience, \ +a Java-viewer for j2k-images, ... +" LICENSE="BSD (2-clause)" COPYRIGHT="2002-2012, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium 2002-2012 Professor Benoit Macq diff --git a/media-libs/portaudio/portaudio-19.recipe b/media-libs/portaudio/portaudio-19.recipe index 7639b2708..7075a6359 100644 --- a/media-libs/portaudio/portaudio-19.recipe +++ b/media-libs/portaudio/portaudio-19.recipe @@ -1,5 +1,7 @@ -DESCRIPTION="Port Audio is a free, cross-platform, audio I/O library" -SUMMARY="Port Audio is a free, cross-platform, audio I/O library" +SUMMARY="A free, cross-platform, audio I/O library" +DESCRIPTION=" +Port Audio is a free, cross-platform, audio I/O library. +" HOMEPAGE="http://portaudio.com" SRC_URI="http://portaudio.com/archives/pa_stable_v19_20111121.tgz" CHECKSUM_MD5="25c85c1cc5e9e657486cbc299c6c035a" diff --git a/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe b/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe index e5f5fbee7..3bd50ab37 100644 --- a/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe +++ b/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe @@ -1,5 +1,9 @@ -SUMMARY="SDL2_gfx - SDL2 graphics drawing primitives and other support functions" -DESCRIPTION="The SDL2_gfx library evolved out of the SDL_gfxPrimitives code which provided basic drawing routines such as lines, circles or polygons and SDL_rotozoom which implemented a interpolating rotozoomer for SDL_surfaces." +SUMMARY="SDL2 graphics drawing primitives and other support functions" +DESCRIPTION=" +The SDL2_gfx library evolved out of the SDL_gfxPrimitives code which provided \ +basic drawing routines such as lines, circles or polygons and SDL_rotozoom \ +which implemented a interpolating rotozoomer for SDL_surfaces. +" HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/" SRC_URI="svn+svn://svn.code.sf.net/p/sdl2gfx/code/trunk" #CHECKSUM_MD5="abc123" diff --git a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe index a219d9e46..3e7b9f9fa 100644 --- a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe +++ b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe @@ -1,5 +1,10 @@ SUMMARY="Simple Direct Layer Mixer Library" -DESCRIPTION="sdl2_mixer is a simple multi-channel audio mixer library. It supports any number of simultaneously playing channels of 16 bit stereo audio, plus a single channel of music, mixed by the popular FLAC, MikMoD MOD, Timidity MIDI, Ogg Vorbis, and SMPEG MP3 libraries." +DESCRIPTION=" +sdl2_mixer is a simple multi-channel audio mixer library. It supports any \ +number of simultaneously playing channels of 16 bit stereo audio, plus a \ +single channel of music, mixed by the popular FLAC, MikMoD MOD, Timidity MIDI, \ +Ogg Vorbis, and SMPEG MP3 libraries. +" HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.0.tar.gz" CHECKSUM_MD5="65f6d80df073a1fb3bb537fbda031b50" diff --git a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe index 4a7325c29..8b29df37b 100644 --- a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe +++ b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe @@ -1,12 +1,12 @@ -SUMMARY="A TrueType font rendering library for SDL2" +SUMMARY="A TrueType font rendering library for SDL2" DESCRIPTION=" - SDL_ttf is a TrueType font rendering library that is used with the SDL - library, and almost as portable. It depends on freetype2 to handle the - TrueType font data. It allows a programmer to use multiple TrueType fonts - without having to code a font rendering routine themselves. With the power - of outline fonts and antialiasing, high quality text output can be obtained - without much effort. - " +SDL_ttf is a TrueType font rendering library that is used with the SDL \ +library, and almost as portable. It depends on freetype2 to handle the \ +TrueType font data. It allows a programmer to use multiple TrueType fonts \ +without having to code a font rendering routine themselves. With the power of \ +outline fonts and antialiasing, high quality text output can be obtained \ +without much effort. +" HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.12.tar.gz" CHECKSUM_MD5="79787216b56cb4707f39d538f2225e00" diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe index 1013b7e37..7d779a8f4 100644 --- a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe +++ b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe @@ -1,5 +1,9 @@ -SUMMARY="SDL_gfx - SDL graphics drawing primitives and other support functions" -DESCRIPTION="The SDL_gfx library evolved out of the SDL_gfxPrimitives code which provided basic drawing routines such as lines, circles or polygons and SDL_rotozoom which implemented a interpolating rotozoomer for SDL_surfaces." +SUMMARY="SDL graphics drawing primitives and other support functions" +DESCRIPTION=" +The SDL_gfx library evolved out of the SDL_gfxPrimitives code which provided \ +basic drawing routines such as lines, circles or polygons and SDL_rotozoom \ +which implemented a interpolating rotozoomer for SDL_surfaces. +" HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/" SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.24.tar.gz" CHECKSUM_MD5="838514185ff9a3b6377760aaa52fef8a" diff --git a/media-libs/sdl_image/sdl_image-1.2.12.recipe b/media-libs/sdl_image/sdl_image-1.2.12.recipe index d1a9b9f1d..3e089ffc0 100644 --- a/media-libs/sdl_image/sdl_image-1.2.12.recipe +++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe @@ -1,6 +1,13 @@ -SUMMARY="Simple Direct Media Layer Image Library" -DESCRIPTION="SDL_image is an image file loading library. It loads images as SDL surfaces, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV -As of SDL_image 1.2.5, JPEG, PNG, TIFF, and WEBP image loading libraries are dynamically loaded, so if you don't need to load those formats, you don't need to include those shared libraries. libpng depends on libz, and libtiff depends on both libz and libjpeg." +SUMMARY="Simple Direct Media Layer Image Library" +DESCRIPTION=" +SDL_image is an image file loading library. It loads images as SDL surfaces, \ +and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, \ +TIFF, WEBP, XCF, XPM, XV +As of SDL_image 1.2.5, JPEG, PNG, TIFF, and WEBP image loading libraries are \ +dynamically loaded, so if you don't need to load those formats, you don't need \ +to include those shared libraries. libpng depends on libz, and libtiff depends \ +on both libz and libjpeg. +" HOMEPAGE="http://www.libsdl.org/projects/SDL_image" SRC_URI="http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz" CHECKSUM_MD5="a0f9098ebe5400f0bdc9b62e60797ecb" 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 c6fa95bdb..4edd13398 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -1,5 +1,10 @@ SUMMARY="Simple Direct Layer Mixer Library" -DESCRIPTION="sdl_mixer is a simple multi-channel audio mixer library. It supports any number of simultaneously playing channels of 16 bit stereo audio, plus a single channel of music, mixed by the popular FLAC, MikMoD MOD, Timidity MIDI, Ogg Vorbis, and SMPEG MP3 libraries." +DESCRIPTION=" +sdl_mixer is a simple multi-channel audio mixer library. It supports any \ +number of simultaneously playing channels of 16 bit stereo audio, plus a \ +single channel of music, mixed by the popular FLAC, MikMoD MOD, Timidity MIDI, \ +Ogg Vorbis, and SMPEG MP3 libraries. +" HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz" CHECKSUM_MD5="e03ff73d77a55e3572ad0217131dc4a1" diff --git a/media-libs/sdl_net/sdl_net-1.2.8.recipe b/media-libs/sdl_net/sdl_net-1.2.8.recipe index a359689f9..d632021e9 100644 --- a/media-libs/sdl_net/sdl_net-1.2.8.recipe +++ b/media-libs/sdl_net/sdl_net-1.2.8.recipe @@ -1,5 +1,7 @@ -SUMMARY="Simple Direct Media Layer Net Library" -DESCRIPTION="This is a small simple cross-platform networking library for SDL" +SUMMARY="Simple Direct Media Layer Net Library" +DESCRIPTION=" +This is a small simple cross-platform networking library for SDL. +" HOMEPAGE="http://www.libsdl.org/projects/SDL_net" SRC_URI="http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz" CHECKSUM_MD5="20e64e61d65662db66c379034f11f718" 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 49f8bd882..2db412f45 100644 --- a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe +++ b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe @@ -1,5 +1,9 @@ -SUMMARY="Library that handles decoding of several popular sound file formats." -DESCRIPTION="sdl-sound is a library that handles the decoding of several popular file formats, such as .WAV and .MP3. It is meant to make the programmer's sound playback tasks simpler." +SUMMARY="Library that handles decoding of several popular sound file formats" +DESCRIPTION=" +sdl-sound is a library that handles the decoding of several popular file \ +formats, such as .WAV and .MP3. It is meant to make the programmer's sound \ +playback tasks simpler. +" HOMEPAGE="http://www.icculus.org/SDL_sound" SRC_URI="hg+http://hg.icculus.org/icculus/SDL_sound#release-1.0.3" LICENSE="GNU LGPL v2.1" 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 13c77e3ab..0a75df701 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -1,12 +1,12 @@ -DESCRIPTION=" - SDL_ttf is a TrueType font rendering library that is used with the SDL - library, and almost as portable. It depends on freetype2 to handle the - TrueType font data. It allows a programmer to use multiple TrueType fonts - without having to code a font rendering routine themselves. With the power - of outline fonts and antialiasing, high quality text output can be obtained - without much effort. - " SUMMARY="Simple Direct Media Layer Image Library" +DESCRIPTION=" +SDL_ttf is a TrueType font rendering library that is used with the SDL \ +library, and almost as portable. It depends on freetype2 to handle the \ +TrueType font data. It allows a programmer to use multiple TrueType fonts \ +without having to code a font rendering routine themselves. With the power of \ +outline fonts and antialiasing, high quality text output can be obtained \ +without much effort. +" HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/release-1.2.html" SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz" CHECKSUM_MD5="61e29bd9da8d245bc2471d1b2ce591aa" diff --git a/media-libs/sge/sge-030809.recipe b/media-libs/sge/sge-030809.recipe index b74e3d520..02367c2ce 100644 --- a/media-libs/sge/sge-030809.recipe +++ b/media-libs/sge/sge-030809.recipe @@ -1,5 +1,7 @@ SUMMARY="SDL Graphics Extension" -DESCRIPTION="SDL Graphics Extension" +DESCRIPTION=" +SDL Graphics Extension +" HOMEPAGE="http://www.etek.chalmers.se/~e8cal1/sge/" SRC_URI="http://ports-space.haiku-files.org/source/sge-030809.tar.gz" CHECKSUM_MD5="a76975665b6a2bf189130fa2c8821caf" diff --git a/media-libs/smjpeg/smjpeg-0.2.1.recipe b/media-libs/smjpeg/smjpeg-0.2.1.recipe index d9c671645..9798c4fd7 100644 --- a/media-libs/smjpeg/smjpeg-0.2.1.recipe +++ b/media-libs/smjpeg/smjpeg-0.2.1.recipe @@ -1,5 +1,8 @@ -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)." +SUMMARY="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 6509fb52a..34ebc0305 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -1,5 +1,10 @@ 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." +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" diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc1.recipe index c89e4279e..ea360cc25 100644 --- a/media-libs/speex/speex-1.2~rc1.recipe +++ b/media-libs/speex/speex-1.2~rc1.recipe @@ -1,5 +1,12 @@ SUMMARY="A Free Codec For Free Speech" -DESCRIPTION="Speex is an Open Source/Free Software patent-free audio compression format designed for speech. The Speex Project aims to lower the barrier of entry for voice applications by providing a free alternative to expensive proprietary speech codecs. Moreover, Speex is well-adapted to Internet applications and provides useful features that are not present in most other codecs. Finally, Speex is part of the GNU Project and is available under the revised BSD license." +DESCRIPTION="Speex is an Open Source/Free Software patent-free audio \ +compression format designed for speech. The Speex Project aims to lower the \ +barrier of entry for voice applications by providing a free alternative to \ +expensive proprietary speech codecs. Moreover, Speex is well-adapted to \ +Internet applications and provides useful features that are not present in \ +most other codecs. Finally, Speex is part of the GNU Project and is available \ +under the revised BSD license. +" HOMEPAGE="http://www.speex.org" LICENSE="Speex" COPYRIGHT=" diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe index 422954734..19335c3fb 100644 --- a/media-libs/taglib/taglib-1.7.2.recipe +++ b/media-libs/taglib/taglib-1.7.2.recipe @@ -1,5 +1,10 @@ -SUMMARY="TabLib Audio Meta-Data Library" -DESCRIPTION="TagLib is a library for reading and editing the meta-data of several popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files." +SUMMARY="TabLib Audio Meta-Data Library" +DESCRIPTION=" +TagLib is a library for reading and editing the meta-data of several popular \ +audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg \ +Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack \ +TrueAudio, WAV, AIFF, MP4 and ASF files. +" HOMEPAGE="http://github.com/taglib" SRC_URI="http://taglib.github.io/releases/taglib-1.7.2.tar.gz" CHECKSUM_MD5="b0a9e797d3833fb933c7c3176de3d720" diff --git a/media-libs/taglib/taglib-1.9.1.recipe b/media-libs/taglib/taglib-1.9.1.recipe index 173551bc4..ea69da15d 100644 --- a/media-libs/taglib/taglib-1.9.1.recipe +++ b/media-libs/taglib/taglib-1.9.1.recipe @@ -1,5 +1,7 @@ -SUMMARY="TabLib Audio Meta-Data Library" -DESCRIPTION="TagLib Audio Meta-Data Library" +SUMMARY="TabLib Audio Meta-Data Library" +DESCRIPTION=" +TagLib Audio Meta-Data Library. +" HOMEPAGE="http://github.com/taglib" SRC_URI="http://taglib.github.io/releases/taglib-1.9.1.tar.gz" CHECKSUM_MD5="0d35df96822bbd564c5504cb3c2e4d86" diff --git a/media-libs/tiff/tiff-3.9.6.recipe b/media-libs/tiff/tiff-3.9.6.recipe index b1649fddb..4b8cd9b5b 100644 --- a/media-libs/tiff/tiff-3.9.6.recipe +++ b/media-libs/tiff/tiff-3.9.6.recipe @@ -1,5 +1,9 @@ SUMMARY="Tiff library" -DESCRIPTION="TIFF the Tag Image File Format, is a widely used format for storing image data. Included in this software is a library, libtiff, for reading and writing TIFF." +DESCRIPTION=" +TIFF the Tag Image File Format, is a widely used format for storing image \ +data. Included in this software is a library, libtiff, for reading and writing \ +TIFF. +" HOMEPAGE="http://www.libtiff.org" SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.6.tar.gz" CHECKSUM_MD5="6920f3bf628d791d49f268b83612ed23" diff --git a/media-libs/tiff/tiff-4.0.2.recipe b/media-libs/tiff/tiff-4.0.2.recipe index afd074edc..aa382b618 100644 --- a/media-libs/tiff/tiff-4.0.2.recipe +++ b/media-libs/tiff/tiff-4.0.2.recipe @@ -1,5 +1,9 @@ SUMMARY="Tiff library" -DESCRIPTION="TIFF the Tag Image File Format, is a widely used format for storing image data. Included in this software is a library, libtiff, for reading and writing TIFF." +DESCRIPTION=" +TIFF the Tag Image File Format, is a widely used format for storing image \ +data. Included in this software is a library, libtiff, for reading and writing \ +TIFF. +" HOMEPAGE="http://www.libtiff.org" SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.2.tar.gz" CHECKSUM_MD5="04a08fa1e07e696e820a0c3f32465a13" From 3a758f0e5796909ccf410305607370aa4785882f Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 277/306] Rewrap media-sound DESCRIPTIONs --- media-sound/bladeenc/bladeenc-0.94.2.recipe | 9 +++++---- media-sound/fluidsynth/fluidsynth-1.1.6.recipe | 7 +++++-- media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe | 5 ++++- media-sound/hivelytracker/hivelytracker-1.8.recipe | 12 ++++++++---- media-sound/jack2/jack2-1.9.8.recipe | 5 ++++- media-sound/lame/lame-3.99.5.recipe | 13 ++++++++++--- .../milkytracker/milkytracker-0.90.86.recipe | 11 +++++------ media-sound/mpg123/mpg123-1.12.1.recipe | 5 ++++- media-sound/ocp/ocp-0.1.21_git.recipe | 6 ++++-- media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe | 6 ++++-- 10 files changed, 53 insertions(+), 26 deletions(-) diff --git a/media-sound/bladeenc/bladeenc-0.94.2.recipe b/media-sound/bladeenc/bladeenc-0.94.2.recipe index e35ea82eb..e3ee994b4 100644 --- a/media-sound/bladeenc/bladeenc-0.94.2.recipe +++ b/media-sound/bladeenc/bladeenc-0.94.2.recipe @@ -1,7 +1,8 @@ -SUMMARY="BladeEnc is a free cross-platform MP3 encoder" -DESCRIPTION="BladeEnc is a free, cross-platform, console-based MP3 encoder, - based on the ISO reference code. It is mostly intended for high quality - encoding in high bitrates. +SUMMARY="A free cross-platform MP3 encoder" +DESCRIPTION=" +BladeEnc is a free, cross-platform, console-based MP3 encoder, based on the \ +ISO reference code. It is mostly intended for high quality encoding in high \ +bitrates. " HOMEPAGE="http://bladeenc.mp3.no/" SRC_URI="ftp://ftp.free.fr/.mirrors1/ftp.gentoo.org/distfiles/bladeenc-0.94.2-src-stable.tar.gz" diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe index 9ee32b4fa..280903bf3 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe +++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe @@ -1,5 +1,8 @@ -SUMMARY="Fluidsynth is a software real-time synthesizer based on the Soundfont 2 specifications." -DESCRIPTION="Fluidsynth is a software real-time synthesizer based on the Soundfont 2 specifications." +SUMMARY="Fluidsynth is a software real-time synthesizer" +DESCRIPTION=" +Fluidsynth is a software real-time synthesizer based on the Soundfont 2 \ +specifications. +" HOMEPAGE="http://www.fluidsynth.org/" SRC_URI="http://sourceforge.net/projects/fluidsynth/files/fluidsynth-1.1.6/fluidsynth-1.1.6.tar.bz2/download" CHECKSUM_MD5="f6e696690e989098f70641364fdffad7" diff --git a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe index 9b27ed9fd..cddb0fdbc 100644 --- a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe +++ b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe @@ -1,5 +1,8 @@ SUMMARY="Mp3 encoder based on LAME3.88" -DESCRIPTION="Mp3 encoder based on LAME3.88, which is optimized for Enhanced 3D Now!/SSE/SSE2 and dual-CPUs." +DESCRIPTION=" +Mp3 encoder based on LAME3.88, which is optimized for Enhanced 3D \ +Now!/SSE/SSE2 and dual-CPUs. +" HOMEPAGE="https://github.com/teragonaudio/gogo-no-coda" SRC_URI="https://github.com/teragonaudio/gogo-no-coda/archive/master.zip" CHECKSUM_MD5="7b3008a0aba2578a2b428ba538452e87" diff --git a/media-sound/hivelytracker/hivelytracker-1.8.recipe b/media-sound/hivelytracker/hivelytracker-1.8.recipe index e0563ccfe..205a0af79 100644 --- a/media-sound/hivelytracker/hivelytracker-1.8.recipe +++ b/media-sound/hivelytracker/hivelytracker-1.8.recipe @@ -1,8 +1,12 @@ -SUMMARY="Hively Tracker is a tracker program based upon the AHX format." +SUMMARY="A tracker program based upon the AHX format" DESCRIPTION=" -Hively Tracker is a tracker program based upon the AHX format created in the mid '90s by Dexter and Pink of Abyss. The format was relatively popular, and many songs were created and used in scene productions and games. AHX was designed to create a very SID-like sound on the Amiga. - -HivelyTracker can import and export modules and instruments in the AHX format, but it also improves on AHX in several ways and therefore has its own instrument and module formats. +Hively Tracker is a tracker program based upon the AHX format created in the \ +mid '90s by Dexter and Pink of Abyss. The format was relatively popular, and \ +many songs were created and used in scene productions and games. AHX was \ +designed to create a very SID-like sound on the Amiga. +HivelyTracker can import and export modules and instruments in the AHX format, \ +but it also improves on AHX in several ways and therefore has its own \ +instrument and module formats. " HOMEPAGE="http://www.hivelytracker.co.uk/" SRC_URI="svn+http://hivelytracker.googlecode.com/svn/trunk/#r66" diff --git a/media-sound/jack2/jack2-1.9.8.recipe b/media-sound/jack2/jack2-1.9.8.recipe index a19991b37..d5b8767b1 100644 --- a/media-sound/jack2/jack2-1.9.8.recipe +++ b/media-sound/jack2/jack2-1.9.8.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="jack2 is a C++ version of the JACK low-latency audio server for multi-processor machines." +DESCRIPTION=" +jack2 is a C++ version of the JACK low-latency audio server for \ +multi-processor machines. +" HOMEPAGE="https://github.com/Barrett17/jack2-for-haiku" SRC_URI="git://github.com/Barrett17/jack2-for-haiku.git" REVISION="1" diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe index 35d2a9d61..00e206980 100644 --- a/media-sound/lame/lame-3.99.5.recipe +++ b/media-sound/lame/lame-3.99.5.recipe @@ -1,6 +1,13 @@ -SUMMARY="LAME is a high quality MPEG Audio Layer III (MP3) encoder" -DESCRIPTION="Following the great history of GNU naming, LAME originally stood for LAME Ain't an Mp3 Encoder. LAME started life as a GPL'd patch against the dist10 ISO demonstration source, and thus was incapable of producing an mp3 stream or even being compiled by itself. But in May 2000, the last remnants of the ISO source code were replaced, and now LAME is the source code for a fully LGPL'd MP3 encoder, with speed and quality to rival and often surpass all commercial competitors." - +SUMMARY="A high quality MPEG Audio Layer III (MP3) encoder" +DESCRIPTION=" +Following the great history of GNU naming, LAME originally stood for LAME \ +Ain't an Mp3 Encoder. LAME started life as a GPL'd patch against the dist10 \ +ISO demonstration source, and thus was incapable of producing an mp3 stream or \ +even being compiled by itself. But in May 2000, the last remnants of the ISO \ +source code were replaced, and now LAME is the source code for a fully LGPL'd \ +MP3 encoder, with speed and quality to rival and often surpass all commercial \ +competitors. +" HOMEPAGE="http://lame.sourceforge.net/" SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz" CHECKSUM_MD5="84835b313d4a8b68f5349816d33e07ce" diff --git a/media-sound/milkytracker/milkytracker-0.90.86.recipe b/media-sound/milkytracker/milkytracker-0.90.86.recipe index 53478d38c..c6491283d 100644 --- a/media-sound/milkytracker/milkytracker-0.90.86.recipe +++ b/media-sound/milkytracker/milkytracker-0.90.86.recipe @@ -1,11 +1,10 @@ SUMMARY="Fasttracker II inspired music tracker" DESCRIPTION=" - MilkyTracker is an open source, multi-platform music application for - creating .MOD and .XM module files. It attempts to recreate the module - replay and user experience of the popular DOS program Fasttracker II, - with special playback modes available for improved Amiga ProTracker - 2/3 compatibility. - " +MilkyTracker is an open source, multi-platform music application for creating \ +.MOD and .XM module files. It attempts to recreate the module replay and user \ +experience of the popular DOS program Fasttracker II, with special playback \ +modes available for improved Amiga ProTracker 2/3 compatibility. +" HOMEPAGE="http://www.milkytracker.org/" COPYRIGHT="1994-2013 Peter 'pailes' Barth, diff --git a/media-sound/mpg123/mpg123-1.12.1.recipe b/media-sound/mpg123/mpg123-1.12.1.recipe index 753a9e082..26052220a 100644 --- a/media-sound/mpg123/mpg123-1.12.1.recipe +++ b/media-sound/mpg123/mpg123-1.12.1.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="mpg123 is the fast and Free console based real time MPEG Audio Player for Layer 1, 2 and 3." +DESCRIPTION=" +mpg123 is the fast and Free console based real time MPEG Audio Player for \ +Layer 1, 2 and 3. +" HOMEPAGE="http://www.mpg123.org/" SRC_URI="http://sourceforge.net/projects/mpg123/files/mpg123/1.12.1/mpg123-1.12.1.tar.bz2/download" REVISION="1" diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe index 7dd91f191..2426793d4 100644 --- a/media-sound/ocp/ocp-0.1.21_git.recipe +++ b/media-sound/ocp/ocp-0.1.21_git.recipe @@ -1,5 +1,7 @@ -SUMMARY="ocp - Open Cubic Player" -DESCRIPTION="ocp - Open Cubic Player, a music player ported from DOS" +SUMMARY="ocp - Open Cubic Player" +DESCRIPTION=" +ocp - Open Cubic Player, a music player ported from DOS. +" HOMEPAGE="http://stian.cubic.org/project-ocp.php" SRC_URI="git://git.code.sf.net/p/opencubicplayer/code" REVISION="1" 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 0040c4d9f..2b0eb890e 100644 --- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe +++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe @@ -1,5 +1,7 @@ -SUMMARY="vorbis-tools - tools for using the Ogg Vorbis sound file format" -DESCRIPTION="vorbis-tools - tools for using the Ogg Vorbis sound file format" +SUMMARY="Tools for using the Ogg Vorbis sound file format" +DESCRIPTION=" +vorbis-tools - tools for using the Ogg Vorbis sound file format. +" HOMEPAGE="http://www.vorbis.com/" SRC_URI="http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz" CHECKSUM_MD5="567e0fb8d321b2cd7124f8208b8b90e6" From d5b5ad35f0d705453f24f1ee5b180c2cea370541 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 278/306] Rewrap media-video DESCRIPTIONs --- media-video/ffmpeg/ffmpeg-0.10.2.recipe | 5 ++++- media-video/ffmpeg/ffmpeg-0.11.1.recipe | 5 ++++- media-video/gnash/gnash-0.8.10.recipe | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.recipe b/media-video/ffmpeg/ffmpeg-0.10.2.recipe index 59e376e96..e3faca548 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.2.recipe +++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe @@ -1,5 +1,8 @@ SUMMARY="Audio and video recording, conversion, and streaming library" -DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library." +DESCRIPTION=" +FFmpeg is a complete, cross-platform solution to record, convert and stream \ +audio and video. It includes libavcodec - the leading audio/video codec library. +" HOMEPAGE="http://www.ffmpeg.org" LICENSE=" GNU LGPL v2.1 diff --git a/media-video/ffmpeg/ffmpeg-0.11.1.recipe b/media-video/ffmpeg/ffmpeg-0.11.1.recipe index 5397f247f..7012ca25f 100644 --- a/media-video/ffmpeg/ffmpeg-0.11.1.recipe +++ b/media-video/ffmpeg/ffmpeg-0.11.1.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library." +DESCRIPTION=" +FFmpeg is a complete, cross-platform solution to record, convert and stream \ +audio and video. It includes libavcodec - the leading audio/video codec library. +" HOMEPAGE="http://www.ffmpeg.org" SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.11.1.tar.bz2" CHECKSUM_MD5="ff8cb914f657e164dd60ea1008b555a8" diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe index 5d240f583..afe466e19 100644 --- a/media-video/gnash/gnash-0.8.10.recipe +++ b/media-video/gnash/gnash-0.8.10.recipe @@ -1,5 +1,7 @@ SUMMARY="Gnash" -DESCRIPTION="Gnash is a player for the Adobe Flash technology" +DESCRIPTION=" +Gnash is a player for the Adobe Flash technology. +" HOMEPAGE="http://www.gnu.org/software/gnash/" SRC_URI="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2" CHECKSUM_MD5="63e9f79c41d93d48c5a2fa94856548c4" From 4ad968841009e355292e205c29fbc777d78ba758 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 279/306] Rewrap meta-ports DESCRIPTIONs --- meta-ports/meta_portsfile/meta_portsfile-1.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-ports/meta_portsfile/meta_portsfile-1.recipe b/meta-ports/meta_portsfile/meta_portsfile-1.recipe index 0a00238bd..315225aff 100644 --- a/meta-ports/meta_portsfile/meta_portsfile-1.recipe +++ b/meta-ports/meta_portsfile/meta_portsfile-1.recipe @@ -1,5 +1,7 @@ SUMMARY="Meta package for building all ports of a given portsfile" -DESCRIPTION="Meta package for building all ports of a given portsfile" +DESCRIPTION=" +Meta package for building all ports of a given portsfile. +" REVISION="1" COPYRIGHT="2013 The HaikuPorts team" LICENSE="MIT" From 29c9ec250e1c0315dd8d0a7cc8e943906765063a Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 280/306] Rewrap net-dialup DESCRIPTIONs --- net-dialup/minicom/minicom-2.6.2.recipe | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net-dialup/minicom/minicom-2.6.2.recipe b/net-dialup/minicom/minicom-2.6.2.recipe index 432353088..7db45c7d7 100644 --- a/net-dialup/minicom/minicom-2.6.2.recipe +++ b/net-dialup/minicom/minicom-2.6.2.recipe @@ -1,8 +1,7 @@ SUMMARY="Minicom is a menu driven communications program." DESCRIPTION=" -Minicom is a menu driven communications program. -It emulates ANSI and VT102 terminals. -It has a dialing directory and auto zmodem download. +Minicom is a menu driven communications program. It emulates ANSI and VT102 \ +terminals. It has a dialing directory and auto zmodem download. " HOMEPAGE="https://alioth.debian.org/projects/minicom/" SRC_URI="https://alioth.debian.org/frs/download.php/file/3869/minicom-2.6.2.tar.gz" From a0f4e07b6faca42b870d72051d154cf7b69d2031 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 281/306] Rewrap net-dns DESCRIPTIONs --- net-dns/c_ares/c_ares-1.10.0.recipe | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net-dns/c_ares/c_ares-1.10.0.recipe b/net-dns/c_ares/c_ares-1.10.0.recipe index 113c97981..691e39bec 100644 --- a/net-dns/c_ares/c_ares-1.10.0.recipe +++ b/net-dns/c_ares/c_ares-1.10.0.recipe @@ -1,10 +1,11 @@ SUMMARY="c-ares is a C library for asynchronous DNS requests" DESCRIPTION=" -This is c-ares, an asynchronous resolver library. It is intended for -applications which need to perform DNS queries without blocking, or -need to perform multiple DNS queries in parallel. The primary -examples of such applications are servers which communicate with -multiple clients and programs with graphical user interfaces." +This is c-ares, an asynchronous resolver library. It is intended for \ +applications which need to perform DNS queries without blocking, or need to \ +perform multiple DNS queries in parallel. The primary examples of such \ +applications are servers which communicate with multiple clients and programs \ +with graphical user interfaces. +" HOMEPAGE="http://c-ares.haxx.se/" SRC_URI="http://c-ares.haxx.se/download/c-ares-1.10.0.tar.gz" CHECKSUM_MD5="1196067641411a75d3cbebe074fd36d8" From e57e716c2df77bce1f618db173d68e24b0d849cc Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 282/306] Rewrap net-irc DESCRIPTIONs --- net-irc/quassel/quassel-0.9.2.recipe | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe index d9b7e1d46..b94053ac4 100644 --- a/net-irc/quassel/quassel-0.9.2.recipe +++ b/net-irc/quassel/quassel-0.9.2.recipe @@ -1,15 +1,14 @@ SUMMARY="Quassel IRC." DESCRIPTION=" -Quassel IRC is a modern, cross-platform, distributed IRC client, -meaning that one (or multiple) client(s) can attach to and detach -from a central core -- much like the popular combination of screen -and a text-based IRC client such as WeeChat, but graphical. In -addition to this unique feature, we aim to bring a pleasurable, -comfortable chatting experience to all major platforms (including -Linux, Windows, and MacOS X as well as Android smartphones), making -communication with your peers not only convenient, but also -ubiquitous available. - " +Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that \ +one (or multiple) client(s) can attach to and detach from a central core -- \ +much like the popular combination of screen and a text-based IRC client such \ +as WeeChat, but graphical. In addition to this unique feature, we aim to bring \ +a pleasurable, comfortable chatting experience to all major platforms \ +(including Linux, Windows, and MacOS X as well as Android smartphones), making \ +communication with your peers not only convenient, but also ubiquitous \ +available. +" HOMEPAGE="http://quassel-irc.org" SRC_URI="http://quassel-irc.org/pub/quassel-0.9.2.tar.bz2" CHECKSUM_MD5="4ed88d288f60290f4459d3e68d61b037" From fd1200647014ec6de5063c7cb32a640ead93e1b3 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:57 -0500 Subject: [PATCH 283/306] Rewrap net-libs DESCRIPTIONs --- net-libs/enet/enet-1.3.0.recipe | 13 ++++++++++--- net-libs/gloox/gloox-1.0.9.recipe | 7 +++---- net-libs/libyahoo2/libyahoo2-1.0.1.recipe | 4 +++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/net-libs/enet/enet-1.3.0.recipe b/net-libs/enet/enet-1.3.0.recipe index 155753690..59b36e7fe 100644 --- a/net-libs/enet/enet-1.3.0.recipe +++ b/net-libs/enet/enet-1.3.0.recipe @@ -1,6 +1,13 @@ -DESCRIPTION="ENet's purpose is to provide a relatively thin, simple and robust network communication layer on top of UDP (User Datagram Protocol). The primary feature it provides is optional reliable, in-order delivery of packets. -ENet omits certain higher level networking features such as authentication, lobbying, server discovery, encryption, or other similar tasks that are particularly application specific so that the library remains flexible, portable, and easily embeddable." SUMMARY="ENet is simple and robust network communication layer." +DESCRIPTION=" +ENet's purpose is to provide a relatively thin, simple and robust network \ +communication layer on top of UDP (User Datagram Protocol). The primary \ +feature it provides is optional reliable, in-order delivery of packets. +ENet omits certain higher level networking features such as authentication, \ +lobbying, server discovery, encryption, or other similar tasks that are \ +particularly application specific so that the library remains flexible, \ +portable, and easily embeddable. +" HOMEPAGE="http://enet.bespin.org" SRC_URI="http://enet.bespin.org/download/enet-1.3.0.tar.gz" CHECKSUM_MD5="3ea50cc5f2f4bbea32abae0d50b64e3c" @@ -66,4 +73,4 @@ PROVIDES_devel=" REQUIRES_devel=" enet$secondaryArchSuffix == $portVersion base - " \ No newline at end of file + " diff --git a/net-libs/gloox/gloox-1.0.9.recipe b/net-libs/gloox/gloox-1.0.9.recipe index 9b124a8e1..f846d7488 100644 --- a/net-libs/gloox/gloox-1.0.9.recipe +++ b/net-libs/gloox/gloox-1.0.9.recipe @@ -1,8 +1,7 @@ +SUMMARY="Full-featured Jabber/XMPP client library" DESCRIPTION=" - Rock-solid, full-featured Jabber/XMPP client library, written in clean - ANSI C++ - " -SUMMARY="Full-featured Jabber/XMPP client library, written in clean ANSI C++" +Rock-solid, full-featured Jabber/XMPP client library, written in clean ANSI C++. +" HOMEPAGE="http://camaya.net/gloox/" LICENSE="GNU GPL v2" COPYRIGHT="2002-2012 Jakob Schröter" diff --git a/net-libs/libyahoo2/libyahoo2-1.0.1.recipe b/net-libs/libyahoo2/libyahoo2-1.0.1.recipe index 5ffba2e85..5dc193452 100644 --- a/net-libs/libyahoo2/libyahoo2-1.0.1.recipe +++ b/net-libs/libyahoo2/libyahoo2-1.0.1.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="libyahoo2 - A C library for Yahoo! Messenger" +DESCRIPTION=" +libyahoo2 - A C library for Yahoo! Messenger. +" HOMEPAGE="http://libyahoo2.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/libyahoo2/files/libyahoo2/1.0.1/libyahoo2-1.0.1.tar.bz2/download" DEPEND="glib >= 1.2.8" From 94848cde5805be5af763aeb5addf112e67661ef5 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 284/306] Rewrap net-misc DESCRIPTIONs --- net-misc/axel/axel-2.4.recipe | 9 ++-- net-misc/berdp/berdp-1.recipe | 12 ++--- net-misc/curl/curl-7.26.0.recipe | 16 +++---- net-misc/curl/curl-7.32.0.recipe | 16 +++---- net-misc/curl/curl-7.33.0.recipe | 16 +++---- net-misc/minidlna/minidlna-1.0.21.recipe | 5 +- net-misc/muscle/muscle-6.00.recipe | 16 +++++-- net-misc/neon/neon-0.29.6.recipe | 33 +++++++------ net-misc/openssh/openssh-5.8p2.recipe | 16 +++++-- net-misc/openssh/openssh-6.0p1.recipe | 16 +++++-- net-misc/rdesktop/rdesktop-1.8.0.recipe | 13 +++-- net-misc/rsync/rsync-3.1.0.recipe | 12 ++--- net-misc/tor/tor-0.2.4.20.recipe | 48 ++++++++++++++----- net-misc/wget/wget-1.14.recipe | 10 ++-- .../youtube_dl/youtube_dl-2013.12.20.recipe | 17 +++---- 15 files changed, 153 insertions(+), 102 deletions(-) diff --git a/net-misc/axel/axel-2.4.recipe b/net-misc/axel/axel-2.4.recipe index d21adb66b..e9e5d418b 100644 --- a/net-misc/axel/axel-2.4.recipe +++ b/net-misc/axel/axel-2.4.recipe @@ -1,8 +1,9 @@ SUMMARY="Light Unix download accelerator" -DESCRIPTION="Axel tries to accelerate HTTP/FTP downloading process by using - multiple connections for one file. It can use multiple mirrors for a - download. Axel has no dependencies and is lightweight, so it might be - useful as a wget clone on byte-critical systems. +DESCRIPTION=" +Axel tries to accelerate HTTP/FTP downloading process by using multiple \ +connections for one file. It can use multiple mirrors for a download. Axel has \ +no dependencies and is lightweight, so it might be useful as a wget clone on \ +byte-critical systems. " HOMEPAGE="http://axel.alioth.debian.org/" SRC_URI="https://alioth.debian.org/frs/download.php/file/3015/axel-2.4.tar.gz" diff --git a/net-misc/berdp/berdp-1.recipe b/net-misc/berdp/berdp-1.recipe index 69afb62fc..22d6203a1 100644 --- a/net-misc/berdp/berdp-1.recipe +++ b/net-misc/berdp/berdp-1.recipe @@ -1,10 +1,10 @@ -DESCRIPTION=" - BeRDP is a project dedicated to bringing the RDP protocol to the BeOS - platform utilizing the rdesktop project. RDP is a protocol designed by - Microsoft to remotely administer / run a session on Windows 2000/2003 - Servers / Windows XP Professional workstations. - " SUMMARY="BeRDP is a project dedicated to bringing the RDP protocol to the BeOS" +DESCRIPTION=" +BeRDP is a project dedicated to bringing the RDP protocol to the BeOS platform \ +utilizing the rdesktop project. RDP is a protocol designed by Microsoft to \ +remotely administer / run a session on Windows 2000/2003 Servers / Windows XP \ +Professional workstations. +" HOMEPAGE="https://github.com/HaikuArchives/BeRDP/" SRC_URI="git+https://github.com/HaikuArchives/BeRDP.git#8d73363b567361a5f14bf36173bf68f01260013a" COPYRIGHT="2003-2004 Sikos" diff --git a/net-misc/curl/curl-7.26.0.recipe b/net-misc/curl/curl-7.26.0.recipe index f7c24844c..50cf2a890 100644 --- a/net-misc/curl/curl-7.26.0.recipe +++ b/net-misc/curl/curl-7.26.0.recipe @@ -94,14 +94,14 @@ TEST() } DESCRIPTION=" - Curl is a command line tool for transferring data with URL syntax, - supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, - LDAPS, POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. - curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, - HTTP form based upload, proxies, cookies, user+password authentication - (Basic, Digest, NTLM, Negotiate, kerberos...), file transfer resume, - proxy tunneling and a busload of other useful tricks. - " +Curl is a command line tool for transferring data with URL syntax, supporting \ +DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \ +POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. curl supports SSL \ +certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, \ +proxies, cookies, user+password authentication (Basic, Digest, NTLM, \ +Negotiate, kerberos...), file transfer resume, proxy tunneling and a busload \ +of other useful tricks. +" # ----- devel package ------------------------------------------------------- diff --git a/net-misc/curl/curl-7.32.0.recipe b/net-misc/curl/curl-7.32.0.recipe index bf40b05b3..83e96b664 100644 --- a/net-misc/curl/curl-7.32.0.recipe +++ b/net-misc/curl/curl-7.32.0.recipe @@ -94,14 +94,14 @@ TEST() } DESCRIPTION=" - Curl is a command line tool for transferring data with URL syntax, - supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, - LDAPS, POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. - curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, - HTTP form based upload, proxies, cookies, user+password authentication - (Basic, Digest, NTLM, Negotiate, kerberos...), file transfer resume, - proxy tunneling and a busload of other useful tricks. - " +Curl is a command line tool for transferring data with URL syntax, supporting \ +DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \ +POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. curl supports SSL \ +certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, \ +proxies, cookies, user+password authentication (Basic, Digest, NTLM, \ +Negotiate, kerberos...), file transfer resume, proxy tunneling and a busload \ +of other useful tricks. +" # ----- devel package ------------------------------------------------------- diff --git a/net-misc/curl/curl-7.33.0.recipe b/net-misc/curl/curl-7.33.0.recipe index 52c364ca9..016be6fae 100644 --- a/net-misc/curl/curl-7.33.0.recipe +++ b/net-misc/curl/curl-7.33.0.recipe @@ -94,14 +94,14 @@ TEST() } DESCRIPTION=" - Curl is a command line tool for transferring data with URL syntax, - supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, - LDAPS, POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. - curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, - HTTP form based upload, proxies, cookies, user+password authentication - (Basic, Digest, NTLM, Negotiate, kerberos...), file transfer resume, - proxy tunneling and a busload of other useful tricks. - " +Curl is a command line tool for transferring data with URL syntax, supporting \ +DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \ +POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. curl supports SSL \ +certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, \ +proxies, cookies, user+password authentication (Basic, Digest, NTLM, \ +Negotiate, kerberos...), file transfer resume, proxy tunneling and a busload \ +of other useful tricks. +" # ----- devel package ------------------------------------------------------- diff --git a/net-misc/minidlna/minidlna-1.0.21.recipe b/net-misc/minidlna/minidlna-1.0.21.recipe index 8839d9911..bf9c246f1 100644 --- a/net-misc/minidlna/minidlna-1.0.21.recipe +++ b/net-misc/minidlna/minidlna-1.0.21.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="MiniDLNA MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully compliant with DLNA/UPnP-AV clients." +DESCRIPTION=" +MiniDLNA MiniDLNA (aka ReadyDLNA) is server software with the aim of being \ +fully compliant with DLNA/UPnP-AV clients. +" HOMEPAGE="http://sourceforge.net/projects/minidlna/" SRC_URI="http://sourceforge.net/projects/minidlna/files/minidlna/1.0.21/minidlna_1.0.21_src.tar.gz" REVISION="1" diff --git a/net-misc/muscle/muscle-6.00.recipe b/net-misc/muscle/muscle-6.00.recipe index 5edc6bb1a..192b1346e 100644 --- a/net-misc/muscle/muscle-6.00.recipe +++ b/net-misc/muscle/muscle-6.00.recipe @@ -1,8 +1,16 @@ -DESCRIPTION="The MUSCLE system is a robust, somewhat scalable, cross-platform client-server solution for dynamic distributed applications for Haiku and other operating systems. - It allows (n) client programs (each of which may be running on a separate computer and/or under a different OS) to communicate with each other in a many-to-many message-passing style. - It employs a central server to which client programs may connect or disconnect at any time (this design is similar to other client-server systems such as Quake servers, IRC servers, and Napster servers, but more general in application). - In addition to the client-server system, MUSCLE contains classes to support peer-to-peer message streaming connections, as well as some handy miscellaneous utility classes." SUMMARY="Robust, somewhat scalable, cross-platform client-server solution" +DESCRIPTION=" +The MUSCLE system is a robust, somewhat scalable, cross-platform client-server \ +solution for dynamic distributed applications for Haiku and other operating \ +systems. It allows (n) client programs (each of which may be running on a \ +separate computer and/or under a different OS) to communicate with each other \ +in a many-to-many message-passing style. It employs a central server to which \ +client programs may connect or disconnect at any time (this design is similar \ +to other client-server systems such as Quake servers, IRC servers, and Napster \ +servers, but more general in application). In addition to the client-server \ +system, MUSCLE contains classes to support peer-to-peer message streaming \ +connections, as well as some handy miscellaneous utility classes. +" COPYRIGHT="2000-2009 Meyer Sound Laboratories Inc." LICENSE="BSD (3-clause)" HOMEPAGE="https://public.msli.com/lcs/muscle/index.html" diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index 6b71d573e..bc7d6ba8a 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -1,22 +1,21 @@ SUMMARY="HTTP and WebDAV client library, with a C interface" DESCRIPTION=" - neon is an HTTP and WebDAV client library, with a C interface. Features: - - - high-level wrappers for common HTTP and WebDAV operations (GET, MOVE, - DELETE, etc) - - low-level interface to the HTTP request/response engine, allowing the - use of arbitrary HTTP methods, headers, etc. - - authentication support including Basic and Digest support, along with - GSSAPI-based Negotiate on Unix, and SSPI-based Negotiate/NTLM on Win32 - - SSL/TLS support using OpenSSL or GnuTLS; exposing an abstraction layer - for verifying server certificates, handling client certificates, and - examining certificate properties. Smartcard-based client certificates - are also supported via a PKCS#11 wrapper interface. - - abstract interface to parsing XML using libxml2 or expat, and wrappers - for simplifying handling XML HTTP response bodies - - WebDAV metadata support; wrappers for PROPFIND and PROPPATCH to simplify - property manipulation. - " +neon is an HTTP and WebDAV client library, with a C interface. Features: +- high-level wrappers for common HTTP and WebDAV operations (GET, MOVE, \ +DELETE, etc) +- low-level interface to the HTTP request/response engine, allowing the use of \ +arbitrary HTTP methods, headers, etc. +- authentication support including Basic and Digest support, along with \ +GSSAPI-based Negotiate on Unix, and SSPI-based Negotiate/NTLM on Win32 +- SSL/TLS support using OpenSSL or GnuTLS; exposing an abstraction layer for \ +verifying server certificates, handling client certificates, and examining \ +certificate properties. Smartcard-based client certificates are also supported \ +via a PKCS#11 wrapper interface. +- abstract interface to parsing XML using libxml2 or expat, and wrappers for \ +simplifying handling XML HTTP response bodies +- WebDAV metadata support; wrappers for PROPFIND and PROPPATCH to simplify \ +property manipulation. +" HOMEPAGE="http://www.webdav.org/neon/" LICENSE="GNU LGPL v2" COPYRIGHT="1999-2011 Joe Orton" diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe index b149e3b18..fa9c4a16a 100644 --- a/net-misc/openssh/openssh-5.8p2.recipe +++ b/net-misc/openssh/openssh-5.8p2.recipe @@ -89,6 +89,16 @@ TEST() make tests } -DESCRIPTION="OpenSSH is a FREE version of the SSH connectivity tools that technical users of the Internet rely on. Users of telnet, rlogin, and ftp may not realize that their password is transmitted across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords) to effectively eliminate eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH provides secure tunneling capabilities and several authentication methods, and supports all SSH protocol versions. - -The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with scp, and ftp with sftp. Also included is sshd (the server side of the package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, ssh-keyscan, ssh-keygen and sftp-server." +DESCRIPTION=" +OpenSSH is a FREE version of the SSH connectivity tools that technical users \ +of the Internet rely on. Users of telnet, rlogin, and ftp may not realize that \ +their password is transmitted across the Internet unencrypted, but it is. \ +OpenSSH encrypts all traffic (including passwords) to effectively eliminate \ +eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH \ +provides secure tunneling capabilities and several authentication methods, and \ +supports all SSH protocol versions. +The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with \ +scp, and ftp with sftp. Also included is sshd (the server side of the \ +package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, \ +ssh-keyscan, ssh-keygen and sftp-server. +" diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index b8316422b..07657236a 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -116,6 +116,16 @@ TEST() make tests } -DESCRIPTION="OpenSSH is a FREE version of the SSH connectivity tools that technical users of the Internet rely on. Users of telnet, rlogin, and ftp may not realize that their password is transmitted across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords) to effectively eliminate eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH provides secure tunneling capabilities and several authentication methods, and supports all SSH protocol versions. - -The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with scp, and ftp with sftp. Also included is sshd (the server side of the package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, ssh-keyscan, ssh-keygen and sftp-server." +DESCRIPTION=" +OpenSSH is a FREE version of the SSH connectivity tools that technical users \ +of the Internet rely on. Users of telnet, rlogin, and ftp may not realize that \ +their password is transmitted across the Internet unencrypted, but it is. \ +OpenSSH encrypts all traffic (including passwords) to effectively eliminate \ +eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH \ +provides secure tunneling capabilities and several authentication methods, and \ +supports all SSH protocol versions. +The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with \ +scp, and ftp with sftp. Also included is sshd (the server side of the \ +package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, \ +ssh-keyscan, ssh-keygen and sftp-server. +" diff --git a/net-misc/rdesktop/rdesktop-1.8.0.recipe b/net-misc/rdesktop/rdesktop-1.8.0.recipe index c45c74b94..cc80affba 100644 --- a/net-misc/rdesktop/rdesktop-1.8.0.recipe +++ b/net-misc/rdesktop/rdesktop-1.8.0.recipe @@ -1,11 +1,10 @@ -DESCRIPTION=" - rdesktop is an open source client for Windows Remote Desktop Services, - capable of natively speaking Remote Desktop Protocol (RDP) in order to - present the user's Windows desktop. rdesktop is known to work with - Windows versions such as NT 4 Terminal Server, 2000, XP, 2003, - 2003 R2, Vista, 2008, 7, and 2008 R2. - " SUMMARY="An open source client for Windows Remote Desktop Services." +DESCRIPTION=" +rdesktop is an open source client for Windows Remote Desktop Services, capable \ +of natively speaking Remote Desktop Protocol (RDP) in order to present the \ +user's Windows desktop. rdesktop is known to work with Windows versions such \ +as NT 4 Terminal Server, 2000, XP, 2003, 2003 R2, Vista, 2008, 7, and 2008 R2. +" HOMEPAGE="http://rdesktop.org/" SRC_URI="git+https://github.com/threedeyes/rdesktop.git#dc04b43ccb443f8245e5cda69ab063624e0d6f8c" COPYRIGHT="1999-2013 Matthew Chapman" diff --git a/net-misc/rsync/rsync-3.1.0.recipe b/net-misc/rsync/rsync-3.1.0.recipe index 44c28ca89..c37066845 100644 --- a/net-misc/rsync/rsync-3.1.0.recipe +++ b/net-misc/rsync/rsync-3.1.0.recipe @@ -1,11 +1,11 @@ SUMMARY="rsync is a utility for fast incremental file transfer" DESCRIPTION=" -rsync is a file transfer program for Unix systems. rsync uses the -'rsync algorithm' which provides a very fast method for bringing -remote files into sync. It does this by sending just the differences -in the files across the link, without requiring that both sets of -files are present at one of the ends of the link beforehand." - +rsync is a file transfer program for Unix systems. rsync uses the 'rsync \ +algorithm' which provides a very fast method for bringing remote files into \ +sync. It does this by sending just the differences in the files across the \ +link, without requiring that both sets of files are present at one of the ends \ +of the link beforehand. +" HOMEPAGE="http://rsync.samba.org/" SRC_URI="http://rsync.samba.org/ftp/rsync/src/rsync-3.1.0.tar.gz" CHECKSUM_MD5="3be148772a33224771a8d4d2a028b132" diff --git a/net-misc/tor/tor-0.2.4.20.recipe b/net-misc/tor/tor-0.2.4.20.recipe index 416a8dff6..c4e71ae77 100644 --- a/net-misc/tor/tor-0.2.4.20.recipe +++ b/net-misc/tor/tor-0.2.4.20.recipe @@ -1,16 +1,40 @@ SUMMARY="A virtual layer that helps you improve privacy and anonymity" -DESCRIPTION="Tor is a network of virtual tunnels that allows people and groups to improve their privacy and security on the Internet. It also enables software developers to create new communication tools with built-in privacy features. Tor provides the foundation for a range of applications that allow organizations and individuals to share information over public networks without compromising their privacy. - -Individuals use Tor to keep websites from tracking them and their family members, or to connect to news sites, instant messaging services, or the like when these are blocked by their local Internet providers. Tor's hidden services let users publish web sites and other services without needing to reveal the location of the site. Individuals also use Tor for socially sensitive communication: chat rooms and web forums for rape and abuse survivors, or people with illnesses. - -Journalists use Tor to communicate more safely with whistleblowers and dissidents. Non-governmental organizations (NGOs) use Tor to allow their workers to connect to their home website while they're in a foreign country, without notifying everybody nearby that they're working with that organization. - -Groups such as Indymedia recommend Tor for safeguarding their members' online privacy and security. Activist groups like the Electronic Frontier Foundation (EFF) recommend Tor as a mechanism for maintaining civil liberties online. Corporations use Tor as a safe way to conduct competitive analysis, and to protect sensitive procurement patterns from eavesdroppers. They also use it to replace traditional VPNs, which reveal the exact amount and timing of communication. Which locations have employees working late? Which locations have employees consulting job-hunting websites? Which research divisions are communicating with the company's patent lawyers? - -A branch of the U.S. Navy uses Tor for open source intelligence gathering, and one of its teams used Tor while deployed in the Middle East recently. Law enforcement uses Tor for visiting or surveilling web sites without leaving government IP addresses in their web logs, and for security during sting operations. - -The variety of people who use Tor is actually part of what makes it so secure. Tor hides you among the other users on the network, so the more populous and diverse the user base for Tor is, the more your anonymity will be protected." - +DESCRIPTION=" +Tor is a network of virtual tunnels that allows people and groups to improve \ +their privacy and security on the Internet. It also enables software \ +developers to create new communication tools with built-in privacy features. \ +Tor provides the foundation for a range of applications that allow \ +organizations and individuals to share information over public networks \ +without compromising their privacy. +Individuals use Tor to keep websites from tracking them and their family \ +members, or to connect to news sites, instant messaging services, or the like \ +when these are blocked by their local Internet providers. Tor's hidden \ +services let users publish web sites and other services without needing to \ +reveal the location of the site. Individuals also use Tor for socially \ +sensitive communication: chat rooms and web forums for rape and abuse \ +survivors, or people with illnesses. +Journalists use Tor to communicate more safely with whistleblowers and \ +dissidents. Non-governmental organizations (NGOs) use Tor to allow their \ +workers to connect to their home website while they're in a foreign country, \ +without notifying everybody nearby that they're working with that organization. +Groups such as Indymedia recommend Tor for safeguarding their members' online \ +privacy and security. Activist groups like the Electronic Frontier Foundation \ +(EFF) recommend Tor as a mechanism for maintaining civil liberties online. \ +Corporations use Tor as a safe way to conduct competitive analysis, and to \ +protect sensitive procurement patterns from eavesdroppers. They also use it to \ +replace traditional VPNs, which reveal the exact amount and timing of \ +communication. Which locations have employees working late? Which locations \ +have employees consulting job-hunting websites? Which research divisions are \ +communicating with the company's patent lawyers? +A branch of the U.S. Navy uses Tor for open source intelligence gathering, and \ +one of its teams used Tor while deployed in the Middle East recently. Law \ +enforcement uses Tor for visiting or surveilling web sites without leaving \ +government IP addresses in their web logs, and for security during sting \ +operations. +The variety of people who use Tor is actually part of what makes it so secure. \ +Tor hides you among the other users on the network, so the more populous and \ +diverse the user base for Tor is, the more your anonymity will be protected. +" HOMEPAGE="https://www.torproject.org" SRC_URI="https://www.torproject.org/dist/tor-0.2.4.20.tar.gz" CHECKSUM_MD5="a8cd8e3b3a3f6a7770f2c22d280f19b8" diff --git a/net-misc/wget/wget-1.14.recipe b/net-misc/wget/wget-1.14.recipe index 473a1f779..a1f31e1c4 100644 --- a/net-misc/wget/wget-1.14.recipe +++ b/net-misc/wget/wget-1.14.recipe @@ -1,9 +1,9 @@ -SUMMARY="wget is a tool for downloading files from the internet" +SUMMARY="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. - " +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" diff --git a/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe b/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe index b9d5d7361..ccfa3082e 100644 --- a/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe +++ b/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe @@ -1,14 +1,11 @@ -SUMMARY="A command-line program to download videos from various sites." +SUMMARY="A command-line program to download videos from various sites" DESCRIPTION=" - The program is usually invoked as youtube-dl followed by options - and the video URL. - Run 'youtube-dl --help' and get a summary of all options. - - Some YouTube videos are served using Adobe's proprietary RTMP - protocol, which imposes DRM restrictions and encrypts the - connection. youtube-dl is not able to download these videos by - itself. - " +The program is usually invoked as youtube-dl followed by options and the video \ +URL. Run 'youtube-dl --help' and get a summary of all options. +Some YouTube videos are served using Adobe's proprietary RTMP protocol, which \ +imposes DRM restrictions and encrypts the connection. youtube-dl is not able \ +to download these videos by itself. +" HOMEPAGE="http://rg3.github.io/youtube-dl/index.html" SRC_URI="https://yt-dl.org/downloads/2013.12.20/youtube-dl-2013.12.20.tar.gz" CHECKSUM_MD5="be0cf52206f9ba3f5f841deec3ce3bde" From 1326ce35949f9a7e4429e3886da93f54feb4e4bf Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 285/306] Rewrap net-p2p DESCRIPTIONs --- net-p2p/seeks/seeks-0.x_git.recipe | 5 +- net-p2p/transmission/transmission-2.82.recipe | 65 +++++++++---------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/net-p2p/seeks/seeks-0.x_git.recipe b/net-p2p/seeks/seeks-0.x_git.recipe index 71ce8179b..2e1db4762 100644 --- a/net-p2p/seeks/seeks-0.x_git.recipe +++ b/net-p2p/seeks/seeks-0.x_git.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="An Open Decentralized Platform for Collaborative Search, Filtering and content Curation" +DESCRIPTION=" +An Open Decentralized Platform for Collaborative Search, Filtering and content \ +Curation. +" HOMEPAGE="http://www.seeks-project.info/" SRC_URI="git://seeks.git.sourceforge.net/gitroot/seeks/seeks" REVISION="1" diff --git a/net-p2p/transmission/transmission-2.82.recipe b/net-p2p/transmission/transmission-2.82.recipe index f6e3acec1..80831ba04 100644 --- a/net-p2p/transmission/transmission-2.82.recipe +++ b/net-p2p/transmission/transmission-2.82.recipe @@ -1,37 +1,36 @@ SUMMARY="Transmission is a cross-platform open source BitTorrent client" -DESCRIPTION="Transmission is a cross-platform BitTorrent client that is: - -Open Source. - -Transmission is an open source, volunteer-based project. Unlike some BitTorrent clients, Transmission doesn't play games with its users to make money: - -Transmission doesn't bundle toolbars, pop-up ads, flash ads, twitter tools, or anything else. -It doesn't hold some feaures back for a payware version. -Its source code is available for anyone to review. -We don't track our users, and our website and forums have no third-party ads or analytics. - -Easy. - -Transmission is designed for easy, powerful use. We've set the defaults to Just Work and it only takes a few clicks to configure advanced features like watch directories, bad peer blocklists, and the web interface. - -Lean. - -In separate benchmarks, Linux Format and Lacrocivious both found Transmission to use less CPU than any other GUI client. It even used less CPU than some non-GUI clients. - -Transmission also has the lowest memory footprint of any major BitTorrent client. - -Imageshack chose Transmission for its BitTorrent farms because the competition requires amounts of memory several times greater than Transmission. - -Transmission's small footprint is one reason why many home device manufacturers, such as FON, Belkin, and Networked Media Tank ship with Transmission. When Belkin and Vuze Inc. partnered to write a Torrent Genie to let people who ran Vuze and owned a Belkin router keep sharing files even when Vuze wasn't running, they decided to use Transmission -- not Vuze's own BitTorrent client -- on the router. - -Native. - -Unlike many cross-platform applications, Transmission integrates seamlessly with your operating system. - -Powerful. - -Transmission has the features you want from a BitTorrent client: encryption, a web interface, peer exchange, magnet links, DHT, µTP, UPnP and NAT-PMP port forwarding, webseed support, watch directories, tracker editing, global and per-torrent speed limits, and more." - +DESCRIPTION=" +Transmission is an open source, volunteer-based project. Unlike some \ +BitTorrent clients, Transmission doesn't play games with its users to make \ +money: +- Transmission doesn't bundle toolbars, pop-up ads, flash ads, twitter tools, \ +or anything else. +- It doesn't hold some feaures back for a payware version. +- Its source code is available for anyone to review. +- They don't track our users, and their website and forums have no third-party \ +ads or analytics. +Transmission is designed for easy, powerful use. They've set the defaults to \ +Just Work and it only takes a few clicks to configure advanced features like \ +watch directories, bad peer blocklists, and the web interface. +In separate benchmarks, Linux Format and Lacrocivious both found Transmission \ +to use less CPU than any other GUI client. It even used less CPU than some \ +non-GUI clients. +Transmission also has the lowest memory footprint of any major BitTorrent \ +client. +Imageshack chose Transmission for its BitTorrent farms because the competition \ +requires amounts of memory several times greater than Transmission. +Transmission's small footprint is one reason why many home device \ +manufacturers, such as FON, Belkin, and Networked Media Tank ship with \ +Transmission. When Belkin and Vuze Inc. partnered to write a Torrent Genie to \ +let people who ran Vuze and owned a Belkin router keep sharing files even when \ +Vuze wasn't running, they decided to use Transmission -- not Vuze's own BitTorrent client -- on the router. +Unlike many cross-platform applications, Transmission integrates seamlessly \ +with your operating system. +Transmission has the features you want from a BitTorrent client: encryption, a \ +web interface, peer exchange, magnet links, DHT, µTP, UPnP and NAT-PMP port \ +forwarding, webseed support, watch directories, tracker editing, global and \ +per-torrent speed limits, and more. +" HOMEPAGE="http://www.transmissionbt.com/" SRC_URI="https://transmission.cachefly.net/transmission-2.82.tar.xz" CHECKSUM_MD5="a5ef870c0410b12d10449c2d36fa4661" From dda9078a5e21a40577e8cc0e8eb58091a4e96c1d Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 286/306] Rewrap net-proxy DESCRIPTIONs --- net-proxy/privoxy/privoxy-3.0.19.recipe | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net-proxy/privoxy/privoxy-3.0.19.recipe b/net-proxy/privoxy/privoxy-3.0.19.recipe index c862b36a9..5696770bb 100644 --- a/net-proxy/privoxy/privoxy-3.0.19.recipe +++ b/net-proxy/privoxy/privoxy-3.0.19.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk" +DESCRIPTION=" +A web proxy with advanced filtering capabilities for protecting privacy \ +against Internet junk. +" HOMEPAGE="http://www.privoxy.org/" SRC_URI="http://sourceforge.net/projects/ijbswa/files/Sources/3.0.19%20%28stable%29/privoxy-3.0.19-stable-src.tar.gz/download" REVISION="1" From 630bd7aaca208aa543154aeb8dc09be2794ca59c Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 287/306] Rewrap net-wireless DESCRIPTIONs --- net-wireless/b43_fwcutter/b43_fwcutter-012.recipe | 4 +++- .../wpa_supplicant/wpa_supplicant-0.7.3.recipe | 11 +++++++++-- net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe | 9 ++++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/net-wireless/b43_fwcutter/b43_fwcutter-012.recipe b/net-wireless/b43_fwcutter/b43_fwcutter-012.recipe index 43d1a74d7..9262ebcc6 100644 --- a/net-wireless/b43_fwcutter/b43_fwcutter-012.recipe +++ b/net-wireless/b43_fwcutter/b43_fwcutter-012.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="A tool for extracting the firmware from a binary Broadcom 43xx wireless driver." +DESCRIPTION=" +A tool for extracting the firmware from a binary Broadcom 43xx wireless driver. +" HOMEPAGE="http://linuxwireless.org/en/users/Drivers/b43" SRC_URI="http://bues.ch/b43/fwcutter/b43-fwcutter-012.tar.bz2" CHECKSUM_MD5="69eadf67b459f313a8d6b37aaabef96c" diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe index a13ea3c74..fbc7508ad 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe @@ -1,5 +1,12 @@ -SUMMARY="A WPA Supplicant with support for WPA and WPA2" -DESCRIPTION="wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both desktop/laptop computers and embedded systems. Supplicant is the IEEE 802.1X/WPA component that is used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver." +SUMMARY="A WPA Supplicant with support for WPA and WPA2" +DESCRIPTION=" +wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with \ +support for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both \ +desktop/laptop computers and embedded systems. Supplicant is the IEEE \ +802.1X/WPA component that is used in the client stations. It implements key \ +negotiation with a WPA Authenticator and it controls the roaming and IEEE \ +802.11 authentication/association of the wlan driver. +" HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-0.7.3.tar.gz" CHECKSUM_MD5="f516f191384a9a546e3f5145c08addda" diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe index e9a67a6a5..4980380b6 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe @@ -1,5 +1,12 @@ SUMMARY="A WPA Supplicant with support for WPA and WPA2" -DESCRIPTION="wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both desktop/laptop computers and embedded systems. Supplicant is the IEEE 802.1X/WPA component that is used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver." +DESCRIPTION=" +wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with \ +support for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both \ +desktop/laptop computers and embedded systems. Supplicant is the IEEE \ +802.1X/WPA component that is used in the client stations. It implements key \ +negotiation with a WPA Authenticator and it controls the roaming and IEEE \ +802.11 authentication/association of the wlan driver. +" HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-2.0.tar.gz" CHECKSUM_MD5="3be2ebfdcced52e00eda0afe2889839d" From feccd5b27a9204823c7d9fcdad6878d856fd1583 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 288/306] Rewrap sci-libs DESCRIPTIONs --- sci-libs/cln/cln-1.3.2.recipe | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sci-libs/cln/cln-1.3.2.recipe b/sci-libs/cln/cln-1.3.2.recipe index bbde965c6..0d572ec78 100644 --- a/sci-libs/cln/cln-1.3.2.recipe +++ b/sci-libs/cln/cln-1.3.2.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="CLN is a library for efficient computations with all kinds of numbers in arbitrary precision." +DESCRIPTION=" +CLN is a library for efficient computations with all kinds of numbers in \ +arbitrary precision. +" HOMEPAGE="http://www.ginac.de/CLN/" SRC_URI="http://www.ginac.de/CLN/cln-1.3.2.tar.bz2" CHECKSUM_MD5="d897cce94d9c34d106575ed4ec865d71" From a0d739012494d2b8c574519bdaa8c2352d24b050 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 289/306] Rewrap sys-apps DESCRIPTIONs --- sys-apps/diffutils/diffutils-3.3.recipe | 28 ++++++++----------- sys-apps/dmidecode/dmidecode-2.12.recipe | 5 +++- sys-apps/dtc/dtc-1.4.0.recipe | 4 ++- sys-apps/ed/ed-1.7.recipe | 4 ++- sys-apps/file/file-5.15.recipe | 10 +++---- sys-apps/getconf/getconf-r260000.recipe | 10 ++++--- sys-apps/grep/grep-2.14.recipe | 5 +++- sys-apps/groff/groff-1.20.1.recipe | 5 +++- sys-apps/man/man-1.6g.recipe | 4 ++- sys-apps/most/most-pre5.1_15.recipe | 6 +++- sys-apps/sed/sed-4.2.1.recipe | 16 +++++------ sys-apps/spiff/spiff-1.recipe | 15 +++++----- sys-apps/texinfo/texinfo-4.13a.recipe | 4 ++- .../the_silver_searcher-0.18.1.recipe | 9 +++--- sys-apps/which/which-2.20.recipe | 5 ++-- 15 files changed, 74 insertions(+), 56 deletions(-) diff --git a/sys-apps/diffutils/diffutils-3.3.recipe b/sys-apps/diffutils/diffutils-3.3.recipe index 583fc5da9..b391f8e44 100644 --- a/sys-apps/diffutils/diffutils-3.3.recipe +++ b/sys-apps/diffutils/diffutils-3.3.recipe @@ -1,21 +1,17 @@ SUMMARY="Several programs for finding differences between files." DESCRIPTION=" -You can use the diff command to show differences between two files, or -each corresponding file in two directories. diff outputs differences -between files line by line in any of several formats, selectable by -command line options. This set of differences is often called a ‘diff’ -or ‘patch’. - -You can use the cmp command to show the offsets and line numbers where -two files differ. cmp can also show all the characters that differ -between the two files, side by side. - -You can use the diff3 command to show differences among three files. -When two people have made independent changes to a common original, -diff3 can report the differences between the original and the two -changed versions, and can produce a merged file that contains both -persons' changes together with warnings about conflicts. - +You can use the diff command to show differences between two files, or each \ +corresponding file in two directories. diff outputs differences between files \ +line by line in any of several formats, selectable by command line options. \ +This set of differences is often called a ‘diff’ or ‘patch’. +You can use the cmp command to show the offsets and line numbers where two \ +files differ. cmp can also show all the characters that differ between the two \ +files, side by side. +You can use the diff3 command to show differences among three files. When two \ +people have made independent changes to a common original, diff3 can report \ +the differences between the original and the two changed versions, and can \ +produce a merged file that contains both persons' changes together with \ +warnings about conflicts. You can use the sdiff command to merge two files interactively. " LICENSE="GNU GPL v3" diff --git a/sys-apps/dmidecode/dmidecode-2.12.recipe b/sys-apps/dmidecode/dmidecode-2.12.recipe index ee6e4cf35..64b99c1ac 100644 --- a/sys-apps/dmidecode/dmidecode-2.12.recipe +++ b/sys-apps/dmidecode/dmidecode-2.12.recipe @@ -1,5 +1,8 @@ SUMMARY="Decodes BIOS SMBIOS/DMI tables" -DESCRIPTION="Reports information about your system's hardware as described in your system BIOS according to the SMBIOS/DMI standard" +DESCRIPTION=" +Reports information about your system's hardware as described in your system \ +BIOS according to the SMBIOS/DMI standard +" HOMEPAGE="http://www.nongnu.org/dmidecode/" SRC_URI="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-2.12.tar.gz" CHECKSUM_MD5="02ee243e1ecac7fe0d04428aec85f63a" diff --git a/sys-apps/dtc/dtc-1.4.0.recipe b/sys-apps/dtc/dtc-1.4.0.recipe index 387681a71..d3250e9ad 100644 --- a/sys-apps/dtc/dtc-1.4.0.recipe +++ b/sys-apps/dtc/dtc-1.4.0.recipe @@ -1,5 +1,7 @@ SUMMARY="The Device Tree Compiler" -DESCRIPTION="The Device Tree Compiler" +DESCRIPTION=" +The Device Tree Compiler +" HOMEPAGE="http://git.jdl.com/gitweb/?p=dtc.git;a=summary" SRC_URI="git://git.jdl.com/software/dtc.git#v1.4.0" LICENSE="GNU GPL v2" diff --git a/sys-apps/ed/ed-1.7.recipe b/sys-apps/ed/ed-1.7.recipe index d1352e658..a9e0fc477 100644 --- a/sys-apps/ed/ed-1.7.recipe +++ b/sys-apps/ed/ed-1.7.recipe @@ -1,5 +1,7 @@ SUMMARY="Your basic line editor" -DESCRIPTION="Your basic line editor" +DESCRIPTION=" +Your basic line editor +" HOMEPAGE="http://www.gnu.org/software/ed/" COPYRIGHT="1992-2010 Free Software Foundation, Inc." LICENSE="GNU GPL v3" diff --git a/sys-apps/file/file-5.15.recipe b/sys-apps/file/file-5.15.recipe index b2f370b93..1d595b308 100644 --- a/sys-apps/file/file-5.15.recipe +++ b/sys-apps/file/file-5.15.recipe @@ -1,10 +1,10 @@ SUMMARY="Identify a file's format by scanning binary data for patterns" DESCRIPTION=" -This is Release 5.x of Ian Darwin's (copyright but distributable) -file(1) command, an implementation of the Unix File(1) command. It -knows the 'magic number' of several thousands of file types. This -version is the standard 'file' command for Linux, *BSD, and other -systems. (See 'patchlevel.h' for the exact release number). +This is Release 5.x of Ian Darwin's (copyright but distributable) file(1) \ +command, an implementation of the Unix File(1) command. It knows the 'magic \ +number' of several thousands of file types. This version is the standard \ +'file' command for Linux, *BSD, and other systems. (See 'patchlevel.h' for the \ +exact release number). " HOMEPAGE="ftp://ftp.astron.com/pub/file/" SRC_URI="ftp://ftp.astron.com/pub/file/file-5.15.tar.gz" diff --git a/sys-apps/getconf/getconf-r260000.recipe b/sys-apps/getconf/getconf-r260000.recipe index b307ae299..b7b61810b 100644 --- a/sys-apps/getconf/getconf-r260000.recipe +++ b/sys-apps/getconf/getconf-r260000.recipe @@ -1,8 +1,10 @@ SUMMARY="Prints out values of POSIX configuration variables" -DESCRIPTION="FreeBSD getconf - - The getconf command prints values of system configuration variables. - It is a command interface to the values returned by sysconf(3), confstr(3), and pathconf(3)." +DESCRIPTION=" +FreeBSD getconf +The getconf command prints values of system configuration variables. It is a \ +command interface to the values returned by sysconf(3), confstr(3), and \ +pathconf(3). +" HOMEPAGE="http://www.freebsd.org/" COPYRIGHT="2000 Massachusetts Institute of Technology" LICENSE="MIT" diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index fc3a7c32e..d0dc428e3 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -1,5 +1,8 @@ SUMMARY="GNU regular expression matcher" -DESCRIPTION="The grep command searches one or more input files for lines containing a match to a specified pattern. By default, grep prints the matching lines." +DESCRIPTION=" +The grep command searches one or more input files for lines containing a match \ +to a specified pattern. By default, grep prints the matching lines. +" HOMEPAGE="http://www.gnu.org/software/grep/" LICENSE="GNU GPL v3" COPYRIGHT="1992-2012 Free Software Foundation, Inc." diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe index 49639b32d..85c775947 100644 --- a/sys-apps/groff/groff-1.20.1.recipe +++ b/sys-apps/groff/groff-1.20.1.recipe @@ -1,5 +1,8 @@ SUMMARY="GNU troff typesetting package" -DESCRIPTION="The groff (GNU troff) software is a typesetting package which reads plain text mixed with formatting commands and produces formatted output." +DESCRIPTION=" +The groff (GNU troff) software is a typesetting package which reads plain text \ +mixed with formatting commands and produces formatted output. +" HOMEPAGE="http://www.gnu.org/software/groff/" SRC_URI="http://ftp.gnu.org/gnu/groff/groff-1.20.1.tar.gz" CHECKSUM_MD5="48fa768dd6fdeb7968041dd5ae8e2b02" diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe index b4c8456c4..cf3de4c0e 100644 --- a/sys-apps/man/man-1.6g.recipe +++ b/sys-apps/man/man-1.6g.recipe @@ -1,5 +1,7 @@ SUMMARY="Standard commands to read man pages" -DESCRIPTION="Standard commands to read man pages." +DESCRIPTION=" +Standard commands to read man pages. +" HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz" CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660" diff --git a/sys-apps/most/most-pre5.1_15.recipe b/sys-apps/most/most-pre5.1_15.recipe index e65925bfb..3ae9447b4 100644 --- a/sys-apps/most/most-pre5.1_15.recipe +++ b/sys-apps/most/most-pre5.1_15.recipe @@ -1,5 +1,9 @@ SUMMARY="MOST is a paging program similar to more and less" -DESCRIPTION="MOST is a powerful paging program for Unix, VMS, MSDOS, and win32 systems. Unlike other well-known paging programs most supports multiple windows and can scroll left and right. Why settle for less?" +DESCRIPTION=" +MOST is a powerful paging program for Unix, VMS, MSDOS, and win32 systems. \ +Unlike other well-known paging programs most supports multiple windows and can \ +scroll left and right. Why settle for less? +" HOMEPAGE="http://www.jedsoft.org/most/" SRC_URI="http://www.jedsoft.org/snapshots/most-pre5.1-15.tar.gz" CHECKSUM_MD5="5894e7acde3ff14e16595b147ca4d2fb" diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index d7f82e46d..f9628efdb 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -1,14 +1,12 @@ SUMMARY="A stream editor" DESCRIPTION=" - Sed is a stream editor, i.e. it can be used to perform basic text - transformations on an input stream (a file or input from a pipeline). - - While in some ways similar to an editor which permits scripted edits - (such as ed), sed works by making only one pass over the input(s), and - is consequently more efficient. But it is sed's ability to filter text - in a pipeline which particularly distinguishes it from other types of - editors. - " +Sed is a stream editor, i.e. it can be used to perform basic text \ +transformations on an input stream (a file or input from a pipeline). +While in some ways similar to an editor which permits scripted edits (such as \ +ed), sed works by making only one pass over the input(s), and is consequently \ +more efficient. But it is sed's ability to filter text in a pipeline which \ +particularly distinguishes it from other types of editors. +" HOMEPAGE="http://www.gnu.org/software/sed" COPYRIGHT="1989-2009 Free Software Foundation, Inc." LICENSE="GNU GPL v3" diff --git a/sys-apps/spiff/spiff-1.recipe b/sys-apps/spiff/spiff-1.recipe index 2662cb205..b4f5cc78c 100644 --- a/sys-apps/spiff/spiff-1.recipe +++ b/sys-apps/spiff/spiff-1.recipe @@ -1,11 +1,12 @@ DESCRIPTION=" - 'spiff' is a command line program that compares the contents of two files - and prints a description of the important differences between them in a - form rather like the standard 'diff' utility. However, unlike diff, it is - not line oriented -- it compares word sequences with all white space and - newlines disregarded, so even if formatting is different you only see the - significant differences. It also compares floating-point values with a - tolerance, so you can look in data files for discrepancies." +'spiff' is a command line program that compares the contents of two files and \ +prints a description of the important differences between them in a form \ +rather like the standard 'diff' utility. However, unlike diff, it is not line \ +oriented -- it compares word sequences with all white space and newlines \ +disregarded, so even if formatting is different you only see the significant \ +differences. It also compares floating-point values with a tolerance, so you \ +can look in data files for discrepancies. +" SUMMARY="Advanced command line tool like standard 'diff'" HOMEPAGE="https://github.com/HaikuArchives/Spiff" SRC_URI="git+https://github.com/HaikuArchives/Spiff#50fa5e3cfe1431071b1de57828508f6903b052c2" diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe index 4601c846e..a5401abc8 100644 --- a/sys-apps/texinfo/texinfo-4.13a.recipe +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -1,5 +1,7 @@ SUMMARY="Standard GNU documentation format tool" -DESCRIPTION="Texinfo is the official documentation format of the GNU project." +DESCRIPTION=" +Texinfo is the official documentation format of the GNU project. +" HOMEPAGE="http://www.gnu.org/software/texinfo/" COPYRIGHT="1992-2008 Free Software Foundation, Inc." LICENSE="GNU GPL v3" diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe index 8a03f9826..903826fdc 100644 --- a/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe +++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe @@ -1,13 +1,12 @@ SUMMARY="A code-searching tool similar to ack, but faster." DESCRIPTION=" A code-searching tool similar to ack, but faster. - * It searches code about 3–5× faster than ack. * It ignores file patterns from your .gitignore and .hgignore. -* If there are files in your source repo you don't want to search, - just add their patterns to a .agignore file. -* Ag uses Pthreads to take advantage of multiple CPU cores and search - files in parallel. +* If there are files in your source repo you don't want to search, just add \ +their patterns to a .agignore file. +* Ag uses Pthreads to take advantage of multiple CPU cores and search files in \ +parallel. " HOMEPAGE="https://github.com/ggreer/the_silver_searcher/" SRC_URI="git+https://github.com/ggreer/the_silver_searcher.git#ae5f4417d1" diff --git a/sys-apps/which/which-2.20.recipe b/sys-apps/which/which-2.20.recipe index 8df104316..6b4e0aa4e 100644 --- a/sys-apps/which/which-2.20.recipe +++ b/sys-apps/which/which-2.20.recipe @@ -35,6 +35,7 @@ INSTALL() make install } -DESCRIPTION="GNU which is an utility that is used to find which executable - (or alias or shell function) is executed when entered on the shell prompt. +DESCRIPTION=" +GNU which is an utility that is used to find which executable (or alias or \ +shell function) is executed when entered on the shell prompt. " From f707402b7ef7149fdf6d9960e72ae16d991d8176 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 290/306] Rewrap sys-block DESCRIPTIONs --- sys-block/parted/parted-3.1.53_git.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys-block/parted/parted-3.1.53_git.recipe b/sys-block/parted/parted-3.1.53_git.recipe index 1b699ef66..6e06f6227 100644 --- a/sys-block/parted/parted-3.1.53_git.recipe +++ b/sys-block/parted/parted-3.1.53_git.recipe @@ -1,5 +1,7 @@ SUMMARY="parted" -DESCRIPTION="parted partition editor" +DESCRIPTION=" +parted partition editor. +" HOMEPAGE="http://www.gnu.org/software/parted" SRC_URI="git://git.debian.org/git/parted/parted.git" #CHECKSUM_MD5="" @@ -48,4 +50,3 @@ INSTALL() { make install } - From 1d16aaeecd709468e72227e8aa71c2f0ace73f16 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 291/306] Rewrap sys-devel DESCRIPTIONs --- sys-devel/autoconf/autoconf-2.68.recipe | 10 +-- sys-devel/autoconf/autoconf-2.69.recipe | 10 +-- sys-devel/automake/automake-1.11.1.recipe | 10 +-- sys-devel/automake/automake-1.12.2.recipe | 10 +-- sys-devel/automake/automake-1.13.1.recipe | 10 +-- sys-devel/bc/bc-1.06.recipe | 8 +-- .../binutils/binutils-2.17_2013_04_21.recipe | 61 +++++++++---------- .../binutils-2.23.2_2013_04_09.recipe | 39 ++++++------ sys-devel/bison/bison-2.4.3.recipe | 21 +++---- sys-devel/bison/bison-2.5.recipe | 21 +++---- sys-devel/clang/clang-3.2.recipe | 11 ++-- sys-devel/distcc/distcc-3.1.recipe | 16 ++--- sys-devel/flex/flex-2.5.35.recipe | 6 +- sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe | 4 +- sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe | 4 +- sys-devel/gettext/gettext-0.18.1.1.recipe | 15 ++++- sys-devel/jam/jam-2.5_2012_10_12.recipe | 26 ++++---- sys-devel/llvm/llvm-3.3.recipe | 5 +- sys-devel/m4/m4-1.4.16.recipe | 29 ++++----- sys-devel/make/make-3.82.recipe | 16 +++-- sys-devel/patch/patch-2.7.1.recipe | 6 +- 21 files changed, 171 insertions(+), 167 deletions(-) diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 70b5deb7b..72e390ea1 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -1,10 +1,10 @@ SUMMARY="A tool for automatically configuring source code" DESCRIPTION=" - GNU Autoconf is a tool for configuring source code and makefiles. Using - autoconf, programmers can create portable and configurable packages, - because the person building the package is allowed to specify various - configuration options. - " +GNU Autoconf is a tool for configuring source code and makefiles. Using \ +autoconf, programmers can create portable and configurable packages, because \ +the person building the package is allowed to specify various configuration \ +options. +" HOMEPAGE="http://www.gnu.org/software/autoconf/" SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2" CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07" diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index 8e56bcf97..3d6f64316 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -1,10 +1,10 @@ SUMMARY="A tool for automatically configuring source code" DESCRIPTION=" - GNU Autoconf is a tool for configuring source code and makefiles. Using - autoconf, programmers can create portable and configurable packages, - because the person building the package is allowed to specify various - configuration options. - " +GNU Autoconf is a tool for configuring source code and makefiles. Using \ +autoconf, programmers can create portable and configurable packages, because \ +the person building the package is allowed to specify various configuration \ +options. +" HOMEPAGE="http://www.gnu.org/software/autoconf/" COPYRIGHT="1992-2012 Free Software Foundation, Inc." LICENSE=" diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe index bfa7103d1..9e86a795a 100644 --- a/sys-devel/automake/automake-1.11.1.recipe +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -1,10 +1,10 @@ SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'" DESCRIPTION=" - Automake is a tool for automatically generating 'Makefile.in' files - from 'Makefile.am' files. 'Makefile.am' is a series of 'make' macro - definitions (with rules occasionally thrown in). The generated - 'Makefile.in' files are compatible with the GNU Makefile standards. - " +Automake is a tool for automatically generating 'Makefile.in' files from \ +'Makefile.am' files. 'Makefile.am' is a series of 'make' macro definitions \ +(with rules occasionally thrown in). The generated 'Makefile.in' files are \ +compatible with the GNU Makefile standards. +" HOMEPAGE="http://www.gnu.org/software/automake/" COPYRIGHT="2009 Free Software Foundation, Inc." LICENSE="GNU GPL v2" diff --git a/sys-devel/automake/automake-1.12.2.recipe b/sys-devel/automake/automake-1.12.2.recipe index d70818f7e..b6ea56418 100644 --- a/sys-devel/automake/automake-1.12.2.recipe +++ b/sys-devel/automake/automake-1.12.2.recipe @@ -1,10 +1,10 @@ SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'" DESCRIPTION=" - Automake is a tool for automatically generating 'Makefile.in' files - from 'Makefile.am' files. 'Makefile.am' is a series of 'make' macro - definitions (with rules occasionally thrown in). The generated - 'Makefile.in' files are compatible with the GNU Makefile standards. - " +Automake is a tool for automatically generating 'Makefile.in' files from \ +'Makefile.am' files. 'Makefile.am' is a series of 'make' macro definitions \ +(with rules occasionally thrown in). The generated 'Makefile.in' files are \ +compatible with the GNU Makefile standards. +" HOMEPAGE="http://www.gnu.org/software/automake/" COPYRIGHT="2012 Free Software Foundation, Inc." LICENSE="GNU GPL v2" diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index 3195941f6..8139a7ee7 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -1,10 +1,10 @@ SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'" DESCRIPTION=" - Automake is a tool for automatically generating 'Makefile.in' files - from 'Makefile.am' files. 'Makefile.am' is a series of 'make' macro - definitions (with rules occasionally thrown in). The generated - 'Makefile.in' files are compatible with the GNU Makefile standards. - " +Automake is a tool for automatically generating 'Makefile.in' files from \ +'Makefile.am' files. 'Makefile.am' is a series of 'make' macro definitions \ +(with rules occasionally thrown in). The generated 'Makefile.in' files are \ +compatible with the GNU Makefile standards. +" HOMEPAGE="http://www.gnu.org/software/automake/" COPYRIGHT="2013 Free Software Foundation, Inc." LICENSE="GNU GPL v2" diff --git a/sys-devel/bc/bc-1.06.recipe b/sys-devel/bc/bc-1.06.recipe index be5c4fb85..91c6ccb79 100644 --- a/sys-devel/bc/bc-1.06.recipe +++ b/sys-devel/bc/bc-1.06.recipe @@ -1,8 +1,8 @@ SUMMARY="Handy console-based calculator utility" -DESCRIPTION="bc is an arbitrary precision numeric processing language. - Syntax is similar to C, but differs in many substantial areas. It - supports interactive execution of statements. bc is a utility included - in the POSIX P1003.2/D11 draft standard. +DESCRIPTION=" +bc is an arbitrary precision numeric processing language. Syntax is similar to \ +C, but differs in many substantial areas. It supports interactive execution of \ +statements. bc is a utility included in the POSIX P1003.2/D11 draft standard. " HOMEPAGE="http://www.gnu.org/software/bc/bc.html" SRC_URI="http://ftp.gnu.org/gnu/bc/bc-1.06.tar.gz" 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 4b17e93a7..9869f3fd2 100644 --- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe +++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe @@ -140,36 +140,31 @@ INSTALL() } DESCRIPTION=" - The GNU Binutils are a collection of binary tools. The main ones are: - - ld - the GNU linker. - as - the GNU assembler. - - But they also include: - - addr2line - Converts addresses into filenames and line numbers. - ar - A utility for creating, modifying and extracting from archives. - c++filt - Filter to demangle encoded C++ symbols. - dlltool - Creates files for building and using DLLs. - gold - A new, faster, ELF only linker, still in beta test. - gprof - Displays profiling information. - nlmconv - Converts object code into an NLM. - nm - Lists symbols from object files. - objcopy - Copys and translates object files. - objdump - Displays information from object files. - ranlib - Generates an index to the contents of an archive. - readelf - Displays information from any ELF format object file. - size - Lists the section sizes of an object or archive file. - strings - Lists printable strings from files. - strip - Discards symbols. - windmc - A Windows compatible message compiler. - windres - A compiler for Windows resource files. - - Most of these programs use BFD, the Binary File Descriptor library, to do low-level - manipulation. Many of them also use the opcodes library to assemble and disassemble machine - instructions. - - The binutils have been ported to most major Unix variants as well as Wintel systems, and their - main reason for existence is to give the GNU system (and GNU/Linux) the facility to compile - and link programs. - " +The GNU Binutils are a collection of binary tools. The main ones are: +- ld - the GNU linker. +- as - the GNU assembler. +But they also include: +- addr2line - Converts addresses into filenames and line numbers. +- ar - A utility for creating, modifying and extracting from archives. +- c++filt - Filter to demangle encoded C++ symbols. +- dlltool - Creates files for building and using DLLs. +- gold - A new, faster, ELF only linker, still in beta test. +- gprof - Displays profiling information. +- nlmconv - Converts object code into an NLM. +- nm - Lists symbols from object files. +- objcopy - Copys and translates object files. +- objdump - Displays information from object files. +- ranlib - Generates an index to the contents of an archive. +- readelf - Displays information from any ELF format object file. +- size - Lists the section sizes of an object or archive file. +- strings - Lists printable strings from files. +- strip - Discards symbols. +- windmc - A Windows compatible message compiler. +- windres - A compiler for Windows resource files. +Most of these programs use BFD, the Binary File Descriptor library, to do \ +low-level manipulation. Many of them also use the opcodes library to assemble \ +and disassemble machine instructions. +The binutils have been ported to most major Unix variants as well as Wintel \ +systems, and their main reason for existence is to give the GNU system (and \ +GNU/Linux) the facility to compile and link programs. +" 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 42a3d32d1..a46e0ce23 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 @@ -149,24 +149,21 @@ INSTALL() } DESCRIPTION=" - The GNU Binutils are a collection of binary tools. The main ones are: - - ld - the GNU linker. - as - the GNU assembler. - - But they also include: - - addr2line - Converts addresses into filenames and line numbers. - ar - A utility for creating, modifying and extracting from archives. - c++filt - Filter to demangle encoded C++ symbols. - nm - Lists symbols from object files. - objcopy - Copys and translates object files. - objdump - Displays information from object files. - ranlib - Generates an index to the contents of an archive. - readelf - Displays information from any ELF format object file. - size - Lists the section sizes of an object or archive file. - strings - Lists printable strings from files. - strip - Discards symbols. - - The tools of this package can be used for cross-builds to $effectiveTargetMachineTriple. - " +The GNU Binutils are a collection of binary tools. The main ones are: +- ld - the GNU linker. +- as - the GNU assembler. +But they also include: +- addr2line - Converts addresses into filenames and line numbers. +- ar - A utility for creating, modifying and extracting from archives. +- c++filt - Filter to demangle encoded C++ symbols. +- nm - Lists symbols from object files. +- objcopy - Copys and translates object files. +- objdump - Displays information from object files. +- ranlib - Generates an index to the contents of an archive. +- readelf - Displays information from any ELF format object file. +- size - Lists the section sizes of an object or archive file. +- strings - Lists printable strings from files. +- strip - Discards symbols. +The tools of this package can be used for cross-builds to \ +$effectiveTargetMachineTriple. +" diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index c6da80506..c74232b5e 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -1,16 +1,15 @@ SUMMARY="A yacc-compatible parser generator" DESCRIPTION=" - Bison is a general-purpose parser generator that converts an annotated - context-free grammar into an LALR(1) or GLR parser for that grammar. Once - you are proficient with Bison, you can use it to develop a wide range of - language parsers, from those used in simple desk calculators to complex - programming languages. - - Bison is upward compatible with Yacc: all properly-written Yacc grammars - ought to work with Bison with no change. Anyone familiar with Yacc should - be able to use Bison with little trouble. You need to be fluent in C or - C++ programming in order to use Bison. - " +Bison is a general-purpose parser generator that converts an annotated \ +context-free grammar into an LALR(1) or GLR parser for that grammar. Once you \ +are proficient with Bison, you can use it to develop a wide range of language \ +parsers, from those used in simple desk calculators to complex programming \ +languages. +Bison is upward compatible with Yacc: all properly-written Yacc grammars ought \ +to work with Bison with no change. Anyone familiar with Yacc should be able to \ +use Bison with little trouble. You need to be fluent in C or C++ programming \ +in order to use Bison. +" HOMEPAGE="http://www.gnu.org/software/bison/bison.html" COPYRIGHT="1992-2010 Free Software Foundation, Inc." LICENSE="GNU GPL v3" diff --git a/sys-devel/bison/bison-2.5.recipe b/sys-devel/bison/bison-2.5.recipe index c82ef16fc..32524beed 100644 --- a/sys-devel/bison/bison-2.5.recipe +++ b/sys-devel/bison/bison-2.5.recipe @@ -1,16 +1,15 @@ SUMMARY="A yacc-compatible parser generator" DESCRIPTION=" - Bison is a general-purpose parser generator that converts an annotated - context-free grammar into an LALR(1) or GLR parser for that grammar. Once - you are proficient with Bison, you can use it to develop a wide range of - language parsers, from those used in simple desk calculators to complex - programming languages. - - Bison is upward compatible with Yacc: all properly-written Yacc grammars - ought to work with Bison with no change. Anyone familiar with Yacc should - be able to use Bison with little trouble. You need to be fluent in C or - C++ programming in order to use Bison. - " +Bison is a general-purpose parser generator that converts an annotated \ +context-free grammar into an LALR(1) or GLR parser for that grammar. Once you \ +are proficient with Bison, you can use it to develop a wide range of language \ +parsers, from those used in simple desk calculators to complex programming \ +languages. +Bison is upward compatible with Yacc: all properly-written Yacc grammars ought \ +to work with Bison with no change. Anyone familiar with Yacc should be able to \ +use Bison with little trouble. You need to be fluent in C or C++ programming \ +in order to use Bison. +" HOMEPAGE="http://www.gnu.org/software/bison/bison.html" COPYRIGHT="1992-2011 Free Software Foundation, Inc." LICENSE="GNU GPL v3" diff --git a/sys-devel/clang/clang-3.2.recipe b/sys-devel/clang/clang-3.2.recipe index b322c72bd..33324b949 100644 --- a/sys-devel/clang/clang-3.2.recipe +++ b/sys-devel/clang/clang-3.2.recipe @@ -1,9 +1,10 @@ SUMMARY="A llvm front end compiler for C and C++" -DESCRIPTION="Clang is an 'LLVM native' C/C++/Objective-C compiler, which - aims to deliver amazingly fast compiles (e.g. about 3x faster than - GCC when compiling Objective-C code in a debug configuration), - extremely useful error and warning messages and to provide a - platform for building great source level tools." +DESCRIPTION=" +Clang is an 'LLVM native' C/C++/Objective-C compiler, which aims to deliver \ +amazingly fast compiles (e.g. about 3x faster than GCC when compiling \ +Objective-C code in a debug configuration), extremely useful error and warning \ +messages and to provide a platform for building great source level tools. +" HOMEPAGE="http://www.llvm.org/" LICENSE="UIUC" diff --git a/sys-devel/distcc/distcc-3.1.recipe b/sys-devel/distcc/distcc-3.1.recipe index 259270d4f..aaebaeba8 100644 --- a/sys-devel/distcc/distcc-3.1.recipe +++ b/sys-devel/distcc/distcc-3.1.recipe @@ -65,11 +65,13 @@ TEST() } DESCRIPTION=" - distcc is a program to distribute builds of C, C++, Objective C or Objective C++ code - across several machines on a network. distcc should always generate the same results - as a local build, is simple to install and use, and is usually much faster than a local compile. +distcc is a program to distribute builds of C, C++, Objective C or Objective \ +C++ code across several machines on a network. distcc should always generate \ +the same results as a local build, is simple to install and use, and is \ +usually much faster than a local compile. - distcc does not require all machines to share a filesystem, have synchronized clocks, - or to have the same libraries or header files installed. They can even have different - processors or operating systems, if cross-compilers are installed. - " +distcc does not require all machines to share a filesystem, have synchronized \ +clocks, or to have the same libraries or header files installed. They can even \ +have different processors or operating systems, if cross-compilers are \ +installed. +" diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index e568bb789..9902934d0 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -1,8 +1,8 @@ SUMMARY="A tool for generating scanners." DESCRIPTION=" - Flex is a fast lexical analyser generator. It is a tool for generating - programs that perform pattern-matching on text. - " +Flex is a fast lexical analyser generator. It is a tool for generating \ +programs that perform pattern-matching on text. +" HOMEPAGE="http://flex.sourceforge.net/" COPYRIGHT="2001-2007 The Flex Project; 1990, 1997 The Regents of the University of California" LICENSE="Flex" diff --git a/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe b/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe index 2e0d0f70b..a8a586880 100644 --- a/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe +++ b/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe @@ -1,5 +1,7 @@ SUMMARY="C/C++ compiler" -DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5." +DESCRIPTION=" +Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5. +" HOMEPAGE="http://gcc.gnu.org" LICENSE=" GNU GPL v2 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 0e134cf65..a9994f2ff 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 @@ -1,5 +1,7 @@ SUMMARY="C/C++ cross-compiler for target ${effectiveTargetMachineTriple}" -DESCRIPTION="Standard compiler for x86 platform." +DESCRIPTION=" +Standard compiler for x86 platform. +" HOMEPAGE="http://gcc.gnu.org" LICENSE=" GNU GPL v2 diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe index 5b1090fe9..1a6cb99f5 100644 --- a/sys-devel/gettext/gettext-0.18.1.1.recipe +++ b/sys-devel/gettext/gettext-0.18.1.1.recipe @@ -1,5 +1,18 @@ SUMMARY="GNU tools for native language support" -DESCRIPTION="GNU 'gettext' is an important step for the GNU Translation Project, as it is an asset on which we may build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools and documentation. Specifically, the GNU 'gettext' utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. These tools include a set of conventions about how programs should be written to support message catalogs, a directory and file naming organization for the message catalogs themselves, a runtime library supporting the retrieval of translated messages, and a few stand-alone programs to massage in various ways the sets of translatable strings, or already translated strings. A special GNU Emacs mode also helps interested parties in preparing these sets, or bringing them up to date." +DESCRIPTION=" +GNU 'gettext' is an important step for the GNU Translation Project, as it is \ +an asset on which we may build many other steps. This package offers to \ +programmers, translators, and even users, a well integrated set of tools and \ +documentation. Specifically, the GNU 'gettext' utilities are a set of tools \ +that provides a framework to help other GNU packages produce multi-lingual \ +messages. These tools include a set of conventions about how programs should \ +be written to support message catalogs, a directory and file naming \ +organization for the message catalogs themselves, a runtime library supporting \ +the retrieval of translated messages, and a few stand-alone programs to \ +massage in various ways the sets of translatable strings, or already \ +translated strings. A special GNU Emacs mode also helps interested parties in \ +preparing these sets, or bringing them up to date. +" HOMEPAGE="http://www.gnu.org/software/gettext/" LICENSE="GNU GPL v3" COPYRIGHT="1998, 2010 Free Software Foundation, Inc." 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 37e98f628..0370db9fa 100644 --- a/sys-devel/jam/jam-2.5_2012_10_12.recipe +++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe @@ -1,20 +1,16 @@ SUMMARY="Build tool, replacement for make" DESCRIPTION=" - Jam is a small open-source build tool that can be used as a replacement - for Make. Even though Jam is a lot simpler to use than Make, it is far - more powerful and easy to master. Its design is sufficiently clear to - allow any average programmer to extend it with advanced features at will. - - The main differences between Jam and Make are as follows: - - - Jam uses ‘Jamfiles’ instead of ‘Makefiles’. - - - Jamfiles do not normally contain toolset-specific rules or actions. - They are thus portable among distinct compilers. - - - Jamfiles are a lot simpler than Makefiles to write and understand, - while providing the same functionality, and much, much more. - " +Jam is a small open-source build tool that can be used as a replacement for \ +Make. Even though Jam is a lot simpler to use than Make, it is far more \ +powerful and easy to master. Its design is sufficiently clear to allow any \ +average programmer to extend it with advanced features at will. +The main differences between Jam and Make are as follows: +- Jam uses ‘Jamfiles’ instead of ‘Makefiles’. +- Jamfiles do not normally contain toolset-specific rules or actions. They are \ +thus portable among distinct compilers. +- Jamfiles are a lot simpler than Makefiles to write and understand, while \ +providing the same functionality, and much, much more. +" HOMEPAGE="http://www.perforce.com/jam/jam.html" LICENSE="Jam" COPYRIGHT="1993-2003 Christopher Seiwald" diff --git a/sys-devel/llvm/llvm-3.3.recipe b/sys-devel/llvm/llvm-3.3.recipe index 9dd0abcd1..e7aa7515a 100644 --- a/sys-devel/llvm/llvm-3.3.recipe +++ b/sys-devel/llvm/llvm-3.3.recipe @@ -1,5 +1,8 @@ SUMMARY="Modular and reuseable compiler and toolchain technologies." -DESCRIPTION="LLVM is a collection of modular and reuseable compiler and and toolchain technologies." +DESCRIPTION=" +LLVM is a collection of modular and reuseable compiler and and toolchain \ +technologies. +" HOMEPAGE="http://www.llvm.org/" LICENSE="UIUC" COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign" diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index e3c3a4491..a4b2b7fc9 100644 --- a/sys-devel/m4/m4-1.4.16.recipe +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -1,21 +1,18 @@ SUMMARY="A macro processor" DESCRIPTION=" - GNU M4 is an implementation of the traditional Unix macro processor. - It is mostly SVR4 compatible although it has some extensions (for - example, handling more than 9 positional parameters to macros). - GNU M4 also has built-in functions for including files, running shell - commands, doing arithmetic, etc. - - M4 is a macro processor in the sense that it copies its input to the - output expanding macros as it goes. Macros are either builtin or - user-defined and can take any number of arguments. Besides just doing - macro expansion, m4 has builtin functions for including named files, - running UNIX commands, doing integer arithmetic, manipulating text in - various ways, recursion etc... M4 can be used either as a front-end to - a compiler or as a macro processor in its own right. - - One of the biggest users of M4 is the GNU Autoconf project. - " +GNU M4 is an implementation of the traditional Unix macro processor. It is \ +mostly SVR4 compatible although it has some extensions (for example, handling \ +more than 9 positional parameters to macros). GNU M4 also has built-in \ +functions for including files, running shell commands, doing arithmetic, etc. +M4 is a macro processor in the sense that it copies its input to the output \ +expanding macros as it goes. Macros are either builtin or user-defined and can \ +take any number of arguments. Besides just doing macro expansion, m4 has \ +builtin functions for including named files, running UNIX commands, doing \ +integer arithmetic, manipulating text in various ways, recursion etc... M4 can \ +be used either as a front-end to a compiler or as a macro processor in its own \ +right. +One of the biggest users of M4 is the GNU Autoconf project. +" HOMEPAGE="http://www.gnu.org/software/m4/" COPYRIGHT="2000, 2005-2011 Free Software Foundation, Inc." LICENSE="GNU GPL v3" diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index 192519546..b3a06bd9f 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -1,14 +1,12 @@ SUMMARY="Standard tool to compile source trees" DESCRIPTION=" - Make is a tool which controls the generation of executables and other - non-source files of a program from the program's source files. - - Make gets its knowledge of how to build your program from a file called - the makefile, which lists each of the non-source files and how to compute - it from other files. When you write a program, you should write a makefile - for it, so that it is possible to use Make to build and install the - program. - " +Make is a tool which controls the generation of executables and other \ +non-source files of a program from the program's source files. +Make gets its knowledge of how to build your program from a file called the \ +makefile, which lists each of the non-source files and how to compute it from \ +other files. When you write a program, you should write a makefile for it, so \ +that it is possible to use Make to build and install the program. +" HOMEPAGE="http://www.gnu.org/software/make/" LICENSE="GNU GPL v3" COPYRIGHT="1988-2010 Free Software Foundation, Inc." diff --git a/sys-devel/patch/patch-2.7.1.recipe b/sys-devel/patch/patch-2.7.1.recipe index 37388be0e..49155a3ae 100644 --- a/sys-devel/patch/patch-2.7.1.recipe +++ b/sys-devel/patch/patch-2.7.1.recipe @@ -1,8 +1,8 @@ SUMMARY="Utility to apply diffs to files" DESCRIPTION=" -Patch takes a patch file containing a difference listing produced by -the diff program and applies those differences to one or more -original files, producing patched versions. +Patch takes a patch file containing a difference listing produced by the diff \ +program and applies those differences to one or more original files, producing \ +patched versions. " LICENSE="GNU GPL v3" COPYRIGHT="2012 Free Software Foundation, Inc." From e958789b46ca47588a2184590f8db79e269f0aa2 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 292/306] Rewrap sys-fs DESCRIPTIONs --- sys-fs/e2fsprogs/e2fsprogs-1.43.recipe | 4 +++- sys-fs/e2fsprogs/e2fsprogs-1.43_git.recipe | 4 +++- sys-fs/fatsort/fatsort-0.9.17.269.recipe | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.recipe b/sys-fs/e2fsprogs/e2fsprogs-1.43.recipe index 9531f3103..5bd17f91c 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.recipe +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" +DESCRIPTION=" +Standard EXT2/EXT3/EXT4 filesystem utilities. +" HOMEPAGE="http://e2fsprogs.sourceforge.net/" SRC_URI="http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs-TEST/1.43-WIP-0922/e2fsprogs-1.43-WIP-2012-09-22.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fe2fsprogs%2Ffiles%2Fe2fsprogs-TEST%2F1.43-WIP-0922%2F&ts=1356043363&use_mirror=switch" CHECKSUM_MD5="653625e10de6ee038e1ee40480de9787" diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43_git.recipe b/sys-fs/e2fsprogs/e2fsprogs-1.43_git.recipe index 5adffe854..76d477afe 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43_git.recipe +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43_git.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" +DESCRIPTION=" +Standard EXT2/EXT3/EXT4 filesystem utilities. +" HOMEPAGE="http://e2fsprogs.sourceforge.net/" SRC_URI="git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git" #CHECKSUM_MD5="" diff --git a/sys-fs/fatsort/fatsort-0.9.17.269.recipe b/sys-fs/fatsort/fatsort-0.9.17.269.recipe index bbea62c96..f4b3b9c1e 100644 --- a/sys-fs/fatsort/fatsort-0.9.17.269.recipe +++ b/sys-fs/fatsort/fatsort-0.9.17.269.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players." +DESCRIPTION=" +Sorts files on FAT16/32 partitions, ideal for basic audio players. +" HOMEPAGE="http://fatsort.sourceforge.net/" SRC_URI="http://downloads.sourceforge.net/project/fatsort/fatsort-0.9.17.269.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Ffatsort%2Ffiles%2F&ts=1364726083&use_mirror=freefr" CHECKSUM_MD5="3d04984b08afe8119475d0f1343120db" From 30423e0bd161efe9231827872a1d91cc27e980fa Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 293/306] Rewrap sys-libs DESCRIPTIONs --- sys-libs/glu/glu-9.0.0.recipe | 4 +++- sys-libs/mesa/mesa-10.0.1.recipe | 11 ++++++----- sys-libs/mesa/mesa-7.8.2.recipe | 15 ++++++++++----- sys-libs/mesa/mesa-7.9.2.recipe | 11 ++++++----- sys-libs/mesa/mesa-9.1.1.recipe | 15 ++++++++++----- sys-libs/ncurses/ncurses-5.9.recipe | 19 ++++++++++++++----- sys-libs/readline/readline-6.2.recipe | 14 +++++++++++--- sys-libs/slang/slang-2.2.4.recipe | 21 ++++++++++----------- sys-libs/zlib/zlib-1.2.8.recipe | 11 ++++++++++- 9 files changed, 80 insertions(+), 41 deletions(-) diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe index 6850e66d6..c60a8cb72 100644 --- a/sys-libs/glu/glu-9.0.0.recipe +++ b/sys-libs/glu/glu-9.0.0.recipe @@ -1,5 +1,7 @@ SUMMARY="OpenGL Utility Library" -DESCRIPTION="OpenGL Utility Library" +DESCRIPTION=" +OpenGL Utility Library. +" HOMEPAGE="http://freedesktop.org" COPYRIGHT="Copyright (C) 1999-2012 Brian Paul and others. All Rights Reserved." LICENSE="MIT" diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe index ad2c370b3..3ad0ec9e8 100644 --- a/sys-libs/mesa/mesa-10.0.1.recipe +++ b/sys-libs/mesa/mesa-10.0.1.recipe @@ -1,9 +1,10 @@ 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. - " +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" diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe index 121b45e59..261fc2d2c 100644 --- a/sys-libs/mesa/mesa-7.8.2.recipe +++ b/sys-libs/mesa/mesa-7.8.2.recipe @@ -5,11 +5,16 @@ # package, mainly to keep the copyright info. SUMMARY="Multi-platform GL implementation" -DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. - -A variety of device drivers allows Mesa to be used in many different environments ranging from software emulation to complete hardware acceleration for modern GPUs. - -Mesa ties into several other open-source projects: the Direct Rendering Infrastructure and X.org to provide OpenGL support to users of X on Linux, FreeBSD and other operating systems." +DESCRIPTION=" +Mesa is an open-source implementation of the OpenGL specification - a system \ +for rendering interactive 3D graphics. +A variety of device drivers allows Mesa to be used in many different \ +environments ranging from software emulation to complete hardware acceleration \ +for modern GPUs. +Mesa ties into several other open-source projects: the Direct Rendering \ +Infrastructure and X.org to provide OpenGL support to users of X on Linux, \ +FreeBSD and other operating systems. +" HOMEPAGE="http://www.mesa3d.org/" COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." LICENSE="MIT" diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index 28c637e37..72c9895a5 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -1,9 +1,10 @@ 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. - " +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" diff --git a/sys-libs/mesa/mesa-9.1.1.recipe b/sys-libs/mesa/mesa-9.1.1.recipe index aea69935d..735873ce8 100644 --- a/sys-libs/mesa/mesa-9.1.1.recipe +++ b/sys-libs/mesa/mesa-9.1.1.recipe @@ -5,11 +5,16 @@ # package, mainly to keep the copyright info. SUMMARY="Multi-platform GL implementation" -DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. - -A variety of device drivers allows Mesa to be used in many different environments ranging from software emulation to complete hardware acceleration for modern GPUs. - -Mesa ties into several other open-source projects: the Direct Rendering Infrastructure and X.org to provide OpenGL support to users of X on Linux, FreeBSD and other operating systems." +DESCRIPTION=" +Mesa is an open-source implementation of the OpenGL specification - a system \ +for rendering interactive 3D graphics. +A variety of device drivers allows Mesa to be used in many different \ +environments ranging from software emulation to complete hardware acceleration \ +for modern GPUs. +Mesa ties into several other open-source projects: the Direct Rendering \ +Infrastructure and X.org to provide OpenGL support to users of X on Linux, \ +FreeBSD and other operating systems. +" HOMEPAGE="http://www.mesa3d.org/" COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." LICENSE="MIT" diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index 677256cdf..225fb3883 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -166,11 +166,20 @@ INSTALL() fi } -DESCRIPTION="The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0, and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses. - -The ncurses code was developed under GNU/Linux. It has been in use for some time with OpenBSD as the system curses library, and on FreeBSD and NetBSD as an external package. It should port easily to any ANSI/POSIX-conforming UNIX. It has even been ported to OS/2 Warp! - -The distribution includes the library and support utilities, including a terminfo compiler tic, a decompiler infocmp, clear, tput, tset, and a termcap conversion tool captoinfo. Full manual pages are provided for the library and tools." +DESCRIPTION=" +The Ncurses (new curses) library is a free software emulation of curses in \ +System V Release 4.0, and more. It uses Terminfo format, supports pads and \ +color and multiple highlights and forms characters and function-key mapping, \ +and has all the other SYSV-curses enhancements over BSD Curses. +The ncurses code was developed under GNU/Linux. It has been in use for some \ +time with OpenBSD as the system curses library, and on FreeBSD and NetBSD as \ +an external package. It should port easily to any ANSI/POSIX-conforming UNIX. \ +It has even been ported to OS/2 Warp! +The distribution includes the library and support utilities, including a \ +terminfo compiler tic, a decompiler infocmp, clear, tput, tset, and a termcap \ +conversion tool captoinfo. Full manual pages are provided for the library and \ +tools. +" # ----- devel package ------------------------------------------------------- diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe index 7526a15f9..c30bc05fa 100644 --- a/sys-libs/readline/readline-6.2.recipe +++ b/sys-libs/readline/readline-6.2.recipe @@ -1,7 +1,15 @@ SUMMARY="The GNU Readline library" -DESCRIPTION="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available. The Readline library includes additional functions to maintain a list of previously-entered command lines, to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands. - -The history facilites are also placed into a separate library, the History library, as part of the build process. The History library may be used without Readline in applications which desire its capabilities." +DESCRIPTION=" +The GNU Readline library provides a set of functions for use by applications \ +that allow users to edit command lines as they are typed in. Both Emacs and vi \ +editing modes are available. The Readline library includes additional \ +functions to maintain a list of previously-entered command lines, to recall \ +and perhaps reedit those lines, and perform csh-like history expansion on \ +previous commands. +The history facilites are also placed into a separate library, the History \ +library, as part of the build process. The History library may be used without \ +Readline in applications which desire its capabilities. +" HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" COPYRIGHT="1989-2011 Free Software Foundation, Inc." LICENSE="GNU GPL v3" diff --git a/sys-libs/slang/slang-2.2.4.recipe b/sys-libs/slang/slang-2.2.4.recipe index 45cd8e32a..36a27eb43 100644 --- a/sys-libs/slang/slang-2.2.4.recipe +++ b/sys-libs/slang/slang-2.2.4.recipe @@ -1,15 +1,14 @@ -SUMMARY="S-Lang is a multi-platform programmer's library designed to allow a developer to create robust multi-platform software." +SUMMARY="S-Lang is a library to help create robust multi-platform software" DESCRIPTION=" -S-Lang is a multi-platform programmer's library designed to allow a -developer to create robust multi-platform software. It provides -facilities required by interactive applications such as display/screen -management, keyboard input, keymaps, and so on. The most exciting -feature of the library is the slang interpreter that may be easily -embedded into a program to make it extensible. While the emphasis has -always been on the embedded nature of the interpreter, it may also be -used in a stand-alone fashion through the use of slsh, which is part -of the S-Lang distribution." - +S-Lang is a multi-platform programmer's library designed to allow a developer \ +to create robust multi-platform software. It provides facilities required by \ +interactive applications such as display/screen management, keyboard input, \ +keymaps, and so on. The most exciting feature of the library is the slang \ +interpreter that may be easily embedded into a program to make it extensible. \ +While the emphasis has always been on the embedded nature of the interpreter, \ +it may also be used in a stand-alone fashion through the use of slsh, which is \ +part of the S-Lang distribution. +" HOMEPAGE="http://www.jedsoft.org/slang/" SRC_URI="ftp://space.mit.edu/pub/davis/slang/v2.2/slang-2.2.4.tar.bz2" CHECKSUM_MD5="7fcfd447e378f07dd0c0bae671fe6487" diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe index 140c26b76..82219fe71 100644 --- a/sys-libs/zlib/zlib-1.2.8.recipe +++ b/sys-libs/zlib/zlib-1.2.8.recipe @@ -1,5 +1,14 @@ SUMMARY="A Massively Spiffy Yet Delicately Unobtrusive Compression Library" -DESCRIPTION="zlib is designed to be a free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library for use on virtually any computer hardware and operating system. The zlib data format is itself portable across platforms. Unlike the LZW compression method used in Unix compress(1) and in the GIF image format, the compression method currently used in zlib essentially never expands the data. (LZW can double or triple the file size in extreme cases.) zlib's memory footprint is also independent of the input data and can be reduced, if necessary, at some cost in compression." +DESCRIPTION=" +zlib is designed to be a free, general-purpose, legally unencumbered -- that \ +is, not covered by any patents -- lossless data-compression library for use on \ +virtually any computer hardware and operating system. The zlib data format is \ +itself portable across platforms. Unlike the LZW compression method used in \ +Unix compress(1) and in the GIF image format, the compression method currently \ +used in zlib essentially never expands the data. (LZW can double or triple the \ +file size in extreme cases.) zlib's memory footprint is also independent of \ +the input data and can be reduced, if necessary, at some cost in compression. +" HOMEPAGE="http://www.zlib.net/" COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" LICENSE="Zlib" From 737a7a3326ea4a20d065afd0f10466b8c67abacf Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 294/306] Rewrap www-client DESCRIPTIONs --- www-client/links/links-2.3pre2.recipe | 6 ++++-- www-client/links/links-2.8.recipe | 6 ++++-- www-client/qupzilla/qupzilla-1.4.x.recipe | 20 +++++++++----------- www-client/w3m/w3m-0.5.3.recipe | 10 +++++----- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/www-client/links/links-2.3pre2.recipe b/www-client/links/links-2.3pre2.recipe index 48546dcab..39049a8ef 100644 --- a/www-client/links/links-2.3pre2.recipe +++ b/www-client/links/links-2.3pre2.recipe @@ -1,5 +1,7 @@ -SUMMARY="links web browser" -DESCRIPTION="links web browser" +SUMMARY="links web browser" +DESCRIPTION=" +links web browser. +" HOMEPAGE="http://links.twibright.com/" SRC_URI="http://links.twibright.com/download/links-2.3pre2.tar.gz" REVISION="1" diff --git a/www-client/links/links-2.8.recipe b/www-client/links/links-2.8.recipe index d501db8ff..67072ea2b 100644 --- a/www-client/links/links-2.8.recipe +++ b/www-client/links/links-2.8.recipe @@ -1,5 +1,7 @@ -SUMMARY="links web browser" -DESCRIPTION="links web browser" +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" diff --git a/www-client/qupzilla/qupzilla-1.4.x.recipe b/www-client/qupzilla/qupzilla-1.4.x.recipe index f49c354ff..dd80ab1e2 100644 --- a/www-client/qupzilla/qupzilla-1.4.x.recipe +++ b/www-client/qupzilla/qupzilla-1.4.x.recipe @@ -1,15 +1,13 @@ -SUMMARY="QupZilla, a lightweight Qt WebKit web browser." +SUMMARY="A lightweight Qt WebKit web browser." DESCRIPTION=" - QupZilla is a lightweight multiplatform web browser based on - libqtwebkit. - - It provides: - - A unified interface for bookmarks, history and RSS reading. - - A themeable interface. - - Integrated AdBlock. - - Speed Dial. - - Multiplatform support. - " +QupZilla is a lightweight multiplatform web browser based on libqtwebkit. +It provides: +- A unified interface for bookmarks, history and RSS reading. +- A themeable interface. +- Integrated AdBlock. +- Speed Dial. +- Multiplatform support. +" HOMEPAGE="http://www.qupzilla.com" SRC_URI="git://github.com/QupZilla/qupzilla.git#4f3aba95ff4194c9b756d196f54d50ff30161f46" diff --git a/www-client/w3m/w3m-0.5.3.recipe b/www-client/w3m/w3m-0.5.3.recipe index 64abaf33e..7d7c996e8 100644 --- a/www-client/w3m/w3m-0.5.3.recipe +++ b/www-client/w3m/w3m-0.5.3.recipe @@ -1,10 +1,10 @@ SUMMARY="Text based WWW browser, supports tables and frames" DESCRIPTION=" -w3m is a text-based web browser as well as a pager like 'more' or -'less'. With w3m you can browse web pages through a terminal emulator -window (xterm, rxvt or something like that). Moreover, w3m can be -used as a text formatting tool which typesets HTML into plain text." - +w3m is a text-based web browser as well as a pager like 'more' or 'less'. With \ +w3m you can browse web pages through a terminal emulator window (xterm, rxvt \ +or something like that). Moreover, w3m can be used as a text formatting tool \ +which typesets HTML into plain text. +" HOMEPAGE="http://w3m.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/w3m/files/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz" REVISION="2" From 01eac841f4ce9958a34a2bbe71fd9ee95aa61bc3 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 295/306] Rewrap www-servers DESCRIPTIONs --- www-servers/cherokee/cherokee-1.2.101.recipe | 5 ++++- www-servers/haproxy/haproxy-1.4.22.recipe | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/www-servers/cherokee/cherokee-1.2.101.recipe b/www-servers/cherokee/cherokee-1.2.101.recipe index 82a05810a..bd2c983f9 100644 --- a/www-servers/cherokee/cherokee-1.2.101.recipe +++ b/www-servers/cherokee/cherokee-1.2.101.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="Cherokee is an innovative, feature rich, and yet easy to configure open source web server" +DESCRIPTION=" +Cherokee is an innovative, feature rich, and yet easy to configure open source \ +web server. +" HOMEPAGE="http://www.cherokee-project.com" SRC_URI="http://cherokee.osuosl.org/1.2/1.2.101/cherokee-1.2.101.tar.gz" REVISION="1" diff --git a/www-servers/haproxy/haproxy-1.4.22.recipe b/www-servers/haproxy/haproxy-1.4.22.recipe index fbaef0b80..b7df92931 100644 --- a/www-servers/haproxy/haproxy-1.4.22.recipe +++ b/www-servers/haproxy/haproxy-1.4.22.recipe @@ -1,5 +1,10 @@ -DESCRIPTION="HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. It is particularly suited for web sites crawling under very high loads while needing persistence or Layer7 processing." SUMMARY="Reliable, high performace TCP/HTTP load balancer" +DESCRIPTION=" +HAProxy is a free, very fast and reliable solution offering high availability, \ +load balancing, and proxying for TCP and HTTP-based applications. It is \ +particularly suited for web sites crawling under very high loads while needing \ +persistence or Layer7 processing. +" HOMEPAGE="http://haproxy.1wt.eu/" SRC_URI="http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz" CHECKSUM_MD5="a0b007c76f6a78524f3b3dd5e704979c" @@ -43,4 +48,4 @@ INSTALL() SBINDIR="${sbinDir}" \ MANDIR="${manDir}" \ DOCDIR="${docDir}" -} \ No newline at end of file +} From 2369021b2a537863b0bebe92646f124f6cc05e8b Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 296/306] Rewrap x11-libs DESCRIPTIONs --- x11-libs/agg/agg-2.5.recipe | 7 +++++-- x11-libs/cairo/cairo-1.10.0.recipe | 4 +++- x11-libs/cairo/cairo-1.8.10.recipe | 4 +++- x11-libs/cd/cd-5.6.recipe | 10 +++++++--- x11-libs/iup/iup-3.8.recipe | 17 +++++++++++------ x11-libs/libxau/libxau-1.0.5.recipe | 6 ++++-- x11-libs/libxcb/libxcb-1.6.recipe | 6 ++++-- x11-libs/pango/pango-1.28.1.recipe | 5 ++++- x11-libs/pixman/pixman-0.20.0.recipe | 4 +++- x11-libs/xtrans/xtrans-1.2.5.recipe | 6 ++++-- 10 files changed, 48 insertions(+), 21 deletions(-) diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe index 866e5b574..11cf2fc4b 100644 --- a/x11-libs/agg/agg-2.5.recipe +++ b/x11-libs/agg/agg-2.5.recipe @@ -1,6 +1,9 @@ SUMMARY="Anti-Grain Geometry (AGG)" -DESCRIPTION="Anti-Grain Geometry (AGG) is an Open Source, free of charge graphic library, written in industrially standard C++." -HOMEPAGE="http://antigrain.com" +DESCRIPTION=" +Anti-Grain Geometry (AGG) is an Open Source, free of charge graphic library, \ +written in industrially standard C++. +" +HOMEPAGE="http://antigrain.com" SRC_URI="http://www.antigrain.com/agg-2.5.tar.gz" REVISION="1" CHECKSUM_MD5="0229a488bc47be10a2fee6cf0b2febd6" diff --git a/x11-libs/cairo/cairo-1.10.0.recipe b/x11-libs/cairo/cairo-1.10.0.recipe index 776d8bdfb..196990cfd 100644 --- a/x11-libs/cairo/cairo-1.10.0.recipe +++ b/x11-libs/cairo/cairo-1.10.0.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Cairo is a 2D graphics library with support for multiple output devices." +DESCRIPTION=" +Cairo is a 2D graphics library with support for multiple output devices. +" HOMEPAGE="http://cairographics.org" SRC_URI="http://cairographics.org/releases/cairo-1.10.0.tar.gz" REVISION="1" diff --git a/x11-libs/cairo/cairo-1.8.10.recipe b/x11-libs/cairo/cairo-1.8.10.recipe index 571c35752..d3715de56 100644 --- a/x11-libs/cairo/cairo-1.8.10.recipe +++ b/x11-libs/cairo/cairo-1.8.10.recipe @@ -1,4 +1,6 @@ -DESCRIPTION="Cairo is a 2D graphics library with support for multiple output devices." +DESCRIPTION=" +Cairo is a 2D graphics library with support for multiple output devices. +" HOMEPAGE="http://cairographics.org" SRC_URI="http://cairographics.org/releases/cairo-1.8.10.tar.gz" REVISION="1" diff --git a/x11-libs/cd/cd-5.6.recipe b/x11-libs/cd/cd-5.6.recipe index 2ad3e71ad..f18cac235 100644 --- a/x11-libs/cd/cd-5.6.recipe +++ b/x11-libs/cd/cd-5.6.recipe @@ -126,7 +126,11 @@ PROVIDES_devel=" LICENSE="MIT" COPYRIGHT="1994-2013 Tecgraf, PUC-Rio." -DESCRIPTION="CD (Canvas Draw) is a platform-independent graphics library. It is implemented in several platforms using native graphics libraries: Microsoft Windows (GDI) and X-Windows (XLIB). - -The library contains functions to support both vector and image applications, and the visualization surface can be either a window or a more abstract surface, such as Image, Clipboard, Metafile, PS, and so on. +DESCRIPTION=" +CD (Canvas Draw) is a platform-independent graphics library. It is implemented \ +in several platforms using native graphics libraries: Microsoft Windows (GDI) \ +and X-Windows (XLIB). +The library contains functions to support both vector and image applications, \ +and the visualization surface can be either a window or a more abstract \ +surface, such as Image, Clipboard, Metafile, PS, and so on. " diff --git a/x11-libs/iup/iup-3.8.recipe b/x11-libs/iup/iup-3.8.recipe index 99a5c0c04..b4aa87176 100644 --- a/x11-libs/iup/iup-3.8.recipe +++ b/x11-libs/iup/iup-3.8.recipe @@ -131,10 +131,15 @@ PROVIDES_devel=" LICENSE="MIT" COPYRIGHT="1994-2013 Tecgraf, PUC-Rio." -DESCRIPTION="IUP is a multi-platform toolkit for building graphical user interfaces. It offers APIs in three basic languages: C, Lua and LED. - +DESCRIPTION=" +IUP is a multi-platform toolkit for building graphical user interfaces. It \ +offers APIs in three basic languages: C, Lua and LED. Its library contains about 100 functions for creating and manipulating dialogs. - -IUP's purpose is to allow a program to run in different systems without changes - the toolkit provides the application portability. Supported systems include: GTK+, Motif and Windows. - -IUP uses an abstract layout model based on the boxes-and-glue paradigm from the TEX text editor. This model, combined with the dialog-specification language (LED) or with the Lua binding (IupLua) makes the dialog creation task more flexible and independent from the graphics system's resolution." +IUP's purpose is to allow a program to run in different systems without \ +changes - the toolkit provides the application portability. Supported systems \ +include: GTK+, Motif and Windows. +IUP uses an abstract layout model based on the boxes-and-glue paradigm from \ +the TEX text editor. This model, combined with the dialog-specification \ +language (LED) or with the Lua binding (IupLua) makes the dialog creation task \ +more flexible and independent from the graphics system's resolution. +" diff --git a/x11-libs/libxau/libxau-1.0.5.recipe b/x11-libs/libxau/libxau-1.0.5.recipe index d3848bf41..43b6efac6 100644 --- a/x11-libs/libxau/libxau-1.0.5.recipe +++ b/x11-libs/libxau/libxau-1.0.5.recipe @@ -1,5 +1,7 @@ -SUMMARY="libxau" -DESCRIPTION="libxau" +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" diff --git a/x11-libs/libxcb/libxcb-1.6.recipe b/x11-libs/libxcb/libxcb-1.6.recipe index 6fc9d23b5..fbcbf454d 100644 --- a/x11-libs/libxcb/libxcb-1.6.recipe +++ b/x11-libs/libxcb/libxcb-1.6.recipe @@ -1,5 +1,7 @@ -SUMMARY="libxcb" -DESCRIPTION="libxcb" +SUMMARY="libxcb" +DESCRIPTION=" +libxcb. +" HOMEPAGE="http://xcb.freedesktop.org/" SRC_URI="http://xcb.freedesktop.org/dist/libxcb-1.6.tar.gz" CHECKSUM_MD5="f824cc4cb4b43f5bbc84c0e17fbd80d0" diff --git a/x11-libs/pango/pango-1.28.1.recipe b/x11-libs/pango/pango-1.28.1.recipe index a783d46ad..21fa4b064 100644 --- a/x11-libs/pango/pango-1.28.1.recipe +++ b/x11-libs/pango/pango-1.28.1.recipe @@ -1,4 +1,7 @@ -DESCRIPTION="Pango is a library for laying out and rendering of text, with an emphasis on internationalization." +DESCRIPTION=" +Pango is a library for laying out and rendering of text, with an emphasis on \ +internationalization. +" HOMEPAGE="http://www.pango.org/" SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/1.28/pango-1.28.1.tar.gz" CHECKSUM_MD5="8c0418a1400df7c4d08db5dbd3287d53" diff --git a/x11-libs/pixman/pixman-0.20.0.recipe b/x11-libs/pixman/pixman-0.20.0.recipe index e0ccec93a..0373ac2c7 100644 --- a/x11-libs/pixman/pixman-0.20.0.recipe +++ b/x11-libs/pixman/pixman-0.20.0.recipe @@ -1,5 +1,7 @@ SUMMARY="pixman" -DESCRIPTION="Pixman - The pixel-manipulation library for X and cairo" +DESCRIPTION=" +Pixman - The pixel-manipulation library for X and cairo. +" HOMEPAGE="http://cgit.freedesktop.org/pixman/" SRC_URI="http://cairographics.org/releases/pixman-0.20.0.tar.gz" CHECKSUM_MD5="c1a31d5cedfa97c5af7148a2d1fd4356" diff --git a/x11-libs/xtrans/xtrans-1.2.5.recipe b/x11-libs/xtrans/xtrans-1.2.5.recipe index 24967005b..3edf0485c 100644 --- a/x11-libs/xtrans/xtrans-1.2.5.recipe +++ b/x11-libs/xtrans/xtrans-1.2.5.recipe @@ -1,5 +1,7 @@ -SUMMARY="xtrans" -DESCRIPTION="xtrans" +SUMMARY="xtrans" +DESCRIPTION=" +xtrans. +" HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/" SRC_URI="http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.5.tar.gz" CHECKSUM_MD5="b2f47d49faf1f24e8294b624b21b9b93" From 5fa89c4743ad704f3fb4fa1247ccbdc0e380479e Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 297/306] Rewrap x11-misc DESCRIPTIONs --- x11-misc/util_macros/util_macros-1.17.0_git.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/x11-misc/util_macros/util_macros-1.17.0_git.recipe b/x11-misc/util_macros/util_macros-1.17.0_git.recipe index 22926812b..d088a29d3 100644 --- a/x11-misc/util_macros/util_macros-1.17.0_git.recipe +++ b/x11-misc/util_macros/util_macros-1.17.0_git.recipe @@ -1,5 +1,7 @@ SUMMARY="xorg util-macros" -DESCRIPTION="xorg util-macros" +DESCRIPTION=" +Xorg util-macros. +" HOMEPAGE="http://cgit.freedesktop.org/xorg/util/macros/" COPYRIGHT="2005 Red Hat, Inc. 2005, 2006, Oracle and/or its affiliates. All rights reserved." From 2c5c2d0856a072ddaff23c570b42570028deb4ea Mon Sep 17 00:00:00 2001 From: noryb009 Date: Thu, 2 Jan 2014 16:40:58 -0500 Subject: [PATCH 298/306] Rewrap x11-proto DESCRIPTIONs --- x11-proto/inputproto/inputproto-2.0.recipe | 6 ++++-- x11-proto/kbproto/kbproto-1.0.4.recipe | 6 ++++-- x11-proto/xcb_proto/xcb_proto-1.6.recipe | 6 ++++-- x11-proto/xextproto/xextproto-7.1.1.recipe | 6 ++++-- x11-proto/xproto/xproto-7.0.23_git.recipe | 6 ++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/x11-proto/inputproto/inputproto-2.0.recipe b/x11-proto/inputproto/inputproto-2.0.recipe index 3835d78cb..6ff6409be 100644 --- a/x11-proto/inputproto/inputproto-2.0.recipe +++ b/x11-proto/inputproto/inputproto-2.0.recipe @@ -1,5 +1,7 @@ -SUMMARY="inputproto" -DESCRIPTION="inputproto" +SUMMARY="inputproto" +DESCRIPTION=" +inputproto. +" HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.0.tar.gz" CHECKSUM_MD5="13d91739cf70a781f1db24d8d3677574" diff --git a/x11-proto/kbproto/kbproto-1.0.4.recipe b/x11-proto/kbproto/kbproto-1.0.4.recipe index 4632636d4..4a420b2a7 100644 --- a/x11-proto/kbproto/kbproto-1.0.4.recipe +++ b/x11-proto/kbproto/kbproto-1.0.4.recipe @@ -1,5 +1,7 @@ -SUMMARY="kbproto" -DESCRIPTION="kbproto" +SUMMARY="kbproto" +DESCRIPTION=" +kbproto. +" HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.4.tar.gz" CHECKSUM_MD5="4deef518a03bc94a7a25902bb7c98dd6" diff --git a/x11-proto/xcb_proto/xcb_proto-1.6.recipe b/x11-proto/xcb_proto/xcb_proto-1.6.recipe index 3127598b5..b6f661beb 100644 --- a/x11-proto/xcb_proto/xcb_proto-1.6.recipe +++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe @@ -1,5 +1,7 @@ -SUMMARY="xcb-proto" -DESCRIPTION="xcb-proto" +SUMMARY="xcb-proto" +DESCRIPTION=" +xcb-proto. +" HOMEPAGE="http://xcb.freedesktop.org/" SRC_URI="http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.gz" CHECKSUM_MD5="8d29695e8faf5fcdce568c66eaeaa5ee" diff --git a/x11-proto/xextproto/xextproto-7.1.1.recipe b/x11-proto/xextproto/xextproto-7.1.1.recipe index 7fab39b0f..ee28282d2 100644 --- a/x11-proto/xextproto/xextproto-7.1.1.recipe +++ b/x11-proto/xextproto/xextproto-7.1.1.recipe @@ -1,5 +1,7 @@ -SUMMARY="xextproto" -DESCRIPTION="xextproto" +SUMMARY="xextproto" +DESCRIPTION=" +xextproto. +" HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.1.1.tar.gz" CHECKSUM_MD5="6c55283718dbeb826bcf899b9e89faba" diff --git a/x11-proto/xproto/xproto-7.0.23_git.recipe b/x11-proto/xproto/xproto-7.0.23_git.recipe index f3b239bd7..ad07d01d7 100644 --- a/x11-proto/xproto/xproto-7.0.23_git.recipe +++ b/x11-proto/xproto/xproto-7.0.23_git.recipe @@ -1,5 +1,7 @@ -SUMMARY="xproto" -DESCRIPTION="xproto" +SUMMARY="xproto" +DESCRIPTION=" +xproto. +" HOMEPAGE="http://cgit.freedesktop.org/xorg/proto/xproto/" COPYRIGHT="1991, Oracle and/or its affiliates. All rights reserved. 1985, 1987, 1988, 1990, 1991, 1993-1996, 1998 The Open Group From 854083a8a907ea86a4c0d62231f34531c14c1329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 2 Jan 2014 23:44:04 +0000 Subject: [PATCH 299/306] FreedroidRPG --- .../freedroidrpg/freedroidrpg-0.15.1.recipe | 114 ++++++++++++++++++ .../freedroidrpg/patches/configure.2.ac.patch | 94 +++++++++++++++ .../freedroidrpg/patches/configure.ac.patch | 25 ++++ 3 files changed, 233 insertions(+) create mode 100644 games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe create mode 100644 games-rpg/freedroidrpg/patches/configure.2.ac.patch create mode 100644 games-rpg/freedroidrpg/patches/configure.ac.patch diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe new file mode 100644 index 000000000..fe2dc2415 --- /dev/null +++ b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe @@ -0,0 +1,114 @@ +SUMMARY="FreedroidRPG is a open source role playing game" +DESCRIPTION="The game tells the story of a world destroyed by a conflict between robots and their human masters. Play as Tux in a quest to save the world from the murderous rebel bots who know no mercy. You get to choose which path you wish to follow, and freedom of choice is everywhere in the game. + +FreedroidRPG features a real time combat system with melee and ranged weapons, fairly similar to the proprietary game Diablo. There is an innovative system of programs that can be run in order to take control of enemy robots, alter their behavior, or improve one's characteristics. You can use over 50 different kinds of items and fight countless enemies on your way to your destiny. An advanced dialog system provides story background and immersive role playing situations. + +The game is complete, fully playable, and can provide about 10 hours of fun. It is still being actively developed, and help is welcome in many areas. People having - or trying to acquire - programming, map editing, or writing skills will find FreedroidRPG to be an exciting, fast-moving project in which they can fully express their creativity." +HOMEPAGE="http://freedroid.org" +SRC_URI="http://sourceforge.net/projects/freedroid/files/freedroidRPG/freedroidRPG-0.15/freedroidRPG-0.15.1.tar.gz/download" +CHECKSUM_MD5="b95ea6abae46bea6ee3ace9a1902f682" +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2010 The Freedroid team" +REVISION="1" + +DISABLE_SOURCE_PACKAGE=yes + +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 x86_64" + +PROVIDES=" + freedroidrpg$secondaryArchSuffix = $portVersion + app:freedroidrpg$secondaryArchSuffix = $portVersion + cmd:pngtoico$secondaryArchSuffix = $portVersion + cmd:croppy$secondaryArchSuffix = $portVersion + cmd:explode_atlas$secondaryArchSuffix = $portVersion + cmd:explodefont$secondaryArchSuffix = $portVersion + cmd:gluefont$secondaryArchSuffix = $portVersion + cmd:make_atlas$secondaryArchSuffix = $portVersion +" +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + #freedroidrpg_data == $portVersion + lib:libsdl$secondaryArchSuffix + #lib:libsdl_mixer$secondaryArchSuffix + lib:libsdl_image$secondaryArchSuffix + lib:libsdl_gfx$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libglu$secondaryArchSuffix + lib:libgl$secondaryArchSuffix +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix + #devel:libsdl_mixer$secondaryArchSuffix + devel:libsdl_image$secondaryArchSuffix + devel:libsdl_gfx$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libglu$secondaryArchSuffix + devel:libgl$secondaryArchSuffix +" +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:libtoolize + cmd:autoconf + cmd:automake + cmd:pkg_config + cmd:python +" +SOURCE_DIR="freedroidrpg-0.15.1" + +PATCHES=" + configure.ac.patch + configure.2.ac.patch +" +PATCH() +{ + sed -i 's/lua.h/..\/lua\/lua.h/g' src/*.c + sed -i 's/lua.h/..\/lua\/lua.h/g' src/*.h + sed -i 's/lauxlib.h/..\/lua\/lauxlib.h/g' src/*.c + sed -i 's/lauxlib.h/..\/lua\/lauxlib.h/g' src/*.h + sed -i 's/lualib.h/..\/lua\/lualib.h/g' src/*.c + sed -i 's/lualib.h/..\/lua\/lualib.h/g' src/*.h +} +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + ./configure --disable-sdltest --with-embedded-lua --libdir=$libDir --includedir=$includeDir \ + --bindir=$binDir --datadir=$dataDir --mandir=$manDir + make +} +INSTALL() +{ + make install + + mkdir -p $appsDir + + mv $binDir/freedroidRPG $appsDir + + packageEntries data $dataDir + addAppDeskbarSymlink $appsDir/freedroidRPG "FreedroidRPG" +} +PROVIDES_data=" + freedroidrpg_data = $portVersion +" +REQUIRES_data=" + haiku >= $haikuVersion +" +SUMMARY_data="FreedroidRPG data files" +ARCHITECTURES_data="any" diff --git a/games-rpg/freedroidrpg/patches/configure.2.ac.patch b/games-rpg/freedroidrpg/patches/configure.2.ac.patch new file mode 100644 index 000000000..df1d7c334 --- /dev/null +++ b/games-rpg/freedroidrpg/patches/configure.2.ac.patch @@ -0,0 +1,94 @@ +diff --git a/configure.ac b/configure.ac +index 73a762a..faf7cb9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -51,7 +51,7 @@ case "$target" in + + *) + CFLAGS="$CFLAGS -DFD_DATADIR='\"\$(pkgdatadir)\"'" #avoid expansion of $pkgdatadir ! +- LDFLAGS="$LDFLAGS -rdynamic" ++ LDFLAGS="$LDFLAGS -lGL" + SYS_GL_LIB=GL + ;; + esac +@@ -105,53 +105,24 @@ AM_PATH_SDL($SDL_VERSION, + CFLAGS="$CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + +-AC_CHECK_LIB([jpeg], [jpeg_start_compress],, +- AC_MSG_ERROR([libjpeg needed to run FreedroidRPG! +-see http://www.ijg.org/])) ++AC_CHECK_LIB([jpeg], [jpeg_start_compress]) + +-AC_CHECK_LIB([z], [compress],, +- AC_MSG_ERROR([zlib is needed to run FreedroidRPG! +-see http://www.gzip.org/zlib/])) ++AC_CHECK_LIB([z], [compress]) + +-AC_CHECK_LIB([png], [png_read_png],, +- AC_MSG_ERROR([libpng needed to run FreedroidRPG +-see http://www.libpng.org/pub/png/libpng.html])) ++AC_CHECK_LIB([png], [png_read_png]) + +-AC_CHECK_LIB([SDL_image], [IMG_LoadJPG_RW],, +- AC_MSG_ERROR([SDL_image library needed for FreedroidRPG! +-see http://www.libsdl.org/])) ++AC_CHECK_LIB([SDL_image], [IMG_LoadJPG_RW]) + +-AC_CHECK_LIB([SDL_gfx], [zoomSurface],, +- AC_MSG_ERROR([SDL_gfx library needed for FreedroidRPG! +-Please refer to the INSTALL file])) ++AC_CHECK_LIB([SDL_gfx], [zoomSurface]) + + AC_MSG_NOTICE([[Checking for optional SDL libraries:]]) + summary_sound="yes" +-AC_CHECK_LIB([SDL_mixer], [Mix_ChannelFinished],, AC_MSG_WARN([ +--------------------------------------------------- +-libSDL_mixer not found! +-You need the SDL_mixer library (version >= 1.2.1) if you want sound! +-(see see http://www.libsdl.org/) +---> compiling without sound support +---------------------------------------------------]) +-summary_sound="SDL_mixer not found") ++AC_CHECK_LIB([SDL_mixer], [Mix_ChannelFinished]) + + if test x$want_vorbis = xyes; then +-AC_CHECK_LIB([ogg], [oggpack_read],, AC_MSG_WARN([ +--------------------------------------------------- +-libogg not found! +-You need the Ogg libs installed if you want +-Freedroid to be able to play Ogg files (e.g. the Intro theme) +---------------------------------------------------]) +-summary_sound="no libogg") ++AC_CHECK_LIB([ogg], [oggpack_read]) + +-AC_CHECK_LIB([vorbis], [vorbis_block_init],, AC_MSG_WARN([ +--------------------------------------------------- +-libvorbis not found! +-You need the Vorbis libs installed if you want +-Freedroid to be able to play Ogg files (e.g. the Intro theme) +---------------------------------------------------]) +-summary_sound="no libvorbis") ++AC_CHECK_LIB([vorbis], [vorbis_block_init]) + else + AC_DEFINE(HAVE_LIBOGG,0, [Define to 1 if ogg libs were found]) + AC_DEFINE(HAVE_LIBVORBIS,0, [Define to 1 if Vorbis libs were found]) +@@ -219,7 +190,17 @@ AC_TYPE_SIZE_T + AC_HEADER_TIME + + # Checks for library functions. +-AC_CHECK_FUNCS([alarm getcwd gettimeofday memset sqrt strstr strtok alphasort scandir nl_langinfo dirname]) ++AC_DEFINE([HAVE_ALARM],[1],[Haiku has alarm]) ++AC_DEFINE([HAVE_DIRNAME],[1],[Haiku has dirname]) ++AC_DEFINE([HAVE_GETCWD],[1],[Haiku has getcwd]) ++AC_DEFINE([HAVE_GETTIMEOFDAY],[1],[Haiku has gettimeofday]) ++AC_DEFINE([HAVE_STRSTR],[1],[Haiku has strstr]) ++AC_DEFINE([HAVE_STRTOK],[1],[Haiku has strtok]) ++AC_DEFINE([HAVE_SQRT],[1],[Haiku has sqrt]) ++AC_DEFINE([HAVE_MEMSET],[1],[Haiku has memset]) ++AC_DEFINE([HAVE_SCANDIR],[1],[Haiku has scandir]) ++AC_DEFINE([HAVE_ALPHASORT],[1],[Haiku has alphashort]) ++AC_DEFINE([PACKAGE_BUGREPORT],["http://bitbucket.org/haikuports/haikuports"],[Haikuports bugs]) + + if test x$want_backtrace = xyes; then + AC_CHECK_FUNCS([backtrace]) diff --git a/games-rpg/freedroidrpg/patches/configure.ac.patch b/games-rpg/freedroidrpg/patches/configure.ac.patch new file mode 100644 index 000000000..a2b7e08a0 --- /dev/null +++ b/games-rpg/freedroidrpg/patches/configure.ac.patch @@ -0,0 +1,25 @@ +diff --git a/configure.ac b/configure.ac +index dad2e72..73a762a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8,7 +8,7 @@ AC_CANONICAL_TARGET + dnl Setup for automake + AM_INIT_AUTOMAKE([tar-ustar dist-bzip2]) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + # Checks for programs. + AC_PROG_CC +@@ -17,9 +17,8 @@ AC_PROG_MAKE_SET + + AC_HEADER_STDC + # Checks for libraries. +-AC_CHECK_LIB([m], [sin],, +- AC_MSG_ERROR([libm not found!! +-No maths library?? What kinda crazy system is that??])) ++AC_CHECK_LIB(m, sin) ++AC_SUBST(LIBM) + + AC_PATH_X + AC_PATH_XTRA From aca3fd94cca8b6e4272f81b2a0daf62bc1e376b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 2 Jan 2014 23:47:50 +0000 Subject: [PATCH 300/306] Enable source package --- games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe | 2 -- 1 file changed, 2 deletions(-) diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe index fe2dc2415..0b26bad1f 100644 --- a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe +++ b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe @@ -11,8 +11,6 @@ LICENSE="GNU GPL v2" COPYRIGHT="2002-2010 The Freedroid team" REVISION="1" -DISABLE_SOURCE_PACKAGE=yes - ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then ARCHITECTURES="$ARCHITECTURES x86_gcc2" From 8dac4ed9c75c072618fa3ed648c71c6ff57cd916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 2 Jan 2014 23:49:57 +0000 Subject: [PATCH 301/306] Enable _data dependencie --- games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe index 0b26bad1f..182b33843 100644 --- a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe +++ b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe @@ -29,7 +29,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - #freedroidrpg_data == $portVersion + freedroidrpg_data == $portVersion lib:libsdl$secondaryArchSuffix #lib:libsdl_mixer$secondaryArchSuffix lib:libsdl_image$secondaryArchSuffix From 8e659866b6c432768687e9eb41d91f96dc905c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 3 Jan 2014 00:11:04 +0000 Subject: [PATCH 302/306] Update summary and description --- .../freedroidrpg/freedroidrpg-0.15.1.recipe | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe index 182b33843..bf3b97059 100644 --- a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe +++ b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe @@ -1,9 +1,22 @@ -SUMMARY="FreedroidRPG is a open source role playing game" -DESCRIPTION="The game tells the story of a world destroyed by a conflict between robots and their human masters. Play as Tux in a quest to save the world from the murderous rebel bots who know no mercy. You get to choose which path you wish to follow, and freedom of choice is everywhere in the game. - -FreedroidRPG features a real time combat system with melee and ranged weapons, fairly similar to the proprietary game Diablo. There is an innovative system of programs that can be run in order to take control of enemy robots, alter their behavior, or improve one's characteristics. You can use over 50 different kinds of items and fight countless enemies on your way to your destiny. An advanced dialog system provides story background and immersive role playing situations. - -The game is complete, fully playable, and can provide about 10 hours of fun. It is still being actively developed, and help is welcome in many areas. People having - or trying to acquire - programming, map editing, or writing skills will find FreedroidRPG to be an exciting, fast-moving project in which they can fully express their creativity." +SUMMARY="A role playing game battling roboters" +DESCRIPTION=" +The game tells the story of a world destroyed by a conflict between robots and\ +their human masters. Play as Tux in a quest to save the world from the \ +murderous rebel bots who know no mercy. You get to choose which path you wish \ +to follow, and freedom of choice is everywhere in the game. \ +\ +FreedroidRPG features a real time combat system with melee and ranged weapons, \ +fairly similar to the proprietary game Diablo. There is an innovative system of\ +programs that can be run in order to take control of enemy robots, alter their \ +behavior, or improve one's characteristics. You can use over 50 different kinds\ +of items and fight countless enemies on your way to your destiny. An advanced \ +dialog system provides story background and immersive role playing situations.\ +\ +The game is complete, fully playable, and can provide about 10 hours of fun. \ +It is still being actively developed, and help is welcome in many areas. People\ +having - or trying to acquire - programming, map editing, or writing skills \ +will find FreedroidRPG to be an exciting, fast-moving project in which they can\ +fully express their creativity." HOMEPAGE="http://freedroid.org" SRC_URI="http://sourceforge.net/projects/freedroid/files/freedroidRPG/freedroidRPG-0.15/freedroidRPG-0.15.1.tar.gz/download" CHECKSUM_MD5="b95ea6abae46bea6ee3ace9a1902f682" From 39d3484ab6dd271f83b4988d8e212db0d166c1a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 3 Jan 2014 15:16:30 +0100 Subject: [PATCH 303/306] gmp: Fix typo --- dev-libs/gmp/gmp-5.1.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe index ae82b8f71..4a1eca3bd 100644 --- a/dev-libs/gmp/gmp-5.1.1.recipe +++ b/dev-libs/gmp/gmp-5.1.1.recipe @@ -8,7 +8,7 @@ LICENSE="GNU GPL v3 COPYRIGHT="1991-2013 Free Software Foundation, Inc." REVISION="1" ARCHITECTURES="x86 x86_gcc2" -PROVIDES="cmp:gmp = $portVersion compat >= 5.1 +PROVIDES="cmd:gmp = $portVersion compat >= 5.1 lib:libgmp lib:libgmp = 10 lib:libgmp = 10.1.1" From 6ea17344f851e3c27d3f3ae5f4f929ad016cce43 Mon Sep 17 00:00:00 2001 From: Artur Jamro Date: Fri, 3 Jan 2014 20:07:19 +0000 Subject: [PATCH 304/306] Added recipe files for IlmBase and OpenEXR --- media-libs/ilmbase/ilmbase-2.1.0.recipe | 100 ++++++++++++++ .../ilmbase/patches/ilmbase-2.1.0.patch | 13 ++ media-libs/openexr/openexr-2.1.0.recipe | 127 ++++++++++++++++++ .../openexr/patches/openexr-2.1.0.patch | 13 ++ 4 files changed, 253 insertions(+) create mode 100644 media-libs/ilmbase/ilmbase-2.1.0.recipe create mode 100644 media-libs/ilmbase/patches/ilmbase-2.1.0.patch create mode 100644 media-libs/openexr/openexr-2.1.0.recipe create mode 100644 media-libs/openexr/patches/openexr-2.1.0.patch diff --git a/media-libs/ilmbase/ilmbase-2.1.0.recipe b/media-libs/ilmbase/ilmbase-2.1.0.recipe new file mode 100644 index 000000000..f902c61ab --- /dev/null +++ b/media-libs/ilmbase/ilmbase-2.1.0.recipe @@ -0,0 +1,100 @@ +DESCRIPTION=" +IlmBase provides base libraries for OpenEXR. It contains five \ +modules. Half encapsulates 16-bit floating-point format. IlmThread \ +is thread abstraction library which currently supports pthreads and \ +Windows threads. Imath implements 2D and 3D vectors, 3x3 and 4x4 \ +matrices, quaternions and other useful math functions. Iex is an \ +exception-handling library. There is also IexMath module. +" +SUMMARY="OpenEXR ILM Base libraries" +HOMEPAGE="http://www.openexr.com" +LICENSE="BSD (3-clause)" +COPYRIGHT="2002-2011 Industrial Light & Magic" +SRC_URI="http://download.savannah.nongnu.org/releases/openexr/ilmbase-2.1.0.tar.gz" +CHECKSUM_MD5="8ba2f608191ad020e50277d8a3ba0850" +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" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 ?x86_64" + +PATCHES="ilmbase-2.1.0.patch" + +PROVIDES=" + ilmbase$secondaryArchSuffix = $portVersion + lib:libilmbase$secondaryArchSuffix = $portVersion + lib:libHalf$secondaryArchSuffix = $portVersion + lib:libIex_2_1$secondaryArchSuffix = $portVersion + lib:libIexMath_2_1$secondaryArchSuffix = $portVersion + lib:libIlmThread_2_1$secondaryArchSuffix = $portVersion + lib:libImath_2_1$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:which + cmd:autoconf + cmd:aclocal + cmd:libtoolize + " + +BUILD() +{ + ./bootstrap + runConfigure ./configure + make +} + +INSTALL() +{ + make install + + # prepare development lib links + prepareInstalledDevelLibs libHalf + prepareInstalledDevelLibs libIex + prepareInstalledDevelLibs libIexMath + prepareInstalledDevelLibs libIlmThread + prepareInstalledDevelLibs libImath + prepareInstalledDevelLibs libIex-2_1 + prepareInstalledDevelLibs libIexMath-2_1 + prepareInstalledDevelLibs libIlmThread-2_1 + prepareInstalledDevelLibs libImath-2_1 + + fixPkgconfig + + # devel package + packageEntries devel $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + ilmbase${secondaryArchSuffix}_devel = $portVersion + devel:libilmbase$secondaryArchSuffix = $portVersion + devel:libHalf$secondaryArchSuffix = $portVersion + devel:libIex_2_1$secondaryArchSuffix = $portVersion + devel:libIexMath_2_1$secondaryArchSuffix = $portVersion + devel:libIlmThread_2_1$secondaryArchSuffix = $portVersion + devel:libImath_2_1$secondaryArchSuffix = $portVersion + devel:libIex$secondaryArchSuffix = $portVersion + devel:libIexMath$secondaryArchSuffix = $portVersion + devel:libIlmThread$secondaryArchSuffix = $portVersion + devel:libImath$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + ilmbase$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/ilmbase/patches/ilmbase-2.1.0.patch b/media-libs/ilmbase/patches/ilmbase-2.1.0.patch new file mode 100644 index 000000000..83627aede --- /dev/null +++ b/media-libs/ilmbase/patches/ilmbase-2.1.0.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 743fc1f..30ca197 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -10,7 +10,7 @@ AC_SUBST(ILMBASE_VERSION_API, ${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR}) + + AC_CANONICAL_HOST + AC_CONFIG_SRCDIR(ImathTest/main.cpp) +-AM_CONFIG_HEADER(config/IlmBaseConfig.h) ++AC_CONFIG_HEADER(config/IlmBaseConfig.h) + AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better + AM_MAINTAINER_MODE + diff --git a/media-libs/openexr/openexr-2.1.0.recipe b/media-libs/openexr/openexr-2.1.0.recipe new file mode 100644 index 000000000..f5046cbed --- /dev/null +++ b/media-libs/openexr/openexr-2.1.0.recipe @@ -0,0 +1,127 @@ +DESCRIPTION=" +OpenEXR is a high dynamic-range (HDR) image file format developed \ +by Industrial Light & Magic for use in computer imaging \ +applications. OpenEXR is used by ILM on all motion pictures \ +currently in production. The first movies to employ OpenEXR were \ +Harry Potter and the Sorcerers Stone, Men in Black II, Gangs of \ +New York, and Signs. Since then, OpenEXR has become ILM's main \ +image file format. +" +SUMMARY="OpenEXR is a high dynamic-range (HDR) image file format" +HOMEPAGE="http://www.openexr.com" +LICENSE="BSD (3-clause)" +COPYRIGHT="2002-2011 Industrial Light & Magic" +SRC_URI="http://download.savannah.nongnu.org/releases/openexr/openexr-2.1.0.tar.gz" +CHECKSUM_MD5="33735d37d2ee01c6d8fbd0df94fb8b43" +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" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 ?x86_64" + +PATCHES="openexr-2.1.0.patch" + +PROVIDES=" + openexr$secondaryArchSuffix = $portVersion + lib:libIlmImf_Imf_2_1$secondaryArchSuffix = $portVersion + cmd:exrenvmap$secondaryArchSuffix = $portVersion + cmd:exrheader$secondaryArchSuffix = $portVersion + cmd:exrmakepreview$secondaryArchSuffix = $portVersion + cmd:exrmaketiled$secondaryArchSuffix = $portVersion + cmd:exrmultipart$secondaryArchSuffix = $portVersion + cmd:exrmultiview$secondaryArchSuffix = $portVersion + cmd:exrstdattr$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libilmbase$secondaryArchSuffix == $portVersion + lib:libHalf$secondaryArchSuffix == $portVersion + lib:libIex_2_1$secondaryArchSuffix == $portVersion + lib:libIexMath_2_1$secondaryArchSuffix == $portVersion + lib:libIlmThread_2_1$secondaryArchSuffix == $portVersion + lib:libImath_2_1$secondaryArchSuffix == $portVersion + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + ilmbase${secondaryArchSuffix}_devel == $portVersion + devel:libilmbase$secondaryArchSuffix == $portVersion + devel:libHalf$secondaryArchSuffix == $portVersion + devel:libIex_2_1$secondaryArchSuffix == $portVersion + devel:libIexMath_2_1$secondaryArchSuffix == $portVersion + devel:libIlmThread_2_1$secondaryArchSuffix == $portVersion + devel:libImath_2_1$secondaryArchSuffix == $portVersion + devel:libIex$secondaryArchSuffix == $portVersion + devel:libIexMath$secondaryArchSuffix == $portVersion + devel:libIlmThread$secondaryArchSuffix == $portVersion + devel:libImath$secondaryArchSuffix == $portVersion + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + ilmbase$secondaryArchSuffix == $portVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:which + cmd:autoconf + cmd:aclocal + cmd:libtoolize + cmd:pkg_config + " + +BUILD() +{ + pathSecondaryArchSuffix=$(echo ${secondaryArchSuffix} | sed s/^_//g) + IlmBasePkgconfig=$(find /packages/ilmbase${secondaryArchSuffix}_devel-\ +${portVersion}-*/ilmbase${secondaryArchSuffix}/develop/lib/\ +${pathSecondaryArchSuffix}/pkgconfig/IlmBase.pc | sed s/IlmBase\.pc//g) + export PKG_CONFIG_PATH+=:$IlmBasePkgconfig + + ./bootstrap + runConfigure ./configure + make +} + +INSTALL() +{ + make install + + # prepare development documentation + devDocDir=$developDocDir + mkdir -p $devDocDir + mv $dataDir/doc $devDocDir + + # prepare autom4te script + aclocalDir=$developDir + mkdir -p $aclocalDir + mv $dataDir/aclocal $aclocalDir + + #clear empty directory + rmdir $dataDir + + # prepare development lib links + prepareInstalledDevelLibs libIlmImf + + fixPkgconfig + + # devel package + packageEntries devel $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + openexr${secondaryArchSuffix}_devel = $portVersion + devel:libIlmImf$secondaryArchSuffix = $portVersion + doc:libIlmImf$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + openexr$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/openexr/patches/openexr-2.1.0.patch b/media-libs/openexr/patches/openexr-2.1.0.patch new file mode 100644 index 000000000..b192a850e --- /dev/null +++ b/media-libs/openexr/patches/openexr-2.1.0.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 23e9e5f..90570d4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,7 +11,7 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}) + + AC_CANONICAL_HOST + AC_CONFIG_SRCDIR(IlmImfTest/main.cpp) +-AM_CONFIG_HEADER(config/OpenEXRConfig.h) ++AC_CONFIG_HEADER(config/OpenEXRConfig.h) + AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better + AM_MAINTAINER_MODE + From a03db20b9001d8e73a7eb226e9ba05085a71687e Mon Sep 17 00:00:00 2001 From: Artur Jamro Date: Fri, 3 Jan 2014 22:49:17 +0000 Subject: [PATCH 305/306] IlmBase and OpenEXR recipes: provided some fixes --- media-libs/ilmbase/ilmbase-2.1.0.recipe | 18 +++++++++--------- media-libs/openexr/openexr-2.1.0.recipe | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/media-libs/ilmbase/ilmbase-2.1.0.recipe b/media-libs/ilmbase/ilmbase-2.1.0.recipe index f902c61ab..e3f497dce 100644 --- a/media-libs/ilmbase/ilmbase-2.1.0.recipe +++ b/media-libs/ilmbase/ilmbase-2.1.0.recipe @@ -64,15 +64,15 @@ INSTALL() make install # prepare development lib links - prepareInstalledDevelLibs libHalf - prepareInstalledDevelLibs libIex - prepareInstalledDevelLibs libIexMath - prepareInstalledDevelLibs libIlmThread - prepareInstalledDevelLibs libImath - prepareInstalledDevelLibs libIex-2_1 - prepareInstalledDevelLibs libIexMath-2_1 - prepareInstalledDevelLibs libIlmThread-2_1 - prepareInstalledDevelLibs libImath-2_1 + prepareInstalledDevelLibs libHalf \ + libIex \ + libIexMath \ + libIlmThread \ + libImath \ + libIex-2_1 \ + libIexMath-2_1 \ + libIlmThread-2_1 \ + libImath-2_1 fixPkgconfig diff --git a/media-libs/openexr/openexr-2.1.0.recipe b/media-libs/openexr/openexr-2.1.0.recipe index f5046cbed..777db4078 100644 --- a/media-libs/openexr/openexr-2.1.0.recipe +++ b/media-libs/openexr/openexr-2.1.0.recipe @@ -29,6 +29,7 @@ PATCHES="openexr-2.1.0.patch" PROVIDES=" openexr$secondaryArchSuffix = $portVersion + lib:libIlmImf$secondaryArchSuffix = $portVersion lib:libIlmImf_Imf_2_1$secondaryArchSuffix = $portVersion cmd:exrenvmap$secondaryArchSuffix = $portVersion cmd:exrheader$secondaryArchSuffix = $portVersion @@ -73,7 +74,7 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:aclocal cmd:libtoolize - cmd:pkg_config + cmd:pkg_config$secondaryArchSuffix " BUILD() @@ -94,20 +95,19 @@ INSTALL() make install # prepare development documentation - devDocDir=$developDocDir - mkdir -p $devDocDir - mv $dataDir/doc $devDocDir + mkdir -p $developDocDir + mv $dataDir/doc $developDocDir # prepare autom4te script - aclocalDir=$developDir - mkdir -p $aclocalDir - mv $dataDir/aclocal $aclocalDir + mkdir -p $developDir + mv $dataDir/aclocal $developDir #clear empty directory rmdir $dataDir # prepare development lib links - prepareInstalledDevelLibs libIlmImf + prepareInstalledDevelLibs libIlmImf-Imf_2_1 \ + libIlmImf fixPkgconfig @@ -120,7 +120,7 @@ INSTALL() PROVIDES_devel=" openexr${secondaryArchSuffix}_devel = $portVersion devel:libIlmImf$secondaryArchSuffix = $portVersion - doc:libIlmImf$secondaryArchSuffix = $portVersion + devel:libIlmImf_Imf_2_1$secondaryArchSuffix = $portVersion " REQUIRES_devel=" openexr$secondaryArchSuffix == $portVersion base From 2c58d51b9d858cc03db209a9851a473bd5fa1149 Mon Sep 17 00:00:00 2001 From: Artur Jamro Date: Fri, 3 Jan 2014 23:54:26 +0000 Subject: [PATCH 306/306] IlmBase and OpenEXR recipes: cosmetic patch --- media-libs/ilmbase/ilmbase-2.1.0.recipe | 11 ++--------- media-libs/openexr/openexr-2.1.0.recipe | 3 +-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/media-libs/ilmbase/ilmbase-2.1.0.recipe b/media-libs/ilmbase/ilmbase-2.1.0.recipe index e3f497dce..b1d704c3f 100644 --- a/media-libs/ilmbase/ilmbase-2.1.0.recipe +++ b/media-libs/ilmbase/ilmbase-2.1.0.recipe @@ -64,15 +64,8 @@ INSTALL() make install # prepare development lib links - prepareInstalledDevelLibs libHalf \ - libIex \ - libIexMath \ - libIlmThread \ - libImath \ - libIex-2_1 \ - libIexMath-2_1 \ - libIlmThread-2_1 \ - libImath-2_1 + prepareInstalledDevelLibs libHalf libIex libIexMath libIlmThread \ + libImath libIex-2_1 libIexMath-2_1 libIlmThread-2_1 libImath-2_1 fixPkgconfig diff --git a/media-libs/openexr/openexr-2.1.0.recipe b/media-libs/openexr/openexr-2.1.0.recipe index 777db4078..e05c89722 100644 --- a/media-libs/openexr/openexr-2.1.0.recipe +++ b/media-libs/openexr/openexr-2.1.0.recipe @@ -106,8 +106,7 @@ INSTALL() rmdir $dataDir # prepare development lib links - prepareInstalledDevelLibs libIlmImf-Imf_2_1 \ - libIlmImf + prepareInstalledDevelLibs libIlmImf-Imf_2_1 libIlmImf fixPkgconfig